Skip to content

chore: adapt upstream 7bd7f99e6cab - #7

Draft
q1 wants to merge 579 commits into
forkfrom
sync/codex-upstream
Draft

chore: adapt upstream 7bd7f99e6cab#7
q1 wants to merge 579 commits into
forkfrom
sync/codex-upstream

Conversation

@q1

@q1 q1 commented Sep 8, 2026

Copy link
Copy Markdown
Owner

Prepared local semantic adaptations in 18 fork-owned files. Ready for runner verification; nothing staged or committed.

Fork d2e3edbdf97cca682afa689e67917f3356226972 → upstream 7bd7f99e6cab940892ff9240549c507bfd066aee. Candidate cbba9cf3688f6d1593355a9f38c69ac3652d53c7.

Semantic adaptation:

  • Migrated 31 error declarations to upstream Effect’s Schema.TaggedError, preserving tags and payloads.
  • Replaced obsolete compaction forwarding with upstream’s capability contract. Native compaction follows the active Prism/direct session; slash-command behavior remains upstream-owned.
  • Adapted usage fixtures to upstream’s auth-files/api-call flow and isolated CLI fixtures from socket allocation.
  • Reviewed range-diff and affected seams. Retained Prism identity, management, eligibility and verified-release behavior because upstream additions do not supersede them.

Compatibility:

  • Added coverage for flags-off parity and retaining unavailable pooled model selections.
  • Preserved identity/session fences, revision-bound management, confirmed readback and explicit direct routing.
  • No new upstream seams or wire-schema changes. Existing seam debt remains.

Additional checks reported by Codex:

  • Initial focused suites: 87 tests passed after adaptation.
  • Extended fork fixtures: 356 passed; two usage failures subsequently corrected.
  • Usage integration plus upstream hub tests: 15 passed.
  • Routed adapter tests: 23 passed, including five new compaction cases.
  • Final CLI and RN model fixtures: 18 passed.
  • Four Swift wire fixtures decoded against current TypeScript contracts.
  • git diff --check passed.

Unresolved gaps:

  • None reported.

Release implications:

  • Runner’s fixed checks remain pending; no release acceptance claimed.
  • Live service/provider compatibility remains outside this fixture-only verification.

Verified on the candidate commit:

  • node_modules/.bin/tsc --noEmit -p packages/fork-core/tsconfig.json
  • node_modules/.bin/tsc --noEmit -p packages/client-runtime/tsconfig.json
  • node_modules/.bin/tsc --noEmit -p apps/server/tsconfig.json
  • node_modules/.bin/tsc --noEmit -p apps/web/tsconfig.json
  • node_modules/.bin/tsc --noEmit -p apps/mobile/tsconfig.json
  • node_modules/.bin/vp test run apps/server/src/fork packages/client-runtime/src/fork packages/fork-core/src apps/mobile/src/fork apps/web/src/fork apps/server/src/cloud/pinnedRuntime.test.ts apps/server/src/usage/cliproxyApi.test.ts apps/mobile/src/lib/modelOptions.test.ts
  • node_modules/.bin/vp test run apps/server/src/server.test.ts -t preflight|CORS
  • node scripts/fork/seams.ts --check --no-write --base {upstream} --head HEAD

Native verification: Web/desktop and RN logic received fixture coverage. Swift received wire-fixture checks only. Mac/ARM builds, simulators, Apple signing and native runtime acceptance were not verified on Linux.

This draft proposes source changes. Source promotion, artifact publication and deployment require separate review and approval.

jakeleventhal and others added 30 commits September 7, 2026 15:51
…ut of credits" (pingdotgg#10473)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…tgg#10620)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Dara Adedeji <daraadedeji07@gmail.com>
Co-authored-by: Dara Adedeji <76637177+SunkenInTime@users.noreply.github.com>
Co-authored-by: Wout Stiens <71498452+StiensWout@users.noreply.github.com>
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…gg#10619)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
pingdotgg#10526)

Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Michael and others added 28 commits September 11, 2026 12:21
Fork-Feature: prism

Upstream: no
Fork-Feature: base

Upstream: no
Fork-Feature: mic-identity
Upstream: no
Preserve independent environment authorization, renew service credentials per request, and reject shared-key compatibility paths in identity mode.

Fork-Feature: mic-identity
Upstream: no
Add hosted onboarding without environment grants, fresh identity and paired-service access, scoped routing controls, and explicit stale or unsupported states across the clients.

Fork-Feature: mic-identity
Upstream: no
Use session-bound authorization for service clients and per-thread coding brokers, with independent environment access and revocation fencing.

Fork-Feature: mic-identity

Upstream: no
Fork-Feature: mic-identity

Upstream: no
Fork-Feature: mic-identity

Upstream: no
Share pairing lifecycle across web and React Native, add Swift host management, and keep discovery independent of inference grants. Bind host confirmations to fresh discovery and preserve recovery when the gateway is unavailable.

Fork-Feature: mic-identity
Upstream: no
…churn

Fork-Feature: prism
Fork-Feature: base
Upstream: no
Fork-Seam-Debt: yes
The completed browser, remote runtime and mobile lifecycle integration requires eight additional upstream files. Preserve the existing counting rules and enforce the reviewed scope after extracting implementation and unrelated patch churn.

Fork-Feature: base
Fork-Feature: prism
Upstream: no
The v7.2.151-prism.2 release is built from 0e043afac31d41d68433d6f4a3af72fe1264df52. Published Linux release binaries match the qualified local binaries and the corresponding container files.

Fork-Feature: prism
Upstream: no
Restore upstream CORS metadata outside registered Prism routes and when the relevant fork flags are disabled. Select the Prism policy before global CORS short-circuits OPTIONS, preserving configured origins and credentials. Keep real-server connect/disconnect coverage and add baseline and origin-policy checks.

Fork-Feature: prism
Fork-Seam-Debt: yes
Upstream: no
…ecutable

Read the full tar listing under pipefail and require exactly one supported engine member. Avoid closing tar stdout early when awk finds the executable.

Fork-Feature: base
Upstream: no
Retain the manual fix reviewed in sync PR #5: the app also defines an Environment model, so qualify the SwiftUI property wrapper explicitly. The Prism feature expansion had restored the unqualified spelling.

Fork-Feature: prism
Fork-Feature: swift-ios
Upstream: no
Apply the pinned formatter to the eight files reported by source CI. Changes only wrap imports, calls, JSX spacing, and the seam-debt table.

Fork-Feature: prism
Fork-Seam-Debt: yes
Upstream: no
Fork-Feature: base
Upstream: no
Fork-Seam-Debt: yes
@q1
q1 force-pushed the sync/codex-upstream branch from 2cda367 to cbba9cf Compare September 11, 2026 19:38
@q1 q1 changed the title chore: adapt upstream 3faeee49ac67 chore: adapt upstream 7bd7f99e6cab Sep 11, 2026
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.