Repository navigation
Conversation
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>
|
Review the following changes in direct dependencies. Learn more about Socket for GitHub.
|
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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Normal two-parent merge of upstream
devthrough0fad04b3d5, following #484, #487, #489 and #494. Sync-only: no version bump, no release, no publish, no host change. Targets onlyshuv1337/shuvcode:integration-v2. No default-branch push, rebase, force-push, tag, release, publish, deployment or live-service restart.cbe71595e1(the drift sweep's 16 was stale; the fetched drift is 22). Upstream introduced no new version in this window, so root manifests stay2.3.0and the CLI manifest/lockfile stay2.3.0-shuv.2.ref, invalid-glob messages for glob/grep, New-timeline subagent state (chips, no spinner, no subagent counts in shell summaries), QR server naming, hex detection/tip and dialog size presets, Go Qwen4 Max docs, and strobe 0.40–0.42 benchmark pins.GH_TOKEN, chore(sync): merge upstream dev through cbe71595e1 #494's Unicode preview/direct-shell badge and next-owned story boundary, and fix(cli): report current manager-owned installations correctly #496's current-manager update message plus fork CODEOWNERS/docs are still present.pwsh-hosted-probediagnostic branch (174302ace9) is parkeddo not merge/do not releasefor test(core): first PowerShell shell-tool test intermittently stalls in CI #493; nothing from it is included.Ancestry
730296522672c4c1a0abe52d01045a622977b819(origin/integration-v2, fix(cli): report current manager-owned installations correctly #496), verified againstgit ls-remote --symref origin HEAD.cbe71595e1f370ff91b3081872b96bbe56519c41.0fad04b3d5a8d5f40e6147573192a7e076787522(upstream/dev, symref verified asdev), 22 commits; merge base is the previous pin.aaa6252c9af43980f8ceaea64749b5eb8c05da4d; audit commit:bbe71ae7317a2da4e02b49042b2e132bee8f2fab.integration-v2is stale at72423e0520in its other worktree; that checkout (with its unrelated untrackedpackages/posts/andservices/www/) was left untouched and the topic starts at refreshedorigin/integration-v2.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
packages/app/src/servers/connect/pairing.tsshuvcode paircomment wording and adopted upstream's{"code","urls","name"?}payload comment plus the optionalnamecarried intopairingLink.Every other both-sides-changed file auto-merged;
git show --remerge-diff aaa6252c9arecords 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-probediagnostic 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)
bun run check(lint + 40-package typecheck)bun run generate(packages/client)HttpApichangebun install --frozen-lockfilegit diff --checksettings(built)command-palette,mcp-workspace-toggle,new-session(built)origin/integration-v2(pre-existing SolidcreateRootwarnings), no assertion weakenedCross-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.3onlatest(base is still2.3.0; #496's fix and its merge are one unreleased change).