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

shuv1337 · 2026-10-29T06:59:34Z

Summary

Merge upstream anomalyco/opencode branch v2 through tag v2.2.1 (3ebcf9a32c7b28f658cfee80775448929361727a) into integration-v2.

Base: integration-v2 (PR chore(sync): merge upstream v2 through v2.2.0 #458 / v2.2.0 sync was already merged; its conflict resolutions are included)
Head: merge/upstream-v2.2.1 @ 50d9e686fc829e0723ebd71088b757f7f980d86d
Upstream commits brought in: 134 (plus merge commit + one follow-up fix)
Commits on this PR vs base: 136
This PR supersedes chore(sync): merge upstream v2 through v2.2.0 #458 for continuing the sync through v2.2.1 (do not close chore(sync): merge upstream v2 through v2.2.0 #458; it is already merged)

Notable conflicts and resolutions

Area	Resolution
All `package.json` versions	Took 2.2.1
`packages/cli/package.json`	Kept fork name `shuvcode` and version `2.2.1-shuv.1` (not `@opencode/cli`)
Managed service ports (`service-config.ts` + tests)	Kept fork ports 0x1337 / 0x1338 (upstream 0xc0de / 0xc0df)
`packages/core/src/plugin/internal.ts`	Kept both `JevTool` (fork) and `ImageGenerateTool` (upstream)
`session/execution/restart.ts`	Took upstream `image` recovery and kept fork `ambiguous` subagent handling
`location-activity.ts`	Kept fork `beforeDecision` + richer eviction path; adjusted background owner mapping so `image` recoveries use `sessionID` (not subagent fields)
`migration.gen.ts`	Kept fork `subagent-operation` migration and added upstream `schedule` as `m55`
TUI prompt files	Combined: `promptFilesForServer(files, …)` so terminal snapshot attachments are preserved with media-URI filtering
TUI theme fallback	`DEFAULT_THEME_NAME` + upstream `newDesigns()`
TUI test fixture	Kept shuvcode quota stub + root 404 and upstream goal RPC stub
`AGENTS.md`	Kept V2 TUI Stories and added upstream Live Desktop Diagnostics
`CHANGELOG.md`	Took full v2.2.1 notes; kept fork import-path guidance under v2.2.0
`.github/workflows/release.yml` + `release-dry-run.yml`	Kept fork deletion (do not reintroduce upstream release workflows)
`sign-desktop-macos.sh`	Matched body to `APPLE_NOTARY_*`; kept shellcheck directives
`bun.lock`	Regenerated via `bun install` after version bumps
Post-merge: `session-runner.test.ts`	Removed duplicate `Job` import (silent auto-merge artifact)

Local verification

bun run --cwd packages/core typecheck — pass (1798 files)
bun run --cwd packages/cli typecheck — pass
bun run --cwd packages/tui typecheck — pass
bun run --cwd packages/cli test test/service.test.ts — 29 pass, 1 skip, 0 fail
bun run --cwd packages/core test test/tool-shell.test.ts — 67 pass, 42 skip, 0 fail
bun run --cwd packages/core test test/location-activity.test.ts — 20 pass, 0 fail
Pre-push bun run check / oxlint could not complete in this agent environment (system Node 22 fails to load oxlint .ts JS plugins); push used HUSKY=0 after the typechecks/tests above.

CI / paid runners note

This PR touches packages/process-daemon/** and adds:

.github/workflows/check-process-daemon.yml (PR path filter; includes macos-15 matrix)
.github/workflows/release-process-daemon.yml (PR path filter on daemon release scripts; includes macos-15 / macos-15-intel)

Opening the PR will likely auto-run those path-filtered workflows (no workflow_dispatch was triggered). Existing fork PR workflows (typecheck, hygiene, plugin-browser, etc.) may also run. Fork release.yml / release-dry-run.yml remain deleted.

Not done

Did not merge this PR
Did not close chore(sync): merge upstream v2 through v2.2.0 #458
Did not start any workflow_dispatch

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

anomalyco#59592)

…malyco#59631)

…omalyco#59286) Co-authored-by: Kit Langton <kit.langton@gmail.com>

…o#59500)

…lyco#59506)

…per async call (anomalyco#57976)

…eout (anomalyco#59667) Co-authored-by: rekram1-node <63023139+rekram1-node@users.noreply.github.com>

Co-authored-by: opencode-agent[bot] <219766164+opencode-agent[bot]@users.noreply.github.com>

…alyco#60057)

…malyco#59901) Co-authored-by: Brendonovich <14191578+Brendonovich@users.noreply.github.com>

…lyco#57627)

…expect (anomalyco#59927)

…yco#60079)

…0067)

…alyco#60081)

…tal API (anomalyco#59457)

…malyco#60087)

…ield (anomalyco#60096)

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

Merge anomalyco/opencode v2.2.1 (3ebcf9a) into integration-v2. Conflict resolutions preserve shuvcode fork customizations (ports 0x1337/0x1338, JevTool, CLI package name, release workflow deletions, quota fixtures, migrations) while taking upstream v2.2.1 features (image_generate, schedule, goal RPC, etc.).

session-runner.test.ts imported Job twice after the v2.2.1 sync auto-merge.

socket-security · 2026-10-29T07:01:09Z

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Package	Supply Chain Security	Vulnerability	Quality	Maintenance
npm/katex@0.16.47 ⏵ 0.18.11		⁺¹		^-48
cargo/nix@0.28.0
npm/dompurify@3.4.14 ⏵ 3.4.17	⁺¹	⁺⁷⁵
npm/@astrojs/markdown-remark@6.3.11 ⏵ 7.3.2			⁺²
npm/@ai-sdk/provider-utils@4.0.21 ⏵ 4.0.62	^-23	⁺¹	⁺¹
npm/@ai-sdk/provider@3.0.19
npm/@astrojs/check@0.9.11
npm/@astrojs/solid-js@5.1.0 ⏵ 7.1.0	⁺¹			^-2
npm/vite@8.2.2 ⏵ 7.3.7		⁺²²		^-1
npm/vite@8.2.2 ⏵ 8.2.4	⁺¹	⁺²²	⁺¹	^-1
npm/@astrojs/starlight@0.34.3 ⏵ 0.41.11			⁺¹	⁺²
npm/astro@5.7.13 ⏵ 7.3.8	⁺¹	⁺⁷⁵	⁺¹
cargo/fs2@0.4.3
cargo/crossbeam-channel@0.5.16
cargo/portable-pty@0.9.0
cargo/shell-words@1.1.1
npm/zod@4.1.8 ⏵ 4.6.7		⁺¹⁶
npm/hono@4.10.7 ⏵ 4.13.13	⁺²	⁺⁵⁰
npm/solid-js@1.9.15 ⏵ 1.9.17	⁺¹			⁺¹

View full report

The v2.2.1 release commit rewrote every package.json version, including @opencode/pty. Validate tag compares that field to Cargo.toml, which stayed at 0.3.2 along with the optional dependency pins.

The v2.2.1 merge auto-included release-process-daemon.yml, which publishes releases and npm and schedules paid macOS jobs on pull requests. Fork policy keeps upstream release workflows out.

Fork policy keeps upstream process-daemon CI off pull requests. The release workflow is already removed; this drops the check workflow too.

github-actions Bot and others added 30 commits October 27, 2026 19:13

release: v2.2.0 (anomalyco#59558)

8697644

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

docs(console): every harness reaches every model (anomalyco#59611)

0b1f125

fix(core): offer Console web search only when the workspace enables it (

5f8487f

anomalyco#59592)

refactor(core): drop the legacy Console config path (anomalyco#59595)

5e31344

refactor(core): drop the ManagedPolicy service (anomalyco#59609)

d78b817

fix(app): make dropdowns open instantly (anomalyco#59268)

112427a

fix(cli): put dev builds back on the shared service and database (ano…

51e4de1

…malyco#59631)

feat(app): highlight quote source while writing its first comment (an…

4a85158

…omalyco#59286) Co-authored-by: Kit Langton <kit.langton@gmail.com>

feat(app): refine project and worktree picker (anomalyco#59397)

1151139

feat(app): add session location menu actions (anomalyco#59607)

4ba064f

feat(app): focus prompt history search (anomalyco#59626)

d012e07

feat(app): align search and command palettes (anomalyco#59604)

7b1e54a

fix(core): keep prompt cache settings out of model variants (anomalyc…

24bf4d4

…o#59500)

chore(ai): drop five unused legacy provider entrypoint aliases (anoma…

96ae220

…lyco#59506)

fix(ai): don't treat 429 throttles as context overflow (anomalyco#59649)

618b890

fix(session-ui): remove agent finish checkmark (anomalyco#59646)

320445a

refactor(codemode): run programs on one job queue instead of a fiber …

e26f85b

…per async call (anomalyco#57976)

test: deflake shutdown-deadline cleanup and PowerShell permission tim…

5f1f8d0

…eout (anomalyco#59667) Co-authored-by: rekram1-node <63023139+rekram1-node@users.noreply.github.com>

feat(app): refine artifact previews and file actions (anomalyco#59657)

b3de41a

perf(core): coalesce snapshot captures and skip repeat ignore work (a…

cdaba26

…nomalyco#59419)

fix(session-ui): use V2 styling for retry tooltip (anomalyco#59647)

432d870

fix(console): link to v2 docs (anomalyco#59679)

caebbcc

chore(desktop): preserve appearance during CDP diagnostics (anomalyco…

b431db8

…#59681)

fix(app): keep location shortcut working after tooltip hover (anomaly…

3f74f03

…co#59680)

chore(core): log cancelled and expired oauth attempts (anomalyco#59689)

92db5e1

chore(process-daemon): move opencode-pty into the monorepo (anomalyco…

76e1f5b

…#59694)

fix(core): keep snapshots working in repos with a split index (anomal…

1ed00ce

…yco#59417)

chore(deps): bump dompurify to 3.4.17 (anomalyco#59709)

9f43157

chore(web): remove unused dependencies (anomalyco#59719)

40c7ea2

chore(deps): bump astro to 7.3.8 (anomalyco#59711)

b981937

neriousy and others added 23 commits October 28, 2026 19:05

feat(core): add /goal with a client-side done check (anomalyco#59437)

8de0323

Co-authored-by: opencode-agent[bot] <219766164+opencode-agent[bot]@users.noreply.github.com>

chore(deps): bump katex to 0.18.11 (anomalyco#60037)

e85207b

chore(deps): bump @ai-sdk/provider-utils to 4.0.62 (anomalyco#60036)

01abece

fix(core): stop merging credential metadata into model settings (anom…

c5d9c30

…alyco#60057)

fix(session-ui): stop shell text showing through the copy button (ano…

7c47eb7

…malyco#59901) Co-authored-by: Brendonovich <14191578+Brendonovich@users.noreply.github.com>

feat(core): add image_generate tool (anomalyco#59939)

89f3ac1

chore: add Hona as GUI plugin SDK codeowner (anomalyco#60071)

9039a2a

fix(core): tell Code Mode models built-in tools stay top-level (anoma…

aaa0d7c

…lyco#57627)

fix(ai): send image sizes the way OpenRouter, Vercel Grok and Google …

78c31ea

…expect (anomalyco#59927)

fix(tui): show execution failures that happen before any step (anomal…

6a0acd1

…yco#60079)

fix(ai): send OpenRouter image edits as input references (anomalyco#6…

27641b3

…0067)

feat(app): redesign the integrations dialog (anomalyco#59976)

eb06c3c

feat(ai): load Meta Muse Image through a meta/images entrypoint (anom…

085a891

…alyco#60081)

feat(core): schedule prompts from agents, /schedule and the experimen…

fbb47c9

…tal API (anomalyco#59457)

feat(core): offer gpt-image-2 on the Codex login (anomalyco#60085)

d142014

fix(core): rewrite the image_generate description (anomalyco#60090)

2f3e56d

fix(app): let a plugin server's event stream follow its endpoint (ano…

5c0376f

…malyco#60087)

feat(app): make the new model picker the default (anomalyco#59997)

a9caf6d

feat(core): make image_generate opt-in with one experimental config f…

f023f7c

…ield (anomalyco#60096)

chore: update nix node_modules hashes (anomalyco#59827)

79349e8

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

release: v2.2.1

3ebcf9a

fix(core): drop duplicate Job import after upstream merge

50d9e68

session-runner.test.ts imported Job twice after the v2.2.1 sync auto-merge.

cursoragent added 3 commits October 29, 2026 07:29

fix(process-daemon): restore npm package version to 0.3.2

58d2deb

The v2.2.1 release commit rewrote every package.json version, including @opencode/pty. Validate tag compares that field to Cargo.toml, which stayed at 0.3.2 along with the optional dependency pins.

chore(ci): drop upstream process-daemon release workflow

76a7040

The v2.2.1 merge auto-included release-process-daemon.yml, which publishes releases and npm and schedules paid macOS jobs on pull requests. Fork policy keeps upstream release workflows out.

chore(ci): drop process-daemon check workflow

69b43a7

Fork policy keeps upstream process-daemon CI off pull requests. The release workflow is already removed; this drops the check workflow too.

shuv1337 merged commit cb92f74 into integration-v2 Oct 29, 2026
5 checks passed

This was referenced Oct 29, 2026

chore(sync): merge upstream v2 through v2.2.2 #465

Merged

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

Merged

Navigation Menu

Repository navigation

chore(sync): merge upstream v2 through v2.2.1 - #464

chore(sync): merge upstream v2 through v2.2.1#464
shuv1337 merged 139 commits into
integration-v2from
merge/upstream-v2.2.1

shuv1337 commented Oct 29, 2026

Uh oh!

socket-security Bot commented Oct 29, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

Conversation

shuv1337 commented Oct 29, 2026

Summary

Notable conflicts and resolutions

Local verification

CI / paid runners note

Not done

Uh oh!

socket-security Bot commented Oct 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

socket-security Bot commented Oct 29, 2026 •

edited

Loading