chore(sync): upstream sync 2026-08-04 — 242 commits, 4 conflicts resolved

[github-actions]

Upstream sync 2026-08-04

Rebuilt fresh from current dev (09b9ffe776, includes #372 token-auth and #380 Mantle) and merged upstream/dev @ f0afb6750e.

242 upstream commits · 591 files · +83,212 / −9,680

This supersedes the 2026-07-27 push. The branch was rebuilt from current dev the way sync-upstream.sh:100 does it, so it is not a descendant of the previous head — the update was a --force-with-lease replacing e230f997be.

---

Conflicts resolved (4) — semantic, not ours/theirs

All four were hand-merged to preserve both upstream intent and ANR customization. All four are now recorded in rerere and committed to .sync/rr-cache, so the next sync replays them untouched (store grew 14 → 20 entries).

packages/opencode/src/acp/event.ts
Upstream refactored the inline event loop into a consume() method with connection tracking (connected, connectionWaiters, disconnected()). This file carries ANRCODE_CHANGE {"issue":331,"branch":"anr/331/fix-silent-catch-handlers"}.

Taking "theirs" would have silently reverted issue #331 — upstream's consume() uses .catch(() => {}), the exact silent-swallow that ticket removed. Resolution keeps upstream's structure and restores ANR's console.debug("ignored", err) at both catch sites: the outer consume() call and the inner handle() catch that upstream also left silent.

packages/core/src/models-dev.ts
Upstream migrated the default source models.dev → models.opencode.ai. ANR adds OPENCODE_API_ENDPOINT cache-key handling. Resolution adopts upstream's new default and preserves the ANR endpoint branch, updating its inner comparison to the new URL so the models.json fast path still works.

packages/app/package.json
ANR commit 1d81dd45b1 (release gate) had dropped --conditions=solid --only-failures from test:unit. Dropping --only-failures is deliberate and correct — it would undermine the full-suite validation gate this pipeline depends on. But --conditions=solid is required for solid-js resolution (test:unit:watch still carries it), so losing it looks like collateral. Resolution restores --conditions=solid, leaves --only-failures out.

This file was one of the three # UNRESOLVED (2026-07-05) entries in conflict-rules.conf; it is now genuinely resolved and remembered. The other two (packages/core/test/git.test.ts, packages/tui/test/cli/cmd/tui/sync-fixture.tsx) did not conflict this run — those stale entries can be dropped.

bun.lock — resolved ours per conflict-rules.conf, then reconciled via bun install (succeeded, 623 packages).

---

ANR customization preserved

	markers	files
dev	107	63
this branch	107	63

Verified per-file, not just in aggregate — no file lost markers. Confirmed no conflict markers remain anywhere in the tree.

---

⚠️ Validation status — CI is the gate

The local bun turbo typecheck and bun turbo test gates did not complete against this merge. Two attempts were killed for environmental reasons (one process-terminated, one had its working tree swapped mid-run by an unrelated checkout). No local result should be read as a pass.

bun install did succeed and the lockfile reconciled cleanly. Everything else — the semantic-break and runtime-break gates sync-upstream.sh normally requires for safe_to_push — is unproven locally and rests on this PR's CI run.

⚠️ For @donta — packages/opencode/test-output.log

An accidentally-committed test artifact (added 2d5c1bd746, 2026-07-16 "Fixing tests"). Tracked on dev, absent upstream, not gitignored. It contains 7 lines like ===================================== that match the conflict-marker safety scan at sync-upstream.sh:177, which excludes only bun.lock and .sync/rr-cache.

Any batch without an escalation will match that scan, git merge --abort, and exit 4. This sync was run manually rather than through the script specifically to avoid it. Left in place per instruction — it needs either git rm --cached + gitignore, or an added scan exclusion, before the automated sync can run green.

---

🤖 Generated with Claude Code