[ScriptedAlchemy]

Why

The fork had diverged from upstream by 158 upstream commits. This merges pingdotgg/t3code:main through 61c3794c32b0eeebfac09add43e403618c65d2d7 into the fork base (4522c820569243e43e60913651677f37f8217926) and resolves all 48 conflicted files.

The commit preserves both histories with two parents. The published Git tree was verified to exactly match the local integration tree.

What changes

• Reconcile the upstream Effect crypto and MCP registration APIs while preserving PEA/pstack, project intelligence, assisted learning, and conversation summaries.
• Retain account isolation and pooled provider behavior. Refresh active pool member models correctly, aggregate workspace metadata, and preserve the Claude custom spawn path and root-refusal diagnostics.
• Preserve orchestration handoffs, code-index refresh, PR watchers, remote delegation, and authentication behavior while incorporating upstream changes.
• Keep all existing fork migration IDs 1–85 unchanged; append the incoming migrations as 86 and 87.
• Reconcile web/mobile composer and sidebar changes, client route lease handling, and the associated regression fixtures.

Validation

945 focused tests passed across 37 files for the original integration commit.

Area	Files	Tests
MCP and project intelligence	11	316
Providers, adapters, ACP, and WebSocket integration	9	242
Authentication, settings, and persistence migrations	6	153
Orchestration and peer services	6	117
Client runtime	4	84
GitHub pull-request provider	1	33

• Full server, web, mobile, desktop, and client-runtime typechecks passed.
• Contracts, provider-core, source-control-github, provider-acp, provider-cursor, and provider-kiro typechecks passed.
• Frozen lockfile dependency installation and native project-memory build passed.
• Formatting, scoped lint, and Git whitespace/conflict-marker checks passed. The working tree is clean.
• Hosted CI remains a separate gate on the latest published commit.

The required check:changed command was attempted but could not complete within this environment's resource limits and cache sandbox restrictions. Its inner cached typechecks and root test runner do not accept the controls needed here. The individual checks listed above passed using direct, bounded-concurrency commands; the aggregate gate and full CI are not claimed as passing.

Follow-up: current fork CI

Commit c21f80d merges current fork main ef873edeb5927d63e4e40920923b629616b95bbf into this branch. The local merge is clean. It preserves upstream's macOS Rosetta preparation and brings in the fork's runner validation, pinned Expo action, and private Linux CI routing.

• All 16 runner-policy and private-routing behavior tests passed.
• Actionlint passed for the four affected workflows, allowing their existing Blacksmith runner labels. The repository runner-policy scan passed.
• Frozen dependency installation, changed-file formatting, and Git whitespace checks passed.
• vp run check:changed HEAD --concurrency 1 --timeout 300 was attempted for these eight follow-up files. That run could not complete: the native prerequisite could not find a working Cargo, and the cached typecheck supervisor was denied seccomp_unotify. Its native-dependent test was skipped; this is not a green aggregate result.
• The published tree exactly matches the validated local merge tree.

Follow-up: pstack compatibility and replay checks

Commit ea88db8 merges the repaired #46 branch, including #51's packaged-runtime fix, into this integration branch. It resolves the overlapping Claude test setup by retaining the extended plugin-settings cases with upstream's NodeCrypto.layer. Upstream settings environment handling, SDK bypass-settings normalization, Linux packaging support, Effect 4.1.2, and Claude SDK 0.3.284 are preserved.

The selected gate also exposed two issues inherited from the prior integration head. The Claude adapter now uses a type-only Node namespace import, and the archived Codex rollback replay expectation includes the model provider and T3 thread ID already sent by production.

• Frozen dependency installation and supply-chain verification passed.
• All five selected Claude/native-plugin/discovery cases passed on the merged tree. Direct scripts typechecking passed.
• vp run check:changed HEAD --concurrency 1 --timeout 120 passed the native addon build, unused patch checks, formatting, both knip passes, and GraphQL validation. Its test step passed 573 of 574 cases across seven files, exposing the stale Codex expectation above.
• After correcting that expectation and the namespace import, the failing Codex case passed, scoped lint and formatting passed, and the direct server typecheck passed. The entire 574-case batch was not rerun for these fixture and type-only edits.
• The aggregate is not green: its cached typecheck supervisor for 41 affected packages is denied seccomp_unotify in this environment. Direct server and scripts typechecks are separate evidence; full hosted CI remains required.
• Git whitespace/conflict checks passed. The published tree exactly matches the validated local merge tree, and it merges cleanly with OpenCode PR fix(opencode): point agents at T3's browser instead of OpenCode's #50 at eb608546afd2e02b4d2af495f74b7f9f2cbd1252.

Authored with GPT-6 Astra Pro using the ChatGPT coding harness.

[changeset-bot]

⚠️ No Changeset found

Latest commit: 3f7bc90

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR