Skip to content

sync: merge upstream/dev catch-up (629 commits)#31

Merged
lacymorrow merged 633 commits into
devfrom
sync/upstream-catchup-2026-06-26
Jun 29, 2026
Merged

sync: merge upstream/dev catch-up (629 commits)#31
lacymorrow merged 633 commits into
devfrom
sync/upstream-catchup-2026-06-26

Conversation

@lacymorrow

@lacymorrow lacymorrow commented Jun 26, 2026

Copy link
Copy Markdown
Owner

LAC-2490 — Weekly Lash Upstream Sync (2026-06-29)

Brings main up to upstream/dev tip be8cfa7e08.

Commits merged

  • Base sync (572 commits): bf418954fb merge: Merge upstream/dev 2026-06-26
  • Lash patch (post-merge fixes): 3900f8cba0 fix: apply lash-specific patches after upstream merge
  • Weekly extension (57 commits): 467a6cf7cb merge: extend upstream/dev catch-up to 2026-06-29
  • Type fix for SSE rename: 8891cd6b3c fix(tui): use V2Event after upstream SSE name preservation (#34171)

Escalation file check (per LAC-2490)

File Touched in this sync Conflict?
packages/opencode/src/session/prompt.ts yes (upstream) none
packages/tui/src/app.tsx yes (upstream) none
packages/tui/src/component/prompt/index.tsx yes (upstream) auto-merged
packages/sdk/js/src/v2/gen/types.gen.ts yes (upstream) auto-merged
packages/tui/src/config/keybind.ts no

Invariants

  • agent_cycle still bound to shift+tab (packages/tui/src/config/keybind.ts:129).
  • Lash CLI branding unchanged (no upstream rename touched it).

Gate

  • bun turbo typecheck → 29/29 successful (4m34s clean, ~1m cached).

Brendonovich and others added 30 commits June 24, 2026 01:39
Co-authored-by: Test <test@opencode.test>
Co-authored-by: Brendan Allan <git@brendonovich.dev>
opencode-agent Bot and others added 27 commits June 27, 2026 18:11
)

Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
Co-authored-by: Brendan Allan <git@brendonovich.dev>
Brings PR up to current upstream/dev tip (be8cfa7).
Auto-merge succeeded with no conflicts.

LAC-2490
…#34171)

Upstream renamed the SSE event union back to `V2Event` (no `V2Event1`
suffix). Drop the alias import.

LAC-2490
@lacymorrow lacymorrow changed the title sync: merge upstream/dev catch-up (572 commits) sync: merge upstream/dev catch-up (629 commits) Jun 29, 2026
@lacymorrow lacymorrow merged commit 2602aff into dev Jun 29, 2026
6 of 13 checks passed
@lacymorrow lacymorrow deleted the sync/upstream-catchup-2026-06-26 branch June 29, 2026 10:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.