LAC-2496: Upstream sync 2026-06-30 (catch-up + 68 commits)

[lacymorrow]

Summary

Resolves LAC-2496 — manual escalation of the LAC-2416 weekly auto-sync.

• Continues sync/upstream-catchup-2026-06-26 (PR sync: merge upstream/dev catch-up (629 commits) #31 vehicle) by merging the remaining 68 commits up to upstream/dev tip 8289883de8 (chore: generate).
• Brings origin/dev forward by the full ~700-commit upstream catch-up since merge base 2602afff35.

Conflict resolution

Only one true conflict materialized — everything else (including the files flagged for escalation in the parent task spec) auto-merged cleanly.

• packages/tui/src/app.tsx — combined upstream's new PermissionProvider (added around ProjectProvider) with the lash ExecutionModeProvider + WorkingDirProvider wrappers that surround <App />. Final provider order:

  PermissionProvider
    ProjectProvider
      ...
        LocationProvider
          ExecutionModeProvider   ← lash
            WorkingDirProvider    ← lash
              <App />
  

Files the parent task pre-flagged as complex (packages/opencode/src/session/prompt.ts, the core layer-node refactor, the tool registry changes, the ~60+ migrated tests, the console i18n bundle) all auto-merged with no human intervention required.

Lash invariants verified

• agent_cycle = shift+tab keybind preserved (packages/tui/src/config/keybind.ts:129).
• getCwd() / @shell-mode imports preserved in packages/opencode/src/session/prompt.ts and packages/opencode/src/tool/shell.ts.
• useKittyKeyboard: {} preserved in packages/tui/src/app.tsx.
• Lash branding and CLI structure unchanged.

Test plan

• git diff --name-only --diff-filter=U is empty (no remaining conflict markers).
• bun turbo typecheck — 29/29 tasks succeeded (~11m cold, ~3m warm).
• Manual smoke once merged.

Notes on the "67 commits" estimate

Parent task estimated the surface as 67 commits / 143 conflicting files. Actual: ~700 commits since origin/dev tip (because the LAC-2416 sync branch advanced PR #31's base without origin/dev catching up), but only one UU conflict after the merge because the sync branch was already current with most of upstream's structural refactors. The escalation was still the right call — auto-resolve heuristics couldn't have known the prompt.ts hunks would land cleanly without a hand check.

Parent: LAC-2416.

[gemini-code-assist]

Code Review

This pull request introduces a major architectural refactoring of the application's client contract, routing, and state synchronization to support a multi-server and multi-workspace model. Key changes include transitioning to reactive, directory-scoped, and tab-scoped state management for prompt inputs, file views, comments, permissions, and notifications. It also introduces a new desktop-optimized directory and file picker powered by @pierre/trees, refactors the titlebar to support drag-and-drop tab reordering via @dnd-kit/solid, and adds a comprehensive manual performance benchmarking suite with Playwright and Chrome tracing. Additionally, several regression tests have been added to cover tab closing, line comments, request docks, todo docks, and hidden terminals. I have no feedback to provide as there are no review comments to assess.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.