Skip to content

Merge upstream main through 5a96895a85 - #499

Merged
patroza merged 81 commits into
fork/devfrom
sync/upstream-d60a71ef6e
Oct 4, 2026
Merged

Merge upstream main through 5a96895a85#499
patroza merged 81 commits into
fork/devfrom
sync/upstream-d60a71ef6e

Conversation

@patroza

@patroza patroza commented Oct 4, 2026 •
edited
Loading

Copy link
Copy Markdown
Owner

Classic-merge pingdotgg/t3code main through 5a96895a85.

Inner weld 445af7ef2f parents 02e6bf1ec2 (fork/dev) + d60a71ef6e.
Follow-up c8889b81d8 sets the required failureKind on the launch-retry git error fixture.
Tip merge 9462f9abe5 parents c8889b81d8 + eac52f0087 (busy-stream close no longer drops the connection). Lockfile regenerated.
Latest tip 5a24b740b6 parents af302f78c7 + 5a96895a85: expanded tool-call output, and shift-held pull request quick actions. Clean merge; no lockfile change.

Node unit tests that build a client router stub the DOM globals Router 1.171 now touches (history, document, self). Thread search tests that mock @effect/atom-react run isolated.

Kept on the fork

  • Identity claim gate on web and mobile, next to the nightly mobile beta notice and the global voice control
  • Client command source stamping, including prepared-run.retry preparation restart
  • Product handshake rejection on the RPC scope layer; device.list still checks its input-dependent scope
  • Sidebar ownership and environment filters, recency grouping when the working shelf is off, and the shared inbox return order when it is on
  • Mobile working shelf plus recency headers
  • dfx 1.0.16, msgpackr-extract: true, GitHub-hosted runners, Fork CI Test timeout 20 minutes
  • Claude query environment resolved through direnv

Incoming

Working-section order that stays put while agents finish, full-screen mobile simulator viewer, sqlite write-lock waits, one-click provider updates, paginated PR review replies, sidebar settle/wake sweep, draft-thread context menu, expanded tool-call output, and shift-held pull request quick actions.

origin/main stays at 4f5834ba72. Repository rules require a pull request for main, so this land is the fork/dev classic merge only.

yashranaway and others added 30 commits October 3, 2026 18:46
@yashranaway @shivamhwp
fix(shared): classify workspace previews by literal filenames (pingdo…
f391794 
…tgg#10311)

Co-authored-by: yashranaway <yashranaway@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
@znoraka
fix(mobile): iOS threads no longer jump to the top (pingdotgg#14808)
1945ce8
@Bil0000
fix(web): reduce the gap above the draft composer (pingdotgg#15196)
44b4965
@jakeleventhal @claude
fix(mobile): a dev server left running no longer shows the waiting bo…
a0bf1ee 
…lt (pingdotgg#15194)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@SunkenInTime @claude
fix(server): a Claude command you stop shows as interrupted (pingdotg…
ce90eec 
…g#14896)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@bfowler
fix(server): editors appear once a slow discovery scan finishes (ping…
0080e80 
…dotgg#13917)
@juliusmarminge
fix(server): Claude threads no longer stay stuck in plan mode Claude …
aad7329 
…entered itself (pingdotgg#15224)
@jakeleventhal
fix(mobile): show complete subagent details (pingdotgg#15189)
65731f9
@juliusmarminge @claude
fix(mobile): an expired Live Activity no longer leaves a second card (p…
77823bd 
…ingdotgg#15254)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@t3-code
test(web): remove redundant thread sort fallback tests (pingdotgg#15095)
cfdff56 
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
@maria-rcks
fix(web): thinking row after a failed tool expands the run's tool cal…
70e5a40 
…ls (pingdotgg#15056)
@flamboh
perf(web): DOM changes no longer restyle the whole page (pingdotgg#15265
39efcd8 
)
@t3dotgg @claude
perf(usage): cut warm usage scans from seconds to milliseconds on lar…
71dbaf1 
…ge histories (pingdotgg#15149)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@flamboh
perf(web): virtualize command palette results (pingdotgg#15266)
fffe6e6
@flamboh
chore(lint): flag :has() variants that restyle the whole page (pingdo…
0cfa113 
…tgg#15274)
@t3dotgg @claude
fix(web): workspace card docks beside chat when the window is narrow (p…
429c625 
…ingdotgg#14992)

Chat stays centered while the workspace card fits beside it with 32px to spare. When it does not fit, chat moves left only as far as needed, narrows only after it reaches the left padding, and the card becomes a popover below a 640px chat. The card is lighter: 280px wide, 32px rows, no section labels, no "Project folder" hint.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@maria-rcks
feat(web): render mermaid code blocks as diagrams (pingdotgg#15067)
5e35272 
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
@t3dotgg @claude
feat(web): Nightly tells you to get the beta mobile app (pingdotgg#15070
f1dcd93 
)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@t3dotgg @tris203 @claude
test(server): ACP adapter tests no longer race the prompt settle (pin…
a21702d 
…gdotgg#15330)

Takes over pingdotgg#14876.

Co-authored-by: tris203 <admin@snappeh.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@t3dotgg @claude
feat(usage): fold preview model IDs into the model they belong to (pi…
b05adb7 
…ngdotgg#15333)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
refactor(server): check RPC scopes in group middleware (pingdotgg#15324)
a78760e 
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@t3dotgg @claude
feat(mobile): beta Working section hides busy threads until they need…
8d84666 
… you (pingdotgg#15346)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@yordis
fix(settings): symlinked settings files stay linked when saved (pingd…
00eb8f6 
…otgg#15009)

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@t3dotgg @claude
fix(server): Stop ends a dev server left running before a provider sw…
d65cd33 
…itch (pingdotgg#15355)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@t3dotgg @claude
fix(server): merged threads settle even after the agent wakes on its …
243d1e7 
…own (pingdotgg#15388)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@maria-rcks
fix(web): no-project drafts can switch machines (pingdotgg#15356)
c47f426
@Yash-Singh1
fix(web): highlight tool inputs and remove nested work log indentation (
f786ff3 
pingdotgg#15384)
@maria-rcks
fix(server): restarts keep delegated tasks, queued threads, and stops…
5108c97 
… intact (pingdotgg#15323)
@maria-rcks @claude
fix(web): sending past the resume banner compacts first (pingdotgg#15290
a976f8c 
)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@maria-rcks
fix(codex): resume archived native sessions (pingdotgg#15389)
44bd4c9
juliusmarminge and others added 20 commits October 3, 2026 22:09
@juliusmarminge @claude
feat(clients): step a new thread to the next machine from the keyboard (
c5a0c78 
pingdotgg#15391)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@yordis
fix(web): promoting a draft thread no longer logs a React key warning (…
d073c26 
…pingdotgg#15458)

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@yordis
test(server): the text generation's fake Claude CLI is a fixture file…
ee7b49d 
…, not a generated string (pingdotgg#15479)

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@juliusmarminge @Bil0000 @claude
fix(mobile): keep dictation running across navigation behind an edge …
bf5c146 
…pill (pingdotgg#15502)

Co-authored-by: Bil0000 <62337003+Bil0000@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
fix(client-runtime): relay disconnects no longer show as thread errors (
a92c43b 
pingdotgg#15470)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@SunkenInTime @claude
fix(web): subagent cards name the provider account (pingdotgg#15493)
daa1d0e 
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@eimexdev @maria-rcks
fix(server): read paginated review replies when watching PRs (pingdot…
f4f3abf 
…gg#15427)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
@maria-rcks
fix(server): offer one-click provider updates for every install (ping…
fe93a5d 
…dotgg#15416)
@juliusmarminge @claude
fix(mobile): keep the dictation timer from shifting width (pingdotgg#…
930aec1 
…15504)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
fix(relay): T3 Connect links no longer fail on colliding prepared sta…
4059607 
…tements (pingdotgg#15411)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
fix(server): sqlite transactions wait for the write lock instead of f…
0fe4fa4 
…ailing (pingdotgg#15488)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@flamboh
fix(web): unpin button shows the pin-off icon on hover (pingdotgg#15425)
6e0abd5
@PixPMusic
fix(mobile): make queued message removal tappable (pingdotgg#15417)
ae010fe
@maria-rcks
fix(web): keep workspace panels below dialogs (pingdotgg#15454)
e19a48d
@t3dotgg @claude
fix(clients): Working section keeps its order while agents finish and…
1302cca 
… wake (pingdotgg#15418)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@juliusmarminge @claude
feat(mobile): full-screen simulator viewer with on-demand controls (p…
d60a71e 
…ingdotgg#15551)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@github-actions
Merge upstream main through d60a71e
445af7e 
# Conflicts:
#	apps/mobile/src/App.tsx
#	apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx
#	apps/mobile/src/features/threads/threadListV2.ts
#	apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
#	apps/server/src/ws.ts
#	apps/web/src/components/ChatView.tsx
#	apps/web/src/components/CommandPalette.tsx
#	apps/web/src/components/GitActionsControl.tsx
#	apps/web/src/components/Sidebar.logic.test.ts
#	apps/web/src/components/Sidebar.logic.ts
#	apps/web/src/components/Sidebar.tsx
#	apps/web/src/routes/__root.tsx
#	pnpm-lock.yaml
@t3dotgg @claude
fix(client-runtime): closing a busy stream no longer drops the connec…
eac52f0 
…tion (pingdotgg#15563)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@github-actions
fix(server): set failureKind on launch retry git error
c8889b8 
Upstream made GitCommandError.failureKind required at construction. The worktree-prep retry fixture still omitted it, so the draft push typecheck failed.

Model: grok-4.7
@github-actions
Merge upstream main through eac52f0
9462f9a 
Includes the busy-stream close fix that landed after the d60a71e weld. Lockfile regenerated from the merged manifests.

Model: grok-4.7
@github-actions github-actions Bot added the 📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. label Oct 4, 2026
@patroza patroza changed the title Merge upstream main through d60a71ef6e Merge upstream main through eac52f0087 Oct 4, 2026
@github-actions
fix(web): stub router DOM globals in node unit tests
0ead876 
TanStack Router 1.171 writes history.scrollRestoration while constructing a client router. These two node tests pass isServer: false and have no DOM, so the ship gate failed before the router finished setup.

Model: grok-4.7
@github-actions
fix(web): isolate the thread search atom mock
af302f7 
Under isolate:false an earlier file binds the real atom hook, so the settled search reports no matches and the ship gate fails depending on worker order.

Model: grok-4.7
@patroza
patroza marked this pull request as ready for review October 4, 2026 08:57
maria-rcks and others added 3 commits October 4, 2026 07:58
@maria-rcks
feat(web): add shift-held pull request quick actions (pingdotgg#15549)
33b7d7b 
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
@maria-rcks
fix: expanded tool calls show their output, empty ones don't expand (p…
5a96895 
…ingdotgg#15505)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
@github-actions
Merge upstream main through 5a96895
5a24b74 
Two commits after the eac52f0 weld: expanded tool-call output, and shift-held pull request quick actions. The merge was clean. Fork handshake, source stamping, and Claude direnv environment stayed in place.

Model: grok-4.7
@patroza patroza changed the title Merge upstream main through eac52f0087 Merge upstream main through 5a96895a85 Oct 4, 2026
@patroza
patroza merged commit 67a35e4 into fork/dev Oct 4, 2026
6 of 7 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

📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.