merge: upstream/dev sync to 2026-08-24 (v1.18.21) - #43
Open
lacymorrow wants to merge 179 commits into
Open
Conversation
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
…1620) Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> Co-authored-by: 侯秀凯 <9627034+hoooou@users.noreply.github.com>
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
Co-authored-by: Dax Raad <d@ironbay.co> Co-authored-by: Dax <mail@thdxr.com>
Co-authored-by: vimtor <vn4varro@gmail.com>
Co-authored-by: skyzhao1223 <skyzhao1223@users.noreply.github.com>
Co-authored-by: skyzhao1223 <skyzhao1223@users.noreply.github.com>
Co-authored-by: Dax Raad <mail@thdxr.com>
Co-authored-by: Aiden Cline <rekram1-node@users.noreply.github.com>
…o smaller models like dsv4 flash (anomalyco#42045) Co-authored-by: akenra <37288280+akenra@users.noreply.github.com>
Co-authored-by: MrMushrooooom <MrMushrooooom@users.noreply.github.com> Co-authored-by: Frank <frank@anoma.ly>
Co-authored-by: nexxeln <95541290+nexxeln@users.noreply.github.com>
113 upstream commits merged. Conflicts: 15 package.json version bumps (kept lash 1.7.13) + bun.lock (regenerated from upstream base). Upstream @ai-sdk/amazon-bedrock and google-vertex pin bumps preserved in packages/opencode and packages/core. Invariants verified: agent_cycle=shift+tab, EventCwdUpdated, getCwd() in prompt.ts. Typecheck 30/30. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
lacymorrow
changed the title
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
20 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.
Summary
Cumulative weekly upstream sync branch (LAC-3333 + LAC-3413).
Paperclip: LAC-3413 (Lash Upstream Sync — Weekly), LAC-3333
Conflict resolution (2026-08-24)
package.jsonversion conflicts — kept lash1.7.13per playbookbun.lock— regenerated from upstream base (no floated deps; verified)@ai-sdk/amazon-bedrock4.0.158 +@ai-sdk/google-vertex4.0.181 pin bumps preserved inpackages/opencodeandpackages/coreInvariants verified
agent_cycle=shift+tab(NOT tab) inpackages/tui/src/config/keybind.tsEventCwdUpdatedpresent intypes.gen.tsgetCwd()/setCwd()/detectNaturalLanguage()intact insession/prompt.tsExecutionModeProvider/WorkingDirProviderwrapping<App />determineRouting(),handleShellTabCompletion(), ctrl+spaceprompt.mode.toggle,shortenedWorkingDirinprompt/index.tsxTesting
bun turbo typecheck: 30/30 packages, zero errors (after each week's merge)🤖 Generated with Claude Code