Skip to content

LAC-3264: Upstream sync (cumulative → v1.18.16, 2026-08-10) - #42

Merged
lacymorrow merged 1449 commits into
devfrom
LAC-3102/upstream-sync-2026-07-27
Aug 10, 2026
Merged

LAC-3264: Upstream sync (cumulative → v1.18.16, 2026-08-10)#42
lacymorrow merged 1449 commits into
devfrom
LAC-3102/upstream-sync-2026-07-27

Conversation

@lacymorrow

Copy link
Copy Markdown
Owner

Summary

Conflict Resolution

  • packages/*/package.json, sdks/vscode/package.json: kept lash version (1.7.x)
  • bun.lock: took upstream, then regenerated with bun install
  • No conflicts in: prompt.ts, app.tsx, prompt/index.tsx, types.gen.ts, keybinds.ts

Invariants Verified

  • agent_cycle = shift+tab (packages/tui/src/config/keybind.ts:130) ✓
  • EventCwdUpdated in types.gen.ts: not touched ✓
  • Shell-mode plugins unaffected ✓

Typecheck Gate

cd packages/opencode && bun run typecheck
# → 0 errors

Note

PR #39 (LAC-2739) is the base for this sync and must merge first. This PR is consolidating both syncs.

Closes LAC-3102

Brendonovich and others added 30 commits July 24, 2026 06:05
…lyco#38117)

Co-authored-by: Brendan Allan <14191578+Brendonovich@users.noreply.github.com>
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
Co-authored-by: Zach Bruggeman <zbruggeman@ramp.com>
Co-authored-by: Zach Bruggeman <zbruggeman@ramp.com>
opencode-agent Bot and others added 26 commits August 7, 2026 04:08
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
Co-authored-by: Brendan Allan <14191578+Brendonovich@users.noreply.github.com>
59 upstream commits (d37fdb1..941e71d). Conflicts: 15 package.json
version bumps (kept lash 1.7.13) + bun.lock (regenerated from clean base).
Sensitive files auto-merged clean; agent_cycle=shift+tab verified.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@lacymorrow lacymorrow changed the title LAC-3206: Upstream sync (cumulative → v1.18.13, 2026-08-04) LAC-3264: Upstream sync (cumulative → v1.18.16, 2026-08-10) Aug 10, 2026
@lacymorrow

Copy link
Copy Markdown
Owner Author

LAC-3264: weekly sync 2026-08-10 (→ upstream v1.18.16)

Merged 59 new upstream commits (d37fdb1f18..941e71dbbb) into this cumulative branch.

Conflicts (all standard, auto-resolved per playbook):

  • 15 package.json version bumps — kept lash 1.7.13
  • bun.lock — restored clean pre-merge base, then bun install; staged delta is only internal 1.18.13→1.18.16 versions plus upstream's new @ai-sdk/openai-compatible@2.0.41 patchedDependencies entry (patch file present)

Escalation-flagged files: none conflicted. prompt.ts auto-merged one upstream fix hunk (orphan detection now uses parentID instead of ID ordering); prompt/index.tsx auto-merged the new cursor-style config feature (anomalyco#32295). keybinds.ts, app.tsx, types.gen.ts untouched.

Invariants verified: agent_cycle=shift+tab (keybind.ts:130), getCwd/setCwd/sentinel in prompt.ts, EventCwdUpdated in types.gen.ts, determineRouting/shortenedWorkingDir/modePrefixColor/double border in prompt/index.tsx, ctrl+space → prompt.mode.toggle.

Typecheck gate: bun turbo typecheck — 30/30 successful, 0 errors.

⚠️ Backlog note: this PR now carries five weekly syncs (07-13 → 08-10) unmerged into dev. The longer it sits, the larger the eventual conflict surface.

@lacymorrow
lacymorrow merged commit 78cd62c into dev Aug 10, 2026
10 of 11 checks passed
@lacymorrow
lacymorrow deleted the LAC-3102/upstream-sync-2026-07-27 branch August 10, 2026 12:51
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.