LAC-2739: Upstream sync (consolidated: 06-30 → 07-20, ~1135 commits, upstream v1.18.3)#39
Open
lacymorrow wants to merge 1149 commits into
Open
LAC-2739: Upstream sync (consolidated: 06-30 → 07-20, ~1135 commits, upstream v1.18.3)#39lacymorrow wants to merge 1149 commits into
lacymorrow wants to merge 1149 commits into
Conversation
Co-authored-by: Kit Langton <kit.langton@gmail.com>
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
Co-authored-by: Brendan Allan <git@brendonovich.dev>
Co-authored-by: Brendan Allan <14191578+Brendonovich@users.noreply.github.com> Co-authored-by: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Co-authored-by: Frank <frank@anoma.ly>
Co-authored-by: Jay <53023+jayair@users.noreply.github.com>
Co-authored-by: Aiden Cline <rekram1-node@users.noreply.github.com>
Co-authored-by: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Co-authored-by: Aiden Cline <rekram1-node@users.noreply.github.com>
anomalyco#37696) Co-authored-by: liqiping <liqiping@msh.team> Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
Co-authored-by: Aiden Cline <rekram1-node@users.noreply.github.com>
Co-authored-by: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Co-authored-by: Jay <53023+jayair@users.noreply.github.com>
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
…-2026-07-13 * origin/dev: fix(test): deflake tool.shell metadata streaming test (LAC-2722) (#40) fix(llm): break circular type inference in ToolResultValue schema fix(build): update worker entrypoint path after upstream sync fix: restore release script lost in upstream sync merge
Weekly sync (LAC-2865). Conflicts: 15 package.json version bumps (kept lash 1.7.13), bun.lock regenerated. No complex conflicts. Invariants verified: agent_cycle=shift+tab, ctrl+space mode toggle, determineRouting, getCwd sentinel, EventCwdUpdated, shortenedWorkingDir. Co-Authored-By: Paperclip <noreply@paperclip.ing>
Co-Authored-By: Paperclip <noreply@paperclip.ing>
lacymorrow
changed the title
…ed-lockfile install
Running `bun install` with conflict markers in bun.lock re-resolved all
^-ranged deps, floating storybook-solidjs-vite 10.1.1 -> 10.6.0 whose new
Solid-version detection fails on CI ("solid-js is not installed") and
storybook 10.4.1 -> 10.5.2 which OOMs the local build. Restored the
pre-merge lockfile and re-ran bun install so only real package.json
deltas re-resolve (opentui 0.4.5, ai-sdk, tanstack, marked catalog bumps).
Documented the lockfile-conflict procedure in UPSTREAM_SYNC.md §13.
Verified: packages/storybook `bun run build` exits 0 locally.
Co-Authored-By: Paperclip <noreply@paperclip.ing>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
19 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Consolidated upstream sync
Merges
upstream/dev(anomalyco/opencode) intodev, consolidating four weekly syncs whose pipeline stalled at various points:origin/dev(PR fix(test): deflake tool.shell metadata streaming test (LAC-2722) #40 Windows tool.shell deflake).Conflict resolution (per UPSTREAM_SYNC.md playbook)
package.jsonfiles each week: kept lash1.7.13(all packages versioned together).bun.lockregenerated viabun installafter each merge.packages/tui/src/component/prompt/index.tsx(kept lashshortenedWorkingDirfooter — superset of upstream's session-directory display).Lash invariants verified (post-merge, each sync)
agent_cycle: shift+tab(packages/tui/src/config/keybind.ts:130), reverse onnone— Tab reserved for shell completion.ctrl+spaceexecution-mode toggle (prompt.mode.togglebinding inpackages/tui/src/component/prompt/index.tsx).determineRouting()shell/agent routing in prompt submit.getCwd()cwd sentinel inpackages/opencode/src/session/prompt.ts.EventCwdUpdatedinpackages/sdk/js/src/v2/gen/types.gen.ts.shortenedWorkingDirfooter display.Testing
bun turbo typecheck: 30/30 packages pass (re-run after 07-20 merge).unit (windows)/e2e (windows): timeout-pattern failures also present ondevat head (tracked in LAC-2770); not introduced by this branch.