Repository navigation
merge: bring upstream T3 (ac8e9453c) into t3.14/main - #7
Merged
AmbitiousRealism2025 merged 124 commits intoOct 6, 2026
Merged
Conversation
…#15851) Co-authored-by: maria-rcks <[email protected]>
…#15853) Co-authored-by: maria-rcks <[email protected]>
Co-authored-by: maria-rcks <[email protected]>
…dotgg#15958) Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
…ingdotgg#15951) Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
…of encoding a fallback (pingdotgg#16118) Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
…ngdotgg#16167) Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
…ingdotgg#16170) Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
…pingdotgg#16002) Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
…ingdotgg#15592) Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
…tgg#16200) Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
…eady passed (pingdotgg#15804) Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
…r cached (pingdotgg#15500) Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
…ingdotgg#16207) Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
…ingdotgg#16315) Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
…gain (pingdotgg#16363) Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
…ingdotgg#16314) Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
…g#16253) Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
…ingdotgg#16382) Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
…g#13217) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <[email protected]>
…ingdotgg#16400) Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]> Co-authored-by: Yash Singh <[email protected]>
Merges upstream/main up to ac8e945 (123 commits since the fork base 7812230). Two textual conflicts, both small: - ProviderTurnStartService.ts imports ProviderAuthService from its new location, next to the T3.14 imports. - server.ts takes upstream's `layerRuntimeCoreDependencies` naming and keeps `Layer.provideMerge(DurableReattach.layer)`. Upstream refactors that git merged cleanly but that broke T3.14 code: - pingdotgg#16295 (one module per service): `persistence/Layers/Sqlite.ts` -> `persistence/Sqlite.ts` (`layerFromPath`), `provider/Services/ProviderAuthService.ts` -> `provider/ProviderAuthService.ts`, `provider/Layers/piThinkingCapabilities.ts` -> `provider/piThinkingCapabilities.ts`. - pingdotgg#16282 (layer naming): `makeSingleLayer` -> `layerSingle`, `makeOrchestratorV2ReplayLayerWithRegistry` -> `layerWithRegistry`. - pingdotgg#16138 (Effect 4.0.1): `effect/unstable/process` -> `effect/process`. No behavior change in T3.14 code. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
Owner
Author
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
|
Codex Review: Didn't find any major issues. 👍 Reviewed commit: ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
If Codex has suggestions, it will comment; otherwise it will react with 👍. Codex can also answer questions or update the PR. Try commenting "@codex address that feedback". |
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.
Why
The fork was cut from upstream at
781223057on 5 October. Upstream has merged 123 commits since then, including three refactors that rename or move code T3.14 calls. Merging now, before D03 and W03 add more T3.14 changes to orchestration, keeps the cost low. A trial merge this morning showed what it would take; this PR is that merge, done for real.What changed
Merge of
upstream/mainatac8e9453c. The 123 upstream commits are unchanged from pingdotgg/t3code. Against upstream, the result differs only in the 19 T3.14 files, with the same footprint as before (+6,725/−34).Two textual conflicts, both small:
ProviderTurnStartService.ts:ProviderAuthServiceis imported from its new location, next to the T3.14 imports.server.ts: takes upstream'slayerRuntimeCoreDependenciesnaming and keepsLayer.provideMerge(DurableReattach.layer).Twelve compile breaks that git merged cleanly. Each comes from an upstream refactor:
persistence/Sqlite.tswithlayerFromPath,provider/ProviderAuthService.tsandprovider/piThinkingCapabilities.ts.layerSingleandlayerWithRegistry.effect/process.No behavior change in T3.14 code; the fixes are import paths and names only.
Verification
tsc --noEmitforapps/server: clean in all T3.14 files. The remaining errors are insrc/process/externalLauncher.test.ts, which is identical to upstream's. It callstestLayer, which refactor: layer variables are named layer or layerXyz pingdotgg/t3code#16282 renamed; fix(shared): find versioned JetBrains macOS app bundles pingdotgg/t3code#16246 then added uses of the old name. That break is upstream's own and is left as is.vp fmtandvp lintare clean on the touched files.T314_WORKER_CLI=…set: the durable fake, adapter and orchestrator suites, including the real-worker restart, steer and Pi model client cases, plus the drivers, recovery, effect worker, turn start, turn control, run execution and projection recovery suites.pnpm install --frozen-lockfilefrom upstream's lockfile, using Node 24.21.0.Notes for running it
T3_SERVICE_LAUNCHER_CONTEXTat startup. A shell started by an installed T3 inherits that variable, and the server then refuses to start ("The service launcher started a different t3 version"). Run the fork with the variable unset (env -u T3_SERVICE_LAUNCHER_CONTEXT …). The check is local; it does not contact the installed launcher.Reviewing: the T3.14 changes are the 19 files listed above, plus the conflict resolutions in the merge commit
a2fa360ef. The upstream commits need no review here.Model and harness: Claude Opus 5.5 in Claude Code, inside T3 Code.
🤖 Generated with Claude Code