chore: sync upstream pingdotgg/t3code (20260718)#201
Merged
Conversation
Co-authored-by: codex <codex@users.noreply.github.com>
pingdotgg#4017) Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#3969) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ow (pingdotgg#3952) Co-authored-by: Claude Fable 5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Julius Marminge <jmarminge@gmail.com>
…#3932) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#4097) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Julius Marminge <jmarminge@gmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: codex <codex@users.noreply.github.com>
…tructions (pingdotgg#3948) Co-authored-by: Claude Fable 5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#2757) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#3108) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: codex <codex@users.noreply.github.com>
…) (pingdotgg#2124) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Codex <codex@openai.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#3521) Co-authored-by: Codex <codex@openai.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Codex <codex@openai.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ions (pingdotgg#3951) Co-authored-by: Claude Fable 5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Julius Marminge <jmarminge@gmail.com> Co-authored-by: codex <codex@users.noreply.github.com>
…g#3867) Co-authored-by: Claude Fable 5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Post-cherry-pick fixups for the 20260718 upstream sync: - ElectronUpdater: restore setAllowDowngrade key dropped during pingdotgg#3832 conflict resolution - AcpSessionRuntime: thread assistantItemRuntimeId through the fork's session/load replay path (observeSessionLoadAssistantSegments + ensureActiveAssistantSegmentState) to match upstream pingdotgg#3932's collision-safe assistant item id scheme - Update fork tests asserting the old assistant item id format to the runtime-scoped format (AcpJsonRpcConnection, CursorAdapter) - GitVcsDriverCore test: expect the fork's for-each-ref listRefs command under pingdotgg#4077's stable-diagnostics assertion - showcasePendingTasks test: add fork-required dataAudience to EnvironmentProject fixtures Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: d4fd50056a
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
adamfgr
enabled auto-merge (squash)
July 18, 2026 04:10
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
18 participants
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.
Nightly upstream sync — pingdotgg/t3code → agriffiths-bots/t3code
Cherry-picks the 31 new upstream commits since the last sync
(
fdca154..5ca3266onupstream/main). One commit was already present in thefork and skipped as empty; 30 were applied.
Gate: CI-only sync policy. Commits use the audited
FACTORY_SKIPsyncescape hatch. Full local verification is green:
vp run typecheck,vp check(0 errors), and
vp test run(6041 passed, 0 failed).Conflict resolution (the only merge-introduced surface)
Files where our resolution differs from a clean upstream apply:
apps/server/src/ws.ts,server.test.ts— kept the fork's supersetsubscribeThread(storage-epoch/revision revalidation, tombstone recovery),which already implements upstream Fix dropped events during initial thread snapshot pingdotgg/t3code#4079's "attach live subscription before
draining" fix. Took
--ours(zero net change); fork testbuffers live thread events before reading a forced snapshotalready covers it.ElectronUpdater.ts/DesktopUpdates.test.ts(feat: show nightly update changelog tooltip pingdotgg/t3code#3832) — kept the fork'sloadAutoUpdater.pipelazy-load idiom and addedsetFullChangelogin that idiom.GitVcsDriverCore.ts(fix(server): stabilize non-repository Git diagnostics pingdotgg/t3code#4077) — kept the fork'sfor-each-reflistRefsrewrite; adopted upstream's
executeGitWithStableDiagnostics(LC_ALL=C) on thefork's stderr-parsing call sites. Updated the new upstream diagnostics test to
expect the fork's
for-each-refcommand.remote.test.ts(Normalize protocol-relative remote host input as https pingdotgg/t3code#3971) — kept both the fork's Cloudflare-Access test andupstream's new protocol-relative host tests.
CursorAdapter.ts([codex] prevent ACP assistant ID collisions after restarts pingdotgg/t3code#3932) — kept the fork structure, applied upstream'sEffect.provideService(Crypto.Crypto, crypto); verified the siblingGrok/Driver/TextGeneration sites auto-merged the same line correctly.
ChatComposer.tsx([codex] fix mobile composer Enter behavior pingdotgg/t3code#3930) — kept the fork'shasCoarsePointershouldSubmitComposerOnEnter(fromChatComposer.logic.ts) and droppedupstream's duplicate
composer-logicimport to avoid a name collision.CodexDeveloperInstructions.ts/CodexSessionRuntime.test.ts(feat(server): include runtime model and effort in Codex developer instructions pingdotgg/t3code#3948) —kept the fork's
T3_CODE_THREAD_TOOL_INSTRUCTIONS(replaces upstream's browsertool text) and adopted upstream's
buildCodexDeveloperInstructionsruntimemodel/effort feature + its tests.
Post-cherry-pick fixups (separate commit)
assistantItemRuntimeIdthrough the fork's session/loadreplay path (
observeSessionLoadAssistantSegments/ensureActiveAssistantSegmentState) so replayed and live assistant item idsshare the runtime-scoped scheme; updated fork tests asserting the old id format.
dataAudienceto upstream's new mobile-showcaseEnvironmentProjectfixtures.setAllowDowngradekey dropped during the feat: show nightly update changelog tooltip pingdotgg/t3code#3832 resolution.Upstream-origin findings (files not in the conflicted set) are accepted per the
fork's upstream-sync policy.