chore: sync upstream pingdotgg/t3code (20260719) by wizzoapp[bot] · Pull Request #209 · agriffiths-bots/t3code

wizzoapp · 2026-07-19T02:40:53Z

Nightly sync of pingdotgg/t3code into this fork.

Range: fdca154..1735e27 (50 upstream commits). Because this fork squash-merges
to main, the sync cherry-picks the range rather than merging.

21 commits applied
29 commits were already present in the fork (cherry-pick reported them
empty; spot-checked file-by-file against upstream before skipping)

Verification

gate	result
`vp run typecheck`	0 errors (15 packages)
`vp check`	0 errors, 1 warning (pre-existing style warning in upstream's `SidebarUpdatePill.tsx`)
`vp test run`	6135 passed, 7 skipped, 0 failed (682 files)

Conflicted-file set

These are the only files where this merge's resolution could introduce a bug;
everything else is upstream applied cleanly.

package.json · apps/mobile/.../showcasePendingTasks.test.ts ·
apps/server/src/ws.ts · apps/server/src/server.test.ts ·
apps/desktop/src/electron/ElectronUpdater.ts ·
apps/desktop/src/updates/DesktopUpdates.test.ts ·
apps/server/src/vcs/GitVcsDriverCore.ts (+ test) ·
packages/shared/src/remote.test.ts ·
apps/server/src/provider/Layers/CursorAdapter.ts ·
apps/server/src/provider/acp/AcpSessionRuntime.ts ·
apps/web/src/components/chat/ChatComposer.tsx ·
apps/server/src/provider/CodexDeveloperInstructions.ts (+ CodexSessionRuntime.test.ts) ·
apps/web/src/components/ChatView.tsx ·
packages/client-runtime/src/state/threads.ts (+ threads-sync.test.ts) ·
apps/server/src/orchestration/Normalizer.ts ·
apps/desktop/src/wsl/DesktopWslEnvironment.ts ·
scripts/build-desktop-artifact.ts ·
apps/web/src/components/ThreadTerminalDrawer.tsx

Notable resolutions

Fork already implemented upstream's fix — kept the fork's superset:

ws.ts (Fix dropped events during initial thread snapshot pingdotgg/t3code#4079, dropped events during initial thread snapshot): the fork already
attaches the live buffer before reading either the replay boundary or the
snapshot, so every return path drains it. Taking upstream's side would have
deleted the fork's audience guard, storage-epoch validation and tombstone
recovery. Ported upstream's regression test verbatim — it passes against the
fork's implementation.
GitVcsDriverCore.ts (fix(server): stabilize non-repository Git diagnostics pingdotgg/t3code#4077): all three of upstream's LC_ALL=C conversion
sites are already converted, plus a fourth fork-local fallback. The fork's
listRefs uses for-each-ref, so its test assertion (which still asserts
lcAll: "C") was kept over upstream's branch --no-color expectation.

Preferred upstream:

ChatComposer Enter behaviour ([codex] fix mobile composer Enter behavior pingdotgg/t3code#3930): the auto-merge left a duplicate import
of shouldSubmitComposerOnEnter. Adopted upstream's viewport-based helper and
retired the now-orphaned fork-local ChatComposer.logic.ts + its test.
Draft hero landing (feat: draft hero landing on the index route pingdotgg/t3code#4055) and WSL node-version validation (fix(desktop): Validate WSL node version against engine range after probe success pingdotgg/t3code#3621) taken
wholesale, after confirming every referenced symbol resolves in the fork.

Genuine merges (neither side alone was correct):

ChatView.tsx: took upstream's hero-landing structure but restored the
required sessionOnlyDisconnectedSendReason prop that upstream's variant
omits, and kept the fork's debounced environment-unavailable state.
Normalizer.ts: kept both sides (fork's attachment-cleanup helpers +
upstream's timestamp canonicalizer) and retargeted the fork's receipt and
attachment path at canonicalCommand, so canonicalized timestamps actually
reach the persisted command.
build-desktop-artifact.ts: upstream's web brand assets applied before the
fork's 3-arg validateBundledClientAssets (branding rewrites index.html).

Merge-introduced regressions found and fixed (`9d89c08`)

The full suite caught two real incompatibilities, both fixed rather than
papered over:

Duplicate threads on bootstrap replay. Upstream's client-timestamp
canonicalization ([codex] canonicalize client timestamps pingdotgg/t3code#4112) rewrote bootstrap.createThread.createdAt, but
BootstrapTurnStartDispatcher fingerprints a replayed bootstrap turn
against the thread it already created using exactly that field
(BootstrapTurnStartDispatcher.ts:133). Every retry would miss the check and
create a duplicate thread — a production bug, not just 3 red tests. Upstream
has no such dedup, so this was not an intentional upstream behaviour change.
Fixed by keeping the client's bootstrap timestamp as the stable replay
identity while still canonicalizing the turn-level createdAt; upstream's
canonicalizeClientCommandTimestamps and its tests are untouched.
Type error in the terminal copy action. Upstream's new selection-copy
path (Add terminal selection copy action pingdotgg/t3code#2904) passed a Terminal to writeSystemMessage, which this fork
narrowed to TerminalWriteQueue. Switched to terminalWriterRef, matching
every other call site.

🤖 Generated with Claude Code

Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: codex <codex@users.noreply.github.com>

Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: codex <codex@users.noreply.github.com> Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>

…gdotgg#4054) Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>

Co-authored-by: codex <codex@users.noreply.github.com>

Co-authored-by: Julius Marminge <julius0216@outlook.com>

…gg#3608) Co-authored-by: Codex <codex@openai.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>

Co-authored-by: Julius Marminge <julius0216@outlook.com>

Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: codex <codex@users.noreply.github.com>

…obe success (pingdotgg#3621) Co-authored-by: Julius Marminge <julius0216@outlook.com>

Two merge-introduced incompatibilities from the 20260719 upstream sync: - Normalizer: upstream's client-timestamp canonicalization (da3c203) rewrote bootstrap.createThread.createdAt, which BootstrapTurnStartDispatcher uses to fingerprint a replayed bootstrap turn against the thread it already created. Every retry would miss that check and create a duplicate thread. Keep the client's bootstrap timestamp as the stable identity; the turn-level createdAt is still canonicalized. - ThreadTerminalDrawer: upstream's terminal selection copy action (1735e27) passed a Terminal to writeSystemMessage, which this fork narrowed to accept a TerminalWriteQueue. Use terminalWriterRef, matching the other call sites. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

wizzoapp · 2026-07-19T02:41:02Z

@codex review

adamfgr

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 9d89c08847

ℹ️ 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".

chatgpt-codex-connector · 2026-07-19T02:57:45Z

+                disabled={
+                  isConnecting ||
+                  isComposerApprovalState ||
+                  projectSelectionRequired ||
+                  (environmentUnavailable !== null && activePendingProgress === null)


Keep the offline composer editable for queued sends

When an environment is unavailable and there is no pending question, this makes the Lexical editor non-editable, so users who lose connection before drafting cannot type a message to queue. The send path explicitly queues initial sends while activeEnvironmentUnavailable is true, and the primary action still advertises the disconnected queue action, so this state should not block composing the queued text; keep the editor editable and let the send path handle queuing/disablement.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-07-19T02:57:46Z

+      const dockTransition = runMobileComposerTransition(() => {
+        flushSync(() => {
+          captureDraftHeroComposerRect();
+          setDockedDraftHeroThreadKey(activeThreadKey);


Reset draft hero docking after attachment read failures

For draft-hero sends with images, this docks the hero before turnAttachmentsPromise is awaited; if reading an attachment fails, the early return restores the draft and removes the optimistic message but never clears dockedDraftHeroThreadKey. The still-empty draft then stays in the docked layout until navigation instead of returning to the hero, so the attachment failure path should clear this state or docking should wait until attachments are readable.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-07-19T02:57:46Z

+    if (latestUserMessageChanged) {
+      return true;


Match steering acknowledgements to the local send

When another client appends a steering/user message to the same running turn before this tab's send is projected, this condition treats that unrelated latest-user-message change as acknowledgement of the local dispatch. That clears the local "Sending" state for the wrong command, so the composer can stop showing that this tab's send is still pending; store/compare the submitted message id instead of accepting any latest user-message change.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-07-19T02:57:46Z

    if (
      key === "Enter" &&
-      shouldSubmitComposerOnEnter({ hasCoarsePointer, shiftKey: event.shiftKey })
+      shouldSubmitComposerOnEnter({ isMobileViewport, shiftKey: event.shiftKey })


Preserve coarse-pointer Enter behavior

On touch devices whose viewport is wider than the mobile breakpoint, such as tablets or Surface devices in landscape, this now passes only isMobileViewport to the Enter policy after removing the coarse-pointer guard. Plain Enter from the on-screen keyboard will submit instead of inserting a newline, regressing the previous coarse-pointer behavior; keep using pointer capability or include it in the shared helper.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-07-19T02:57:46Z

+  const catalog = AsyncResult.value(get(environmentCatalog.catalogAtom));
+  if (Option.isNone(catalog)) {
+    return false;
+  }


Wait for catalog readiness before settling landing

The catalog atom has an initial empty value with isReady: false, but AsyncResult.value(...) is already Some, so this atom skips the guard and returns true while the entries are still just the initial empty map. On a cold load of /, IndexDraftLanding can render the no-project hero before restored environments and shell snapshots arrive, causing a visible wrong landing state; check catalog.value.isReady before iterating or returning true.

Useful? React with 👍 / 👎.

D3OXY and others added 22 commits July 19, 2026 03:09

Fix dropped events during initial thread snapshot (pingdotgg#4079)

db902e7

[codex] fix mobile composer Enter behavior (pingdotgg#3930)

d6a1d8f

Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: codex <codex@users.noreply.github.com>

feat: draft hero landing on the index route (pingdotgg#4055)

9118e75

Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: codex <codex@users.noreply.github.com> Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>

feat: file explorer mention actions and zoom-aware context menus (pin…

3bf2854

…gdotgg#4054) Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>

fix(web): avoid duplicate mention text on paste

f958c00

Co-authored-by: codex <codex@users.noreply.github.com>

fix(mobile): restore iOS home screen branding (pingdotgg#4025)

78ef1cc

Co-authored-by: Julius Marminge <julius0216@outlook.com>

perf(client): defer active thread cache writes (pingdotgg#4006)

93da3ae

Default diffs to working changes (pingdotgg#3974)

8c2f39c

Co-authored-by: Julius Marminge <julius0216@outlook.com>

Add Grok to marketing site provider list (pingdotgg#3484)

738f338

Fix reopening existing Diff tab (pingdotgg#3973)

ca62d44

Co-authored-by: Julius Marminge <julius0216@outlook.com>

Fix sending messages during active turns (pingdotgg#3919)

665042f

Co-authored-by: Julius Marminge <julius0216@outlook.com>

[codex] Route OpenCode missing-session errors through Effect (pingdot…

d104601

…gg#3608) Co-authored-by: Codex <codex@openai.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>

[fix/feat:ui] Show default option badge (pingdotgg#3232)

94ed435

Co-authored-by: Julius Marminge <julius0216@outlook.com>

[fix/feat:ui] Preserve open-in editor brand colors (pingdotgg#3225)

d699243

Co-authored-by: Julius Marminge <julius0216@outlook.com>

fix(web): handle macOS Home and End in composer (pingdotgg#2508)

6fe6279

Co-authored-by: Julius Marminge <julius0216@outlook.com>

Allow failed remote environments to be removed (pingdotgg#4084)

b4a30b6

Co-authored-by: Julius Marminge <julius0216@outlook.com>

[codex] canonicalize client timestamps (pingdotgg#4112)

d571a98

[fix/feat:ui] Make selected menu checks blue (pingdotgg#3234)

1739a1b

Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: codex <codex@users.noreply.github.com>

fix(desktop): Validate WSL node version against engine range after pr…

d53dc9a

…obe success (pingdotgg#3621) Co-authored-by: Julius Marminge <julius0216@outlook.com>

Refresh splash screen and favicon branding (pingdotgg#4120)

a2ff94a

Add terminal selection copy action (pingdotgg#2904)

f4ee4e0

adamfgr approved these changes Jul 19, 2026

View reviewed changes

adamfgr merged commit 8c13449 into main Jul 19, 2026
8 checks passed

adamfgr deleted the chore/upstream-sync-20260719 branch July 19, 2026 02:57

chatgpt-codex-connector Bot reviewed Jul 19, 2026

View reviewed changes

wizzoapp Bot mentioned this pull request Jul 19, 2026

fix: address Codex findings from upstream sync 20260719 #210

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

chore: sync upstream pingdotgg/t3code (20260719)#209

chore: sync upstream pingdotgg/t3code (20260719)#209
adamfgr merged 22 commits into
mainfrom
chore/upstream-sync-20260719

wizzoapp Bot commented Jul 19, 2026

Uh oh!

wizzoapp Bot commented Jul 19, 2026

Uh oh!

adamfgr left a comment

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Uh oh!

chatgpt-codex-connector Bot Jul 19, 2026

Uh oh!

chatgpt-codex-connector Bot Jul 19, 2026

Uh oh!

chatgpt-codex-connector Bot Jul 19, 2026

Uh oh!

chatgpt-codex-connector Bot Jul 19, 2026

Uh oh!

chatgpt-codex-connector Bot Jul 19, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants

Uh oh!

Conversation

wizzoapp Bot commented Jul 19, 2026

Verification

Conflicted-file set

Notable resolutions

Merge-introduced regressions found and fixed (9d89c08)

Uh oh!

wizzoapp Bot commented Jul 19, 2026

Uh oh!

adamfgr left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jul 19, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Jul 19, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Jul 19, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Jul 19, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Jul 19, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants

Merge-introduced regressions found and fixed (`9d89c08`)