chore: sync upstream pingdotgg/t3code (20260718)

[wizzoapp]

Nightly upstream sync — pingdotgg/t3code → agriffiths-bots/t3code

Cherry-picks the 31 new upstream commits since the last sync
(fdca154..5ca3266 on upstream/main). One commit was already present in the
fork and skipped as empty; 30 were applied.

Gate: CI-only sync policy. Commits use the audited FACTORY_SKIP sync
escape 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 superset
  subscribeThread (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 test
  buffers live thread events before reading a forced snapshot already covers it.
• ElectronUpdater.ts / DesktopUpdates.test.ts (feat: show nightly update changelog tooltip pingdotgg/t3code#3832) — kept the fork's
  loadAutoUpdater.pipe lazy-load idiom and added setFullChangelog in that idiom.
• GitVcsDriverCore.ts (fix(server): stabilize non-repository Git diagnostics pingdotgg/t3code#4077) — kept the fork's for-each-reflistRefs
  rewrite; adopted upstream's executeGitWithStableDiagnostics (LC_ALL=C) on the
  fork's stderr-parsing call sites. Updated the new upstream diagnostics test to
  expect the fork's for-each-ref command.
• remote.test.ts (Normalize protocol-relative remote host input as https pingdotgg/t3code#3971) — kept both the fork's Cloudflare-Access test and
  upstream'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's
  Effect.provideService(Crypto.Crypto, crypto); verified the sibling
  Grok/Driver/TextGeneration sites auto-merged the same line correctly.
• ChatComposer.tsx ([codex] fix mobile composer Enter behavior pingdotgg/t3code#3930) — kept the fork's hasCoarsePointer
shouldSubmitComposerOnEnter (from ChatComposer.logic.ts) and dropped
  upstream's duplicate composer-logic import 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 browser
  tool text) and adopted upstream's buildCodexDeveloperInstructions runtime
  model/effort feature + its tests.

Post-cherry-pick fixups (separate commit)

• Threaded [codex] prevent ACP assistant ID collisions after restarts pingdotgg/t3code#3932's new assistantItemRuntimeId through the fork's session/load
  replay path (observeSessionLoadAssistantSegments /
  ensureActiveAssistantSegmentState) so replayed and live assistant item ids
  share the runtime-scoped scheme; updated fork tests asserting the old id format.
• Added the fork-required dataAudience to upstream's new mobile-showcase
  EnvironmentProject fixtures.
• Restored a setAllowDowngrade key 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.

[chatgpt-codex-connector]

💡 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]

Auto-approved by wizzo-approve: all policy conditions verified against HEAD bd159fa.

[wizzoapp]

Nightly upstream sync — pingdotgg/t3code → agriffiths-bots/t3code

Cherry-picks the 31 new upstream commits since the last sync
(fdca154..5ca3266 on upstream/main). One commit was already present in the
fork and skipped as empty; 30 were applied.

Gate: CI-only sync policy. Commits use the audited FACTORY_SKIP sync
escape 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 superset
  subscribeThread (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 test
  buffers live thread events before reading a forced snapshot already covers it.
• ElectronUpdater.ts / DesktopUpdates.test.ts (feat: show nightly update changelog tooltip pingdotgg/t3code#3832) — kept the fork's
  loadAutoUpdater.pipe lazy-load idiom and added setFullChangelog in that idiom.
• GitVcsDriverCore.ts (fix(server): stabilize non-repository Git diagnostics pingdotgg/t3code#4077) — kept the fork's for-each-reflistRefs
  rewrite; adopted upstream's executeGitWithStableDiagnostics (LC_ALL=C) on the
  fork's stderr-parsing call sites. Updated the new upstream diagnostics test to
  expect the fork's for-each-ref command.
• remote.test.ts (Normalize protocol-relative remote host input as https pingdotgg/t3code#3971) — kept both the fork's Cloudflare-Access test and
  upstream'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's
  Effect.provideService(Crypto.Crypto, crypto); verified the sibling
  Grok/Driver/TextGeneration sites auto-merged the same line correctly.
• ChatComposer.tsx ([codex] fix mobile composer Enter behavior pingdotgg/t3code#3930) — kept the fork's hasCoarsePointer
shouldSubmitComposerOnEnter (from ChatComposer.logic.ts) and dropped
  upstream's duplicate composer-logic import 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 browser
  tool text) and adopted upstream's buildCodexDeveloperInstructions runtime
  model/effort feature + its tests.

Post-cherry-pick fixups (separate commit)

• Threaded [codex] prevent ACP assistant ID collisions after restarts pingdotgg/t3code#3932's new assistantItemRuntimeId through the fork's session/load
  replay path (observeSessionLoadAssistantSegments /
  ensureActiveAssistantSegmentState) so replayed and live assistant item ids
  share the runtime-scoped scheme; updated fork tests asserting the old id format.
• Added the fork-required dataAudience to upstream's new mobile-showcase
  EnvironmentProject fixtures.
• Restored a setAllowDowngrade key 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.

[chatgpt-codex-connector]

💡 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]

Auto-approved by wizzo-approve: all policy conditions verified against HEAD bd159fa.

[wizzoapp]

Nightly upstream sync — pingdotgg/t3code → agriffiths-bots/t3code

Cherry-picks the 31 new upstream commits since the last sync
(fdca154..5ca3266 on upstream/main). One commit was already present in the
fork and skipped as empty; 30 were applied.

Gate: CI-only sync policy. Commits use the audited FACTORY_SKIP sync
escape 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 superset
  subscribeThread (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 test
  buffers live thread events before reading a forced snapshot already covers it.
• ElectronUpdater.ts / DesktopUpdates.test.ts (feat: show nightly update changelog tooltip pingdotgg/t3code#3832) — kept the fork's
  loadAutoUpdater.pipe lazy-load idiom and added setFullChangelog in that idiom.
• GitVcsDriverCore.ts (fix(server): stabilize non-repository Git diagnostics pingdotgg/t3code#4077) — kept the fork's for-each-reflistRefs
  rewrite; adopted upstream's executeGitWithStableDiagnostics (LC_ALL=C) on the
  fork's stderr-parsing call sites. Updated the new upstream diagnostics test to
  expect the fork's for-each-ref command.
• remote.test.ts (Normalize protocol-relative remote host input as https pingdotgg/t3code#3971) — kept both the fork's Cloudflare-Access test and
  upstream'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's
  Effect.provideService(Crypto.Crypto, crypto); verified the sibling
  Grok/Driver/TextGeneration sites auto-merged the same line correctly.
• ChatComposer.tsx ([codex] fix mobile composer Enter behavior pingdotgg/t3code#3930) — kept the fork's hasCoarsePointer
shouldSubmitComposerOnEnter (from ChatComposer.logic.ts) and dropped
  upstream's duplicate composer-logic import 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 browser
  tool text) and adopted upstream's buildCodexDeveloperInstructions runtime
  model/effort feature + its tests.

Post-cherry-pick fixups (separate commit)

• Threaded [codex] prevent ACP assistant ID collisions after restarts pingdotgg/t3code#3932's new assistantItemRuntimeId through the fork's session/load
  replay path (observeSessionLoadAssistantSegments /
  ensureActiveAssistantSegmentState) so replayed and live assistant item ids
  share the runtime-scoped scheme; updated fork tests asserting the old id format.
• Added the fork-required dataAudience to upstream's new mobile-showcase
  EnvironmentProject fixtures.
• Restored a setAllowDowngrade key 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.

[chatgpt-codex-connector]

💡 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]

Auto-approved by wizzo-approve: all policy conditions verified against HEAD bd159fa.

[wizzoapp]

Nightly upstream sync — pingdotgg/t3code → agriffiths-bots/t3code

Cherry-picks the 31 new upstream commits since the last sync
(fdca154..5ca3266 on upstream/main). One commit was already present in the
fork and skipped as empty; 30 were applied.

Gate: CI-only sync policy. Commits use the audited FACTORY_SKIP sync
escape 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 superset
  subscribeThread (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 test
  buffers live thread events before reading a forced snapshot already covers it.
• ElectronUpdater.ts / DesktopUpdates.test.ts (feat: show nightly update changelog tooltip pingdotgg/t3code#3832) — kept the fork's
  loadAutoUpdater.pipe lazy-load idiom and added setFullChangelog in that idiom.
• GitVcsDriverCore.ts (fix(server): stabilize non-repository Git diagnostics pingdotgg/t3code#4077) — kept the fork's for-each-reflistRefs
  rewrite; adopted upstream's executeGitWithStableDiagnostics (LC_ALL=C) on the
  fork's stderr-parsing call sites. Updated the new upstream diagnostics test to
  expect the fork's for-each-ref command.
• remote.test.ts (Normalize protocol-relative remote host input as https pingdotgg/t3code#3971) — kept both the fork's Cloudflare-Access test and
  upstream'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's
  Effect.provideService(Crypto.Crypto, crypto); verified the sibling
  Grok/Driver/TextGeneration sites auto-merged the same line correctly.
• ChatComposer.tsx ([codex] fix mobile composer Enter behavior pingdotgg/t3code#3930) — kept the fork's hasCoarsePointer
shouldSubmitComposerOnEnter (from ChatComposer.logic.ts) and dropped
  upstream's duplicate composer-logic import 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 browser
  tool text) and adopted upstream's buildCodexDeveloperInstructions runtime
  model/effort feature + its tests.

Post-cherry-pick fixups (separate commit)

• Threaded [codex] prevent ACP assistant ID collisions after restarts pingdotgg/t3code#3932's new assistantItemRuntimeId through the fork's session/load
  replay path (observeSessionLoadAssistantSegments /
  ensureActiveAssistantSegmentState) so replayed and live assistant item ids
  share the runtime-scoped scheme; updated fork tests asserting the old id format.
• Added the fork-required dataAudience to upstream's new mobile-showcase
  EnvironmentProject fixtures.
• Restored a setAllowDowngrade key 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.

[chatgpt-codex-connector]

💡 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]

Auto-approved by wizzo-approve: all policy conditions verified against HEAD bd159fa.

[wizzoapp]

Nightly upstream sync — pingdotgg/t3code → agriffiths-bots/t3code

Cherry-picks the 31 new upstream commits since the last sync
(fdca154..5ca3266 on upstream/main). One commit was already present in the
fork and skipped as empty; 30 were applied.

Gate: CI-only sync policy. Commits use the audited FACTORY_SKIP sync
escape 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 superset
  subscribeThread (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 test
  buffers live thread events before reading a forced snapshot already covers it.
• ElectronUpdater.ts / DesktopUpdates.test.ts (feat: show nightly update changelog tooltip pingdotgg/t3code#3832) — kept the fork's
  loadAutoUpdater.pipe lazy-load idiom and added setFullChangelog in that idiom.
• GitVcsDriverCore.ts (fix(server): stabilize non-repository Git diagnostics pingdotgg/t3code#4077) — kept the fork's for-each-reflistRefs
  rewrite; adopted upstream's executeGitWithStableDiagnostics (LC_ALL=C) on the
  fork's stderr-parsing call sites. Updated the new upstream diagnostics test to
  expect the fork's for-each-ref command.
• remote.test.ts (Normalize protocol-relative remote host input as https pingdotgg/t3code#3971) — kept both the fork's Cloudflare-Access test and
  upstream'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's
  Effect.provideService(Crypto.Crypto, crypto); verified the sibling
  Grok/Driver/TextGeneration sites auto-merged the same line correctly.
• ChatComposer.tsx ([codex] fix mobile composer Enter behavior pingdotgg/t3code#3930) — kept the fork's hasCoarsePointer
shouldSubmitComposerOnEnter (from ChatComposer.logic.ts) and dropped
  upstream's duplicate composer-logic import 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 browser
  tool text) and adopted upstream's buildCodexDeveloperInstructions runtime
  model/effort feature + its tests.

Post-cherry-pick fixups (separate commit)

• Threaded [codex] prevent ACP assistant ID collisions after restarts pingdotgg/t3code#3932's new assistantItemRuntimeId through the fork's session/load
  replay path (observeSessionLoadAssistantSegments /
  ensureActiveAssistantSegmentState) so replayed and live assistant item ids
  share the runtime-scoped scheme; updated fork tests asserting the old id format.
• Added the fork-required dataAudience to upstream's new mobile-showcase
  EnvironmentProject fixtures.
• Restored a setAllowDowngrade key 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.

[chatgpt-codex-connector]

💡 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]

Auto-approved by wizzo-approve: all policy conditions verified against HEAD bd159fa.

[wizzoapp]

Nightly upstream sync — pingdotgg/t3code → agriffiths-bots/t3code

Cherry-picks the 31 new upstream commits since the last sync
(fdca154..5ca3266 on upstream/main). One commit was already present in the
fork and skipped as empty; 30 were applied.

Gate: CI-only sync policy. Commits use the audited FACTORY_SKIP sync
escape 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 superset
  subscribeThread (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 test
  buffers live thread events before reading a forced snapshot already covers it.
• ElectronUpdater.ts / DesktopUpdates.test.ts (feat: show nightly update changelog tooltip pingdotgg/t3code#3832) — kept the fork's
  loadAutoUpdater.pipe lazy-load idiom and added setFullChangelog in that idiom.
• GitVcsDriverCore.ts (fix(server): stabilize non-repository Git diagnostics pingdotgg/t3code#4077) — kept the fork's for-each-reflistRefs
  rewrite; adopted upstream's executeGitWithStableDiagnostics (LC_ALL=C) on the
  fork's stderr-parsing call sites. Updated the new upstream diagnostics test to
  expect the fork's for-each-ref command.
• remote.test.ts (Normalize protocol-relative remote host input as https pingdotgg/t3code#3971) — kept both the fork's Cloudflare-Access test and
  upstream'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's
  Effect.provideService(Crypto.Crypto, crypto); verified the sibling
  Grok/Driver/TextGeneration sites auto-merged the same line correctly.
• ChatComposer.tsx ([codex] fix mobile composer Enter behavior pingdotgg/t3code#3930) — kept the fork's hasCoarsePointer
shouldSubmitComposerOnEnter (from ChatComposer.logic.ts) and dropped
  upstream's duplicate composer-logic import 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 browser
  tool text) and adopted upstream's buildCodexDeveloperInstructions runtime
  model/effort feature + its tests.

Post-cherry-pick fixups (separate commit)

• Threaded [codex] prevent ACP assistant ID collisions after restarts pingdotgg/t3code#3932's new assistantItemRuntimeId through the fork's session/load
  replay path (observeSessionLoadAssistantSegments /
  ensureActiveAssistantSegmentState) so replayed and live assistant item ids
  share the runtime-scoped scheme; updated fork tests asserting the old id format.
• Added the fork-required dataAudience to upstream's new mobile-showcase
  EnvironmentProject fixtures.
• Restored a setAllowDowngrade key 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.

[chatgpt-codex-connector]

💡 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]

Auto-approved by wizzo-approve: all policy conditions verified against HEAD bd159fa.

[wizzoapp]

Nightly upstream sync — pingdotgg/t3code → agriffiths-bots/t3code

Cherry-picks the 31 new upstream commits since the last sync
(fdca154..5ca3266 on upstream/main). One commit was already present in the
fork and skipped as empty; 30 were applied.

Gate: CI-only sync policy. Commits use the audited FACTORY_SKIP sync
escape 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 superset
  subscribeThread (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 test
  buffers live thread events before reading a forced snapshot already covers it.
• ElectronUpdater.ts / DesktopUpdates.test.ts (feat: show nightly update changelog tooltip pingdotgg/t3code#3832) — kept the fork's
  loadAutoUpdater.pipe lazy-load idiom and added setFullChangelog in that idiom.
• GitVcsDriverCore.ts (fix(server): stabilize non-repository Git diagnostics pingdotgg/t3code#4077) — kept the fork's for-each-reflistRefs
  rewrite; adopted upstream's executeGitWithStableDiagnostics (LC_ALL=C) on the
  fork's stderr-parsing call sites. Updated the new upstream diagnostics test to
  expect the fork's for-each-ref command.
• remote.test.ts (Normalize protocol-relative remote host input as https pingdotgg/t3code#3971) — kept both the fork's Cloudflare-Access test and
  upstream'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's
  Effect.provideService(Crypto.Crypto, crypto); verified the sibling
  Grok/Driver/TextGeneration sites auto-merged the same line correctly.
• ChatComposer.tsx ([codex] fix mobile composer Enter behavior pingdotgg/t3code#3930) — kept the fork's hasCoarsePointer
shouldSubmitComposerOnEnter (from ChatComposer.logic.ts) and dropped
  upstream's duplicate composer-logic import 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 browser
  tool text) and adopted upstream's buildCodexDeveloperInstructions runtime
  model/effort feature + its tests.

Post-cherry-pick fixups (separate commit)

• Threaded [codex] prevent ACP assistant ID collisions after restarts pingdotgg/t3code#3932's new assistantItemRuntimeId through the fork's session/load
  replay path (observeSessionLoadAssistantSegments /
  ensureActiveAssistantSegmentState) so replayed and live assistant item ids
  share the runtime-scoped scheme; updated fork tests asserting the old id format.
• Added the fork-required dataAudience to upstream's new mobile-showcase
  EnvironmentProject fixtures.
• Restored a setAllowDowngrade key 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.

[chatgpt-codex-connector]

💡 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]

Auto-approved by wizzo-approve: all policy conditions verified against HEAD bd159fa.

[wizzoapp]

Nightly upstream sync — pingdotgg/t3code → agriffiths-bots/t3code

Cherry-picks the 31 new upstream commits since the last sync
(fdca154..5ca3266 on upstream/main). One commit was already present in the
fork and skipped as empty; 30 were applied.

Gate: CI-only sync policy. Commits use the audited FACTORY_SKIP sync
escape 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 superset
  subscribeThread (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 test
  buffers live thread events before reading a forced snapshot already covers it.
• ElectronUpdater.ts / DesktopUpdates.test.ts (feat: show nightly update changelog tooltip pingdotgg/t3code#3832) — kept the fork's
  loadAutoUpdater.pipe lazy-load idiom and added setFullChangelog in that idiom.
• GitVcsDriverCore.ts (fix(server): stabilize non-repository Git diagnostics pingdotgg/t3code#4077) — kept the fork's for-each-reflistRefs
  rewrite; adopted upstream's executeGitWithStableDiagnostics (LC_ALL=C) on the
  fork's stderr-parsing call sites. Updated the new upstream diagnostics test to
  expect the fork's for-each-ref command.
• remote.test.ts (Normalize protocol-relative remote host input as https pingdotgg/t3code#3971) — kept both the fork's Cloudflare-Access test and
  upstream'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's
  Effect.provideService(Crypto.Crypto, crypto); verified the sibling
  Grok/Driver/TextGeneration sites auto-merged the same line correctly.
• ChatComposer.tsx ([codex] fix mobile composer Enter behavior pingdotgg/t3code#3930) — kept the fork's hasCoarsePointer
shouldSubmitComposerOnEnter (from ChatComposer.logic.ts) and dropped
  upstream's duplicate composer-logic import 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 browser
  tool text) and adopted upstream's buildCodexDeveloperInstructions runtime
  model/effort feature + its tests.

Post-cherry-pick fixups (separate commit)

• Threaded [codex] prevent ACP assistant ID collisions after restarts pingdotgg/t3code#3932's new assistantItemRuntimeId through the fork's session/load
  replay path (observeSessionLoadAssistantSegments /
  ensureActiveAssistantSegmentState) so replayed and live assistant item ids
  share the runtime-scoped scheme; updated fork tests asserting the old id format.
• Added the fork-required dataAudience to upstream's new mobile-showcase
  EnvironmentProject fixtures.
• Restored a setAllowDowngrade key 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.

[chatgpt-codex-connector]

💡 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]

Auto-approved by wizzo-approve: all policy conditions verified against HEAD bd159fa.