Skip to content

chore: sync upstream 2026-08-26 - #60

Merged
asfires merged 142 commits into
mainfrom
sync-upstream-2026-08-26
Aug 26, 2026
Merged

chore: sync upstream 2026-08-26#60
asfires merged 142 commits into
mainfrom
sync-upstream-2026-08-26

Conversation

@asfires

@asfires asfires commented Aug 26, 2026

Copy link
Copy Markdown
Owner

What Changed

Fork main was 141 commits behind pingdotgg/t3code main (v0.0.34 release, PR linking, attachment uploads, appearance contrast, background thread submission, Claude auto-compaction, Codex feedback, composer drawers). This merges upstream/main into the fork via a sync branch; 46 files conflicted.

Resolution notes (deliberate fork divergences kept)

  • Claude interruptTurn keeps the fork's interrupt() + early-interrupt replay latch (the Esc retraction pipeline depends on it). Upstream fix(server): stop kills lingering Claude work pingdotgg/t3code#5891 turned Stop into a session close; its stopSessionInternal hardening (close-first, task.completed on stop, guarded session deletion) is adopted, and its three interrupt-as-stop tests now exercise stopSession. The fork's interruptTurn settles every acknowledged live task test is restored.
  • Managed worktree recovery: upstream's new best-effort ensureThreadWorktree (fix(server): recreate a thread's worktree before starting a turn pingdotgg/t3code#7839) skips threads with managedWorktree provenance, so the fork's ref/checkpoint-based recovery (and setup-script rerun) stays authoritative.
  • Tool output projection: the fork's capped full output stays; upstream's projectCommandValue normalization is grafted in. Three ActivityPayloadProjection tests are aligned with retained output (two of them were already failing on fork main).
  • Composer: the fork's expand toggle, pasted-text summaries, prompt-suggestion placeholder and Esc gate are re-applied onto upstream's drawer-based composer; runtime mode config stays in the shared module; upstream's [data-composer-drawer-layer] selector joins CHAT_FLOATING_LAYER_SELECTOR.
  • ThreadSyncStatusPill adopts upstream's attached-drawer styling (drops the fork's raised offset, keeps the 300 ms syncing delay).
  • ChatView: the pre-dispatch cancellation latch wraps upstream's background-submission dispatch; hero state is backgroundSubmissionPending || shouldRenderEmptyThreadHero(...); Codex feedback messages join the optimistic message list ahead of the retraction filter.
  • Theme: sidebar row tints keep the fork's percentages on upstream's --contrast-foreground; markdown rules keep currentcolor.
  • Claude settings order: binaryPath, homePath, autoCompactWindow, launchArgs, promptSuggestions.

Verification

  • typecheck clean in packages/contracts, packages/shared, packages/client-runtime, apps/server, apps/web.
  • Targeted tests: contracts 302/302, shared model 10/10, web 259/259 (session-logic, MessagesTimeline, ThreadSyncStatusPill, ProviderSettingsForm, composer-logic, ChatView.logic, ComposerPromptEditor), server 484/484 across provider adapters, reactors, projections, persistence, startup reconcile, ws, and the new orphaned-session integration test.
  • Lint on files changed on both sides: no new errors. Pre-existing fork lint errors (no-manual-effect-runtime-in-tests in fork-authored reactor/projector tests) are untouched.

Merged and verified by Claude Fable 5 in Claude Code (T3 Code).

maria-rcks and others added 30 commits August 19, 2026 17:46
@maria-rcks
feat(web): confirm before closing a terminal (pingdotgg#7592)
0508792
@maria-rcks
feat(web): refresh pull request details (pingdotgg#7148)
a850895
@lgwacker
fix(web): usage hourly breakdown lists every hour chronologically (pi…
62654d2 
…ngdotgg#7595)
@jakeleventhal @claude
fix(web): remove the terminal pane's app-canvas gutter (pingdotgg#6222)
105cd5e 
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
@maria-rcks
feat(web): attach composer state drawers (pingdotgg#7150)
792a140
@maria-rcks
fix(server): preserve tool lifecycle identity (pingdotgg#7151)
b2e2ccf
@t3dotgg
chore(desktop): use stable Clerk Electron release (pingdotgg#7602)
9027d62
@maria-rcks
feat(web): collapse tool activity into one line (pingdotgg#7152)
4a9edff
@t3-code
test(web): remove redundant timestamp assertions (pingdotgg#7633)
f708f63 
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
@t3-code @maria-rcks
fix(web): import dependency-heavy Open VSX themes (pingdotgg#7642)
beab688 
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
@SunkenInTime
fix(web): retry failed thread bootstraps with a fresh id (pingdotgg#7664
8824f8f 
)
@sethwebster
fix(web): copy terminal selection instead of a blank clipboard (pingd…
21e80a0 
…otgg#7678)
@t3-code @maria-rcks
revert(web): restore sparse hourly usage breakdown (pingdotgg#7718)
aa17ec6 
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
@t3-code @maria-rcks
fix(server): reconcile orphaned provider sessions (pingdotgg#7719)
0929907 
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
@sameerr03
fix(web): fix subagent row left border being cut off (pingdotgg#7207)
490f48e
@kototok903
fix(web): unify composer control rounding (pingdotgg#5957)
cd14b3e
@incognitojam @github-actions
fix(web): show pointer on add project button (pingdotgg#5545)
5ff5f73 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@Rishet11
fix(server): enable the Cursor provider by default like every other p…
730ce9e 
…rovider (pingdotgg#7089)
@ipanasenko
fix(web): fix thread jumping after reorder (pingdotgg#7103)
1afe554
@cn0ss
fix(server): keep Daybreak models out of legacy models (pingdotgg#7659)
4bdbd8c
@t3-code @UtkarshUsername
fix(contracts): reconcile provider default tests (pingdotgg#7725)
fe87502 
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>
@UtkarshUsername
fix(web): polish theme library buttons, search, and import dialog (pi…
f0fb83a 
…ngdotgg#7580)
@t3dotgg
chore: vouch Seth Webster and pcstyle (pingdotgg#7728)
7107a98
@Bil0000
fix(web): add space above composer task tabs (pingdotgg#7740)
68966c1
@maria-rcks @t3-code
feat(composer): list skills with slash commands (pingdotgg#7737)
e723501 
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
@s243a @claude
fix(web): show the full path in file link tooltips (pingdotgg#7741)
6d3bf01 
Co-authored-by: John William Creighton (s243a) <s243a@users.noreply.github.com>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
@talkingdonkeyz
fix(server): serve html assets with utf-8 charset (pingdotgg#6409)
820e563
@ChamaruAmasara @claude
fix(vcs): give git worktree add a longer timeout on large repos (pi…
12c4970 
…ngdotgg#6326)

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
@t3-code @saphid
chore: move implementation plans out of repository (pingdotgg#7665)
9167622 
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: Alex Southwell <4596216+saphid@users.noreply.github.com>
@saphid
Update user count in AGENTS.md (pingdotgg#7658)
45a2c4b
t3dotgg and others added 27 commits August 25, 2026 00:50
@t3dotgg
fix(server): stop routine events from rescanning thread history (ping…
c034f51 
…dotgg#8150)
@t3dotgg
fix(deps): stop pnpm installs from changing the lockfile (pingdotgg#8163
2394998 
)
@t3dotgg
feat(web): settle and restore threads with a keyboard shortcut (pingd…
143341b 
…otgg#8089)
@t3dotgg
perf(desktop): cut macOS signing calls by 81% (pingdotgg#8093)
63eb042
@t3dotgg
feat: link pull requests to threads (pingdotgg#8160)
3c75eb1
@t3dotgg @mweinbach
feat(web): safely attach HEIC photos as JPEG images (pingdotgg#8161)
bd9ed2b 
Co-authored-by: mweinbach <maxweinbach5@gmail.com>
@t3dotgg
feat(mobile): track device models and OS versions (pingdotgg#8169)
bce6809
@lnieuwenhuis
fix(grok): bound cumulative tool output updates (pingdotgg#7279)
afc8342
@t3dotgg
fix(web): delay thread shortcut hints by 200 ms (pingdotgg#8172)
e6d487e
@t3dotgg
fix(server): stop probing Cursor until enabled (pingdotgg#8175)
43f723f
@t3dotgg
docs(release): verify remote updates with database migrations (pingdo…
1a4a759 
…tgg#8177)
@t3dotgg
fix(server): keep provider CLIs available in the macOS service (pingd…
1baf991 
…otgg#8173)
@t3dotgg @claude
feat(claude): compact old threads before they burn through usage (pin…
c7222ca 
…gdotgg#8144)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@tris203
fix(client-runtime): retry queries after connection interruption (pin…
589a9d0 
…gdotgg#8117)
@t3dotgg
fix(server): keep previously used providers working after upgrades (p…
06de9e9 
…ingdotgg#8176)
@t3dotgg
feat(desktop): build macOS previews from a PR label (pingdotgg#8182)
c6b8bb8
@t3dotgg @claude
fix(web): thread jump hints no longer stick after a dictation paste (p…
5d76653 
…ingdotgg#8189)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@MohtashamMurshid
fix(web): keep grouped project renames (pingdotgg#7831)
e67074f
@SunkenInTime Dara Adedeji @shivamhwp
feat(web): reveal chat file chips in the system file manager (pingdot…
082e6ea 
…gg#7140)

Co-authored-by: Dara Adedeji <daraaded@amazon.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
@t3dotgg
fix(server): push no longer writes a feature branch's commits to its …
994372b 
…base branch (pingdotgg#8228)
@t3dotgg @claude
chore(deps): bump @clerk/electron to 0.0.37 (pingdotgg#8240)
5041777 
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg @claude
feat(server): fetch legacy model classification from a hosted manifest (
badae6a 
pingdotgg#8227)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3-code
chore(release): prepare v0.0.34
860caaa
@t3dotgg
fix(desktop): let Clerk UI receive stable auth fixes (pingdotgg#8248)
b0a0281
@t3dotgg @claude
fix(app): un-settled threads return to the top of the list (pingdotgg…
3b86ef9 
…#8231)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3dotgg @claude
perf(ci): cut about a minute from every release (pingdotgg#8250)
a3a8cbd 
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@asfires
chore: sync upstream 2026-08-26
7369d34
@github-actions github-actions Bot added size:XXL vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. labels Aug 26, 2026
@asfires
asfires merged commit 0e6c4cf into main Aug 26, 2026
6 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

size:XXL vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.