[riccardovandra]

Merge with "Create a merge commit", not squash. PR #70 was squashed, so git lost track of what had already been merged and this sync started at about 300 conflicts, nearly all false. See "Merge history" below.

What's new from upstream

795 upstream commits (394929af76..2359643cff). The most relevant are below; the full list is in the merged commits. Upstream PR numbers refer to pingdotgg/t3code.

New features

Threads and composer

• Side chats: ask a side question next to a running thread with /side or /btw, or from the panel's add menu. Requires the server's sideChats capability. (feat: side chats beside the main thread pingdotgg/t3code#26901)
• Model and effort picker: model and effort now share one composer control, and the composer drops its collapsed state and groups its chips. (feat(web): pick the model and its effort from one control pingdotgg/t3code#28057, feat(web): simpler composer with grouped controls, effort words and no collapsed state pingdotgg/t3code#25869)
• Markdown toggle: a composer button and mod+/ switch between rich text and Markdown source. (feat(web): switch the composer between rich text and Markdown source from a button or mod+/ pingdotgg/t3code#26777)
• Message shapes: images, videos, files, pasted text, voice notes and snapshots each get their own timeline shape instead of a bubble around a label. Mobile matches. (feat(web): images and videos sent with text sit above the bubble as their own shape pingdotgg/t3code#27306, feat(web): files sent without text show as file cards pingdotgg/t3code#27324, feat(web): pasted text, voice notes, snapshots and sending files get their own shapes pingdotgg/t3code#27377, feat(mobile): message media, file cards and grouped steers match web pingdotgg/t3code#27373)
• Inline approvals: pending approvals appear on their own timeline row with the full command, not in a banner above the composer. (feat(web): pending approvals show on their timeline row pingdotgg/t3code#26255)
• Context and limits: the Context bar fills from 0 to 100% and shows tokens against the limit. A Labs toggle keeps 5-hour, weekly and context limits in view. (feat(web): context meter fills up and shows tokens against the limit pingdotgg/t3code#27892, feat(web): Labs toggle keeps 5h, weekly, and context limits in view pingdotgg/t3code#26859)
• Thread details card: choose which rows it shows. (feat(web): choose what the thread details card shows pingdotgg/t3code#26904)
• Snooze options: define your own in Settings → Threads. Agents can list snoozed threads across all projects with t3_thread_list allProjects: true. (feat(threads): choose your own snooze options in settings pingdotgg/t3code#26208, feat(server): agents list snoozed threads across all projects in one call pingdotgg/t3code#26442)
• Dev servers: see and stop the dev servers a thread started, including ones launched with cmd &. (feat(server,web): see and stop the dev servers a thread started pingdotgg/t3code#22542)
• Triage: "Triage an issue" in the command palette starts t3 triage without a terminal. (feat: triage an issue from the command palette, no terminal needed pingdotgg/t3code#22753)

Projects and sidebar

• Pin and archive: pin favorite projects and archive old ones. (feat: pin favorite projects and archive old ones pingdotgg/t3code#26154)
• Boring sidebar: Labs layout that groups threads into project folders. It can show two-line rows and hide projects with no active threads. (feat(web): boring sidebar groups threads into project folders pingdotgg/t3code#21039, feat(web): boring sidebar can show folder threads on two lines pingdotgg/t3code#26463, feat(web): boring sidebar hides projects with no active threads pingdotgg/t3code#26387)
• No project threads: turn one into a real project. (feat: turn a No project thread into a project pingdotgg/t3code#26767)
• Keyboard navigation: F6 moves between workspace areas and the sidebar is keyboard navigable. (feat(web): F6 moves between workspace areas, and the sidebar is keyboard navigable pingdotgg/t3code#25877)

Linked environments and multi-machine work (Labs beta)

• Linking: one T3 server can link to another and call its T3 MCP tools, over Tailscale, LAN, Connect or loopback. Work started by a link stays fenced inside it, and T3-Mode-Limit keeps the calling agent's limits. (feat(server): link to another environment pingdotgg/t3code#16655, feat(server): /mcp narrows a client's modes from T3-Mode-Limit pingdotgg/t3code#16653, feat(server): work a linked environment starts stays within its link pingdotgg/t3code#16695)
• Agent use: agents use linked machines through any T3 tool, set up a link themselves through a card, and delegate_task can target a linked environment. (feat(server): agents use linked environments through any T3 tool pingdotgg/t3code#16684, feat(server,web,mobile): an agent sets up a link to another environment pingdotgg/t3code#17129, feat(server): delegate_task to a linked environment pingdotgg/t3code#16719)
• In the UI: @-mention a machine or its threads, copy thread chips that work across machines, and manage links in Connections. Thread links now carry their environment (t3-thread://v2/). (feat(server,web,mobile): @-mention a machine, and linked environments become a Labs beta pingdotgg/t3code#17130, feat(web,mobile): the @ picker lists threads on linked machines pingdotgg/t3code#26201, feat(web,mobile): Copy thread copies a chip that works on linked machines pingdotgg/t3code#26202, feat(web,mobile): linked environments in Connections pingdotgg/t3code#16698, feat(server,web,mobile): thread links name their environment and never a title pingdotgg/t3code#26239)

Providers and usage

• Fallback provider: new threads can fall back when the default provider is out of usage. This sits next to the fork's usage-limit failover. (feat(server,web,mobile): fall back when the default provider is out of usage pingdotgg/t3code#26164)
• Antigravity: Claude and GPT models, thinking levels and diff-based edits. (feat(antigravity): Claude and GPT models, thinking levels, and diff edits pingdotgg/t3code#26876)
• Pi: import terminal Pi sessions during setup. (feat(pi): import terminal Pi sessions during setup pingdotgg/t3code#27515)
• Secret providers: 1Password can back provider environment variables and Bitbucket/GitCafe credentials, behind T3CODE_FEATURE_SECRETS. (feat(settings): add and list 1Password secret providers behind T3CODE_FEATURE_SECRETS pingdotgg/t3code#25709, feat(settings): point provider environment variables at a secret provider pingdotgg/t3code#27115, feat(server): read Bitbucket and GitCafe credentials from a secret provider pingdotgg/t3code#27746)

Review, updates and desktop

• Diff pane: review local commits, and open a tool call's recorded changes even outside a git repo. (feat(web): review local commits in the Diff pane pingdotgg/t3code#19941, feat(web): open tool call diffs in the diff panel pingdotgg/t3code#26304)
• PR review: shift-click to mark a range of files viewed, and a PR action for "Allow edits from maintainers". (feat(web): mark PR files viewed with shift-click pingdotgg/t3code#26349, feat(pull-requests): manage GitHub maintainer edits pingdotgg/t3code#25588)
• Update tracks: Settings → About moves the whole fleet between Stable and Nightly in one step. (feat(updates): switch your whole fleet between Stable and Nightly in one step pingdotgg/t3code#26288)
• Setup commands: t3 up asks how other devices should reach this machine, t3 service protect shields the server from memory pressure, and a t3code://pair link adds a remote server on desktop. (feat(cli): t3 up asks how your other devices reach this machine pingdotgg/t3code#27996, feat(server): t3 service protect keeps the server alive when agents fill memory pingdotgg/t3code#27239, feat(desktop): add a remote server by clicking its t3code://pair link pingdotgg/t3code#24111)
• Desktop navigation: back/forward buttons and trackpad swipes. (feat(desktop): back/forward buttons and trackpad swipe navigation pingdotgg/t3code#27430)
• Devices: Android EAS Simulator sessions and Simlock pools (alpha). (feat(devices): support Android EAS Simulator sessions pingdotgg/t3code#26797, feat(devices): lease simulators and emulators from a Simlock pool (alpha) pingdotgg/t3code#25259)
• Mobile: workflows in the Agents sheet, ZIP browsing, two-pane Android Settings, One UI navigation, "Use last project". (feat(mobile): add dynamic workflows to the Agents sheet pingdotgg/t3code#18642, feat(mobile): browse ZIP attachments with the shared archive reader pingdotgg/t3code#19463, feat(mobile): split wide Android Settings into two panes pingdotgg/t3code#24298, feat(mobile): add One UI navigation preference on Android pingdotgg/t3code#25758, feat(mobile): add a "Use last project" preference for new threads pingdotgg/t3code#24741)

Bug fixes

• Stop: Stop could hang or leave a thread stuck, especially during a restart. It now always completes, and an agent that ignores it can be force stopped. (fix(server): Stop always completes, and an agent that ignores it can be force stopped pingdotgg/t3code#27252, fix(server): Stop during a restart no longer leaves the thread stuck pingdotgg/t3code#27141)
• Restart continuations: they could fail once and be lost, or ignore a parent's stop. They now retry failed starts and respect the stop. (fix(server): restart continuations retry failed starts and respect a parent's stop pingdotgg/t3code#27222)
• Questions after restart: agent questions could no longer be answered after a server restart. They now stay answerable. (fix(server): agent questions stay answerable after a server restart pingdotgg/t3code#19229)
• Held queues: held queues could keep agent and scheduled messages waiting. They now release once the thread completes a run. Claude background-task wakes also start while the queue is held. (fix(server): Claude background-task wakes start when the queue is held pingdotgg/t3code#17885)
• Usage limits: a task cancelled just as its limit landed could still resume at the reset, and worktree cleanup could delete worktrees waiting for one. Both are fixed, and stale Codex limits are no longer replayed. (fix(server): cleanup keeps worktrees waiting for a usage-limit reset pingdotgg/t3code#24689, fix(server): avoid replaying stale Codex usage limits pingdotgg/t3code#26331)
• Codex: a late subagent interrupt could freeze other threads, approvals could stop appearing after many stopped turns, and partial answers could be lost. All three are fixed. (fix(codex): keep late subagent interrupts from freezing other threads pingdotgg/t3code#25322, fix(codex): approvals still appear after many stopped Codex turns pingdotgg/t3code#23234, fix(codex): preserve partial answer messages and thread histories pingdotgg/t3code#23388)
• Claude: the context meter now shows where Claude actually auto-compacts, Open diff shows a diff instead of raw JSON, and command approvals show the command rather than Claude's description of it. (fix(claude): context meter shows where Claude actually auto-compacts pingdotgg/t3code#22654, fix(claude): Open diff shows Claude edits as a diff instead of raw JSON pingdotgg/t3code#26529, fix(claude): command approvals show the command, not Claude's description of it pingdotgg/t3code#20145)
• OpenCode: runtime-mode changes now reach existing sessions and subagents, and streamed text survives an event-stream reconnect. (fix(opencode): apply runtime mode changes to existing OpenCode sessions pingdotgg/t3code#26182, fix(opencode): subagent sessions follow runtime mode changes pingdotgg/t3code#26302, fix(opencode): keep streamed reply text after an event stream reconnect pingdotgg/t3code#23591)
• Worktrees: parallel launches no longer fail on the .git/config lock, slow checkouts can finish, and deleted worktree threads recover from a detached checkout. (fix(server): parallel worktree launches no longer fail on .git/config lock pingdotgg/t3code#25700, fix(server): let slow worktree checkouts finish pingdotgg/t3code#23802, fix(server): deleted worktree threads recover from a detached checkout pingdotgg/t3code#26758)
• Steer: Steer did nothing during a compaction. It now works there. (fix(web): Steer no longer does nothing while a compaction runs pingdotgg/t3code#25837)
• Mobile reconnects: a thread opened while reconnecting could show "Failed to connect" or turn into a new draft. It now opens normally. (fix(mobile): reconnecting threads no longer open on "Failed to connect" pingdotgg/t3code#26643, fix(mobile): a thread opened while reconnecting no longer turns into a new draft pingdotgg/t3code#26565)
• Desktop startup: a broken release hung at launch. It now opens an error window. (fix(desktop): a broken release opens an error window instead of hanging pingdotgg/t3code#25903)
• Copilot: threads now get T3's tools, and follow-ups no longer kill background agents. (fix(acp): Copilot threads get T3's tools pingdotgg/t3code#26968, fix(server): queue Copilot follow-ups without killing background agents pingdotgg/t3code#26715)

Other notable changes

• Server performance: SQLite reads use up to 4 reader workers (up to 5x faster under load), preparing a run is 15x faster, sidebar shell loads are 3x faster, thread recovery reads are 10x faster, and idle servers run 100x fewer background queries. (perf(shared): SQLite reads stop queueing behind each other, up to 5x faster under load pingdotgg/t3code#27097, perf(server): preparing a run is 15x faster and uses 200x less memory pingdotgg/t3code#27105, perf(server): sidebar shell loads 3x faster and startup thread counts 80x faster pingdotgg/t3code#27106, perf(server): thread recovery reads are 10x faster pingdotgg/t3code#27099, perf(server): idle servers run 100x fewer background queries and 4.8M fewer spans a day pingdotgg/t3code#27098)
• Web performance: streaming replies re-render only the last Markdown block, Markdown parses about twice as fast, revisited threads reuse their parse, and long-thread timeline rebuilds drop from 45 ms to 9 ms. (perf(web): streaming replies re-render only their last Markdown block pingdotgg/t3code#27417, perf(web): chat Markdown parses about twice as fast with the same output pingdotgg/t3code#27685, perf(web): revisiting a thread reuses its rendered Markdown instead of parsing again pingdotgg/t3code#27480, perf(web): long-thread timeline rebuilds 45 → 9 ms, tool updates 12 → 0.3 ms pingdotgg/t3code#26727)
• Payload size: huge checkpoints ship up to 75x smaller to clients. (perf: huge checkpoints ship up to 75x smaller to clients pingdotgg/t3code#27110)
• Cleanup: about 18k lines of unreachable code were deleted, and the ProjectionStore in-memory layer is gone. (chore: delete 18k lines of code that nothing reaches pingdotgg/t3code#26238)
• Dev tooling: the Replay (dev) provider tests turns without paid model calls, evals/ was added, and a committed agent-context budget now guards model-facing text. (feat(dev): test turns in the UI for free with a replay provider pingdotgg/t3code#26207)

Merge report

Merge history

PR #70 was squash-merged, so its 126 upstream commits were in main by content but not in history. The first attempt produced about 300 conflicts as a result. The tree of the #70 squash commit is identical to the tip of sync/upstream-2026-10-27, so I added a -s ours commit recording 394929af76 as merged. It changes no files, and only the 795 new commits remained to merge, with 63 real conflicts.

Conflicts and how they were resolved

Most were two additions in the same place (fork RPC, MCP hub, Docs and AI PM rows next to upstream's linked-environment, side-chat and device rows), so both were kept. These needed judgment:

Area	Resolution
Sidebar multi-project filter	Upstream shipped the same feature. I took upstream's state and handlers and dropped nextSidebarProjectScopeKeys. The fork's row checkbox, Cmd/Ctrl toggle and scoped New thread stay, so upstream's selected-badge icon is removed to avoid showing two marks.
Update Everything	Upstream removed the npm publish gate and added track switching. I followed upstream on npm and kept the fork's release-mirror gate, which a track switch skips. releaseGate loses its npm case.
Removed RPCs	Upstream deleted scheduledTasks.list, serverReportHostPowerState, serverGetBackgroundPolicy and terminal.restart. Fork rows around them stay.
ProjectionStore	Upstream's deletion of layerMemory wins. The fork's failover fields in the SQL store are kept.
Agent instructions	t3CodeOrchestrationInstructions(docsCloud) now combines with upstream's device instructions. The prompt helpers take both docsCloud and hasDeviceTools.
ACP	A clean merge would have dropped MCP hub and user servers for flavors using upstream's httpServers. They are now included in that list, with a test.
OpenCode	Upstream's applyPermissionRules replaces the fork's resume-time update, which caused a double session.update, and now carries disabledSkills.
Deleted upstream	composerContextLegacySend.ts and the opencode2_switch fixture are removed, as nothing references them.

Follow-up changes from the merge

• ws.ts: split the layer .pipe chain, which had passed its 20-argument limit.
• Fork code updated for upstream API changes: MarkdownThreadLink, parseThreadLinkHref, and a mobile SettingsActionRow import. sortProviderInstanceEntries and useThreadVisibleTurnItems are exported again.
• scripts/fork-brand.ts: removed CodexAuthCallback.ts, which upstream deleted.
• agentContextBudget.json raised to the measured values: Claude 6761, Codex 8487 and MCP tool list 48485 bytes. The increase is fork instructions and tools, so this will need updating on each sync that changes them.
• Removed 10 unused fork exports and shortened two long comments to pass the pre-commit lint and knip checks.

Verification

• node scripts/fork-brand.ts --check: clean, 195 files.
• vp run typecheck: clean in apps/server, apps/web, apps/mobile, apps/desktop, contracts, shared, client-runtime, provider-core, provider-acp, provider-cursor and provider-opencode.
• Fork tests and tests beside conflicted files: all pass in apps/web (28 files), apps/mobile (16), contracts, shared, client-runtime, provider-core, provider-acp, provider-cursor, provider-opencode and apps/desktop. Four failures remain elsewhere:
  • apps/server (35 files): only ServerEnvironment "publishes proven install ownership", the known macOS upstream failure, still fails.
  • build-desktop-artifact "skips the primary native probe": also fails on pristine upstream.
  • provider-fx discoverFxSkills (2 tests): also fail on pristine upstream, and the package is identical to upstream.
• Pre-commit format, lint and knip pass.

Not run: browser tests, evals and the app itself. Run evals if the combined instruction text looks off in practice.

Claude Opus 5.5 in T3 Code (Claude Code harness).

🤖 Generated with Claude Code