chore(upstream): sync marcode through pingdotgg/t3code@beab6886

[maarco]

What Changed

Merges 44 upstream commits from pingdotgg/t3code@beab6886 into Marcode's main. Compare: main...claude/gracious-bohr-b96qvl

Conflict decisions (17 conflicted files):

• apps/server/src/cli/connect.ts, service.ts — adopt upstream's macOS-vs-Linux boot-service branching, keep Marcode branding in every user-facing string.
• apps/web/src/components/ChatView.tsx — keep Marcode's minimal ChatHeader (thread actions portal into FloatingPillNav) but close with the upstream <WorkspacePageHeader> tag; keep Marcode's transparent glass composer shell while adopting upstream's chat-composer-glass-shell-attached state.
• apps/web/src/components/RightPanelTabs.tsx — adopt upstream's browser-tab mute feature (Volume icons, previewBridge, toggle-mute item and handler) and its data-driven addSurfaceActions.map render. Retire the Files action and copy-path menu entry — Marcode has no right-panel file surface. PierreEntryIcon import dropped for the same reason.
• apps/web/src/components/ThreadTerminalDrawer.tsx — keep Marcode's TerminalPlacementSlot + TerminalChromeActions chrome (owns its own xterm fork) but adopt upstream's confirm-before-close on every close call site.
• apps/web/src/components/chat/ChatComposer.tsx — keep Marcode's floating glass surface (hotspot) with its focus/blur/drag machinery.
• apps/web/src/components/chat/ChatHeader.tsx — keep Marcode's minimal ThreadActionsCluster; upstream's new inline-rename/thread-menu machinery belongs on the chat title, which Marcode does not render here (portalled to FloatingPillNav, entry point on the sidebar row's context menu).
• apps/web/src/components/chat/ComposerPendingApprovalPanel.tsx — keep Marcode's PENDING APPROVAL card layout; honor the new className prop from upstream. Test rewritten to pin the card design so a future sync fails loudly if the compact-row shape reappears.
• apps/web/src/components/pullRequest/PullRequestListFilters.tsx — keep Marcode's Tooltip-wrapped MenuTrigger for the filter icon.
• apps/web/src/routes/_chat.pull-requests.tsx — adopt upstream's extracted PullRequestRefreshControl (removes Marcode's duplicate inline refresh button); add the Tooltip on the extracted control so the label is preserved on both call sites.
• apps/web/src/routes/settings.tsx and apps/web/src/components/usage/UsagePage.tsx — take upstream's content changes (settings breadcrumb cluster, the usage insights redesign and its topbarContent), but keep Marcode's own two-branch page header shell rather than upstream's extracted <WorkspacePageHeader>. Upstream hardcodes that component's inset to COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS, which keys off a data-sidebar-state=collapsed ancestor; Marcode renders no sidebar on these two routes, so the inset never applies and on Electron the breadcrumb slides under the macOS traffic lights. The electron branch keeps SIDEBARLESS_TITLEBAR_INSET_CLASS, the invariant pinned by workspaceTitlebar.fork.test. UsagePage also keeps Marcode's tooltip on every Refresh button.
• apps/web/src/routes/__root.tsx — keep both DraftPromotionWatcher (Marcode) and upstream's new PlanAgentSelectionHeal, mounted side-by-side.
• apps/web/src/components/sidebar/SidebarChrome.tsx — keep Marcode's brand/navigation-in-FloatingPillNav invariant; SidebarChromeHeader stays minimal and SidebarChromeFooter still shows only the update pills. Export upstream's new SidebarUtilityMenu — the Settings sidebar (SettingsSidebarNav) needs it — but do not mount it on the workspace footer. Sidebar brand/wordmark are pinned out by threadSidebarWidth.test.
• packages/client-runtime/src/state/threadSettled.ts — adopt upstream's fix that only auto-settles once per merged/closed PR (thread-latest-event check), and layer Marcode's 1h idle guard on top so a warm follow-up conversation is not buried the instant the PR merges. Tests updated for the renamed changeRequest field.
• apps/web/src/components/files/*Panel.tsx (modify/delete) — Marcode has no right-panel file surface; keep deleted.

Fork-boundary breaks that merged cleanly and are also fixed here:

• apps/server/src/cloud/bootService.ts — the launchd plist declared T3CODE_HOME but Marcode's launcher requires MARCODE_HOME (service would fail to boot on macOS). Renamed and pinned by a new test in bootService.test.ts. Also updated the stale test assertion that expected systemctl --user disable --now t3code.service — Marcode's systemd unit is marcode.service.
• apps/server/src/cli/triage.ts — t3 triage read T3CODE_HOME; renamed to MARCODE_HOME to match Marcode's launcher and t3 pair.
• apps/desktop/scripts/electron-launcher.mjs — dev launcher exported T3CODE_* env vars but DesktopConfig reads MARCODE_* (the desktop app would not pick up the overrides). Renamed here and in the test.

Coupled subtree check: pnpm-workspace.yaml only moved Clerk versions, @effect/* unchanged, infra/relay/package.json unchanged; no vendored subtree resync needed.

Why

Daily upstream sync per .github/upstream-sync.yml. This picks up 44 upstream commits including the browser-tab mute feature, macOS launchd boot service, the usage insights redesign, feat(threads): a merged PR settles its thread only once, and many fix(*) correctness/security changes. Hotspots reviewed against the customization map; where upstream touched Marcode-owned files, decisions are recorded above.

UI Changes

Only visible client changes shipped by upstream. Marcode-owned hotspots (floating pill nav, unified sidebar, floating editor, glass composer, PENDING APPROVAL card, sidebarless settings/usage titlebars) render unchanged. No screenshots attached: the touched surfaces either reuse upstream widgets that upstream's own tests exercise, or preserve Marcode's shape verbatim under focused tests. Worth a human eye on the desktop build for the redesigned usage page and the settings header, since those two are where upstream's layout refactor met Marcode's titlebar invariant.

Checklist

• This PR is small and focused — it is one upstream sync; scope is exactly the upstream delta plus fork-boundary repairs.
• I explained what changed and why
• I included before/after screenshots for any UI changes — deferred to human review of the desktop build
• I included a video for animation/interaction changes — n/a

Verification

CI on e457a94: Check ✅ · Test ✅ · Mobile Native Static Analysis ✅ · Release Smoke ✅ — all four required checks green. Thread transfer budget within every enforced ceiling.

The first push (a207bdf) failed Test on workspaceTitlebar.fork.test.ts: I had over-adopted upstream's WorkspacePageHeader on settings and usage, dropping Marcode's sidebarless titlebar inset. Fixed in e457a94 — see the settings/usage entry above. The fork test caught exactly the class of silent regression it exists for.

Focused local verification, all passing:

• packages/client-runtime/src/state/threadSettled.test.ts (193)
• apps/server/src/cloud/bootService.test.ts, apps/server/src/serviceLauncher.test.ts, apps/desktop/scripts/electron-launcher.test.mjs (30)
• apps/server/src/cli/service.test.ts, apps/server/src/cli/config.test.ts (11)
• apps/server/src/cli/triagePrompt.test.ts (4)
• apps/web/src/components/chat/ChatHeader.test.ts, ComposerPendingApprovalPanel.test.tsx, ComposerPendingApprovalActions.test.tsx, pullRequest/PullRequestListFilters.test.tsx, RightPanelTabs.test.tsx (33)
• apps/web/src/components/sidebar/SidebarChrome.fork.test.tsx, threadSidebarWidth.test.ts, threadActionMenu.logic.test.ts, workspaceTitlebar.fork.test.ts (18)
• tsgo typecheck across t3, @t3tools/web, @t3tools/desktop, @t3tools/client-runtime — clean
• vp fmt --check + vp lint across all changed paths — clean

Left as a draft for review, per the upstream-sync policy.

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	12.6 KiB	13.4 KiB	+833 B (+6.5%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+616 B (+9.6%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+217 B (+3.4%)	7.8 KiB	✅
Codex	Live turn WebSocket decoded	51.8 KiB	55.0 KiB	+3.2 KiB (+6.1%)	66.4 KiB	✅
Codex	Live turn messages	16	16	0 (0.0%)	21	✅
Claude	Total thread wire	12.6 KiB	13.4 KiB	+864 B (+6.7%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+636 B (+9.9%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+228 B (+3.5%)	7.8 KiB	✅
Claude	Live turn WebSocket decoded	52.7 KiB	55.8 KiB	+3.2 KiB (+6.0%)	66.4 KiB	✅
Claude	Live turn messages	16	16	0 (0.0%)	21	✅

Baseline: 2ffb140 · PR result: e457a94 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 109.4 KiB
• Claude decoded thread snapshot: 110.1 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[maarco]

Superseded by PR #51, the newer upstream sync through f035a0f4, which has now merged to main. Closing this older draft to keep the sync queue clean.

[maarco]

What Changed

Merges 44 upstream commits from pingdotgg/t3code@beab6886 into Marcode's main. Compare: main...claude/gracious-bohr-b96qvl

Conflict decisions (17 conflicted files):

• apps/server/src/cli/connect.ts, service.ts — adopt upstream's macOS-vs-Linux boot-service branching, keep Marcode branding in every user-facing string.
• apps/web/src/components/ChatView.tsx — keep Marcode's minimal ChatHeader (thread actions portal into FloatingPillNav) but close with the upstream <WorkspacePageHeader> tag; keep Marcode's transparent glass composer shell while adopting upstream's chat-composer-glass-shell-attached state.
• apps/web/src/components/RightPanelTabs.tsx — adopt upstream's browser-tab mute feature (Volume icons, previewBridge, toggle-mute item and handler) and its data-driven addSurfaceActions.map render. Retire the Files action and copy-path menu entry — Marcode has no right-panel file surface. PierreEntryIcon import dropped for the same reason.
• apps/web/src/components/ThreadTerminalDrawer.tsx — keep Marcode's TerminalPlacementSlot + TerminalChromeActions chrome (owns its own xterm fork) but adopt upstream's confirm-before-close on every close call site.
• apps/web/src/components/chat/ChatComposer.tsx — keep Marcode's floating glass surface (hotspot) with its focus/blur/drag machinery.
• apps/web/src/components/chat/ChatHeader.tsx — keep Marcode's minimal ThreadActionsCluster; upstream's new inline-rename/thread-menu machinery belongs on the chat title, which Marcode does not render here (portalled to FloatingPillNav, entry point on the sidebar row's context menu).
• apps/web/src/components/chat/ComposerPendingApprovalPanel.tsx — keep Marcode's PENDING APPROVAL card layout; honor the new className prop from upstream. Test rewritten to pin the card design so a future sync fails loudly if the compact-row shape reappears.
• apps/web/src/components/pullRequest/PullRequestListFilters.tsx — keep Marcode's Tooltip-wrapped MenuTrigger for the filter icon.
• apps/web/src/routes/_chat.pull-requests.tsx — adopt upstream's extracted PullRequestRefreshControl (removes Marcode's duplicate inline refresh button); add the Tooltip on the extracted control so the label is preserved on both call sites.
• apps/web/src/routes/settings.tsx and apps/web/src/components/usage/UsagePage.tsx — take upstream's content changes (settings breadcrumb cluster, the usage insights redesign and its topbarContent), but keep Marcode's own two-branch page header shell rather than upstream's extracted <WorkspacePageHeader>. Upstream hardcodes that component's inset to COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS, which keys off a data-sidebar-state=collapsed ancestor; Marcode renders no sidebar on these two routes, so the inset never applies and on Electron the breadcrumb slides under the macOS traffic lights. The electron branch keeps SIDEBARLESS_TITLEBAR_INSET_CLASS, the invariant pinned by workspaceTitlebar.fork.test. UsagePage also keeps Marcode's tooltip on every Refresh button.
• apps/web/src/routes/__root.tsx — keep both DraftPromotionWatcher (Marcode) and upstream's new PlanAgentSelectionHeal, mounted side-by-side.
• apps/web/src/components/sidebar/SidebarChrome.tsx — keep Marcode's brand/navigation-in-FloatingPillNav invariant; SidebarChromeHeader stays minimal and SidebarChromeFooter still shows only the update pills. Export upstream's new SidebarUtilityMenu — the Settings sidebar (SettingsSidebarNav) needs it — but do not mount it on the workspace footer. Sidebar brand/wordmark are pinned out by threadSidebarWidth.test.
• packages/client-runtime/src/state/threadSettled.ts — adopt upstream's fix that only auto-settles once per merged/closed PR (thread-latest-event check), and layer Marcode's 1h idle guard on top so a warm follow-up conversation is not buried the instant the PR merges. Tests updated for the renamed changeRequest field.
• apps/web/src/components/files/*Panel.tsx (modify/delete) — Marcode has no right-panel file surface; keep deleted.

Fork-boundary breaks that merged cleanly and are also fixed here:

• apps/server/src/cloud/bootService.ts — the launchd plist declared T3CODE_HOME but Marcode's launcher requires MARCODE_HOME (service would fail to boot on macOS). Renamed and pinned by a new test in bootService.test.ts. Also updated the stale test assertion that expected systemctl --user disable --now t3code.service — Marcode's systemd unit is marcode.service.
• apps/server/src/cli/triage.ts — t3 triage read T3CODE_HOME; renamed to MARCODE_HOME to match Marcode's launcher and t3 pair.
• apps/desktop/scripts/electron-launcher.mjs — dev launcher exported T3CODE_* env vars but DesktopConfig reads MARCODE_* (the desktop app would not pick up the overrides). Renamed here and in the test.

Coupled subtree check: pnpm-workspace.yaml only moved Clerk versions, @effect/* unchanged, infra/relay/package.json unchanged; no vendored subtree resync needed.

Why

Daily upstream sync per .github/upstream-sync.yml. This picks up 44 upstream commits including the browser-tab mute feature, macOS launchd boot service, the usage insights redesign, feat(threads): a merged PR settles its thread only once, and many fix(*) correctness/security changes. Hotspots reviewed against the customization map; where upstream touched Marcode-owned files, decisions are recorded above.

UI Changes

Only visible client changes shipped by upstream. Marcode-owned hotspots (floating pill nav, unified sidebar, floating editor, glass composer, PENDING APPROVAL card, sidebarless settings/usage titlebars) render unchanged. No screenshots attached: the touched surfaces either reuse upstream widgets that upstream's own tests exercise, or preserve Marcode's shape verbatim under focused tests. Worth a human eye on the desktop build for the redesigned usage page and the settings header, since those two are where upstream's layout refactor met Marcode's titlebar invariant.

Checklist

• This PR is small and focused — it is one upstream sync; scope is exactly the upstream delta plus fork-boundary repairs.
• I explained what changed and why
• I included before/after screenshots for any UI changes — deferred to human review of the desktop build
• I included a video for animation/interaction changes — n/a

Verification

CI on e457a94: Check ✅ · Test ✅ · Mobile Native Static Analysis ✅ · Release Smoke ✅ — all four required checks green. Thread transfer budget within every enforced ceiling.

The first push (a207bdf) failed Test on workspaceTitlebar.fork.test.ts: I had over-adopted upstream's WorkspacePageHeader on settings and usage, dropping Marcode's sidebarless titlebar inset. Fixed in e457a94 — see the settings/usage entry above. The fork test caught exactly the class of silent regression it exists for.

Focused local verification, all passing:

• packages/client-runtime/src/state/threadSettled.test.ts (193)
• apps/server/src/cloud/bootService.test.ts, apps/server/src/serviceLauncher.test.ts, apps/desktop/scripts/electron-launcher.test.mjs (30)
• apps/server/src/cli/service.test.ts, apps/server/src/cli/config.test.ts (11)
• apps/server/src/cli/triagePrompt.test.ts (4)
• apps/web/src/components/chat/ChatHeader.test.ts, ComposerPendingApprovalPanel.test.tsx, ComposerPendingApprovalActions.test.tsx, pullRequest/PullRequestListFilters.test.tsx, RightPanelTabs.test.tsx (33)
• apps/web/src/components/sidebar/SidebarChrome.fork.test.tsx, threadSidebarWidth.test.ts, threadActionMenu.logic.test.ts, workspaceTitlebar.fork.test.ts (18)
• tsgo typecheck across t3, @t3tools/web, @t3tools/desktop, @t3tools/client-runtime — clean
• vp fmt --check + vp lint across all changed paths — clean

Left as a draft for review, per the upstream-sync policy.

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	12.6 KiB	13.4 KiB	+833 B (+6.5%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+616 B (+9.6%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+217 B (+3.4%)	7.8 KiB	✅
Codex	Live turn WebSocket decoded	51.8 KiB	55.0 KiB	+3.2 KiB (+6.1%)	66.4 KiB	✅
Codex	Live turn messages	16	16	0 (0.0%)	21	✅
Claude	Total thread wire	12.6 KiB	13.4 KiB	+864 B (+6.7%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+636 B (+9.9%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+228 B (+3.5%)	7.8 KiB	✅
Claude	Live turn WebSocket decoded	52.7 KiB	55.8 KiB	+3.2 KiB (+6.0%)	66.4 KiB	✅
Claude	Live turn messages	16	16	0 (0.0%)	21	✅

Baseline: 2ffb140 · PR result: e457a94 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 109.4 KiB
• Claude decoded thread snapshot: 110.1 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[maarco]

Superseded by PR #51, the newer upstream sync through f035a0f4, which has now merged to main. Closing this older draft to keep the sync queue clean.

[maarco]

What Changed

Merges 44 upstream commits from pingdotgg/t3code@beab6886 into Marcode's main. Compare: main...claude/gracious-bohr-b96qvl

Conflict decisions (17 conflicted files):

• apps/server/src/cli/connect.ts, service.ts — adopt upstream's macOS-vs-Linux boot-service branching, keep Marcode branding in every user-facing string.
• apps/web/src/components/ChatView.tsx — keep Marcode's minimal ChatHeader (thread actions portal into FloatingPillNav) but close with the upstream <WorkspacePageHeader> tag; keep Marcode's transparent glass composer shell while adopting upstream's chat-composer-glass-shell-attached state.
• apps/web/src/components/RightPanelTabs.tsx — adopt upstream's browser-tab mute feature (Volume icons, previewBridge, toggle-mute item and handler) and its data-driven addSurfaceActions.map render. Retire the Files action and copy-path menu entry — Marcode has no right-panel file surface. PierreEntryIcon import dropped for the same reason.
• apps/web/src/components/ThreadTerminalDrawer.tsx — keep Marcode's TerminalPlacementSlot + TerminalChromeActions chrome (owns its own xterm fork) but adopt upstream's confirm-before-close on every close call site.
• apps/web/src/components/chat/ChatComposer.tsx — keep Marcode's floating glass surface (hotspot) with its focus/blur/drag machinery.
• apps/web/src/components/chat/ChatHeader.tsx — keep Marcode's minimal ThreadActionsCluster; upstream's new inline-rename/thread-menu machinery belongs on the chat title, which Marcode does not render here (portalled to FloatingPillNav, entry point on the sidebar row's context menu).
• apps/web/src/components/chat/ComposerPendingApprovalPanel.tsx — keep Marcode's PENDING APPROVAL card layout; honor the new className prop from upstream. Test rewritten to pin the card design so a future sync fails loudly if the compact-row shape reappears.
• apps/web/src/components/pullRequest/PullRequestListFilters.tsx — keep Marcode's Tooltip-wrapped MenuTrigger for the filter icon.
• apps/web/src/routes/_chat.pull-requests.tsx — adopt upstream's extracted PullRequestRefreshControl (removes Marcode's duplicate inline refresh button); add the Tooltip on the extracted control so the label is preserved on both call sites.
• apps/web/src/routes/settings.tsx and apps/web/src/components/usage/UsagePage.tsx — take upstream's content changes (settings breadcrumb cluster, the usage insights redesign and its topbarContent), but keep Marcode's own two-branch page header shell rather than upstream's extracted <WorkspacePageHeader>. Upstream hardcodes that component's inset to COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS, which keys off a data-sidebar-state=collapsed ancestor; Marcode renders no sidebar on these two routes, so the inset never applies and on Electron the breadcrumb slides under the macOS traffic lights. The electron branch keeps SIDEBARLESS_TITLEBAR_INSET_CLASS, the invariant pinned by workspaceTitlebar.fork.test. UsagePage also keeps Marcode's tooltip on every Refresh button.
• apps/web/src/routes/__root.tsx — keep both DraftPromotionWatcher (Marcode) and upstream's new PlanAgentSelectionHeal, mounted side-by-side.
• apps/web/src/components/sidebar/SidebarChrome.tsx — keep Marcode's brand/navigation-in-FloatingPillNav invariant; SidebarChromeHeader stays minimal and SidebarChromeFooter still shows only the update pills. Export upstream's new SidebarUtilityMenu — the Settings sidebar (SettingsSidebarNav) needs it — but do not mount it on the workspace footer. Sidebar brand/wordmark are pinned out by threadSidebarWidth.test.
• packages/client-runtime/src/state/threadSettled.ts — adopt upstream's fix that only auto-settles once per merged/closed PR (thread-latest-event check), and layer Marcode's 1h idle guard on top so a warm follow-up conversation is not buried the instant the PR merges. Tests updated for the renamed changeRequest field.
• apps/web/src/components/files/*Panel.tsx (modify/delete) — Marcode has no right-panel file surface; keep deleted.

Fork-boundary breaks that merged cleanly and are also fixed here:

• apps/server/src/cloud/bootService.ts — the launchd plist declared T3CODE_HOME but Marcode's launcher requires MARCODE_HOME (service would fail to boot on macOS). Renamed and pinned by a new test in bootService.test.ts. Also updated the stale test assertion that expected systemctl --user disable --now t3code.service — Marcode's systemd unit is marcode.service.
• apps/server/src/cli/triage.ts — t3 triage read T3CODE_HOME; renamed to MARCODE_HOME to match Marcode's launcher and t3 pair.
• apps/desktop/scripts/electron-launcher.mjs — dev launcher exported T3CODE_* env vars but DesktopConfig reads MARCODE_* (the desktop app would not pick up the overrides). Renamed here and in the test.

Coupled subtree check: pnpm-workspace.yaml only moved Clerk versions, @effect/* unchanged, infra/relay/package.json unchanged; no vendored subtree resync needed.

Why

Daily upstream sync per .github/upstream-sync.yml. This picks up 44 upstream commits including the browser-tab mute feature, macOS launchd boot service, the usage insights redesign, feat(threads): a merged PR settles its thread only once, and many fix(*) correctness/security changes. Hotspots reviewed against the customization map; where upstream touched Marcode-owned files, decisions are recorded above.

UI Changes

Only visible client changes shipped by upstream. Marcode-owned hotspots (floating pill nav, unified sidebar, floating editor, glass composer, PENDING APPROVAL card, sidebarless settings/usage titlebars) render unchanged. No screenshots attached: the touched surfaces either reuse upstream widgets that upstream's own tests exercise, or preserve Marcode's shape verbatim under focused tests. Worth a human eye on the desktop build for the redesigned usage page and the settings header, since those two are where upstream's layout refactor met Marcode's titlebar invariant.

Checklist

• This PR is small and focused — it is one upstream sync; scope is exactly the upstream delta plus fork-boundary repairs.
• I explained what changed and why
• I included before/after screenshots for any UI changes — deferred to human review of the desktop build
• I included a video for animation/interaction changes — n/a

Verification

CI on e457a94: Check ✅ · Test ✅ · Mobile Native Static Analysis ✅ · Release Smoke ✅ — all four required checks green. Thread transfer budget within every enforced ceiling.

The first push (a207bdf) failed Test on workspaceTitlebar.fork.test.ts: I had over-adopted upstream's WorkspacePageHeader on settings and usage, dropping Marcode's sidebarless titlebar inset. Fixed in e457a94 — see the settings/usage entry above. The fork test caught exactly the class of silent regression it exists for.

Focused local verification, all passing:

• packages/client-runtime/src/state/threadSettled.test.ts (193)
• apps/server/src/cloud/bootService.test.ts, apps/server/src/serviceLauncher.test.ts, apps/desktop/scripts/electron-launcher.test.mjs (30)
• apps/server/src/cli/service.test.ts, apps/server/src/cli/config.test.ts (11)
• apps/server/src/cli/triagePrompt.test.ts (4)
• apps/web/src/components/chat/ChatHeader.test.ts, ComposerPendingApprovalPanel.test.tsx, ComposerPendingApprovalActions.test.tsx, pullRequest/PullRequestListFilters.test.tsx, RightPanelTabs.test.tsx (33)
• apps/web/src/components/sidebar/SidebarChrome.fork.test.tsx, threadSidebarWidth.test.ts, threadActionMenu.logic.test.ts, workspaceTitlebar.fork.test.ts (18)
• tsgo typecheck across t3, @t3tools/web, @t3tools/desktop, @t3tools/client-runtime — clean
• vp fmt --check + vp lint across all changed paths — clean

Left as a draft for review, per the upstream-sync policy.

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	12.6 KiB	13.4 KiB	+833 B (+6.5%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+616 B (+9.6%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+217 B (+3.4%)	7.8 KiB	✅
Codex	Live turn WebSocket decoded	51.8 KiB	55.0 KiB	+3.2 KiB (+6.1%)	66.4 KiB	✅
Codex	Live turn messages	16	16	0 (0.0%)	21	✅
Claude	Total thread wire	12.6 KiB	13.4 KiB	+864 B (+6.7%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+636 B (+9.9%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+228 B (+3.5%)	7.8 KiB	✅
Claude	Live turn WebSocket decoded	52.7 KiB	55.8 KiB	+3.2 KiB (+6.0%)	66.4 KiB	✅
Claude	Live turn messages	16	16	0 (0.0%)	21	✅

Baseline: 2ffb140 · PR result: e457a94 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 109.4 KiB
• Claude decoded thread snapshot: 110.1 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[maarco]

Superseded by PR #51, the newer upstream sync through f035a0f4, which has now merged to main. Closing this older draft to keep the sync queue clean.

[maarco]

What Changed

Merges 44 upstream commits from pingdotgg/t3code@beab6886 into Marcode's main. Compare: main...claude/gracious-bohr-b96qvl

Conflict decisions (17 conflicted files):

• apps/server/src/cli/connect.ts, service.ts — adopt upstream's macOS-vs-Linux boot-service branching, keep Marcode branding in every user-facing string.
• apps/web/src/components/ChatView.tsx — keep Marcode's minimal ChatHeader (thread actions portal into FloatingPillNav) but close with the upstream <WorkspacePageHeader> tag; keep Marcode's transparent glass composer shell while adopting upstream's chat-composer-glass-shell-attached state.
• apps/web/src/components/RightPanelTabs.tsx — adopt upstream's browser-tab mute feature (Volume icons, previewBridge, toggle-mute item and handler) and its data-driven addSurfaceActions.map render. Retire the Files action and copy-path menu entry — Marcode has no right-panel file surface. PierreEntryIcon import dropped for the same reason.
• apps/web/src/components/ThreadTerminalDrawer.tsx — keep Marcode's TerminalPlacementSlot + TerminalChromeActions chrome (owns its own xterm fork) but adopt upstream's confirm-before-close on every close call site.
• apps/web/src/components/chat/ChatComposer.tsx — keep Marcode's floating glass surface (hotspot) with its focus/blur/drag machinery.
• apps/web/src/components/chat/ChatHeader.tsx — keep Marcode's minimal ThreadActionsCluster; upstream's new inline-rename/thread-menu machinery belongs on the chat title, which Marcode does not render here (portalled to FloatingPillNav, entry point on the sidebar row's context menu).
• apps/web/src/components/chat/ComposerPendingApprovalPanel.tsx — keep Marcode's PENDING APPROVAL card layout; honor the new className prop from upstream. Test rewritten to pin the card design so a future sync fails loudly if the compact-row shape reappears.
• apps/web/src/components/pullRequest/PullRequestListFilters.tsx — keep Marcode's Tooltip-wrapped MenuTrigger for the filter icon.
• apps/web/src/routes/_chat.pull-requests.tsx — adopt upstream's extracted PullRequestRefreshControl (removes Marcode's duplicate inline refresh button); add the Tooltip on the extracted control so the label is preserved on both call sites.
• apps/web/src/routes/settings.tsx and apps/web/src/components/usage/UsagePage.tsx — take upstream's content changes (settings breadcrumb cluster, the usage insights redesign and its topbarContent), but keep Marcode's own two-branch page header shell rather than upstream's extracted <WorkspacePageHeader>. Upstream hardcodes that component's inset to COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS, which keys off a data-sidebar-state=collapsed ancestor; Marcode renders no sidebar on these two routes, so the inset never applies and on Electron the breadcrumb slides under the macOS traffic lights. The electron branch keeps SIDEBARLESS_TITLEBAR_INSET_CLASS, the invariant pinned by workspaceTitlebar.fork.test. UsagePage also keeps Marcode's tooltip on every Refresh button.
• apps/web/src/routes/__root.tsx — keep both DraftPromotionWatcher (Marcode) and upstream's new PlanAgentSelectionHeal, mounted side-by-side.
• apps/web/src/components/sidebar/SidebarChrome.tsx — keep Marcode's brand/navigation-in-FloatingPillNav invariant; SidebarChromeHeader stays minimal and SidebarChromeFooter still shows only the update pills. Export upstream's new SidebarUtilityMenu — the Settings sidebar (SettingsSidebarNav) needs it — but do not mount it on the workspace footer. Sidebar brand/wordmark are pinned out by threadSidebarWidth.test.
• packages/client-runtime/src/state/threadSettled.ts — adopt upstream's fix that only auto-settles once per merged/closed PR (thread-latest-event check), and layer Marcode's 1h idle guard on top so a warm follow-up conversation is not buried the instant the PR merges. Tests updated for the renamed changeRequest field.
• apps/web/src/components/files/*Panel.tsx (modify/delete) — Marcode has no right-panel file surface; keep deleted.

Fork-boundary breaks that merged cleanly and are also fixed here:

• apps/server/src/cloud/bootService.ts — the launchd plist declared T3CODE_HOME but Marcode's launcher requires MARCODE_HOME (service would fail to boot on macOS). Renamed and pinned by a new test in bootService.test.ts. Also updated the stale test assertion that expected systemctl --user disable --now t3code.service — Marcode's systemd unit is marcode.service.
• apps/server/src/cli/triage.ts — t3 triage read T3CODE_HOME; renamed to MARCODE_HOME to match Marcode's launcher and t3 pair.
• apps/desktop/scripts/electron-launcher.mjs — dev launcher exported T3CODE_* env vars but DesktopConfig reads MARCODE_* (the desktop app would not pick up the overrides). Renamed here and in the test.

Coupled subtree check: pnpm-workspace.yaml only moved Clerk versions, @effect/* unchanged, infra/relay/package.json unchanged; no vendored subtree resync needed.

Why

Daily upstream sync per .github/upstream-sync.yml. This picks up 44 upstream commits including the browser-tab mute feature, macOS launchd boot service, the usage insights redesign, feat(threads): a merged PR settles its thread only once, and many fix(*) correctness/security changes. Hotspots reviewed against the customization map; where upstream touched Marcode-owned files, decisions are recorded above.

UI Changes

Only visible client changes shipped by upstream. Marcode-owned hotspots (floating pill nav, unified sidebar, floating editor, glass composer, PENDING APPROVAL card, sidebarless settings/usage titlebars) render unchanged. No screenshots attached: the touched surfaces either reuse upstream widgets that upstream's own tests exercise, or preserve Marcode's shape verbatim under focused tests. Worth a human eye on the desktop build for the redesigned usage page and the settings header, since those two are where upstream's layout refactor met Marcode's titlebar invariant.

Checklist

• This PR is small and focused — it is one upstream sync; scope is exactly the upstream delta plus fork-boundary repairs.
• I explained what changed and why
• I included before/after screenshots for any UI changes — deferred to human review of the desktop build
• I included a video for animation/interaction changes — n/a

Verification

CI on e457a94: Check ✅ · Test ✅ · Mobile Native Static Analysis ✅ · Release Smoke ✅ — all four required checks green. Thread transfer budget within every enforced ceiling.

The first push (a207bdf) failed Test on workspaceTitlebar.fork.test.ts: I had over-adopted upstream's WorkspacePageHeader on settings and usage, dropping Marcode's sidebarless titlebar inset. Fixed in e457a94 — see the settings/usage entry above. The fork test caught exactly the class of silent regression it exists for.

Focused local verification, all passing:

• packages/client-runtime/src/state/threadSettled.test.ts (193)
• apps/server/src/cloud/bootService.test.ts, apps/server/src/serviceLauncher.test.ts, apps/desktop/scripts/electron-launcher.test.mjs (30)
• apps/server/src/cli/service.test.ts, apps/server/src/cli/config.test.ts (11)
• apps/server/src/cli/triagePrompt.test.ts (4)
• apps/web/src/components/chat/ChatHeader.test.ts, ComposerPendingApprovalPanel.test.tsx, ComposerPendingApprovalActions.test.tsx, pullRequest/PullRequestListFilters.test.tsx, RightPanelTabs.test.tsx (33)
• apps/web/src/components/sidebar/SidebarChrome.fork.test.tsx, threadSidebarWidth.test.ts, threadActionMenu.logic.test.ts, workspaceTitlebar.fork.test.ts (18)
• tsgo typecheck across t3, @t3tools/web, @t3tools/desktop, @t3tools/client-runtime — clean
• vp fmt --check + vp lint across all changed paths — clean

Left as a draft for review, per the upstream-sync policy.

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	12.6 KiB	13.4 KiB	+833 B (+6.5%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+616 B (+9.6%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+217 B (+3.4%)	7.8 KiB	✅
Codex	Live turn WebSocket decoded	51.8 KiB	55.0 KiB	+3.2 KiB (+6.1%)	66.4 KiB	✅
Codex	Live turn messages	16	16	0 (0.0%)	21	✅
Claude	Total thread wire	12.6 KiB	13.4 KiB	+864 B (+6.7%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+636 B (+9.9%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+228 B (+3.5%)	7.8 KiB	✅
Claude	Live turn WebSocket decoded	52.7 KiB	55.8 KiB	+3.2 KiB (+6.0%)	66.4 KiB	✅
Claude	Live turn messages	16	16	0 (0.0%)	21	✅

Baseline: 2ffb140 · PR result: e457a94 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 109.4 KiB
• Claude decoded thread snapshot: 110.1 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[maarco]

Superseded by PR #51, the newer upstream sync through f035a0f4, which has now merged to main. Closing this older draft to keep the sync queue clean.

[maarco]

What Changed

Merges 44 upstream commits from pingdotgg/t3code@beab6886 into Marcode's main. Compare: main...claude/gracious-bohr-b96qvl

Conflict decisions (17 conflicted files):

• apps/server/src/cli/connect.ts, service.ts — adopt upstream's macOS-vs-Linux boot-service branching, keep Marcode branding in every user-facing string.
• apps/web/src/components/ChatView.tsx — keep Marcode's minimal ChatHeader (thread actions portal into FloatingPillNav) but close with the upstream <WorkspacePageHeader> tag; keep Marcode's transparent glass composer shell while adopting upstream's chat-composer-glass-shell-attached state.
• apps/web/src/components/RightPanelTabs.tsx — adopt upstream's browser-tab mute feature (Volume icons, previewBridge, toggle-mute item and handler) and its data-driven addSurfaceActions.map render. Retire the Files action and copy-path menu entry — Marcode has no right-panel file surface. PierreEntryIcon import dropped for the same reason.
• apps/web/src/components/ThreadTerminalDrawer.tsx — keep Marcode's TerminalPlacementSlot + TerminalChromeActions chrome (owns its own xterm fork) but adopt upstream's confirm-before-close on every close call site.
• apps/web/src/components/chat/ChatComposer.tsx — keep Marcode's floating glass surface (hotspot) with its focus/blur/drag machinery.
• apps/web/src/components/chat/ChatHeader.tsx — keep Marcode's minimal ThreadActionsCluster; upstream's new inline-rename/thread-menu machinery belongs on the chat title, which Marcode does not render here (portalled to FloatingPillNav, entry point on the sidebar row's context menu).
• apps/web/src/components/chat/ComposerPendingApprovalPanel.tsx — keep Marcode's PENDING APPROVAL card layout; honor the new className prop from upstream. Test rewritten to pin the card design so a future sync fails loudly if the compact-row shape reappears.
• apps/web/src/components/pullRequest/PullRequestListFilters.tsx — keep Marcode's Tooltip-wrapped MenuTrigger for the filter icon.
• apps/web/src/routes/_chat.pull-requests.tsx — adopt upstream's extracted PullRequestRefreshControl (removes Marcode's duplicate inline refresh button); add the Tooltip on the extracted control so the label is preserved on both call sites.
• apps/web/src/routes/settings.tsx and apps/web/src/components/usage/UsagePage.tsx — take upstream's content changes (settings breadcrumb cluster, the usage insights redesign and its topbarContent), but keep Marcode's own two-branch page header shell rather than upstream's extracted <WorkspacePageHeader>. Upstream hardcodes that component's inset to COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS, which keys off a data-sidebar-state=collapsed ancestor; Marcode renders no sidebar on these two routes, so the inset never applies and on Electron the breadcrumb slides under the macOS traffic lights. The electron branch keeps SIDEBARLESS_TITLEBAR_INSET_CLASS, the invariant pinned by workspaceTitlebar.fork.test. UsagePage also keeps Marcode's tooltip on every Refresh button.
• apps/web/src/routes/__root.tsx — keep both DraftPromotionWatcher (Marcode) and upstream's new PlanAgentSelectionHeal, mounted side-by-side.
• apps/web/src/components/sidebar/SidebarChrome.tsx — keep Marcode's brand/navigation-in-FloatingPillNav invariant; SidebarChromeHeader stays minimal and SidebarChromeFooter still shows only the update pills. Export upstream's new SidebarUtilityMenu — the Settings sidebar (SettingsSidebarNav) needs it — but do not mount it on the workspace footer. Sidebar brand/wordmark are pinned out by threadSidebarWidth.test.
• packages/client-runtime/src/state/threadSettled.ts — adopt upstream's fix that only auto-settles once per merged/closed PR (thread-latest-event check), and layer Marcode's 1h idle guard on top so a warm follow-up conversation is not buried the instant the PR merges. Tests updated for the renamed changeRequest field.
• apps/web/src/components/files/*Panel.tsx (modify/delete) — Marcode has no right-panel file surface; keep deleted.

Fork-boundary breaks that merged cleanly and are also fixed here:

• apps/server/src/cloud/bootService.ts — the launchd plist declared T3CODE_HOME but Marcode's launcher requires MARCODE_HOME (service would fail to boot on macOS). Renamed and pinned by a new test in bootService.test.ts. Also updated the stale test assertion that expected systemctl --user disable --now t3code.service — Marcode's systemd unit is marcode.service.
• apps/server/src/cli/triage.ts — t3 triage read T3CODE_HOME; renamed to MARCODE_HOME to match Marcode's launcher and t3 pair.
• apps/desktop/scripts/electron-launcher.mjs — dev launcher exported T3CODE_* env vars but DesktopConfig reads MARCODE_* (the desktop app would not pick up the overrides). Renamed here and in the test.

Coupled subtree check: pnpm-workspace.yaml only moved Clerk versions, @effect/* unchanged, infra/relay/package.json unchanged; no vendored subtree resync needed.

Why

Daily upstream sync per .github/upstream-sync.yml. This picks up 44 upstream commits including the browser-tab mute feature, macOS launchd boot service, the usage insights redesign, feat(threads): a merged PR settles its thread only once, and many fix(*) correctness/security changes. Hotspots reviewed against the customization map; where upstream touched Marcode-owned files, decisions are recorded above.

UI Changes

Only visible client changes shipped by upstream. Marcode-owned hotspots (floating pill nav, unified sidebar, floating editor, glass composer, PENDING APPROVAL card, sidebarless settings/usage titlebars) render unchanged. No screenshots attached: the touched surfaces either reuse upstream widgets that upstream's own tests exercise, or preserve Marcode's shape verbatim under focused tests. Worth a human eye on the desktop build for the redesigned usage page and the settings header, since those two are where upstream's layout refactor met Marcode's titlebar invariant.

Checklist

• This PR is small and focused — it is one upstream sync; scope is exactly the upstream delta plus fork-boundary repairs.
• I explained what changed and why
• I included before/after screenshots for any UI changes — deferred to human review of the desktop build
• I included a video for animation/interaction changes — n/a

Verification

CI on e457a94: Check ✅ · Test ✅ · Mobile Native Static Analysis ✅ · Release Smoke ✅ — all four required checks green. Thread transfer budget within every enforced ceiling.

The first push (a207bdf) failed Test on workspaceTitlebar.fork.test.ts: I had over-adopted upstream's WorkspacePageHeader on settings and usage, dropping Marcode's sidebarless titlebar inset. Fixed in e457a94 — see the settings/usage entry above. The fork test caught exactly the class of silent regression it exists for.

Focused local verification, all passing:

• packages/client-runtime/src/state/threadSettled.test.ts (193)
• apps/server/src/cloud/bootService.test.ts, apps/server/src/serviceLauncher.test.ts, apps/desktop/scripts/electron-launcher.test.mjs (30)
• apps/server/src/cli/service.test.ts, apps/server/src/cli/config.test.ts (11)
• apps/server/src/cli/triagePrompt.test.ts (4)
• apps/web/src/components/chat/ChatHeader.test.ts, ComposerPendingApprovalPanel.test.tsx, ComposerPendingApprovalActions.test.tsx, pullRequest/PullRequestListFilters.test.tsx, RightPanelTabs.test.tsx (33)
• apps/web/src/components/sidebar/SidebarChrome.fork.test.tsx, threadSidebarWidth.test.ts, threadActionMenu.logic.test.ts, workspaceTitlebar.fork.test.ts (18)
• tsgo typecheck across t3, @t3tools/web, @t3tools/desktop, @t3tools/client-runtime — clean
• vp fmt --check + vp lint across all changed paths — clean

Left as a draft for review, per the upstream-sync policy.

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	12.6 KiB	13.4 KiB	+833 B (+6.5%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+616 B (+9.6%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+217 B (+3.4%)	7.8 KiB	✅
Codex	Live turn WebSocket decoded	51.8 KiB	55.0 KiB	+3.2 KiB (+6.1%)	66.4 KiB	✅
Codex	Live turn messages	16	16	0 (0.0%)	21	✅
Claude	Total thread wire	12.6 KiB	13.4 KiB	+864 B (+6.7%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+636 B (+9.9%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+228 B (+3.5%)	7.8 KiB	✅
Claude	Live turn WebSocket decoded	52.7 KiB	55.8 KiB	+3.2 KiB (+6.0%)	66.4 KiB	✅
Claude	Live turn messages	16	16	0 (0.0%)	21	✅

Baseline: 2ffb140 · PR result: e457a94 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 109.4 KiB
• Claude decoded thread snapshot: 110.1 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[maarco]

Superseded by PR #51, the newer upstream sync through f035a0f4, which has now merged to main. Closing this older draft to keep the sync queue clean.

[maarco]

What Changed

Merges 44 upstream commits from pingdotgg/t3code@beab6886 into Marcode's main. Compare: main...claude/gracious-bohr-b96qvl

Conflict decisions (17 conflicted files):

• apps/server/src/cli/connect.ts, service.ts — adopt upstream's macOS-vs-Linux boot-service branching, keep Marcode branding in every user-facing string.
• apps/web/src/components/ChatView.tsx — keep Marcode's minimal ChatHeader (thread actions portal into FloatingPillNav) but close with the upstream <WorkspacePageHeader> tag; keep Marcode's transparent glass composer shell while adopting upstream's chat-composer-glass-shell-attached state.
• apps/web/src/components/RightPanelTabs.tsx — adopt upstream's browser-tab mute feature (Volume icons, previewBridge, toggle-mute item and handler) and its data-driven addSurfaceActions.map render. Retire the Files action and copy-path menu entry — Marcode has no right-panel file surface. PierreEntryIcon import dropped for the same reason.
• apps/web/src/components/ThreadTerminalDrawer.tsx — keep Marcode's TerminalPlacementSlot + TerminalChromeActions chrome (owns its own xterm fork) but adopt upstream's confirm-before-close on every close call site.
• apps/web/src/components/chat/ChatComposer.tsx — keep Marcode's floating glass surface (hotspot) with its focus/blur/drag machinery.
• apps/web/src/components/chat/ChatHeader.tsx — keep Marcode's minimal ThreadActionsCluster; upstream's new inline-rename/thread-menu machinery belongs on the chat title, which Marcode does not render here (portalled to FloatingPillNav, entry point on the sidebar row's context menu).
• apps/web/src/components/chat/ComposerPendingApprovalPanel.tsx — keep Marcode's PENDING APPROVAL card layout; honor the new className prop from upstream. Test rewritten to pin the card design so a future sync fails loudly if the compact-row shape reappears.
• apps/web/src/components/pullRequest/PullRequestListFilters.tsx — keep Marcode's Tooltip-wrapped MenuTrigger for the filter icon.
• apps/web/src/routes/_chat.pull-requests.tsx — adopt upstream's extracted PullRequestRefreshControl (removes Marcode's duplicate inline refresh button); add the Tooltip on the extracted control so the label is preserved on both call sites.
• apps/web/src/routes/settings.tsx and apps/web/src/components/usage/UsagePage.tsx — take upstream's content changes (settings breadcrumb cluster, the usage insights redesign and its topbarContent), but keep Marcode's own two-branch page header shell rather than upstream's extracted <WorkspacePageHeader>. Upstream hardcodes that component's inset to COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS, which keys off a data-sidebar-state=collapsed ancestor; Marcode renders no sidebar on these two routes, so the inset never applies and on Electron the breadcrumb slides under the macOS traffic lights. The electron branch keeps SIDEBARLESS_TITLEBAR_INSET_CLASS, the invariant pinned by workspaceTitlebar.fork.test. UsagePage also keeps Marcode's tooltip on every Refresh button.
• apps/web/src/routes/__root.tsx — keep both DraftPromotionWatcher (Marcode) and upstream's new PlanAgentSelectionHeal, mounted side-by-side.
• apps/web/src/components/sidebar/SidebarChrome.tsx — keep Marcode's brand/navigation-in-FloatingPillNav invariant; SidebarChromeHeader stays minimal and SidebarChromeFooter still shows only the update pills. Export upstream's new SidebarUtilityMenu — the Settings sidebar (SettingsSidebarNav) needs it — but do not mount it on the workspace footer. Sidebar brand/wordmark are pinned out by threadSidebarWidth.test.
• packages/client-runtime/src/state/threadSettled.ts — adopt upstream's fix that only auto-settles once per merged/closed PR (thread-latest-event check), and layer Marcode's 1h idle guard on top so a warm follow-up conversation is not buried the instant the PR merges. Tests updated for the renamed changeRequest field.
• apps/web/src/components/files/*Panel.tsx (modify/delete) — Marcode has no right-panel file surface; keep deleted.

Fork-boundary breaks that merged cleanly and are also fixed here:

• apps/server/src/cloud/bootService.ts — the launchd plist declared T3CODE_HOME but Marcode's launcher requires MARCODE_HOME (service would fail to boot on macOS). Renamed and pinned by a new test in bootService.test.ts. Also updated the stale test assertion that expected systemctl --user disable --now t3code.service — Marcode's systemd unit is marcode.service.
• apps/server/src/cli/triage.ts — t3 triage read T3CODE_HOME; renamed to MARCODE_HOME to match Marcode's launcher and t3 pair.
• apps/desktop/scripts/electron-launcher.mjs — dev launcher exported T3CODE_* env vars but DesktopConfig reads MARCODE_* (the desktop app would not pick up the overrides). Renamed here and in the test.

Coupled subtree check: pnpm-workspace.yaml only moved Clerk versions, @effect/* unchanged, infra/relay/package.json unchanged; no vendored subtree resync needed.

Why

Daily upstream sync per .github/upstream-sync.yml. This picks up 44 upstream commits including the browser-tab mute feature, macOS launchd boot service, the usage insights redesign, feat(threads): a merged PR settles its thread only once, and many fix(*) correctness/security changes. Hotspots reviewed against the customization map; where upstream touched Marcode-owned files, decisions are recorded above.

UI Changes

Only visible client changes shipped by upstream. Marcode-owned hotspots (floating pill nav, unified sidebar, floating editor, glass composer, PENDING APPROVAL card, sidebarless settings/usage titlebars) render unchanged. No screenshots attached: the touched surfaces either reuse upstream widgets that upstream's own tests exercise, or preserve Marcode's shape verbatim under focused tests. Worth a human eye on the desktop build for the redesigned usage page and the settings header, since those two are where upstream's layout refactor met Marcode's titlebar invariant.

Checklist

• This PR is small and focused — it is one upstream sync; scope is exactly the upstream delta plus fork-boundary repairs.
• I explained what changed and why
• I included before/after screenshots for any UI changes — deferred to human review of the desktop build
• I included a video for animation/interaction changes — n/a

Verification

CI on e457a94: Check ✅ · Test ✅ · Mobile Native Static Analysis ✅ · Release Smoke ✅ — all four required checks green. Thread transfer budget within every enforced ceiling.

The first push (a207bdf) failed Test on workspaceTitlebar.fork.test.ts: I had over-adopted upstream's WorkspacePageHeader on settings and usage, dropping Marcode's sidebarless titlebar inset. Fixed in e457a94 — see the settings/usage entry above. The fork test caught exactly the class of silent regression it exists for.

Focused local verification, all passing:

• packages/client-runtime/src/state/threadSettled.test.ts (193)
• apps/server/src/cloud/bootService.test.ts, apps/server/src/serviceLauncher.test.ts, apps/desktop/scripts/electron-launcher.test.mjs (30)
• apps/server/src/cli/service.test.ts, apps/server/src/cli/config.test.ts (11)
• apps/server/src/cli/triagePrompt.test.ts (4)
• apps/web/src/components/chat/ChatHeader.test.ts, ComposerPendingApprovalPanel.test.tsx, ComposerPendingApprovalActions.test.tsx, pullRequest/PullRequestListFilters.test.tsx, RightPanelTabs.test.tsx (33)
• apps/web/src/components/sidebar/SidebarChrome.fork.test.tsx, threadSidebarWidth.test.ts, threadActionMenu.logic.test.ts, workspaceTitlebar.fork.test.ts (18)
• tsgo typecheck across t3, @t3tools/web, @t3tools/desktop, @t3tools/client-runtime — clean
• vp fmt --check + vp lint across all changed paths — clean

Left as a draft for review, per the upstream-sync policy.

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	12.6 KiB	13.4 KiB	+833 B (+6.5%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+616 B (+9.6%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+217 B (+3.4%)	7.8 KiB	✅
Codex	Live turn WebSocket decoded	51.8 KiB	55.0 KiB	+3.2 KiB (+6.1%)	66.4 KiB	✅
Codex	Live turn messages	16	16	0 (0.0%)	21	✅
Claude	Total thread wire	12.6 KiB	13.4 KiB	+864 B (+6.7%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+636 B (+9.9%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+228 B (+3.5%)	7.8 KiB	✅
Claude	Live turn WebSocket decoded	52.7 KiB	55.8 KiB	+3.2 KiB (+6.0%)	66.4 KiB	✅
Claude	Live turn messages	16	16	0 (0.0%)	21	✅

Baseline: 2ffb140 · PR result: e457a94 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 109.4 KiB
• Claude decoded thread snapshot: 110.1 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[maarco]

Superseded by PR #51, the newer upstream sync through f035a0f4, which has now merged to main. Closing this older draft to keep the sync queue clean.

[maarco]

What Changed

Merges 44 upstream commits from pingdotgg/t3code@beab6886 into Marcode's main. Compare: main...claude/gracious-bohr-b96qvl

Conflict decisions (17 conflicted files):

• apps/server/src/cli/connect.ts, service.ts — adopt upstream's macOS-vs-Linux boot-service branching, keep Marcode branding in every user-facing string.
• apps/web/src/components/ChatView.tsx — keep Marcode's minimal ChatHeader (thread actions portal into FloatingPillNav) but close with the upstream <WorkspacePageHeader> tag; keep Marcode's transparent glass composer shell while adopting upstream's chat-composer-glass-shell-attached state.
• apps/web/src/components/RightPanelTabs.tsx — adopt upstream's browser-tab mute feature (Volume icons, previewBridge, toggle-mute item and handler) and its data-driven addSurfaceActions.map render. Retire the Files action and copy-path menu entry — Marcode has no right-panel file surface. PierreEntryIcon import dropped for the same reason.
• apps/web/src/components/ThreadTerminalDrawer.tsx — keep Marcode's TerminalPlacementSlot + TerminalChromeActions chrome (owns its own xterm fork) but adopt upstream's confirm-before-close on every close call site.
• apps/web/src/components/chat/ChatComposer.tsx — keep Marcode's floating glass surface (hotspot) with its focus/blur/drag machinery.
• apps/web/src/components/chat/ChatHeader.tsx — keep Marcode's minimal ThreadActionsCluster; upstream's new inline-rename/thread-menu machinery belongs on the chat title, which Marcode does not render here (portalled to FloatingPillNav, entry point on the sidebar row's context menu).
• apps/web/src/components/chat/ComposerPendingApprovalPanel.tsx — keep Marcode's PENDING APPROVAL card layout; honor the new className prop from upstream. Test rewritten to pin the card design so a future sync fails loudly if the compact-row shape reappears.
• apps/web/src/components/pullRequest/PullRequestListFilters.tsx — keep Marcode's Tooltip-wrapped MenuTrigger for the filter icon.
• apps/web/src/routes/_chat.pull-requests.tsx — adopt upstream's extracted PullRequestRefreshControl (removes Marcode's duplicate inline refresh button); add the Tooltip on the extracted control so the label is preserved on both call sites.
• apps/web/src/routes/settings.tsx and apps/web/src/components/usage/UsagePage.tsx — take upstream's content changes (settings breadcrumb cluster, the usage insights redesign and its topbarContent), but keep Marcode's own two-branch page header shell rather than upstream's extracted <WorkspacePageHeader>. Upstream hardcodes that component's inset to COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS, which keys off a data-sidebar-state=collapsed ancestor; Marcode renders no sidebar on these two routes, so the inset never applies and on Electron the breadcrumb slides under the macOS traffic lights. The electron branch keeps SIDEBARLESS_TITLEBAR_INSET_CLASS, the invariant pinned by workspaceTitlebar.fork.test. UsagePage also keeps Marcode's tooltip on every Refresh button.
• apps/web/src/routes/__root.tsx — keep both DraftPromotionWatcher (Marcode) and upstream's new PlanAgentSelectionHeal, mounted side-by-side.
• apps/web/src/components/sidebar/SidebarChrome.tsx — keep Marcode's brand/navigation-in-FloatingPillNav invariant; SidebarChromeHeader stays minimal and SidebarChromeFooter still shows only the update pills. Export upstream's new SidebarUtilityMenu — the Settings sidebar (SettingsSidebarNav) needs it — but do not mount it on the workspace footer. Sidebar brand/wordmark are pinned out by threadSidebarWidth.test.
• packages/client-runtime/src/state/threadSettled.ts — adopt upstream's fix that only auto-settles once per merged/closed PR (thread-latest-event check), and layer Marcode's 1h idle guard on top so a warm follow-up conversation is not buried the instant the PR merges. Tests updated for the renamed changeRequest field.
• apps/web/src/components/files/*Panel.tsx (modify/delete) — Marcode has no right-panel file surface; keep deleted.

Fork-boundary breaks that merged cleanly and are also fixed here:

• apps/server/src/cloud/bootService.ts — the launchd plist declared T3CODE_HOME but Marcode's launcher requires MARCODE_HOME (service would fail to boot on macOS). Renamed and pinned by a new test in bootService.test.ts. Also updated the stale test assertion that expected systemctl --user disable --now t3code.service — Marcode's systemd unit is marcode.service.
• apps/server/src/cli/triage.ts — t3 triage read T3CODE_HOME; renamed to MARCODE_HOME to match Marcode's launcher and t3 pair.
• apps/desktop/scripts/electron-launcher.mjs — dev launcher exported T3CODE_* env vars but DesktopConfig reads MARCODE_* (the desktop app would not pick up the overrides). Renamed here and in the test.

Coupled subtree check: pnpm-workspace.yaml only moved Clerk versions, @effect/* unchanged, infra/relay/package.json unchanged; no vendored subtree resync needed.

Why

Daily upstream sync per .github/upstream-sync.yml. This picks up 44 upstream commits including the browser-tab mute feature, macOS launchd boot service, the usage insights redesign, feat(threads): a merged PR settles its thread only once, and many fix(*) correctness/security changes. Hotspots reviewed against the customization map; where upstream touched Marcode-owned files, decisions are recorded above.

UI Changes

Only visible client changes shipped by upstream. Marcode-owned hotspots (floating pill nav, unified sidebar, floating editor, glass composer, PENDING APPROVAL card, sidebarless settings/usage titlebars) render unchanged. No screenshots attached: the touched surfaces either reuse upstream widgets that upstream's own tests exercise, or preserve Marcode's shape verbatim under focused tests. Worth a human eye on the desktop build for the redesigned usage page and the settings header, since those two are where upstream's layout refactor met Marcode's titlebar invariant.

Checklist

• This PR is small and focused — it is one upstream sync; scope is exactly the upstream delta plus fork-boundary repairs.
• I explained what changed and why
• I included before/after screenshots for any UI changes — deferred to human review of the desktop build
• I included a video for animation/interaction changes — n/a

Verification

CI on e457a94: Check ✅ · Test ✅ · Mobile Native Static Analysis ✅ · Release Smoke ✅ — all four required checks green. Thread transfer budget within every enforced ceiling.

The first push (a207bdf) failed Test on workspaceTitlebar.fork.test.ts: I had over-adopted upstream's WorkspacePageHeader on settings and usage, dropping Marcode's sidebarless titlebar inset. Fixed in e457a94 — see the settings/usage entry above. The fork test caught exactly the class of silent regression it exists for.

Focused local verification, all passing:

• packages/client-runtime/src/state/threadSettled.test.ts (193)
• apps/server/src/cloud/bootService.test.ts, apps/server/src/serviceLauncher.test.ts, apps/desktop/scripts/electron-launcher.test.mjs (30)
• apps/server/src/cli/service.test.ts, apps/server/src/cli/config.test.ts (11)
• apps/server/src/cli/triagePrompt.test.ts (4)
• apps/web/src/components/chat/ChatHeader.test.ts, ComposerPendingApprovalPanel.test.tsx, ComposerPendingApprovalActions.test.tsx, pullRequest/PullRequestListFilters.test.tsx, RightPanelTabs.test.tsx (33)
• apps/web/src/components/sidebar/SidebarChrome.fork.test.tsx, threadSidebarWidth.test.ts, threadActionMenu.logic.test.ts, workspaceTitlebar.fork.test.ts (18)
• tsgo typecheck across t3, @t3tools/web, @t3tools/desktop, @t3tools/client-runtime — clean
• vp fmt --check + vp lint across all changed paths — clean

Left as a draft for review, per the upstream-sync policy.

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	12.6 KiB	13.4 KiB	+833 B (+6.5%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+616 B (+9.6%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+217 B (+3.4%)	7.8 KiB	✅
Codex	Live turn WebSocket decoded	51.8 KiB	55.0 KiB	+3.2 KiB (+6.1%)	66.4 KiB	✅
Codex	Live turn messages	16	16	0 (0.0%)	21	✅
Claude	Total thread wire	12.6 KiB	13.4 KiB	+864 B (+6.7%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+636 B (+9.9%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+228 B (+3.5%)	7.8 KiB	✅
Claude	Live turn WebSocket decoded	52.7 KiB	55.8 KiB	+3.2 KiB (+6.0%)	66.4 KiB	✅
Claude	Live turn messages	16	16	0 (0.0%)	21	✅

Baseline: 2ffb140 · PR result: e457a94 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 109.4 KiB
• Claude decoded thread snapshot: 110.1 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[maarco]

Superseded by PR #51, the newer upstream sync through f035a0f4, which has now merged to main. Closing this older draft to keep the sync queue clean.

[maarco]

What Changed

Merges 44 upstream commits from pingdotgg/t3code@beab6886 into Marcode's main. Compare: main...claude/gracious-bohr-b96qvl

Conflict decisions (17 conflicted files):

• apps/server/src/cli/connect.ts, service.ts — adopt upstream's macOS-vs-Linux boot-service branching, keep Marcode branding in every user-facing string.
• apps/web/src/components/ChatView.tsx — keep Marcode's minimal ChatHeader (thread actions portal into FloatingPillNav) but close with the upstream <WorkspacePageHeader> tag; keep Marcode's transparent glass composer shell while adopting upstream's chat-composer-glass-shell-attached state.
• apps/web/src/components/RightPanelTabs.tsx — adopt upstream's browser-tab mute feature (Volume icons, previewBridge, toggle-mute item and handler) and its data-driven addSurfaceActions.map render. Retire the Files action and copy-path menu entry — Marcode has no right-panel file surface. PierreEntryIcon import dropped for the same reason.
• apps/web/src/components/ThreadTerminalDrawer.tsx — keep Marcode's TerminalPlacementSlot + TerminalChromeActions chrome (owns its own xterm fork) but adopt upstream's confirm-before-close on every close call site.
• apps/web/src/components/chat/ChatComposer.tsx — keep Marcode's floating glass surface (hotspot) with its focus/blur/drag machinery.
• apps/web/src/components/chat/ChatHeader.tsx — keep Marcode's minimal ThreadActionsCluster; upstream's new inline-rename/thread-menu machinery belongs on the chat title, which Marcode does not render here (portalled to FloatingPillNav, entry point on the sidebar row's context menu).
• apps/web/src/components/chat/ComposerPendingApprovalPanel.tsx — keep Marcode's PENDING APPROVAL card layout; honor the new className prop from upstream. Test rewritten to pin the card design so a future sync fails loudly if the compact-row shape reappears.
• apps/web/src/components/pullRequest/PullRequestListFilters.tsx — keep Marcode's Tooltip-wrapped MenuTrigger for the filter icon.
• apps/web/src/routes/_chat.pull-requests.tsx — adopt upstream's extracted PullRequestRefreshControl (removes Marcode's duplicate inline refresh button); add the Tooltip on the extracted control so the label is preserved on both call sites.
• apps/web/src/routes/settings.tsx and apps/web/src/components/usage/UsagePage.tsx — take upstream's content changes (settings breadcrumb cluster, the usage insights redesign and its topbarContent), but keep Marcode's own two-branch page header shell rather than upstream's extracted <WorkspacePageHeader>. Upstream hardcodes that component's inset to COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS, which keys off a data-sidebar-state=collapsed ancestor; Marcode renders no sidebar on these two routes, so the inset never applies and on Electron the breadcrumb slides under the macOS traffic lights. The electron branch keeps SIDEBARLESS_TITLEBAR_INSET_CLASS, the invariant pinned by workspaceTitlebar.fork.test. UsagePage also keeps Marcode's tooltip on every Refresh button.
• apps/web/src/routes/__root.tsx — keep both DraftPromotionWatcher (Marcode) and upstream's new PlanAgentSelectionHeal, mounted side-by-side.
• apps/web/src/components/sidebar/SidebarChrome.tsx — keep Marcode's brand/navigation-in-FloatingPillNav invariant; SidebarChromeHeader stays minimal and SidebarChromeFooter still shows only the update pills. Export upstream's new SidebarUtilityMenu — the Settings sidebar (SettingsSidebarNav) needs it — but do not mount it on the workspace footer. Sidebar brand/wordmark are pinned out by threadSidebarWidth.test.
• packages/client-runtime/src/state/threadSettled.ts — adopt upstream's fix that only auto-settles once per merged/closed PR (thread-latest-event check), and layer Marcode's 1h idle guard on top so a warm follow-up conversation is not buried the instant the PR merges. Tests updated for the renamed changeRequest field.
• apps/web/src/components/files/*Panel.tsx (modify/delete) — Marcode has no right-panel file surface; keep deleted.

Fork-boundary breaks that merged cleanly and are also fixed here:

• apps/server/src/cloud/bootService.ts — the launchd plist declared T3CODE_HOME but Marcode's launcher requires MARCODE_HOME (service would fail to boot on macOS). Renamed and pinned by a new test in bootService.test.ts. Also updated the stale test assertion that expected systemctl --user disable --now t3code.service — Marcode's systemd unit is marcode.service.
• apps/server/src/cli/triage.ts — t3 triage read T3CODE_HOME; renamed to MARCODE_HOME to match Marcode's launcher and t3 pair.
• apps/desktop/scripts/electron-launcher.mjs — dev launcher exported T3CODE_* env vars but DesktopConfig reads MARCODE_* (the desktop app would not pick up the overrides). Renamed here and in the test.

Coupled subtree check: pnpm-workspace.yaml only moved Clerk versions, @effect/* unchanged, infra/relay/package.json unchanged; no vendored subtree resync needed.

Why

Daily upstream sync per .github/upstream-sync.yml. This picks up 44 upstream commits including the browser-tab mute feature, macOS launchd boot service, the usage insights redesign, feat(threads): a merged PR settles its thread only once, and many fix(*) correctness/security changes. Hotspots reviewed against the customization map; where upstream touched Marcode-owned files, decisions are recorded above.

UI Changes

Only visible client changes shipped by upstream. Marcode-owned hotspots (floating pill nav, unified sidebar, floating editor, glass composer, PENDING APPROVAL card, sidebarless settings/usage titlebars) render unchanged. No screenshots attached: the touched surfaces either reuse upstream widgets that upstream's own tests exercise, or preserve Marcode's shape verbatim under focused tests. Worth a human eye on the desktop build for the redesigned usage page and the settings header, since those two are where upstream's layout refactor met Marcode's titlebar invariant.

Checklist

• This PR is small and focused — it is one upstream sync; scope is exactly the upstream delta plus fork-boundary repairs.
• I explained what changed and why
• I included before/after screenshots for any UI changes — deferred to human review of the desktop build
• I included a video for animation/interaction changes — n/a

Verification

CI on e457a94: Check ✅ · Test ✅ · Mobile Native Static Analysis ✅ · Release Smoke ✅ — all four required checks green. Thread transfer budget within every enforced ceiling.

The first push (a207bdf) failed Test on workspaceTitlebar.fork.test.ts: I had over-adopted upstream's WorkspacePageHeader on settings and usage, dropping Marcode's sidebarless titlebar inset. Fixed in e457a94 — see the settings/usage entry above. The fork test caught exactly the class of silent regression it exists for.

Focused local verification, all passing:

• packages/client-runtime/src/state/threadSettled.test.ts (193)
• apps/server/src/cloud/bootService.test.ts, apps/server/src/serviceLauncher.test.ts, apps/desktop/scripts/electron-launcher.test.mjs (30)
• apps/server/src/cli/service.test.ts, apps/server/src/cli/config.test.ts (11)
• apps/server/src/cli/triagePrompt.test.ts (4)
• apps/web/src/components/chat/ChatHeader.test.ts, ComposerPendingApprovalPanel.test.tsx, ComposerPendingApprovalActions.test.tsx, pullRequest/PullRequestListFilters.test.tsx, RightPanelTabs.test.tsx (33)
• apps/web/src/components/sidebar/SidebarChrome.fork.test.tsx, threadSidebarWidth.test.ts, threadActionMenu.logic.test.ts, workspaceTitlebar.fork.test.ts (18)
• tsgo typecheck across t3, @t3tools/web, @t3tools/desktop, @t3tools/client-runtime — clean
• vp fmt --check + vp lint across all changed paths — clean

Left as a draft for review, per the upstream-sync policy.

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	12.6 KiB	13.4 KiB	+833 B (+6.5%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+616 B (+9.6%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+217 B (+3.4%)	7.8 KiB	✅
Codex	Live turn WebSocket decoded	51.8 KiB	55.0 KiB	+3.2 KiB (+6.1%)	66.4 KiB	✅
Codex	Live turn messages	16	16	0 (0.0%)	21	✅
Claude	Total thread wire	12.6 KiB	13.4 KiB	+864 B (+6.7%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+636 B (+9.9%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+228 B (+3.5%)	7.8 KiB	✅
Claude	Live turn WebSocket decoded	52.7 KiB	55.8 KiB	+3.2 KiB (+6.0%)	66.4 KiB	✅
Claude	Live turn messages	16	16	0 (0.0%)	21	✅

Baseline: 2ffb140 · PR result: e457a94 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 109.4 KiB
• Claude decoded thread snapshot: 110.1 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[maarco]

Superseded by PR #51, the newer upstream sync through f035a0f4, which has now merged to main. Closing this older draft to keep the sync queue clean.