chore(sync): merge upstream v2 through v2.2.4 by shuv1337 · Pull Request #466 · shuv1337/shuvcode

shuv1337 · 2026-10-30T10:27:45Z

Summary

Extend the upstream sync through anomalyco/opencode tag v2.2.4 (45898d0f8569225eb1ddb4ee13f8581b34dff311, taken from upstream branch v2, not 2.0) into integration-v2 via a regular merge commit on merge/upstream-v2.2.3.

Base: integration-v2
Head: merge/upstream-v2.2.3 @ efc26ba9b375f2863f90df1fdbafa4d963628ee2
Upstream commits brought in: 31 (v2.2.3 → v2.2.4) plus merge commit aacf7be64e and follow-up efc26ba9b3
Tag verified: git rev-parse v2.2.4 → 45898d0f8569225eb1ddb4ee13f8581b34dff311
No force-push; no rebase of pushed commits

Notable conflicts and resolutions

Area	Resolution
All `package.json` versions	Took 2.2.4
`packages/cli/package.json`	Kept fork name `shuvcode` and version `2.2.4-shuv.1`
Managed service ports	Kept fork ports 0x1337 / 0x1338 (no conflict this round)
`packages/core/src/plugin/internal.ts`	Kept both `JevTool` (fork) and `ImageGenerateTool` (upstream); added upstream `Artifact` service/node/tools
`CHANGELOG.md`	Took full v2.2.4 notes; kept fork `@opencode/ai` breaking-change note
`migration.gen.ts`	Kept fork `subagent-operation` as `m48`; added upstream `job` as `m59`
`restart.ts`	Combined `recoverToolJob` (upstream) with ambiguous recovery on `recoverSubagent` (fork)
`event-manifest`	Combined `Permission.Cancelled` (fork) with `PersistentPty.Updated` (upstream)
`.github/workflows/release*.yml` / process-daemon workflows	Kept fork deletion
`bun.lock`	Regenerated via `bun install` after version bumps
opencode-pty versions	Cargo + npm remain 0.4.0 (match; no Validate-tag fix needed)

Follow-up fixes (post-merge)

packages/ai/src/index.ts: keep only ToolFailure on the public root (upstream surface); restore export * as LLM on @opencode/ai/effect for fork callers
AI provider / aisdk / antigravity tests: LLM.request → ai.request or Effect LLM import
Subagent recovery fixture: drop top-level Tool.node so Location stays bound via LSM/Instance

Pty version check

packages/process-daemon/Cargo.toml → 0.4.0
packages/process-daemon/npm/package.json → 0.4.0
Result: match

Local verification

Typecheck (core / cli / related): pass
packages/ai tests: pass
packages/core tests: merge-related subagent-recovery failures fixed; 2 remaining fails (Tool cached code-mode disabled tool; PluginSupervisor aisdk hook before dynamic npm) pre-exist on parent ef4ad695c9 (verified via worktree)
gitleaks (hygiene): clean

CI / paid runners note

Fork release.yml / release-dry-run.yml / check-process-daemon.yml / release-process-daemon.yml remain deleted. Only free/automatic checks (hygiene, typecheck, plugin-browser, etc.) should run. Do not trigger paid workflow_dispatch.

Not done

Did not merge this PR
Did not start any workflow_dispatch

— opened by Code Monkey (bot)

…anomalyco#60310)

…co#60315)

…nomalyco#60102)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Aiden Cline <aidenpcline@gmail.com>

…le (anomalyco#60335)

…co#60302)

anomalyco#60336)

…es (anomalyco#60140)

…anomalyco#60332)

…invalid checks immediately (anomalyco#60349)

…0116)

)

…o#60356)

…lyco#60077)

Co-authored-by: Sayuri Nekomiya <contactme@awsl.rip>

…#60322)

…alyco#60368)

…ctory changes (anomalyco#60376)

Co-authored-by: adamdotdevin <adamdotdevin@users.noreply.github.com>

…reamed delta (anomalyco#60577)

…60576)

…o#60592)

…alyco#60351)

Co-authored-by: Tarquinen <78942835+Tarquinen@users.noreply.github.com>

…malyco#60616) Co-authored-by: jlongster <17031+jlongster@users.noreply.github.com>

Co-authored-by: Tarquinen <Tarquinen@users.noreply.github.com>

…de serve (anomalyco#60478)

…co#60625) Co-authored-by: MrMushrooooom <19261047+MrMushrooooom@users.noreply.github.com>

…yco#60631)

Removed breaking changes section regarding `@opencode/ai` and updated the changelog with new features and fixes.

Added breaking changes section and updated features.

…nomalyco#60491)

)

…0441) Co-authored-by: r266-tech <r266-tech@users.noreply.github.com> Co-authored-by: pj.reid <pj.reid@zetier.com>

Reverts the lock from anomalyco#60315 that ignored user, project and remote overrides on providers the Console supplies. It also blocked harmless overrides such as model limits, names and variants (anomalyco#60597) and internal gateways.

…alyco#60645)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Restores the opt-in default from before anomalyco#60478. The schedule loop still runs in every server process and keeps its leader election; it only fires schedules in locations that enable the flag.

Merge anomalyco/opencode tag v2.2.4 (45898d0) into merge/upstream-v2.2.3. Preserve fork CLI branding (shuvcode 2.2.4-shuv.1), ports 0x1337/0x1338, dual tools, renumbered migrations (keep subagent-operation as m48; add job as m59), deleted release workflows, and gitleaks allowlist.

Keep ToolFailure on the @opencode/ai root for JevTool, restore the Effect LLM namespace for fork callers, switch AI provider tests to ai.request, and drop top-level Tool.node from the subagent recovery fixture so Location stays bound via LocationServiceMap.

adamdotdevin and others added 30 commits October 29, 2026 12:51

feat(go): add Go Teams plan and limits to /go (anomalyco#60308)

3e8e974

fix(tui): match the empty dialog search cursor to the highlighted row (…

149767c

…anomalyco#60310)

feat(core): integration.connect and integration.use policies (anomaly…

b2bd02e

…co#60315)

fix(core): send execute progress at most every 100 ms (anomalyco#60120)

b6f82bf

fix(core): keep permission reasons and feedback in MCP tool failures (a…

b653a62

…nomalyco#60102)

release: v2.2.2 (anomalyco#60337)

4efad23

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Aiden Cline <aidenpcline@gmail.com>

fix(app): keep question options and submit controls reachable on mobi…

bc7da10

…le (anomalyco#60335)

fix(tui): resolve default cursor style across config reloads (anomaly…

085d6f7

…co#60302)

fix(console): polish Go plan cards and audience switch (anomalyco#60345)

3c55edd

fix(tui): keep # in file search base when not followed by a line range (

7130211

anomalyco#60336)

feat(core): add Code Mode checks with static tool scanning to schedul…

c24c5af

…es (anomalyco#60140)

refactor(core): finish moving shell permission checks off tree-sitter (…

8609cc5

…anomalyco#60332)

fix(core): fail schedule creation when a code check throws and pause …

055a2a9

…invalid checks immediately (anomalyco#60349)

feat(tui): load stored images by reference, like desktop (anomalyco#6…

84aed13

…0116)

fix(tui): highlight PHP code blocks without opening tag (anomalyco#60359

c24760c

)

fix(app): keep inbox scroll position when opening a session (anomalyc…

51625f7

…o#60356)

chore(console): move console and stats to released solid-start (anoma…

b19d143

…lyco#60077)

feat(app): add question notifications and sounds (anomalyco#60358)

d09e2c6

Co-authored-by: Sayuri Nekomiya <contactme@awsl.rip>

fix(core): remove a session's terminals when it is deleted (anomalyco…

06bf854

…#60322)

fix(app): preserve command selection under a stationary pointer (anom…

33e495a

…alyco#60368)

fix(app): preserve simultaneous request notifications (anomalyco#60378)

53ad857

feat(app): allow selecting question answer text (anomalyco#60372)

7ed1f96

chore(release): announce releases in Discord again (anomalyco#60371)

17f4634

feat(process-daemon): rename terminals (anomalyco#60324)

6b11312

chore(process-daemon): release 0.4.0 (anomalyco#60325)

5e6ee37

feat(app): group added projects in settings (anomalyco#60221)

83e3999

refactor(client): share the persistent pty protocol (anomalyco#60323)

067b741

fix(core): check redirects, PowerShell method calls, and dynamic dire…

dc0bfc5

…ctory changes (anomalyco#60376)

test(app): mock persistent pty routes (anomalyco#60327)

a070e11

fix(console): use default OG image on /go (anomalyco#60397)

237a847

Co-authored-by: adamdotdevin <adamdotdevin@users.noreply.github.com>

arvsrn and others added 28 commits October 30, 2026 10:59

fix(app): simplify the session location popover (anomalyco#60492)

eeb3c19

fix(session-ui): stop re-checking the timeline projection on every st…

eff7264

…reamed delta (anomalyco#60577)

fix(session-ui): copy user messages from the actions menu (anomalyco#…

95fc3c8

…60576)

fix(core): drop Claude Code's /login hint from login errors (anomalyc…

ef3a7f1

…o#60592)

feat(app): guide Claude Agent setup before connecting (anomalyco#60603)

8505041

feat(app): add base branch picker shortcut (anomalyco#60579)

1e28374

feat(core): add experimental artifacts with pluggable providers (anom…

8f0fc21

…alyco#60351)

feat(core): rename persistent terminals (anomalyco#60329)

65c0d83

fix(tui): add right padding to edit and patch diffs (anomalyco#60614)

6b4329c

Co-authored-by: Tarquinen <78942835+Tarquinen@users.noreply.github.com>

fix(app): list commands above sessions in command palette search (ano…

df39a70

…malyco#60616) Co-authored-by: jlongster <17031+jlongster@users.noreply.github.com>

fix(tui): keep plugin-set prompt cursor styles (anomalyco#60599)

bb6769c

Co-authored-by: Tarquinen <Tarquinen@users.noreply.github.com>

chore(core): use @opencode/pty 0.4.0 (anomalyco#60387)

4e7d369

feat(core,server): enable schedules by default and run loop in openco…

e76c67a

…de serve (anomalyco#60478)

docs(go): raise DeepSeek V4.1 Flash limits to $100/$200/$105 (anomaly…

4fdea64

…co#60625) Co-authored-by: MrMushrooooom <19261047+MrMushrooooom@users.noreply.github.com>

refactor(ai): one ai object for Promise and Effect (anomalyco#60516)

f0944f0

chore(release): leave AI package changes out of the changelog (anomal…

fed4cfc

…yco#60631)

Update CHANGELOG.md to remove breaking changes

dca643f

Removed breaking changes section regarding `@opencode/ai` and updated the changelog with new features and fixes.

Update CHANGELOG with new features and breaking changes

c6f2f81

Added breaking changes section and updated features.

refactor(core): store background job markers in a SQLite job table (a…

664c8f0

…nomalyco#60491)

feat(app): move the desktop terminal to persistent PTYs (anomalyco#60346

ef712d3

)

fix(cli): keep loopback requests off environment proxies (anomalyco#6…

78dda62

…0441) Co-authored-by: r266-tech <r266-tech@users.noreply.github.com> Co-authored-by: pj.reid <pj.reid@zetier.com>

fix(app): keep terminal tab clicks and renames on the right tab (anom…

e7acf85

…alyco#60645)

chore: update nix node_modules hashes (anomalyco#60187)

85d7397

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

fix(core): keep schedules off unless experimental.schedules is enabled

da87c47

Restores the opt-in default from before anomalyco#60478. The schedule loop still runs in every server process and keeps its leader election; it only fires schedules in locations that enable the flag.

release: v2.2.4

45898d0

shuv1337 changed the title ~~chore(sync): merge upstream v2 through v2.2.3~~ chore(sync): merge upstream v2 through v2.2.4 Oct 30, 2026

shuv1337 merged commit aba3f44 into integration-v2 Oct 30, 2026
5 checks passed

Navigation Menu

Repository navigation

chore(sync): merge upstream v2 through v2.2.4 - #466

chore(sync): merge upstream v2 through v2.2.4#466
shuv1337 merged 136 commits into
integration-v2from
merge/upstream-v2.2.3

shuv1337 commented Oct 30, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

16 participants

Conversation

shuv1337 commented Oct 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Notable conflicts and resolutions

Follow-up fixes (post-merge)

Pty version check

Local verification

CI / paid runners note

Not done

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

16 participants

shuv1337 commented Oct 30, 2026 •

edited

Loading