Skip to content

fix(fork): resolve upstream merge 3d78e915e3 (2026-11-06) - #86

Merged
orbitingflea merged 1 commit into
catch-up/20261106-basefrom
catch-up/20261106
Nov 6, 2026
Merged

orbitingflea merged 1 commit into
catch-up/20261106-basefrom
catch-up/20261106

Conversation

@orbitingflea

Copy link
Copy Markdown
Owner

This pull request resolves the merge of upstream 3d78e91 (159 commits) into the fork and updates the fork's own code to match upstream's changes. The fork still differs from upstream in the same 182 files as before, and adds no new lint suppression.

Upstream edited code next to five of the fork's own changes, so the merge left conflicts. Each conflict keeps both the fork's addition and upstream's. The base branch holds git's merge with its conflict markers, so this pull request shows only the hand-made part.

Upstream also made three code-style rules into errors, so the fork's code now reads the environment and defines one error the way upstream does. Upstream added methods to some interfaces that fork tests fake, so those fakes gain them. Upstream's new PDF test needs the PDF worker to return the library's own loading task. The worker still stops five minutes after the last PDF closes.

The routing of Claude usage reads, reset-credit reads and redeems is unchanged. Selected tests and typechecks of the changed packages pass. The full check of files changed against upstream also passes (evidence).

Files

Conflicts:

  • AntigravityAdapterV2.test.ts: the fork's shared flavorOptions and upstream's defaultModel.
  • Orchestrator.ts: the fork's check that a finished delegated task may start a follow-up for its parent beside upstream's new usage-limit clause.
  • ws.ts: sessions without auth still skip the sign-out race; both paths use upstream's framedRpcWebSocketHttpEffect.
  • packages/contracts/src/settings.ts: the fork's previewBrowserMode and upstream's speech settings.
  • packages/provider-acp/src/server/adapter.ts: the fork's runtimeAccount and upstream's openAgentRequests.

pnpm-lock.yaml is not a conflict: upstream's file plus pnpm install --lockfile-only equals git's merge, so this pull request leaves it unchanged.

Rule and interface updates: EnvironmentAuth.ts and one fork test read through HostProcess.Environment; PreviewDisplayError is a Schema.TaggedError; the fake Claude sessions and the fake secret resolver gain upstream's new members; the tools test provides an empty AssetSigner mock, which upstream's tool handlers now need; pdfWorker.ts returns pdf.js's loading task with destroy wrapped.

- AntigravityAdapterV2.test.ts: keeps the fork's flavorOptions object,
  which a later test spreads, and takes upstream's
  `defaultModel: Effect.undefined`. The old suppression line goes with
  `Effect.succeed(undefined)`.
- Orchestrator.ts: mayStartSubagentFollowup keeps the fork's
  delegatedCompletion check (the port of upstream pingdotgg#28462) and takes
  upstream's new return, which also starts usage-limit continuations.
- ws.ts: keeps the fork's no-auth branch, which skips the revocation
  race, and runs upstream's new framedRpcWebSocketHttpEffect in both arms.
- settings.ts: both sides only added keys; keeps the fork's
  previewBrowserMode and upstream's speech settings, in ServerSettings
  and in ServerSettingsPatch.
- provider-acp adapter.ts: keeps the fork's runtimeAccount and upstream's
  openAgentRequests at runtime spawn and at runtime replacement.
- pnpm-lock.yaml: regenerated from upstream's file with --lockfile-only;
  it is identical to the textual merge.

The fork's code also follows upstream's new Effect rules and APIs:
- EnvironmentAuth.ts and one fork test read the environment through
  HostProcess.Environment; PreviewDisplayError is a Schema.TaggedError.
- Fork test fakes gain upstream's new methods: the fake Claude sessions,
  the AssetSigner mock and the secret store's label.
- pdfWorker.ts returns pdf.js's own loading task with destroy wrapped.
  The worker still stops five minutes after the last document closes.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Copilot AI balanced review requested due to automatic review settings November 6, 2026 05:54

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota. Try requesting a review at a lower effort level.

@github-actions github-actions Bot added vouch:trusted Author is trusted by repo permissions or the VOUCHED list. size:M labels Nov 6, 2026
@orbitingflea orbitingflea added the agent-context-increase Accepts growth of the text agents receive label Nov 6, 2026
@github-actions

github-actions Bot commented Nov 6, 2026

Copy link
Copy Markdown

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

ℹ️ No successful main baseline artifact is available yet. This run establishes the initial measurement.

Provider Metric Main baseline This PR Impact PR ceiling
Codex Total thread wire — 5.0 KiB — 6.8 KiB ✅
Codex Thread snapshot wire — 3.8 KiB — 4.9 KiB ✅
Codex Live turn WebSocket wire — 1.2 KiB — 2.0 KiB ✅
Codex Live turn WebSocket decoded — 21.5 KiB — 24.4 KiB ✅
Codex Live turn messages — 1 — 8 ✅
Claude Total thread wire — 5.0 KiB — 6.8 KiB ✅
Claude Thread snapshot wire — 3.8 KiB — 4.9 KiB ✅
Claude Live turn WebSocket wire — 1.2 KiB — 2.0 KiB ✅
Claude Live turn WebSocket decoded — 21.9 KiB — 24.4 KiB ✅
Claude Live turn messages — 1 — 8 ✅

Baseline: unavailable · PR result: f752d07 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

  • Codex decoded thread snapshot: 108.5 KiB
  • Claude decoded thread snapshot: 108.8 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

@orbitingflea
orbitingflea merged commit f752d07 into catch-up/20261106-base Nov 6, 2026
30 of 33 checks passed
@orbitingflea
orbitingflea deleted the catch-up/20261106 branch November 6, 2026 06:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

agent-context-increase Accepts growth of the text agents receive size:M vouch:trusted Author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants