[brentyates-swx]

Syncs swxtch with 17 upstream commits from anomalyco/opencode dev, through 2406400f0a.

Merged, not rebased

Both were tried in throwaway worktrees before deciding:

	rebase	merge
conflict stops	on the first of our 16 commits, then again on #1 and #28	once
files conflicting	same 3, spread across replays	bun.lock, search.ts, npm.ts
published history	rewrites 16 commits that 16 merged PRs reference	preserved
push required	force-push the default branch	ordinary

The conflict surface is small either way — 5 files overlapped out of 108 on our side and 84 on theirs. Rebasing would buy a linear history at the cost of force-pushing swxtch and orphaning the commits every merged PR points at, which is a poor trade for a fork that will keep syncing.

Conflict resolutions

packages/core/src/filesystem/search.ts — took upstream's.
Upstream's anomalyco#50439 fixes the same import cycle our #2 did, independently. Theirs is slightly more conservative: it keeps import type { FileSystem } for the input types where ours also de-namespaced them to FindInput/GlobInput/GrepInput. Both break the cycle the same way, so taking theirs makes this file byte-identical to upstream and removes a permanent rebase conflict.

The other half of our #2 — the layer-node walk guard — is not upstream and is preserved. Its tests still pass against upstream's file.

packages/core/src/npm.ts — kept both import sets.
One hunk, purely additive: semver from our #28 (compare requested versions, not just dependency names) and createRequire/pathToFileURL from upstream's anomalyco#50413 (resolve an npm package entrypoint to a file under Node). Unrelated fixes; both survive.

bun.lock — regenerated from the merged manifests.

packages/web/package.json auto-merged (upstream bumped 1.18.31 → 1.18.32).

Verification

test/npm.test.ts auto-merged — both sides edited it — so a clean textual merge is not evidence the combined logic works. Ran it, and the tests either side of the resolutions, explicitly:

• bun install --frozen-lockfile — clean, satisfies the ci: fail when bun.lock does not match the manifests #33 gate
• bun run typecheck — 30/30
• packages/core test/npm.test.ts — 19/19
• layer-node guard tests (our surviving half of fix(core): break filesystem search cycle and guard layer-node walk #2) — 19/19
• filesystem search tests (now upstream's implementation) — 29/29

Going through a PR rather than pushing swxtch directly so CI runs the full unit and e2e suites against the merge before the default branch moves.

Note

#37 is open against the pre-sync swxtch. Once this lands, #37 wants rebasing onto the synced base rather than merging on a stale one.

🤖 Generated with Claude Code

https://claude.ai/code/session_017iG7xA9wRvNyFYZSXm8inU

[brentyates-swx]

Session stamp

• Session ID: c87b9b84-25b3-4804-a2ae-7e52148ee41f
• Working repo (session launch cwd): /home/byates/swx-opencode
• Worktree for this branch: /home/byates/swx-sync
• Upstream added locally as a fetch-only remote (git remote set-url --push upstream DISABLED_NO_PUSH_TO_UPSTREAM), so nothing here can write to anomalyco/opencode.

[brentyates-swx]

CI caught a design flaw in the #22 correctness gate

The unit job failed on Lint for correctness bugs with 20 no-unreachable errors — 0 before this merge, 20 after, so upstream introduced them. The fork-guard audit and the lockfile gate both passed.

They are not bugs. Upstream retires legacy console endpoints by inserting a throw at the top of the handler and leaving the old body in place:

const user = Actor.assert("user")
throw new Error("Go subscriptions have moved to the new Console")
const { successUrl, cancelUrl, method } = input   // unreachable, deliberately

All 20 are that pattern, in packages/console/core/src/billing.ts and packages/console/app/src/routes/workspace/[id]/go/index.tsx.

The flaw is in what #22 shipped

That gate runs oxlint --config .oxlintrc.gate.json . — the whole inherited tree. Its purpose is to catch bugs in code we author, but as written it polices code we merely inherit, so upstream's stylistic choices can block every future sync. This is the first time that bit, and it would have bitten every sync from here on.

Fixed by scoping rather than weakening: packages/console/** and artifacts/** are excluded. Our 16 commits touch packages/console in 0 places, so no coverage of our own work is lost, and no rule is demoted.

The alternative — patching upstream's files to satisfy our lint — would mean diverging on upstream-owned code and re-resolving it on every sync. That is exactly the cost this fork is trying not to pay.

Verified the gate still guards

Injected throw new Error(...) followed by a return into packages/opencode/src/cli/cmd/db-export-usage.ts, a file we own:

x eslint(no-unreachable): Unreachable code.

Still reported. Reverted, and the tree is 684 warnings and 0 errors. A narrowed guard that no longer guards would be worse than the failure it replaced, so that check mattered more than the green run.