Skip to content

chore(sync): merge upstream dev through 0fad04b3d5 - #497

Open
shuv1337 wants to merge 26 commits into
integration-v2from
sync-upstream-233
Open

shuv1337 wants to merge 26 commits into
integration-v2from
sync-upstream-233

Conversation

@shuv1337

Copy link
Copy Markdown
Owner

Normal two-parent merge of upstream dev through 0fad04b3d5, following #484, #487, #489 and #494. Sync-only: no version bump, no release, no publish, no host change. Targets only shuv1337/shuvcode:integration-v2. No default-branch push, rebase, force-push, tag, release, publish, deployment or live-service restart.

Ancestry

  • Fork base: 730296522672c4c1a0abe52d01045a622977b819 (origin/integration-v2, fix(cli): report current manager-owned installations correctly #496), verified against git ls-remote --symref origin HEAD.
  • Prior upstream pin: cbe71595e1f370ff91b3081872b96bbe56519c41.
  • Upstream target: 0fad04b3d5a8d5f40e6147573192a7e076787522 (upstream/dev, symref verified as dev), 22 commits; merge base is the previous pin.
  • Merge commit: aaa6252c9af43980f8ceaea64749b5eb8c05da4d; audit commit: bbe71ae7317a2da4e02b49042b2e132bee8f2fab.
  • Local integration-v2 is stale at 72423e0520 in its other worktree; that checkout (with its unrelated untracked packages/posts/ and services/www/) was left untouched and the topic starts at refreshed origin/integration-v2.
  • Completion fetch: upstream moved once more to 367d24b70a (feat(ai): scope HTTP middleware to any call, for every modality anomalyco/opencode#64152); the frozen pin and refreshed base are unchanged.

Durable audit, conflict resolution and all 162 branch dispositions.

Conflict resolution

Path Resolution
packages/app/src/servers/connect/pairing.ts Kept the fork's shuvcode pair comment wording and adopted upstream's {"code","urls","name"?} payload comment plus the optional name carried into pairingLink.

Every other both-sides-changed file auto-merged; git show --remerge-diff aaa6252c9a records the resolution.

Branch inventory

All 162 pre-existing unmerged local/origin refs re-inventoried against the refreshed base. 160 have byte-identical tips to the #489/#494 audit and keep those dispositions verbatim; the only additions are the local and remote pwsh-hosted-probe diagnostic refs for #493, which stay parked non-merge. #495 (27840dc9a8) and #496 (7302965226) landed after the previous audit and are no longer unmerged. Nothing is landed or deleted by this sync.

Validation (Linux x64, Bun 1.4.4, isolated HOME/XDG, Playwright Chromium in the private test home)

Gate Result
Root bun run check (lint + 40-package typecheck) 40/40 pass
bun run generate (packages/client) No drift; no public Protocol/Server HttpApi change
bun install --frozen-lockfile 1597 packages, no lockfile change
git diff --check Pass
Core 7,647 pass / 16 skip / 11 fail — all 11 the pre-existing GitLab OAuth port 8080 conflict, identical 8/11 on unmodified base
CLI / TUI / Server / AI 487 / 1,757 / 142 / 2,242 pass, 0 fail
App unit + browser 2,720 + 360 pass, 0 fail
Session-ui unit / components 605 pass; 220 components passed, zero retries
App components 279 passed, zero retries
UI / gui-plugins / client / protocol / schema / util / desktop hex 626 / 1,130 / 274 / 14 / 92 / 155 / 2 pass, 0 fail
App e2e settings (built) 73 passed on rerun (one first-run load flake in an untouched navigation test, passed alone and on full-file rerun)
App e2e command-palette, mcp-workspace-toggle, new-session (built) 70 passed / 3 failed; the same three fail identically on unmodified origin/integration-v2 (pre-existing Solid createRoot warnings), no assertion weakened

Cross-platform: Linux-only local evidence; fork CI has Linux legs only. The desktop hex detector's Windows/macOS branches are covered by unit tests with simulated platform inputs, not runtime proof, and none is claimed.

Flags

No feature flag. The range adopts upstream behavior and contains fixes, docs and benchmarks; nothing risky or half-landed needs gating.

Release

No release belongs in this PR. If the lead judges the user-visible fixes worth shipping, separate release prep can cut 2.3.0-shuv.3 on latest (base is still 2.3.0; #496's fix and its merge are one unreleased change).

Hona and others added 24 commits November 14, 2026 09:23
Co-authored-by: opencode-agent[bot] <219766164+opencode-agent[bot]@users.noreply.github.com>
Co-authored-by: opencode-agent[bot] <219766164+opencode-agent[bot]@users.noreply.github.com>
@socket-security

socket-security Bot commented Nov 16, 2026 •

Copy link
Copy Markdown

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

Diff Package Supply Chain
Security
Vulnerability Quality Maintenance License
Updatednpm/​@​hona/​strobe@​0.39.0 ⏵ 0.42.0100 +110099 +196 +1100

View full report

The defect middleware answered handler defects with a readable
{ _tag: UnknownError, message, ref } 500, but no endpoint declared the
response. The generated Promise client only decodes declared statuses, so
every normal app call discarded the body and threw UnexpectedStatus.

Declare UnknownError on the whole HttpApi through the same middleware
mechanism that puts the schema-error 400 on every endpoint, and fail with
that declared error instead of a response carried in the cause. Typed
failures pass through so declared errors keep their own body. Regenerated
the Promise client from packages/client; the OpenAPI 500 on the prompt
route and declaredStatuses now agree.

A declared status is only decoded when the body is the tagged error it
declares, so HTML, plain text or an empty body from a proxy or an older
server still reports UnexpectedStatus instead of losing the status.

Covered through the real public client: a full-disk prompt admission
keeps the storage reason and ref, leaves no pending work, stays readable,
and admits again once the disk has room. Corrected the audit pass/skip
counts and recorded the repair scope.
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.

6 participants