chore(upstream): sync marcode through be7d35aa

[maarco]

What Changed

Merged pingdotgg/t3code@be7d35aa into Marcode — 75 upstream commits across 24 conflicted paths, resolved by hand. Draft on purpose: CI is green, but the live-client verification the runbook asks for on UI hotspots has not been run.

Conflict decisions

Path	Decision
AGENTS.md	Kept Marcode's structure. Adopted upstream's new Plans and work artifacts policy and its "never commit PR-only assets" rule. Dropped upstream's duplicate Verifying / Pull requests sections (Marcode has its own) and the user-count blurb.
.plans/effect-atom.md	Accepted upstream's deletion — Marcode's only edit was an identifier cleanup in a file upstream retired repo-wide.
.github/workflows/ci.yml	Took upstream's mobile-native change gate; kept Marcode's GitHub-hosted runner. See silent breaks below for the new jobs.
apps/server/src/cli/{connect,service}.ts	Adopted upstream's macOS launchd support and platform-aware copy, rendered in Marcode's voice.
apps/web/src/components/files/{FileBrowserPanel,FilePreviewPanel}.tsx	Kept deleted. Upstream's refresh fix (pingdotgg#7490) targets the right-panel file surface Marcode retired; the floating editor's file tree has no refresh control, so there is no sibling to port it to.
ChatView.tsx	Kept Marcode's title-only ChatHeader and container-level panelLayoutControls, closing with upstream's WorkspacePageHeader. Composer shell keeps Marcode's transparent glass and takes upstream's attached-drawer modifier.
chat/ChatComposer.tsx	Took upstream's new composer top drawer; re-applied Marcode's glass surface to the relocated composer surface div.
chat/ChatHeader.tsx	Kept Marcode's cluster. Upstream's inline rename and thread action menu belong to a header Marcode does not render, and those actions already have an entry point on the sidebar row.
chat/ComposerPendingApprovalPanel.tsx	Took upstream's inline code chip. Marcode's only divergence was typography on a label the redesign removes.
chat/MessagesTimeline.tsx	Upstream's dropped -mx-1 plus Marcode's text-sm.
RightPanelTabs.tsx	Adopted upstream's tab mute control and add-surface keyboard shortcuts. Dropped the file-tab copy-path action, the Files surface and its icon — all owned by the retired right-panel file surface.
Sidebar.logic.ts, Sidebar.tsx	Kept both imports; upstream's cursor-pointer with Marcode's text-xs.
sidebar/SidebarChrome.tsx	Kept Marcode's footer. Upstream's whole delta was the footer nav and brand that FloatingPillNav owns.
ThreadTerminalDrawer.tsx	Kept Marcode's terminal chrome; adopted upstream's close confirmation and its terminal-background surface fix.
PullRequestListFilters.tsx, routes/_chat.pull-requests.tsx	Took upstream's shared Button trigger and its relocation of the refresh control, moving Marcode's tooltip onto the control's new home.
usage/UsagePage.tsx, routes/settings.tsx	Took upstream's move onto the shared WorkspacePageHeader; kept Marcode's tooltip on the refresh button.
index.css	Both blocks kept — they collided only on insertion point.
routes/__root.tsx	Render Marcode's DraftPromotionWatcherand upstream's new PlanAgentSelectionHeal.
threadSettled.ts	Took upstream's changeRequestAutoSettles signature and its activity anchor; kept Marcode's one-hour warm window on top.

Clean merges that would have broken on Marcode

Five upstream changes produced no conflict and would have shipped broken. Four were caught by a fork-identity sweep of the merged tree; the fifth was caught by CI.

1. macOS launch agent exported T3CODE_HOME. Marcode's launcher requires MARCODE_HOME and exits without it, so the background service would install and never start. Both unit renderers now export the same key, pinned by a test.
2. Launch agent label was com.t3tools.t3code.service, which would make a Marcode install and an upstream install the same launchd job — the macOS half of the coexistence rule the systemd unit already holds. Now app.marcode.service, pinned by a test.
3. New t3 triage CLI read T3CODE_HOME where every other Marcode entry point reads MARCODE_HOME.
4. Three new CI jobs (Test Server, Rust, Mobile Native Changes) arrived with Blacksmith runner labels the fork cannot schedule — they would have queued forever. Remapped to ubuntu-24.04, and an upstream test still asserting systemctl --user disable --now t3code.service was corrected to marcode.service.
5. Upstream's test-suite split moved apps/server's tests out from under Marcode's ripgrep install step (49471f6f). WorkspaceFileSystem.searchContent shells out to ripgrep, which the runner image does not carry; the step stayed on test, a job that now explicitly excludes t3, so the two searchContent tests ran without it and returned zero matches. Reproduced locally by hiding rg — same two assertions fail, 25/25 pass with it present.

Fork pins updated

• workspaceTitlebar.fork.test.ts — upstream moved settings and usage onto the shared header, which hardcodes the collapsed-sidebar inset. Marcode carries its sidebarless inset forward as a sidebarless prop on that shared header; the test now pins both halves (the header honouring the flag, and each route passing it).
• upstream-sync-workflow.test.ts — two pins were too narrow. The CI runner pin asserted an exact four-job list, so upstream adding a job broke it for the wrong reason; it now asserts that no job carries a label the fork cannot schedule. The ripgrep pin named ci.jobs.test by hand, so the test-suite split moved the search tests out from under it while the assertion stayed green and CI went red; it now derives the job list from the workflow — any job running package tests without excluding t3 must install ripgrep — and was verified to fail, naming the offending job, by removing the step.
• SettingsSidebarNav.tsx — restored Marcode's page-level Back row after upstream replaced it with the SidebarUtilityMenu this fork does not mount.

Coupled subtrees:pnpm-workspace.yaml moved only Clerk versions; the Effect catalog and infra/relay/package.json are unchanged, so no vendored subtree sync is due.

Why

The scheduled sync found 75 new upstream commits with a conflicted delta, which the automation deliberately refuses to resolve. This is the hand-resolved integration branch that policy calls for: it keeps upstream's correctness, security and dependency work while preserving Marcode's floating navigation shell, retired right-panel file surfaces, unified workspace sidebar, and service identity.

Hotspot paths were treated as mandatory-review, not automatic keep-Marcode: upstream's macOS launchd support, terminal close confirmation, tab mute control, add-surface shortcuts, shared page header, and settled-thread activity anchor all landed inside customized files and were all taken.

UI Changes

Not captured. This merge touches several web surfaces (composer drawers, right-panel tabs, usage page, settings and pull-request headers, terminal chrome). The runbook's live-client pass has not been run in this environment, so before/after evidence still has to be produced — see Verification. Keeping the PR in draft until that lands.

Verification

CI green on 49471f6f — all four required checks (Check, Test, Mobile Native Static Analysis, Release Smoke) plus the new Test Server 1/2/3, Rust, and Mobile Native Changes. The thread-transfer budget report is within every ceiling.

Run locally (focused, per AGENTS.md):

• vp test run over the touched surfaces, all passing: fork pins (workspaceTitlebar.fork, SidebarChrome.fork, upstream-sync-workflow), threadSettled, boot service / service launcher / service CLI, right panel store, the seven composer suites, RightPanelTabs, UsagePage, Sidebar.logic, ChatView.logic, threadActionMenu.logic, -chatIndexTitlebar, editor surface and open-floating-file, GitActionsControl.logic, shared/git, contracts/settings, contracts/orchestration, client-runtime/operations/projects.
• vp run --filter typecheck: @t3tools/web, @t3tools/client-runtime, t3, @t3tools/contracts, @t3tools/shared — all clean.
• vp fmt --check on the changed files, vp lint on apps/web/src, apps/server/src, packages/client-runtime/src, scripts — clean (warnings only, all pre-existing patterns).

Not verified:

• Live web/mobile client verification, and the branding-asset check the runbook asks for on UI hotspots.
• ThreadTerminalDrawer.test.ts could not run in the sync container (@aliimam/icons@1.1.3 ships a main pointing at a dist/index.cjs its tarball lacks). It passes in CI, which covers it.

Follow-up, not done here

Two pre-existing issues this PR surfaces but deliberately does not widen into:

1. Native fingerprint diff will sit queued forever..github/workflows/mobile-fingerprint-check.yml is unchanged by this merge but still carries runs-on: blacksmith-8vcpu-ubuntu-2404, and the fork has no Blacksmith installation — the same class of break as item 4 above. It is advisory (the check is advisory: it always passes, the label is the signal) and not in requiredPullRequestChecks, so it leaves the PR unstable rather than blocked. Proposed patch: runs-on: ubuntu-24.04. Its only stated resource need is NODE_OPTIONS=--max-old-space-size=8192, and the GitHub-hosted image has 16 GB RAM, so the 8 GB heap fits — it will just be slower on 4 vCPU. Left alone here because the runbook says to audit those workflows individually rather than sweep the labels, and this one is not part of the upstream delta.
2. The new upstream t3 triage CLI ships a playbook that names "T3 Code" throughout and points users at github.com/pingdotgg/t3code for filing issues. Only the functional MARCODE_HOME break was fixed; whether Marcode wants its own triage playbook and issue tracker is a product decision, and rebranding a 200-line upstream-owned file would widen this sync.

Checklist

• This PR is small and focused — one concern: the upstream merge
• I explained what changed and why
• I included before/after screenshots for any UI changes — pending live-client pass
• I included a video for animation/interaction changes — n/a

[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	+850 B (+6.6%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+619 B (+9.6%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+231 B (+3.6%)	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.5 KiB	+873 B (+6.8%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+632 B (+9.8%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.6 KiB	+241 B (+3.7%)	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: 49471f6 · 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

Merged pingdotgg/t3code@be7d35aa into Marcode — 75 upstream commits across 24 conflicted paths, resolved by hand. Draft on purpose: CI is green, but the live-client verification the runbook asks for on UI hotspots has not been run.

Conflict decisions

Path	Decision
AGENTS.md	Kept Marcode's structure. Adopted upstream's new Plans and work artifacts policy and its "never commit PR-only assets" rule. Dropped upstream's duplicate Verifying / Pull requests sections (Marcode has its own) and the user-count blurb.
.plans/effect-atom.md	Accepted upstream's deletion — Marcode's only edit was an identifier cleanup in a file upstream retired repo-wide.
.github/workflows/ci.yml	Took upstream's mobile-native change gate; kept Marcode's GitHub-hosted runner. See silent breaks below for the new jobs.
apps/server/src/cli/{connect,service}.ts	Adopted upstream's macOS launchd support and platform-aware copy, rendered in Marcode's voice.
apps/web/src/components/files/{FileBrowserPanel,FilePreviewPanel}.tsx	Kept deleted. Upstream's refresh fix (pingdotgg#7490) targets the right-panel file surface Marcode retired; the floating editor's file tree has no refresh control, so there is no sibling to port it to.
ChatView.tsx	Kept Marcode's title-only ChatHeader and container-level panelLayoutControls, closing with upstream's WorkspacePageHeader. Composer shell keeps Marcode's transparent glass and takes upstream's attached-drawer modifier.
chat/ChatComposer.tsx	Took upstream's new composer top drawer; re-applied Marcode's glass surface to the relocated composer surface div.
chat/ChatHeader.tsx	Kept Marcode's cluster. Upstream's inline rename and thread action menu belong to a header Marcode does not render, and those actions already have an entry point on the sidebar row.
chat/ComposerPendingApprovalPanel.tsx	Took upstream's inline code chip. Marcode's only divergence was typography on a label the redesign removes.
chat/MessagesTimeline.tsx	Upstream's dropped -mx-1 plus Marcode's text-sm.
RightPanelTabs.tsx	Adopted upstream's tab mute control and add-surface keyboard shortcuts. Dropped the file-tab copy-path action, the Files surface and its icon — all owned by the retired right-panel file surface.
Sidebar.logic.ts, Sidebar.tsx	Kept both imports; upstream's cursor-pointer with Marcode's text-xs.
sidebar/SidebarChrome.tsx	Kept Marcode's footer. Upstream's whole delta was the footer nav and brand that FloatingPillNav owns.
ThreadTerminalDrawer.tsx	Kept Marcode's terminal chrome; adopted upstream's close confirmation and its terminal-background surface fix.
PullRequestListFilters.tsx, routes/_chat.pull-requests.tsx	Took upstream's shared Button trigger and its relocation of the refresh control, moving Marcode's tooltip onto the control's new home.
usage/UsagePage.tsx, routes/settings.tsx	Took upstream's move onto the shared WorkspacePageHeader; kept Marcode's tooltip on the refresh button.
index.css	Both blocks kept — they collided only on insertion point.
routes/__root.tsx	Render Marcode's DraftPromotionWatcherand upstream's new PlanAgentSelectionHeal.
threadSettled.ts	Took upstream's changeRequestAutoSettles signature and its activity anchor; kept Marcode's one-hour warm window on top.

Clean merges that would have broken on Marcode

Five upstream changes produced no conflict and would have shipped broken. Four were caught by a fork-identity sweep of the merged tree; the fifth was caught by CI.

1. macOS launch agent exported T3CODE_HOME. Marcode's launcher requires MARCODE_HOME and exits without it, so the background service would install and never start. Both unit renderers now export the same key, pinned by a test.
2. Launch agent label was com.t3tools.t3code.service, which would make a Marcode install and an upstream install the same launchd job — the macOS half of the coexistence rule the systemd unit already holds. Now app.marcode.service, pinned by a test.
3. New t3 triage CLI read T3CODE_HOME where every other Marcode entry point reads MARCODE_HOME.
4. Three new CI jobs (Test Server, Rust, Mobile Native Changes) arrived with Blacksmith runner labels the fork cannot schedule — they would have queued forever. Remapped to ubuntu-24.04, and an upstream test still asserting systemctl --user disable --now t3code.service was corrected to marcode.service.
5. Upstream's test-suite split moved apps/server's tests out from under Marcode's ripgrep install step (49471f6f). WorkspaceFileSystem.searchContent shells out to ripgrep, which the runner image does not carry; the step stayed on test, a job that now explicitly excludes t3, so the two searchContent tests ran without it and returned zero matches. Reproduced locally by hiding rg — same two assertions fail, 25/25 pass with it present.

Fork pins updated

• workspaceTitlebar.fork.test.ts — upstream moved settings and usage onto the shared header, which hardcodes the collapsed-sidebar inset. Marcode carries its sidebarless inset forward as a sidebarless prop on that shared header; the test now pins both halves (the header honouring the flag, and each route passing it).
• upstream-sync-workflow.test.ts — two pins were too narrow. The CI runner pin asserted an exact four-job list, so upstream adding a job broke it for the wrong reason; it now asserts that no job carries a label the fork cannot schedule. The ripgrep pin named ci.jobs.test by hand, so the test-suite split moved the search tests out from under it while the assertion stayed green and CI went red; it now derives the job list from the workflow — any job running package tests without excluding t3 must install ripgrep — and was verified to fail, naming the offending job, by removing the step.
• SettingsSidebarNav.tsx — restored Marcode's page-level Back row after upstream replaced it with the SidebarUtilityMenu this fork does not mount.

Coupled subtrees:pnpm-workspace.yaml moved only Clerk versions; the Effect catalog and infra/relay/package.json are unchanged, so no vendored subtree sync is due.

Why

The scheduled sync found 75 new upstream commits with a conflicted delta, which the automation deliberately refuses to resolve. This is the hand-resolved integration branch that policy calls for: it keeps upstream's correctness, security and dependency work while preserving Marcode's floating navigation shell, retired right-panel file surfaces, unified workspace sidebar, and service identity.

Hotspot paths were treated as mandatory-review, not automatic keep-Marcode: upstream's macOS launchd support, terminal close confirmation, tab mute control, add-surface shortcuts, shared page header, and settled-thread activity anchor all landed inside customized files and were all taken.

UI Changes

Not captured. This merge touches several web surfaces (composer drawers, right-panel tabs, usage page, settings and pull-request headers, terminal chrome). The runbook's live-client pass has not been run in this environment, so before/after evidence still has to be produced — see Verification. Keeping the PR in draft until that lands.

Verification

CI green on 49471f6f — all four required checks (Check, Test, Mobile Native Static Analysis, Release Smoke) plus the new Test Server 1/2/3, Rust, and Mobile Native Changes. The thread-transfer budget report is within every ceiling.

Run locally (focused, per AGENTS.md):

• vp test run over the touched surfaces, all passing: fork pins (workspaceTitlebar.fork, SidebarChrome.fork, upstream-sync-workflow), threadSettled, boot service / service launcher / service CLI, right panel store, the seven composer suites, RightPanelTabs, UsagePage, Sidebar.logic, ChatView.logic, threadActionMenu.logic, -chatIndexTitlebar, editor surface and open-floating-file, GitActionsControl.logic, shared/git, contracts/settings, contracts/orchestration, client-runtime/operations/projects.
• vp run --filter typecheck: @t3tools/web, @t3tools/client-runtime, t3, @t3tools/contracts, @t3tools/shared — all clean.
• vp fmt --check on the changed files, vp lint on apps/web/src, apps/server/src, packages/client-runtime/src, scripts — clean (warnings only, all pre-existing patterns).

Not verified:

• Live web/mobile client verification, and the branding-asset check the runbook asks for on UI hotspots.
• ThreadTerminalDrawer.test.ts could not run in the sync container (@aliimam/icons@1.1.3 ships a main pointing at a dist/index.cjs its tarball lacks). It passes in CI, which covers it.

Follow-up, not done here

Two pre-existing issues this PR surfaces but deliberately does not widen into:

1. Native fingerprint diff will sit queued forever..github/workflows/mobile-fingerprint-check.yml is unchanged by this merge but still carries runs-on: blacksmith-8vcpu-ubuntu-2404, and the fork has no Blacksmith installation — the same class of break as item 4 above. It is advisory (the check is advisory: it always passes, the label is the signal) and not in requiredPullRequestChecks, so it leaves the PR unstable rather than blocked. Proposed patch: runs-on: ubuntu-24.04. Its only stated resource need is NODE_OPTIONS=--max-old-space-size=8192, and the GitHub-hosted image has 16 GB RAM, so the 8 GB heap fits — it will just be slower on 4 vCPU. Left alone here because the runbook says to audit those workflows individually rather than sweep the labels, and this one is not part of the upstream delta.
2. The new upstream t3 triage CLI ships a playbook that names "T3 Code" throughout and points users at github.com/pingdotgg/t3code for filing issues. Only the functional MARCODE_HOME break was fixed; whether Marcode wants its own triage playbook and issue tracker is a product decision, and rebranding a 200-line upstream-owned file would widen this sync.

Checklist

• This PR is small and focused — one concern: the upstream merge
• I explained what changed and why
• I included before/after screenshots for any UI changes — pending live-client pass
• I included a video for animation/interaction changes — n/a

[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	+850 B (+6.6%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+619 B (+9.6%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+231 B (+3.6%)	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.5 KiB	+873 B (+6.8%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+632 B (+9.8%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.6 KiB	+241 B (+3.7%)	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: 49471f6 · 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

Merged pingdotgg/t3code@be7d35aa into Marcode — 75 upstream commits across 24 conflicted paths, resolved by hand. Draft on purpose: CI is green, but the live-client verification the runbook asks for on UI hotspots has not been run.

Conflict decisions

Path	Decision
AGENTS.md	Kept Marcode's structure. Adopted upstream's new Plans and work artifacts policy and its "never commit PR-only assets" rule. Dropped upstream's duplicate Verifying / Pull requests sections (Marcode has its own) and the user-count blurb.
.plans/effect-atom.md	Accepted upstream's deletion — Marcode's only edit was an identifier cleanup in a file upstream retired repo-wide.
.github/workflows/ci.yml	Took upstream's mobile-native change gate; kept Marcode's GitHub-hosted runner. See silent breaks below for the new jobs.
apps/server/src/cli/{connect,service}.ts	Adopted upstream's macOS launchd support and platform-aware copy, rendered in Marcode's voice.
apps/web/src/components/files/{FileBrowserPanel,FilePreviewPanel}.tsx	Kept deleted. Upstream's refresh fix (pingdotgg#7490) targets the right-panel file surface Marcode retired; the floating editor's file tree has no refresh control, so there is no sibling to port it to.
ChatView.tsx	Kept Marcode's title-only ChatHeader and container-level panelLayoutControls, closing with upstream's WorkspacePageHeader. Composer shell keeps Marcode's transparent glass and takes upstream's attached-drawer modifier.
chat/ChatComposer.tsx	Took upstream's new composer top drawer; re-applied Marcode's glass surface to the relocated composer surface div.
chat/ChatHeader.tsx	Kept Marcode's cluster. Upstream's inline rename and thread action menu belong to a header Marcode does not render, and those actions already have an entry point on the sidebar row.
chat/ComposerPendingApprovalPanel.tsx	Took upstream's inline code chip. Marcode's only divergence was typography on a label the redesign removes.
chat/MessagesTimeline.tsx	Upstream's dropped -mx-1 plus Marcode's text-sm.
RightPanelTabs.tsx	Adopted upstream's tab mute control and add-surface keyboard shortcuts. Dropped the file-tab copy-path action, the Files surface and its icon — all owned by the retired right-panel file surface.
Sidebar.logic.ts, Sidebar.tsx	Kept both imports; upstream's cursor-pointer with Marcode's text-xs.
sidebar/SidebarChrome.tsx	Kept Marcode's footer. Upstream's whole delta was the footer nav and brand that FloatingPillNav owns.
ThreadTerminalDrawer.tsx	Kept Marcode's terminal chrome; adopted upstream's close confirmation and its terminal-background surface fix.
PullRequestListFilters.tsx, routes/_chat.pull-requests.tsx	Took upstream's shared Button trigger and its relocation of the refresh control, moving Marcode's tooltip onto the control's new home.
usage/UsagePage.tsx, routes/settings.tsx	Took upstream's move onto the shared WorkspacePageHeader; kept Marcode's tooltip on the refresh button.
index.css	Both blocks kept — they collided only on insertion point.
routes/__root.tsx	Render Marcode's DraftPromotionWatcherand upstream's new PlanAgentSelectionHeal.
threadSettled.ts	Took upstream's changeRequestAutoSettles signature and its activity anchor; kept Marcode's one-hour warm window on top.

Clean merges that would have broken on Marcode

Five upstream changes produced no conflict and would have shipped broken. Four were caught by a fork-identity sweep of the merged tree; the fifth was caught by CI.

1. macOS launch agent exported T3CODE_HOME. Marcode's launcher requires MARCODE_HOME and exits without it, so the background service would install and never start. Both unit renderers now export the same key, pinned by a test.
2. Launch agent label was com.t3tools.t3code.service, which would make a Marcode install and an upstream install the same launchd job — the macOS half of the coexistence rule the systemd unit already holds. Now app.marcode.service, pinned by a test.
3. New t3 triage CLI read T3CODE_HOME where every other Marcode entry point reads MARCODE_HOME.
4. Three new CI jobs (Test Server, Rust, Mobile Native Changes) arrived with Blacksmith runner labels the fork cannot schedule — they would have queued forever. Remapped to ubuntu-24.04, and an upstream test still asserting systemctl --user disable --now t3code.service was corrected to marcode.service.
5. Upstream's test-suite split moved apps/server's tests out from under Marcode's ripgrep install step (49471f6f). WorkspaceFileSystem.searchContent shells out to ripgrep, which the runner image does not carry; the step stayed on test, a job that now explicitly excludes t3, so the two searchContent tests ran without it and returned zero matches. Reproduced locally by hiding rg — same two assertions fail, 25/25 pass with it present.

Fork pins updated

• workspaceTitlebar.fork.test.ts — upstream moved settings and usage onto the shared header, which hardcodes the collapsed-sidebar inset. Marcode carries its sidebarless inset forward as a sidebarless prop on that shared header; the test now pins both halves (the header honouring the flag, and each route passing it).
• upstream-sync-workflow.test.ts — two pins were too narrow. The CI runner pin asserted an exact four-job list, so upstream adding a job broke it for the wrong reason; it now asserts that no job carries a label the fork cannot schedule. The ripgrep pin named ci.jobs.test by hand, so the test-suite split moved the search tests out from under it while the assertion stayed green and CI went red; it now derives the job list from the workflow — any job running package tests without excluding t3 must install ripgrep — and was verified to fail, naming the offending job, by removing the step.
• SettingsSidebarNav.tsx — restored Marcode's page-level Back row after upstream replaced it with the SidebarUtilityMenu this fork does not mount.

Coupled subtrees:pnpm-workspace.yaml moved only Clerk versions; the Effect catalog and infra/relay/package.json are unchanged, so no vendored subtree sync is due.

Why

The scheduled sync found 75 new upstream commits with a conflicted delta, which the automation deliberately refuses to resolve. This is the hand-resolved integration branch that policy calls for: it keeps upstream's correctness, security and dependency work while preserving Marcode's floating navigation shell, retired right-panel file surfaces, unified workspace sidebar, and service identity.

Hotspot paths were treated as mandatory-review, not automatic keep-Marcode: upstream's macOS launchd support, terminal close confirmation, tab mute control, add-surface shortcuts, shared page header, and settled-thread activity anchor all landed inside customized files and were all taken.

UI Changes

Not captured. This merge touches several web surfaces (composer drawers, right-panel tabs, usage page, settings and pull-request headers, terminal chrome). The runbook's live-client pass has not been run in this environment, so before/after evidence still has to be produced — see Verification. Keeping the PR in draft until that lands.

Verification

CI green on 49471f6f — all four required checks (Check, Test, Mobile Native Static Analysis, Release Smoke) plus the new Test Server 1/2/3, Rust, and Mobile Native Changes. The thread-transfer budget report is within every ceiling.

Run locally (focused, per AGENTS.md):

• vp test run over the touched surfaces, all passing: fork pins (workspaceTitlebar.fork, SidebarChrome.fork, upstream-sync-workflow), threadSettled, boot service / service launcher / service CLI, right panel store, the seven composer suites, RightPanelTabs, UsagePage, Sidebar.logic, ChatView.logic, threadActionMenu.logic, -chatIndexTitlebar, editor surface and open-floating-file, GitActionsControl.logic, shared/git, contracts/settings, contracts/orchestration, client-runtime/operations/projects.
• vp run --filter typecheck: @t3tools/web, @t3tools/client-runtime, t3, @t3tools/contracts, @t3tools/shared — all clean.
• vp fmt --check on the changed files, vp lint on apps/web/src, apps/server/src, packages/client-runtime/src, scripts — clean (warnings only, all pre-existing patterns).

Not verified:

• Live web/mobile client verification, and the branding-asset check the runbook asks for on UI hotspots.
• ThreadTerminalDrawer.test.ts could not run in the sync container (@aliimam/icons@1.1.3 ships a main pointing at a dist/index.cjs its tarball lacks). It passes in CI, which covers it.

Follow-up, not done here

Two pre-existing issues this PR surfaces but deliberately does not widen into:

1. Native fingerprint diff will sit queued forever..github/workflows/mobile-fingerprint-check.yml is unchanged by this merge but still carries runs-on: blacksmith-8vcpu-ubuntu-2404, and the fork has no Blacksmith installation — the same class of break as item 4 above. It is advisory (the check is advisory: it always passes, the label is the signal) and not in requiredPullRequestChecks, so it leaves the PR unstable rather than blocked. Proposed patch: runs-on: ubuntu-24.04. Its only stated resource need is NODE_OPTIONS=--max-old-space-size=8192, and the GitHub-hosted image has 16 GB RAM, so the 8 GB heap fits — it will just be slower on 4 vCPU. Left alone here because the runbook says to audit those workflows individually rather than sweep the labels, and this one is not part of the upstream delta.
2. The new upstream t3 triage CLI ships a playbook that names "T3 Code" throughout and points users at github.com/pingdotgg/t3code for filing issues. Only the functional MARCODE_HOME break was fixed; whether Marcode wants its own triage playbook and issue tracker is a product decision, and rebranding a 200-line upstream-owned file would widen this sync.

Checklist

• This PR is small and focused — one concern: the upstream merge
• I explained what changed and why
• I included before/after screenshots for any UI changes — pending live-client pass
• I included a video for animation/interaction changes — n/a

[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	+850 B (+6.6%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+619 B (+9.6%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+231 B (+3.6%)	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.5 KiB	+873 B (+6.8%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+632 B (+9.8%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.6 KiB	+241 B (+3.7%)	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: 49471f6 · 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

Merged pingdotgg/t3code@be7d35aa into Marcode — 75 upstream commits across 24 conflicted paths, resolved by hand. Draft on purpose: CI is green, but the live-client verification the runbook asks for on UI hotspots has not been run.

Conflict decisions

Path	Decision
AGENTS.md	Kept Marcode's structure. Adopted upstream's new Plans and work artifacts policy and its "never commit PR-only assets" rule. Dropped upstream's duplicate Verifying / Pull requests sections (Marcode has its own) and the user-count blurb.
.plans/effect-atom.md	Accepted upstream's deletion — Marcode's only edit was an identifier cleanup in a file upstream retired repo-wide.
.github/workflows/ci.yml	Took upstream's mobile-native change gate; kept Marcode's GitHub-hosted runner. See silent breaks below for the new jobs.
apps/server/src/cli/{connect,service}.ts	Adopted upstream's macOS launchd support and platform-aware copy, rendered in Marcode's voice.
apps/web/src/components/files/{FileBrowserPanel,FilePreviewPanel}.tsx	Kept deleted. Upstream's refresh fix (pingdotgg#7490) targets the right-panel file surface Marcode retired; the floating editor's file tree has no refresh control, so there is no sibling to port it to.
ChatView.tsx	Kept Marcode's title-only ChatHeader and container-level panelLayoutControls, closing with upstream's WorkspacePageHeader. Composer shell keeps Marcode's transparent glass and takes upstream's attached-drawer modifier.
chat/ChatComposer.tsx	Took upstream's new composer top drawer; re-applied Marcode's glass surface to the relocated composer surface div.
chat/ChatHeader.tsx	Kept Marcode's cluster. Upstream's inline rename and thread action menu belong to a header Marcode does not render, and those actions already have an entry point on the sidebar row.
chat/ComposerPendingApprovalPanel.tsx	Took upstream's inline code chip. Marcode's only divergence was typography on a label the redesign removes.
chat/MessagesTimeline.tsx	Upstream's dropped -mx-1 plus Marcode's text-sm.
RightPanelTabs.tsx	Adopted upstream's tab mute control and add-surface keyboard shortcuts. Dropped the file-tab copy-path action, the Files surface and its icon — all owned by the retired right-panel file surface.
Sidebar.logic.ts, Sidebar.tsx	Kept both imports; upstream's cursor-pointer with Marcode's text-xs.
sidebar/SidebarChrome.tsx	Kept Marcode's footer. Upstream's whole delta was the footer nav and brand that FloatingPillNav owns.
ThreadTerminalDrawer.tsx	Kept Marcode's terminal chrome; adopted upstream's close confirmation and its terminal-background surface fix.
PullRequestListFilters.tsx, routes/_chat.pull-requests.tsx	Took upstream's shared Button trigger and its relocation of the refresh control, moving Marcode's tooltip onto the control's new home.
usage/UsagePage.tsx, routes/settings.tsx	Took upstream's move onto the shared WorkspacePageHeader; kept Marcode's tooltip on the refresh button.
index.css	Both blocks kept — they collided only on insertion point.
routes/__root.tsx	Render Marcode's DraftPromotionWatcherand upstream's new PlanAgentSelectionHeal.
threadSettled.ts	Took upstream's changeRequestAutoSettles signature and its activity anchor; kept Marcode's one-hour warm window on top.

Clean merges that would have broken on Marcode

Five upstream changes produced no conflict and would have shipped broken. Four were caught by a fork-identity sweep of the merged tree; the fifth was caught by CI.

1. macOS launch agent exported T3CODE_HOME. Marcode's launcher requires MARCODE_HOME and exits without it, so the background service would install and never start. Both unit renderers now export the same key, pinned by a test.
2. Launch agent label was com.t3tools.t3code.service, which would make a Marcode install and an upstream install the same launchd job — the macOS half of the coexistence rule the systemd unit already holds. Now app.marcode.service, pinned by a test.
3. New t3 triage CLI read T3CODE_HOME where every other Marcode entry point reads MARCODE_HOME.
4. Three new CI jobs (Test Server, Rust, Mobile Native Changes) arrived with Blacksmith runner labels the fork cannot schedule — they would have queued forever. Remapped to ubuntu-24.04, and an upstream test still asserting systemctl --user disable --now t3code.service was corrected to marcode.service.
5. Upstream's test-suite split moved apps/server's tests out from under Marcode's ripgrep install step (49471f6f). WorkspaceFileSystem.searchContent shells out to ripgrep, which the runner image does not carry; the step stayed on test, a job that now explicitly excludes t3, so the two searchContent tests ran without it and returned zero matches. Reproduced locally by hiding rg — same two assertions fail, 25/25 pass with it present.

Fork pins updated

• workspaceTitlebar.fork.test.ts — upstream moved settings and usage onto the shared header, which hardcodes the collapsed-sidebar inset. Marcode carries its sidebarless inset forward as a sidebarless prop on that shared header; the test now pins both halves (the header honouring the flag, and each route passing it).
• upstream-sync-workflow.test.ts — two pins were too narrow. The CI runner pin asserted an exact four-job list, so upstream adding a job broke it for the wrong reason; it now asserts that no job carries a label the fork cannot schedule. The ripgrep pin named ci.jobs.test by hand, so the test-suite split moved the search tests out from under it while the assertion stayed green and CI went red; it now derives the job list from the workflow — any job running package tests without excluding t3 must install ripgrep — and was verified to fail, naming the offending job, by removing the step.
• SettingsSidebarNav.tsx — restored Marcode's page-level Back row after upstream replaced it with the SidebarUtilityMenu this fork does not mount.

Coupled subtrees:pnpm-workspace.yaml moved only Clerk versions; the Effect catalog and infra/relay/package.json are unchanged, so no vendored subtree sync is due.

Why

The scheduled sync found 75 new upstream commits with a conflicted delta, which the automation deliberately refuses to resolve. This is the hand-resolved integration branch that policy calls for: it keeps upstream's correctness, security and dependency work while preserving Marcode's floating navigation shell, retired right-panel file surfaces, unified workspace sidebar, and service identity.

Hotspot paths were treated as mandatory-review, not automatic keep-Marcode: upstream's macOS launchd support, terminal close confirmation, tab mute control, add-surface shortcuts, shared page header, and settled-thread activity anchor all landed inside customized files and were all taken.

UI Changes

Not captured. This merge touches several web surfaces (composer drawers, right-panel tabs, usage page, settings and pull-request headers, terminal chrome). The runbook's live-client pass has not been run in this environment, so before/after evidence still has to be produced — see Verification. Keeping the PR in draft until that lands.

Verification

CI green on 49471f6f — all four required checks (Check, Test, Mobile Native Static Analysis, Release Smoke) plus the new Test Server 1/2/3, Rust, and Mobile Native Changes. The thread-transfer budget report is within every ceiling.

Run locally (focused, per AGENTS.md):

• vp test run over the touched surfaces, all passing: fork pins (workspaceTitlebar.fork, SidebarChrome.fork, upstream-sync-workflow), threadSettled, boot service / service launcher / service CLI, right panel store, the seven composer suites, RightPanelTabs, UsagePage, Sidebar.logic, ChatView.logic, threadActionMenu.logic, -chatIndexTitlebar, editor surface and open-floating-file, GitActionsControl.logic, shared/git, contracts/settings, contracts/orchestration, client-runtime/operations/projects.
• vp run --filter typecheck: @t3tools/web, @t3tools/client-runtime, t3, @t3tools/contracts, @t3tools/shared — all clean.
• vp fmt --check on the changed files, vp lint on apps/web/src, apps/server/src, packages/client-runtime/src, scripts — clean (warnings only, all pre-existing patterns).

Not verified:

• Live web/mobile client verification, and the branding-asset check the runbook asks for on UI hotspots.
• ThreadTerminalDrawer.test.ts could not run in the sync container (@aliimam/icons@1.1.3 ships a main pointing at a dist/index.cjs its tarball lacks). It passes in CI, which covers it.

Follow-up, not done here

Two pre-existing issues this PR surfaces but deliberately does not widen into:

1. Native fingerprint diff will sit queued forever..github/workflows/mobile-fingerprint-check.yml is unchanged by this merge but still carries runs-on: blacksmith-8vcpu-ubuntu-2404, and the fork has no Blacksmith installation — the same class of break as item 4 above. It is advisory (the check is advisory: it always passes, the label is the signal) and not in requiredPullRequestChecks, so it leaves the PR unstable rather than blocked. Proposed patch: runs-on: ubuntu-24.04. Its only stated resource need is NODE_OPTIONS=--max-old-space-size=8192, and the GitHub-hosted image has 16 GB RAM, so the 8 GB heap fits — it will just be slower on 4 vCPU. Left alone here because the runbook says to audit those workflows individually rather than sweep the labels, and this one is not part of the upstream delta.
2. The new upstream t3 triage CLI ships a playbook that names "T3 Code" throughout and points users at github.com/pingdotgg/t3code for filing issues. Only the functional MARCODE_HOME break was fixed; whether Marcode wants its own triage playbook and issue tracker is a product decision, and rebranding a 200-line upstream-owned file would widen this sync.

Checklist

• This PR is small and focused — one concern: the upstream merge
• I explained what changed and why
• I included before/after screenshots for any UI changes — pending live-client pass
• I included a video for animation/interaction changes — n/a

[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	+850 B (+6.6%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+619 B (+9.6%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+231 B (+3.6%)	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.5 KiB	+873 B (+6.8%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+632 B (+9.8%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.6 KiB	+241 B (+3.7%)	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: 49471f6 · 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

Merged pingdotgg/t3code@be7d35aa into Marcode — 75 upstream commits across 24 conflicted paths, resolved by hand. Draft on purpose: CI is green, but the live-client verification the runbook asks for on UI hotspots has not been run.

Conflict decisions

Path	Decision
AGENTS.md	Kept Marcode's structure. Adopted upstream's new Plans and work artifacts policy and its "never commit PR-only assets" rule. Dropped upstream's duplicate Verifying / Pull requests sections (Marcode has its own) and the user-count blurb.
.plans/effect-atom.md	Accepted upstream's deletion — Marcode's only edit was an identifier cleanup in a file upstream retired repo-wide.
.github/workflows/ci.yml	Took upstream's mobile-native change gate; kept Marcode's GitHub-hosted runner. See silent breaks below for the new jobs.
apps/server/src/cli/{connect,service}.ts	Adopted upstream's macOS launchd support and platform-aware copy, rendered in Marcode's voice.
apps/web/src/components/files/{FileBrowserPanel,FilePreviewPanel}.tsx	Kept deleted. Upstream's refresh fix (pingdotgg#7490) targets the right-panel file surface Marcode retired; the floating editor's file tree has no refresh control, so there is no sibling to port it to.
ChatView.tsx	Kept Marcode's title-only ChatHeader and container-level panelLayoutControls, closing with upstream's WorkspacePageHeader. Composer shell keeps Marcode's transparent glass and takes upstream's attached-drawer modifier.
chat/ChatComposer.tsx	Took upstream's new composer top drawer; re-applied Marcode's glass surface to the relocated composer surface div.
chat/ChatHeader.tsx	Kept Marcode's cluster. Upstream's inline rename and thread action menu belong to a header Marcode does not render, and those actions already have an entry point on the sidebar row.
chat/ComposerPendingApprovalPanel.tsx	Took upstream's inline code chip. Marcode's only divergence was typography on a label the redesign removes.
chat/MessagesTimeline.tsx	Upstream's dropped -mx-1 plus Marcode's text-sm.
RightPanelTabs.tsx	Adopted upstream's tab mute control and add-surface keyboard shortcuts. Dropped the file-tab copy-path action, the Files surface and its icon — all owned by the retired right-panel file surface.
Sidebar.logic.ts, Sidebar.tsx	Kept both imports; upstream's cursor-pointer with Marcode's text-xs.
sidebar/SidebarChrome.tsx	Kept Marcode's footer. Upstream's whole delta was the footer nav and brand that FloatingPillNav owns.
ThreadTerminalDrawer.tsx	Kept Marcode's terminal chrome; adopted upstream's close confirmation and its terminal-background surface fix.
PullRequestListFilters.tsx, routes/_chat.pull-requests.tsx	Took upstream's shared Button trigger and its relocation of the refresh control, moving Marcode's tooltip onto the control's new home.
usage/UsagePage.tsx, routes/settings.tsx	Took upstream's move onto the shared WorkspacePageHeader; kept Marcode's tooltip on the refresh button.
index.css	Both blocks kept — they collided only on insertion point.
routes/__root.tsx	Render Marcode's DraftPromotionWatcherand upstream's new PlanAgentSelectionHeal.
threadSettled.ts	Took upstream's changeRequestAutoSettles signature and its activity anchor; kept Marcode's one-hour warm window on top.

Clean merges that would have broken on Marcode

Five upstream changes produced no conflict and would have shipped broken. Four were caught by a fork-identity sweep of the merged tree; the fifth was caught by CI.

1. macOS launch agent exported T3CODE_HOME. Marcode's launcher requires MARCODE_HOME and exits without it, so the background service would install and never start. Both unit renderers now export the same key, pinned by a test.
2. Launch agent label was com.t3tools.t3code.service, which would make a Marcode install and an upstream install the same launchd job — the macOS half of the coexistence rule the systemd unit already holds. Now app.marcode.service, pinned by a test.
3. New t3 triage CLI read T3CODE_HOME where every other Marcode entry point reads MARCODE_HOME.
4. Three new CI jobs (Test Server, Rust, Mobile Native Changes) arrived with Blacksmith runner labels the fork cannot schedule — they would have queued forever. Remapped to ubuntu-24.04, and an upstream test still asserting systemctl --user disable --now t3code.service was corrected to marcode.service.
5. Upstream's test-suite split moved apps/server's tests out from under Marcode's ripgrep install step (49471f6f). WorkspaceFileSystem.searchContent shells out to ripgrep, which the runner image does not carry; the step stayed on test, a job that now explicitly excludes t3, so the two searchContent tests ran without it and returned zero matches. Reproduced locally by hiding rg — same two assertions fail, 25/25 pass with it present.

Fork pins updated

• workspaceTitlebar.fork.test.ts — upstream moved settings and usage onto the shared header, which hardcodes the collapsed-sidebar inset. Marcode carries its sidebarless inset forward as a sidebarless prop on that shared header; the test now pins both halves (the header honouring the flag, and each route passing it).
• upstream-sync-workflow.test.ts — two pins were too narrow. The CI runner pin asserted an exact four-job list, so upstream adding a job broke it for the wrong reason; it now asserts that no job carries a label the fork cannot schedule. The ripgrep pin named ci.jobs.test by hand, so the test-suite split moved the search tests out from under it while the assertion stayed green and CI went red; it now derives the job list from the workflow — any job running package tests without excluding t3 must install ripgrep — and was verified to fail, naming the offending job, by removing the step.
• SettingsSidebarNav.tsx — restored Marcode's page-level Back row after upstream replaced it with the SidebarUtilityMenu this fork does not mount.

Coupled subtrees:pnpm-workspace.yaml moved only Clerk versions; the Effect catalog and infra/relay/package.json are unchanged, so no vendored subtree sync is due.

Why

The scheduled sync found 75 new upstream commits with a conflicted delta, which the automation deliberately refuses to resolve. This is the hand-resolved integration branch that policy calls for: it keeps upstream's correctness, security and dependency work while preserving Marcode's floating navigation shell, retired right-panel file surfaces, unified workspace sidebar, and service identity.

Hotspot paths were treated as mandatory-review, not automatic keep-Marcode: upstream's macOS launchd support, terminal close confirmation, tab mute control, add-surface shortcuts, shared page header, and settled-thread activity anchor all landed inside customized files and were all taken.

UI Changes

Not captured. This merge touches several web surfaces (composer drawers, right-panel tabs, usage page, settings and pull-request headers, terminal chrome). The runbook's live-client pass has not been run in this environment, so before/after evidence still has to be produced — see Verification. Keeping the PR in draft until that lands.

Verification

CI green on 49471f6f — all four required checks (Check, Test, Mobile Native Static Analysis, Release Smoke) plus the new Test Server 1/2/3, Rust, and Mobile Native Changes. The thread-transfer budget report is within every ceiling.

Run locally (focused, per AGENTS.md):

• vp test run over the touched surfaces, all passing: fork pins (workspaceTitlebar.fork, SidebarChrome.fork, upstream-sync-workflow), threadSettled, boot service / service launcher / service CLI, right panel store, the seven composer suites, RightPanelTabs, UsagePage, Sidebar.logic, ChatView.logic, threadActionMenu.logic, -chatIndexTitlebar, editor surface and open-floating-file, GitActionsControl.logic, shared/git, contracts/settings, contracts/orchestration, client-runtime/operations/projects.
• vp run --filter typecheck: @t3tools/web, @t3tools/client-runtime, t3, @t3tools/contracts, @t3tools/shared — all clean.
• vp fmt --check on the changed files, vp lint on apps/web/src, apps/server/src, packages/client-runtime/src, scripts — clean (warnings only, all pre-existing patterns).

Not verified:

• Live web/mobile client verification, and the branding-asset check the runbook asks for on UI hotspots.
• ThreadTerminalDrawer.test.ts could not run in the sync container (@aliimam/icons@1.1.3 ships a main pointing at a dist/index.cjs its tarball lacks). It passes in CI, which covers it.

Follow-up, not done here

Two pre-existing issues this PR surfaces but deliberately does not widen into:

1. Native fingerprint diff will sit queued forever..github/workflows/mobile-fingerprint-check.yml is unchanged by this merge but still carries runs-on: blacksmith-8vcpu-ubuntu-2404, and the fork has no Blacksmith installation — the same class of break as item 4 above. It is advisory (the check is advisory: it always passes, the label is the signal) and not in requiredPullRequestChecks, so it leaves the PR unstable rather than blocked. Proposed patch: runs-on: ubuntu-24.04. Its only stated resource need is NODE_OPTIONS=--max-old-space-size=8192, and the GitHub-hosted image has 16 GB RAM, so the 8 GB heap fits — it will just be slower on 4 vCPU. Left alone here because the runbook says to audit those workflows individually rather than sweep the labels, and this one is not part of the upstream delta.
2. The new upstream t3 triage CLI ships a playbook that names "T3 Code" throughout and points users at github.com/pingdotgg/t3code for filing issues. Only the functional MARCODE_HOME break was fixed; whether Marcode wants its own triage playbook and issue tracker is a product decision, and rebranding a 200-line upstream-owned file would widen this sync.

Checklist

• This PR is small and focused — one concern: the upstream merge
• I explained what changed and why
• I included before/after screenshots for any UI changes — pending live-client pass
• I included a video for animation/interaction changes — n/a

[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	+850 B (+6.6%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+619 B (+9.6%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+231 B (+3.6%)	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.5 KiB	+873 B (+6.8%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+632 B (+9.8%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.6 KiB	+241 B (+3.7%)	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: 49471f6 · 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

Merged pingdotgg/t3code@be7d35aa into Marcode — 75 upstream commits across 24 conflicted paths, resolved by hand. Draft on purpose: CI is green, but the live-client verification the runbook asks for on UI hotspots has not been run.

Conflict decisions

Path	Decision
AGENTS.md	Kept Marcode's structure. Adopted upstream's new Plans and work artifacts policy and its "never commit PR-only assets" rule. Dropped upstream's duplicate Verifying / Pull requests sections (Marcode has its own) and the user-count blurb.
.plans/effect-atom.md	Accepted upstream's deletion — Marcode's only edit was an identifier cleanup in a file upstream retired repo-wide.
.github/workflows/ci.yml	Took upstream's mobile-native change gate; kept Marcode's GitHub-hosted runner. See silent breaks below for the new jobs.
apps/server/src/cli/{connect,service}.ts	Adopted upstream's macOS launchd support and platform-aware copy, rendered in Marcode's voice.
apps/web/src/components/files/{FileBrowserPanel,FilePreviewPanel}.tsx	Kept deleted. Upstream's refresh fix (pingdotgg#7490) targets the right-panel file surface Marcode retired; the floating editor's file tree has no refresh control, so there is no sibling to port it to.
ChatView.tsx	Kept Marcode's title-only ChatHeader and container-level panelLayoutControls, closing with upstream's WorkspacePageHeader. Composer shell keeps Marcode's transparent glass and takes upstream's attached-drawer modifier.
chat/ChatComposer.tsx	Took upstream's new composer top drawer; re-applied Marcode's glass surface to the relocated composer surface div.
chat/ChatHeader.tsx	Kept Marcode's cluster. Upstream's inline rename and thread action menu belong to a header Marcode does not render, and those actions already have an entry point on the sidebar row.
chat/ComposerPendingApprovalPanel.tsx	Took upstream's inline code chip. Marcode's only divergence was typography on a label the redesign removes.
chat/MessagesTimeline.tsx	Upstream's dropped -mx-1 plus Marcode's text-sm.
RightPanelTabs.tsx	Adopted upstream's tab mute control and add-surface keyboard shortcuts. Dropped the file-tab copy-path action, the Files surface and its icon — all owned by the retired right-panel file surface.
Sidebar.logic.ts, Sidebar.tsx	Kept both imports; upstream's cursor-pointer with Marcode's text-xs.
sidebar/SidebarChrome.tsx	Kept Marcode's footer. Upstream's whole delta was the footer nav and brand that FloatingPillNav owns.
ThreadTerminalDrawer.tsx	Kept Marcode's terminal chrome; adopted upstream's close confirmation and its terminal-background surface fix.
PullRequestListFilters.tsx, routes/_chat.pull-requests.tsx	Took upstream's shared Button trigger and its relocation of the refresh control, moving Marcode's tooltip onto the control's new home.
usage/UsagePage.tsx, routes/settings.tsx	Took upstream's move onto the shared WorkspacePageHeader; kept Marcode's tooltip on the refresh button.
index.css	Both blocks kept — they collided only on insertion point.
routes/__root.tsx	Render Marcode's DraftPromotionWatcherand upstream's new PlanAgentSelectionHeal.
threadSettled.ts	Took upstream's changeRequestAutoSettles signature and its activity anchor; kept Marcode's one-hour warm window on top.

Clean merges that would have broken on Marcode

Five upstream changes produced no conflict and would have shipped broken. Four were caught by a fork-identity sweep of the merged tree; the fifth was caught by CI.

1. macOS launch agent exported T3CODE_HOME. Marcode's launcher requires MARCODE_HOME and exits without it, so the background service would install and never start. Both unit renderers now export the same key, pinned by a test.
2. Launch agent label was com.t3tools.t3code.service, which would make a Marcode install and an upstream install the same launchd job — the macOS half of the coexistence rule the systemd unit already holds. Now app.marcode.service, pinned by a test.
3. New t3 triage CLI read T3CODE_HOME where every other Marcode entry point reads MARCODE_HOME.
4. Three new CI jobs (Test Server, Rust, Mobile Native Changes) arrived with Blacksmith runner labels the fork cannot schedule — they would have queued forever. Remapped to ubuntu-24.04, and an upstream test still asserting systemctl --user disable --now t3code.service was corrected to marcode.service.
5. Upstream's test-suite split moved apps/server's tests out from under Marcode's ripgrep install step (49471f6f). WorkspaceFileSystem.searchContent shells out to ripgrep, which the runner image does not carry; the step stayed on test, a job that now explicitly excludes t3, so the two searchContent tests ran without it and returned zero matches. Reproduced locally by hiding rg — same two assertions fail, 25/25 pass with it present.

Fork pins updated

• workspaceTitlebar.fork.test.ts — upstream moved settings and usage onto the shared header, which hardcodes the collapsed-sidebar inset. Marcode carries its sidebarless inset forward as a sidebarless prop on that shared header; the test now pins both halves (the header honouring the flag, and each route passing it).
• upstream-sync-workflow.test.ts — two pins were too narrow. The CI runner pin asserted an exact four-job list, so upstream adding a job broke it for the wrong reason; it now asserts that no job carries a label the fork cannot schedule. The ripgrep pin named ci.jobs.test by hand, so the test-suite split moved the search tests out from under it while the assertion stayed green and CI went red; it now derives the job list from the workflow — any job running package tests without excluding t3 must install ripgrep — and was verified to fail, naming the offending job, by removing the step.
• SettingsSidebarNav.tsx — restored Marcode's page-level Back row after upstream replaced it with the SidebarUtilityMenu this fork does not mount.

Coupled subtrees:pnpm-workspace.yaml moved only Clerk versions; the Effect catalog and infra/relay/package.json are unchanged, so no vendored subtree sync is due.

Why

The scheduled sync found 75 new upstream commits with a conflicted delta, which the automation deliberately refuses to resolve. This is the hand-resolved integration branch that policy calls for: it keeps upstream's correctness, security and dependency work while preserving Marcode's floating navigation shell, retired right-panel file surfaces, unified workspace sidebar, and service identity.

Hotspot paths were treated as mandatory-review, not automatic keep-Marcode: upstream's macOS launchd support, terminal close confirmation, tab mute control, add-surface shortcuts, shared page header, and settled-thread activity anchor all landed inside customized files and were all taken.

UI Changes

Not captured. This merge touches several web surfaces (composer drawers, right-panel tabs, usage page, settings and pull-request headers, terminal chrome). The runbook's live-client pass has not been run in this environment, so before/after evidence still has to be produced — see Verification. Keeping the PR in draft until that lands.

Verification

CI green on 49471f6f — all four required checks (Check, Test, Mobile Native Static Analysis, Release Smoke) plus the new Test Server 1/2/3, Rust, and Mobile Native Changes. The thread-transfer budget report is within every ceiling.

Run locally (focused, per AGENTS.md):

• vp test run over the touched surfaces, all passing: fork pins (workspaceTitlebar.fork, SidebarChrome.fork, upstream-sync-workflow), threadSettled, boot service / service launcher / service CLI, right panel store, the seven composer suites, RightPanelTabs, UsagePage, Sidebar.logic, ChatView.logic, threadActionMenu.logic, -chatIndexTitlebar, editor surface and open-floating-file, GitActionsControl.logic, shared/git, contracts/settings, contracts/orchestration, client-runtime/operations/projects.
• vp run --filter typecheck: @t3tools/web, @t3tools/client-runtime, t3, @t3tools/contracts, @t3tools/shared — all clean.
• vp fmt --check on the changed files, vp lint on apps/web/src, apps/server/src, packages/client-runtime/src, scripts — clean (warnings only, all pre-existing patterns).

Not verified:

• Live web/mobile client verification, and the branding-asset check the runbook asks for on UI hotspots.
• ThreadTerminalDrawer.test.ts could not run in the sync container (@aliimam/icons@1.1.3 ships a main pointing at a dist/index.cjs its tarball lacks). It passes in CI, which covers it.

Follow-up, not done here

Two pre-existing issues this PR surfaces but deliberately does not widen into:

1. Native fingerprint diff will sit queued forever..github/workflows/mobile-fingerprint-check.yml is unchanged by this merge but still carries runs-on: blacksmith-8vcpu-ubuntu-2404, and the fork has no Blacksmith installation — the same class of break as item 4 above. It is advisory (the check is advisory: it always passes, the label is the signal) and not in requiredPullRequestChecks, so it leaves the PR unstable rather than blocked. Proposed patch: runs-on: ubuntu-24.04. Its only stated resource need is NODE_OPTIONS=--max-old-space-size=8192, and the GitHub-hosted image has 16 GB RAM, so the 8 GB heap fits — it will just be slower on 4 vCPU. Left alone here because the runbook says to audit those workflows individually rather than sweep the labels, and this one is not part of the upstream delta.
2. The new upstream t3 triage CLI ships a playbook that names "T3 Code" throughout and points users at github.com/pingdotgg/t3code for filing issues. Only the functional MARCODE_HOME break was fixed; whether Marcode wants its own triage playbook and issue tracker is a product decision, and rebranding a 200-line upstream-owned file would widen this sync.

Checklist

• This PR is small and focused — one concern: the upstream merge
• I explained what changed and why
• I included before/after screenshots for any UI changes — pending live-client pass
• I included a video for animation/interaction changes — n/a

[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	+850 B (+6.6%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+619 B (+9.6%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+231 B (+3.6%)	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.5 KiB	+873 B (+6.8%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+632 B (+9.8%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.6 KiB	+241 B (+3.7%)	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: 49471f6 · 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

Merged pingdotgg/t3code@be7d35aa into Marcode — 75 upstream commits across 24 conflicted paths, resolved by hand. Draft on purpose: CI is green, but the live-client verification the runbook asks for on UI hotspots has not been run.

Conflict decisions

Path	Decision
AGENTS.md	Kept Marcode's structure. Adopted upstream's new Plans and work artifacts policy and its "never commit PR-only assets" rule. Dropped upstream's duplicate Verifying / Pull requests sections (Marcode has its own) and the user-count blurb.
.plans/effect-atom.md	Accepted upstream's deletion — Marcode's only edit was an identifier cleanup in a file upstream retired repo-wide.
.github/workflows/ci.yml	Took upstream's mobile-native change gate; kept Marcode's GitHub-hosted runner. See silent breaks below for the new jobs.
apps/server/src/cli/{connect,service}.ts	Adopted upstream's macOS launchd support and platform-aware copy, rendered in Marcode's voice.
apps/web/src/components/files/{FileBrowserPanel,FilePreviewPanel}.tsx	Kept deleted. Upstream's refresh fix (pingdotgg#7490) targets the right-panel file surface Marcode retired; the floating editor's file tree has no refresh control, so there is no sibling to port it to.
ChatView.tsx	Kept Marcode's title-only ChatHeader and container-level panelLayoutControls, closing with upstream's WorkspacePageHeader. Composer shell keeps Marcode's transparent glass and takes upstream's attached-drawer modifier.
chat/ChatComposer.tsx	Took upstream's new composer top drawer; re-applied Marcode's glass surface to the relocated composer surface div.
chat/ChatHeader.tsx	Kept Marcode's cluster. Upstream's inline rename and thread action menu belong to a header Marcode does not render, and those actions already have an entry point on the sidebar row.
chat/ComposerPendingApprovalPanel.tsx	Took upstream's inline code chip. Marcode's only divergence was typography on a label the redesign removes.
chat/MessagesTimeline.tsx	Upstream's dropped -mx-1 plus Marcode's text-sm.
RightPanelTabs.tsx	Adopted upstream's tab mute control and add-surface keyboard shortcuts. Dropped the file-tab copy-path action, the Files surface and its icon — all owned by the retired right-panel file surface.
Sidebar.logic.ts, Sidebar.tsx	Kept both imports; upstream's cursor-pointer with Marcode's text-xs.
sidebar/SidebarChrome.tsx	Kept Marcode's footer. Upstream's whole delta was the footer nav and brand that FloatingPillNav owns.
ThreadTerminalDrawer.tsx	Kept Marcode's terminal chrome; adopted upstream's close confirmation and its terminal-background surface fix.
PullRequestListFilters.tsx, routes/_chat.pull-requests.tsx	Took upstream's shared Button trigger and its relocation of the refresh control, moving Marcode's tooltip onto the control's new home.
usage/UsagePage.tsx, routes/settings.tsx	Took upstream's move onto the shared WorkspacePageHeader; kept Marcode's tooltip on the refresh button.
index.css	Both blocks kept — they collided only on insertion point.
routes/__root.tsx	Render Marcode's DraftPromotionWatcherand upstream's new PlanAgentSelectionHeal.
threadSettled.ts	Took upstream's changeRequestAutoSettles signature and its activity anchor; kept Marcode's one-hour warm window on top.

Clean merges that would have broken on Marcode

Five upstream changes produced no conflict and would have shipped broken. Four were caught by a fork-identity sweep of the merged tree; the fifth was caught by CI.

1. macOS launch agent exported T3CODE_HOME. Marcode's launcher requires MARCODE_HOME and exits without it, so the background service would install and never start. Both unit renderers now export the same key, pinned by a test.
2. Launch agent label was com.t3tools.t3code.service, which would make a Marcode install and an upstream install the same launchd job — the macOS half of the coexistence rule the systemd unit already holds. Now app.marcode.service, pinned by a test.
3. New t3 triage CLI read T3CODE_HOME where every other Marcode entry point reads MARCODE_HOME.
4. Three new CI jobs (Test Server, Rust, Mobile Native Changes) arrived with Blacksmith runner labels the fork cannot schedule — they would have queued forever. Remapped to ubuntu-24.04, and an upstream test still asserting systemctl --user disable --now t3code.service was corrected to marcode.service.
5. Upstream's test-suite split moved apps/server's tests out from under Marcode's ripgrep install step (49471f6f). WorkspaceFileSystem.searchContent shells out to ripgrep, which the runner image does not carry; the step stayed on test, a job that now explicitly excludes t3, so the two searchContent tests ran without it and returned zero matches. Reproduced locally by hiding rg — same two assertions fail, 25/25 pass with it present.

Fork pins updated

• workspaceTitlebar.fork.test.ts — upstream moved settings and usage onto the shared header, which hardcodes the collapsed-sidebar inset. Marcode carries its sidebarless inset forward as a sidebarless prop on that shared header; the test now pins both halves (the header honouring the flag, and each route passing it).
• upstream-sync-workflow.test.ts — two pins were too narrow. The CI runner pin asserted an exact four-job list, so upstream adding a job broke it for the wrong reason; it now asserts that no job carries a label the fork cannot schedule. The ripgrep pin named ci.jobs.test by hand, so the test-suite split moved the search tests out from under it while the assertion stayed green and CI went red; it now derives the job list from the workflow — any job running package tests without excluding t3 must install ripgrep — and was verified to fail, naming the offending job, by removing the step.
• SettingsSidebarNav.tsx — restored Marcode's page-level Back row after upstream replaced it with the SidebarUtilityMenu this fork does not mount.

Coupled subtrees:pnpm-workspace.yaml moved only Clerk versions; the Effect catalog and infra/relay/package.json are unchanged, so no vendored subtree sync is due.

Why

The scheduled sync found 75 new upstream commits with a conflicted delta, which the automation deliberately refuses to resolve. This is the hand-resolved integration branch that policy calls for: it keeps upstream's correctness, security and dependency work while preserving Marcode's floating navigation shell, retired right-panel file surfaces, unified workspace sidebar, and service identity.

Hotspot paths were treated as mandatory-review, not automatic keep-Marcode: upstream's macOS launchd support, terminal close confirmation, tab mute control, add-surface shortcuts, shared page header, and settled-thread activity anchor all landed inside customized files and were all taken.

UI Changes

Not captured. This merge touches several web surfaces (composer drawers, right-panel tabs, usage page, settings and pull-request headers, terminal chrome). The runbook's live-client pass has not been run in this environment, so before/after evidence still has to be produced — see Verification. Keeping the PR in draft until that lands.

Verification

CI green on 49471f6f — all four required checks (Check, Test, Mobile Native Static Analysis, Release Smoke) plus the new Test Server 1/2/3, Rust, and Mobile Native Changes. The thread-transfer budget report is within every ceiling.

Run locally (focused, per AGENTS.md):

• vp test run over the touched surfaces, all passing: fork pins (workspaceTitlebar.fork, SidebarChrome.fork, upstream-sync-workflow), threadSettled, boot service / service launcher / service CLI, right panel store, the seven composer suites, RightPanelTabs, UsagePage, Sidebar.logic, ChatView.logic, threadActionMenu.logic, -chatIndexTitlebar, editor surface and open-floating-file, GitActionsControl.logic, shared/git, contracts/settings, contracts/orchestration, client-runtime/operations/projects.
• vp run --filter typecheck: @t3tools/web, @t3tools/client-runtime, t3, @t3tools/contracts, @t3tools/shared — all clean.
• vp fmt --check on the changed files, vp lint on apps/web/src, apps/server/src, packages/client-runtime/src, scripts — clean (warnings only, all pre-existing patterns).

Not verified:

• Live web/mobile client verification, and the branding-asset check the runbook asks for on UI hotspots.
• ThreadTerminalDrawer.test.ts could not run in the sync container (@aliimam/icons@1.1.3 ships a main pointing at a dist/index.cjs its tarball lacks). It passes in CI, which covers it.

Follow-up, not done here

Two pre-existing issues this PR surfaces but deliberately does not widen into:

1. Native fingerprint diff will sit queued forever..github/workflows/mobile-fingerprint-check.yml is unchanged by this merge but still carries runs-on: blacksmith-8vcpu-ubuntu-2404, and the fork has no Blacksmith installation — the same class of break as item 4 above. It is advisory (the check is advisory: it always passes, the label is the signal) and not in requiredPullRequestChecks, so it leaves the PR unstable rather than blocked. Proposed patch: runs-on: ubuntu-24.04. Its only stated resource need is NODE_OPTIONS=--max-old-space-size=8192, and the GitHub-hosted image has 16 GB RAM, so the 8 GB heap fits — it will just be slower on 4 vCPU. Left alone here because the runbook says to audit those workflows individually rather than sweep the labels, and this one is not part of the upstream delta.
2. The new upstream t3 triage CLI ships a playbook that names "T3 Code" throughout and points users at github.com/pingdotgg/t3code for filing issues. Only the functional MARCODE_HOME break was fixed; whether Marcode wants its own triage playbook and issue tracker is a product decision, and rebranding a 200-line upstream-owned file would widen this sync.

Checklist

• This PR is small and focused — one concern: the upstream merge
• I explained what changed and why
• I included before/after screenshots for any UI changes — pending live-client pass
• I included a video for animation/interaction changes — n/a

[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	+850 B (+6.6%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+619 B (+9.6%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+231 B (+3.6%)	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.5 KiB	+873 B (+6.8%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+632 B (+9.8%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.6 KiB	+241 B (+3.7%)	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: 49471f6 · 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

Merged pingdotgg/t3code@be7d35aa into Marcode — 75 upstream commits across 24 conflicted paths, resolved by hand. Draft on purpose: CI is green, but the live-client verification the runbook asks for on UI hotspots has not been run.

Conflict decisions

Path	Decision
AGENTS.md	Kept Marcode's structure. Adopted upstream's new Plans and work artifacts policy and its "never commit PR-only assets" rule. Dropped upstream's duplicate Verifying / Pull requests sections (Marcode has its own) and the user-count blurb.
.plans/effect-atom.md	Accepted upstream's deletion — Marcode's only edit was an identifier cleanup in a file upstream retired repo-wide.
.github/workflows/ci.yml	Took upstream's mobile-native change gate; kept Marcode's GitHub-hosted runner. See silent breaks below for the new jobs.
apps/server/src/cli/{connect,service}.ts	Adopted upstream's macOS launchd support and platform-aware copy, rendered in Marcode's voice.
apps/web/src/components/files/{FileBrowserPanel,FilePreviewPanel}.tsx	Kept deleted. Upstream's refresh fix (pingdotgg#7490) targets the right-panel file surface Marcode retired; the floating editor's file tree has no refresh control, so there is no sibling to port it to.
ChatView.tsx	Kept Marcode's title-only ChatHeader and container-level panelLayoutControls, closing with upstream's WorkspacePageHeader. Composer shell keeps Marcode's transparent glass and takes upstream's attached-drawer modifier.
chat/ChatComposer.tsx	Took upstream's new composer top drawer; re-applied Marcode's glass surface to the relocated composer surface div.
chat/ChatHeader.tsx	Kept Marcode's cluster. Upstream's inline rename and thread action menu belong to a header Marcode does not render, and those actions already have an entry point on the sidebar row.
chat/ComposerPendingApprovalPanel.tsx	Took upstream's inline code chip. Marcode's only divergence was typography on a label the redesign removes.
chat/MessagesTimeline.tsx	Upstream's dropped -mx-1 plus Marcode's text-sm.
RightPanelTabs.tsx	Adopted upstream's tab mute control and add-surface keyboard shortcuts. Dropped the file-tab copy-path action, the Files surface and its icon — all owned by the retired right-panel file surface.
Sidebar.logic.ts, Sidebar.tsx	Kept both imports; upstream's cursor-pointer with Marcode's text-xs.
sidebar/SidebarChrome.tsx	Kept Marcode's footer. Upstream's whole delta was the footer nav and brand that FloatingPillNav owns.
ThreadTerminalDrawer.tsx	Kept Marcode's terminal chrome; adopted upstream's close confirmation and its terminal-background surface fix.
PullRequestListFilters.tsx, routes/_chat.pull-requests.tsx	Took upstream's shared Button trigger and its relocation of the refresh control, moving Marcode's tooltip onto the control's new home.
usage/UsagePage.tsx, routes/settings.tsx	Took upstream's move onto the shared WorkspacePageHeader; kept Marcode's tooltip on the refresh button.
index.css	Both blocks kept — they collided only on insertion point.
routes/__root.tsx	Render Marcode's DraftPromotionWatcherand upstream's new PlanAgentSelectionHeal.
threadSettled.ts	Took upstream's changeRequestAutoSettles signature and its activity anchor; kept Marcode's one-hour warm window on top.

Clean merges that would have broken on Marcode

Five upstream changes produced no conflict and would have shipped broken. Four were caught by a fork-identity sweep of the merged tree; the fifth was caught by CI.

1. macOS launch agent exported T3CODE_HOME. Marcode's launcher requires MARCODE_HOME and exits without it, so the background service would install and never start. Both unit renderers now export the same key, pinned by a test.
2. Launch agent label was com.t3tools.t3code.service, which would make a Marcode install and an upstream install the same launchd job — the macOS half of the coexistence rule the systemd unit already holds. Now app.marcode.service, pinned by a test.
3. New t3 triage CLI read T3CODE_HOME where every other Marcode entry point reads MARCODE_HOME.
4. Three new CI jobs (Test Server, Rust, Mobile Native Changes) arrived with Blacksmith runner labels the fork cannot schedule — they would have queued forever. Remapped to ubuntu-24.04, and an upstream test still asserting systemctl --user disable --now t3code.service was corrected to marcode.service.
5. Upstream's test-suite split moved apps/server's tests out from under Marcode's ripgrep install step (49471f6f). WorkspaceFileSystem.searchContent shells out to ripgrep, which the runner image does not carry; the step stayed on test, a job that now explicitly excludes t3, so the two searchContent tests ran without it and returned zero matches. Reproduced locally by hiding rg — same two assertions fail, 25/25 pass with it present.

Fork pins updated

• workspaceTitlebar.fork.test.ts — upstream moved settings and usage onto the shared header, which hardcodes the collapsed-sidebar inset. Marcode carries its sidebarless inset forward as a sidebarless prop on that shared header; the test now pins both halves (the header honouring the flag, and each route passing it).
• upstream-sync-workflow.test.ts — two pins were too narrow. The CI runner pin asserted an exact four-job list, so upstream adding a job broke it for the wrong reason; it now asserts that no job carries a label the fork cannot schedule. The ripgrep pin named ci.jobs.test by hand, so the test-suite split moved the search tests out from under it while the assertion stayed green and CI went red; it now derives the job list from the workflow — any job running package tests without excluding t3 must install ripgrep — and was verified to fail, naming the offending job, by removing the step.
• SettingsSidebarNav.tsx — restored Marcode's page-level Back row after upstream replaced it with the SidebarUtilityMenu this fork does not mount.

Coupled subtrees:pnpm-workspace.yaml moved only Clerk versions; the Effect catalog and infra/relay/package.json are unchanged, so no vendored subtree sync is due.

Why

The scheduled sync found 75 new upstream commits with a conflicted delta, which the automation deliberately refuses to resolve. This is the hand-resolved integration branch that policy calls for: it keeps upstream's correctness, security and dependency work while preserving Marcode's floating navigation shell, retired right-panel file surfaces, unified workspace sidebar, and service identity.

Hotspot paths were treated as mandatory-review, not automatic keep-Marcode: upstream's macOS launchd support, terminal close confirmation, tab mute control, add-surface shortcuts, shared page header, and settled-thread activity anchor all landed inside customized files and were all taken.

UI Changes

Not captured. This merge touches several web surfaces (composer drawers, right-panel tabs, usage page, settings and pull-request headers, terminal chrome). The runbook's live-client pass has not been run in this environment, so before/after evidence still has to be produced — see Verification. Keeping the PR in draft until that lands.

Verification

CI green on 49471f6f — all four required checks (Check, Test, Mobile Native Static Analysis, Release Smoke) plus the new Test Server 1/2/3, Rust, and Mobile Native Changes. The thread-transfer budget report is within every ceiling.

Run locally (focused, per AGENTS.md):

• vp test run over the touched surfaces, all passing: fork pins (workspaceTitlebar.fork, SidebarChrome.fork, upstream-sync-workflow), threadSettled, boot service / service launcher / service CLI, right panel store, the seven composer suites, RightPanelTabs, UsagePage, Sidebar.logic, ChatView.logic, threadActionMenu.logic, -chatIndexTitlebar, editor surface and open-floating-file, GitActionsControl.logic, shared/git, contracts/settings, contracts/orchestration, client-runtime/operations/projects.
• vp run --filter typecheck: @t3tools/web, @t3tools/client-runtime, t3, @t3tools/contracts, @t3tools/shared — all clean.
• vp fmt --check on the changed files, vp lint on apps/web/src, apps/server/src, packages/client-runtime/src, scripts — clean (warnings only, all pre-existing patterns).

Not verified:

• Live web/mobile client verification, and the branding-asset check the runbook asks for on UI hotspots.
• ThreadTerminalDrawer.test.ts could not run in the sync container (@aliimam/icons@1.1.3 ships a main pointing at a dist/index.cjs its tarball lacks). It passes in CI, which covers it.

Follow-up, not done here

Two pre-existing issues this PR surfaces but deliberately does not widen into:

1. Native fingerprint diff will sit queued forever..github/workflows/mobile-fingerprint-check.yml is unchanged by this merge but still carries runs-on: blacksmith-8vcpu-ubuntu-2404, and the fork has no Blacksmith installation — the same class of break as item 4 above. It is advisory (the check is advisory: it always passes, the label is the signal) and not in requiredPullRequestChecks, so it leaves the PR unstable rather than blocked. Proposed patch: runs-on: ubuntu-24.04. Its only stated resource need is NODE_OPTIONS=--max-old-space-size=8192, and the GitHub-hosted image has 16 GB RAM, so the 8 GB heap fits — it will just be slower on 4 vCPU. Left alone here because the runbook says to audit those workflows individually rather than sweep the labels, and this one is not part of the upstream delta.
2. The new upstream t3 triage CLI ships a playbook that names "T3 Code" throughout and points users at github.com/pingdotgg/t3code for filing issues. Only the functional MARCODE_HOME break was fixed; whether Marcode wants its own triage playbook and issue tracker is a product decision, and rebranding a 200-line upstream-owned file would widen this sync.

Checklist

• This PR is small and focused — one concern: the upstream merge
• I explained what changed and why
• I included before/after screenshots for any UI changes — pending live-client pass
• I included a video for animation/interaction changes — n/a

[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	+850 B (+6.6%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+619 B (+9.6%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+231 B (+3.6%)	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.5 KiB	+873 B (+6.8%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+632 B (+9.8%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.6 KiB	+241 B (+3.7%)	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: 49471f6 · 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.