chore(upstream): sync marcode through b1670ac7

[maarco]

What Changed

Merges pingdotgg/t3code@b1670ac7 (111 upstream commits, merge base 82b8a938) into main as a
normal two-parent merge on claude/gracious-bohr-x80z9c. 27 conflicted paths were resolved by hand;
no file was taken wholesale from either side.

The full per-path decision record is in the merge commit body. The parts that need a reviewer's eye:

Fork-identity breaks that merged clean and would have failed silently

• apps/server/src/cloud/bootService.ts — upstream's new macOS launchd plist (feat(server): run the background service on macOS via launchd pingdotgg/t3code#6286) exports
  T3CODE_HOME. resolveLauncherBaseDir reads MARCODE_HOME and exits otherwise, so the launch
  agent would never have started a server. Renamed and pinned with a test.
• apps/server/src/cli/triage.ts — upstream's new t3 triage command (feat(cli): npx t3 triage hands broken installs to your own coding agent pingdotgg/t3code#6563) read T3CODE_HOME.
• apps/server/src/cloud/bootService.test.ts — an upstream assertion hardcoded
  systemctl --user disable --now t3code.service; Marcode's unit is marcode.service.
• docs/user/background-service.md — new upstream doc pointed users at
  ~/.config/systemd/user/t3code.service.
• apps/web/src/components/ChatView.tsx — upstream's cmd+enter background draft (feat(web): cmd+enter to create thread in background pingdotgg/t3code#7821) calls
  handleNewThread, which arrived in a hunk Marcode had restructured for the pill-nav header. It
  merged clean into a ChatView that never declared it (caught by typecheck).
• .github/workflows/ci.yml — upstream added three jobs (test_server, rust,
  mobile_native_changes) on its Blacksmith fleet, which this fork cannot schedule on. All mapped to
  GitHub-hosted runners. Upstream also sharded apps/server out of test into test_server, which
  moved WorkspaceFileSystem's tests away from Marcode's ripgrep install step — the step follows
  them.

Marcode contracts held, upstream fixes taken on top

• threadSettled.ts — took upstream's settle-only-once rule (fix(threads): a merged PR settles its thread only once pingdotgg/t3code#7454), kept Marcode's one-hour warm
  window on top, migrated the Marcode tests to the new changeRequest option shape.
• ThreadTerminalDrawer.tsx — kept Marcode's terminal chrome, routed all three of its close
  affordances through upstream's new confirm-before-close (feat(web): confirm before closing a terminal pingdotgg/t3code#7592).
• RightPanelTabs.tsx — took upstream's tab mute (feat(desktop): mute a browser tab pingdotgg/t3code#7252) and shortcut-driven add-surface menu
  (feat(web): add shortcuts to the surface dropdown pingdotgg/t3code#7318); dropped their copy-path action and "Files" entry, since Marcode has no right-panel file
  surface. The menu keeps Marcode's placement beside the surface list.
• settings.tsx / UsagePage.tsx — adopted upstream's WorkspacePageHeader (feat(web): unify workspace navigation pingdotgg/t3code#7153) and passed the
  sidebarless titlebar inset as an override; both routes mount no sidebar, so the header's
  collapsed-sidebar inset never matches.
• ChatHeader.tsx / SidebarChrome.tsx — kept Marcode's title-only header and update-pill-only
  footer against upstream's breadcrumb, inline rename, title action menu, and footer nav.
• Migration 041_AuthSessionClientConnection renumbered to 042; Marcode owns id 33, so shared
  migrations sit one id higher.

Tests added or rewritten to pin the boundary

• ChatHeader.fork.test.tsx (new) — the header renders the title alone: no breadcrumb, rename, or
  action menu.
• bootService.test.ts — the launchd plist exports MARCODE_HOME and no T3CODE_HOME.
• workspaceTitlebar.fork.test.ts — rewritten to follow upstream's header refactor: the drag region
  now lives in WorkspacePageHeader, and each sidebarless call site must supply the unconditional
  inset. (This test failed on the raw merge — the pin worked.)
• upstream-sync-workflow.test.ts — the two CI pins rewritten as invariants (no Blacksmith runner in
  ci.yml; whichever job runs --filter t3 test installs ripgrep) rather than positions, so they
  survive upstream adding jobs.
• Migrations.test.ts — extended to cover id 42.

Why

The daily upstream sync found 111 new commits. This is the reviewable merge; it is a draft because
the per-hotspot decisions above want a human read, and because two things still need attention:

• t3 triage points at upstream. The new apps/server/src/cli/triagePrompt.ts tells the user to
  search issues in pingdotgg/t3code, fetch PLAYBOOK.md from that repo, and file at
  github.com/pingdotgg/t3code/issues/new. Only the MARCODE_HOME read and the command description
  were retargeted — where Marcode users should file triage issues is a product call, and rewriting
  the whole playbook would be a large permanent edit surface in a brand-new upstream file.
• No live client verification. This container has no browser or simulator, so the web and mobile
  surfaces touched here (composer drawers, right-panel tabs, terminal chrome, usage redesign,
  settings/usage headers) have not been driven. Worth one pass with test-t3-app before this comes
  out of draft.

UI Changes

Not captured — this container cannot drive a client. Upstream's own UI work in this range (usage
insights redesign pingdotgg#7147, composer state drawers pingdotgg#7150, unified workspace navigation pingdotgg#7153, collapsed
tool activity pingdotgg#7152) lands on surfaces Marcode customizes, so before/after images belong to the
verification pass above.

Checklist

• This PR is small and focused — no: it is a 111-commit upstream sync, which is inherently broad.
• I explained what changed and why
• I included before/after screenshots for any UI changes — see above
• I included a video for animation/interaction changes — not applicable

Verification

Run locally against the merge commit (e39df1e3):

• Typecheck: contracts, client-runtime, web, server (t3), scripts, desktop, mobile,
  shared — all clean (suggestion-level Effect diagnostics only).
• Tests: full apps/web suite (292 files, 2993 tests), full packages/client-runtime (53/685), full
  packages/contracts (20/290), full scripts (22 files), and focused apps/server under
  cli/, cloud/, persistence/, plus serviceLauncher.test.ts and CheckpointReactor.test.ts
  (41 files, 182 tests). All pass.
• vp fmt --check clean across every changed file; vp lint clean (warnings only, all pre-existing).

One pre-existing failure, not caused by this merge:
scripts/update-release-package-versions.test.ts > preserves manifest write context and the filesystem cause chmods a file to 0o400 and expects the write to fail. This container runs as
root, which ignores the permission bit. The file is untouched by this merge and the test passes in
CI.

Coupled vendored subtrees: pnpm-workspace.yaml moved (Clerk bumps) but the effect version is
unchanged and infra/relay/package.json did not move, so neither sync:repos coupling triggered.
pnpm-lock.yaml was regenerated with pnpm install --lockfile-only.

---

Generated by Claude Code

[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	+865 B (+6.7%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+629 B (+9.8%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+236 B (+3.7%)	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	+875 B (+6.8%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+631 B (+9.8%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+244 B (+3.8%)	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: 5bcc188 · PR result: e39df1e · 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 pingdotgg/t3code@b1670ac7 (111 upstream commits, merge base 82b8a938) into main as a
normal two-parent merge on claude/gracious-bohr-x80z9c. 27 conflicted paths were resolved by hand;
no file was taken wholesale from either side.

The full per-path decision record is in the merge commit body. The parts that need a reviewer's eye:

Fork-identity breaks that merged clean and would have failed silently

• apps/server/src/cloud/bootService.ts — upstream's new macOS launchd plist (feat(server): run the background service on macOS via launchd pingdotgg/t3code#6286) exports
  T3CODE_HOME. resolveLauncherBaseDir reads MARCODE_HOME and exits otherwise, so the launch
  agent would never have started a server. Renamed and pinned with a test.
• apps/server/src/cli/triage.ts — upstream's new t3 triage command (feat(cli): npx t3 triage hands broken installs to your own coding agent pingdotgg/t3code#6563) read T3CODE_HOME.
• apps/server/src/cloud/bootService.test.ts — an upstream assertion hardcoded
  systemctl --user disable --now t3code.service; Marcode's unit is marcode.service.
• docs/user/background-service.md — new upstream doc pointed users at
  ~/.config/systemd/user/t3code.service.
• apps/web/src/components/ChatView.tsx — upstream's cmd+enter background draft (feat(web): cmd+enter to create thread in background pingdotgg/t3code#7821) calls
  handleNewThread, which arrived in a hunk Marcode had restructured for the pill-nav header. It
  merged clean into a ChatView that never declared it (caught by typecheck).
• .github/workflows/ci.yml — upstream added three jobs (test_server, rust,
  mobile_native_changes) on its Blacksmith fleet, which this fork cannot schedule on. All mapped to
  GitHub-hosted runners. Upstream also sharded apps/server out of test into test_server, which
  moved WorkspaceFileSystem's tests away from Marcode's ripgrep install step — the step follows
  them.

Marcode contracts held, upstream fixes taken on top

• threadSettled.ts — took upstream's settle-only-once rule (fix(threads): a merged PR settles its thread only once pingdotgg/t3code#7454), kept Marcode's one-hour warm
  window on top, migrated the Marcode tests to the new changeRequest option shape.
• ThreadTerminalDrawer.tsx — kept Marcode's terminal chrome, routed all three of its close
  affordances through upstream's new confirm-before-close (feat(web): confirm before closing a terminal pingdotgg/t3code#7592).
• RightPanelTabs.tsx — took upstream's tab mute (feat(desktop): mute a browser tab pingdotgg/t3code#7252) and shortcut-driven add-surface menu
  (feat(web): add shortcuts to the surface dropdown pingdotgg/t3code#7318); dropped their copy-path action and "Files" entry, since Marcode has no right-panel file
  surface. The menu keeps Marcode's placement beside the surface list.
• settings.tsx / UsagePage.tsx — adopted upstream's WorkspacePageHeader (feat(web): unify workspace navigation pingdotgg/t3code#7153) and passed the
  sidebarless titlebar inset as an override; both routes mount no sidebar, so the header's
  collapsed-sidebar inset never matches.
• ChatHeader.tsx / SidebarChrome.tsx — kept Marcode's title-only header and update-pill-only
  footer against upstream's breadcrumb, inline rename, title action menu, and footer nav.
• Migration 041_AuthSessionClientConnection renumbered to 042; Marcode owns id 33, so shared
  migrations sit one id higher.

Tests added or rewritten to pin the boundary

• ChatHeader.fork.test.tsx (new) — the header renders the title alone: no breadcrumb, rename, or
  action menu.
• bootService.test.ts — the launchd plist exports MARCODE_HOME and no T3CODE_HOME.
• workspaceTitlebar.fork.test.ts — rewritten to follow upstream's header refactor: the drag region
  now lives in WorkspacePageHeader, and each sidebarless call site must supply the unconditional
  inset. (This test failed on the raw merge — the pin worked.)
• upstream-sync-workflow.test.ts — the two CI pins rewritten as invariants (no Blacksmith runner in
  ci.yml; whichever job runs --filter t3 test installs ripgrep) rather than positions, so they
  survive upstream adding jobs.
• Migrations.test.ts — extended to cover id 42.

Why

The daily upstream sync found 111 new commits. This is the reviewable merge; it is a draft because
the per-hotspot decisions above want a human read, and because two things still need attention:

• t3 triage points at upstream. The new apps/server/src/cli/triagePrompt.ts tells the user to
  search issues in pingdotgg/t3code, fetch PLAYBOOK.md from that repo, and file at
  github.com/pingdotgg/t3code/issues/new. Only the MARCODE_HOME read and the command description
  were retargeted — where Marcode users should file triage issues is a product call, and rewriting
  the whole playbook would be a large permanent edit surface in a brand-new upstream file.
• No live client verification. This container has no browser or simulator, so the web and mobile
  surfaces touched here (composer drawers, right-panel tabs, terminal chrome, usage redesign,
  settings/usage headers) have not been driven. Worth one pass with test-t3-app before this comes
  out of draft.

UI Changes

Not captured — this container cannot drive a client. Upstream's own UI work in this range (usage
insights redesign pingdotgg#7147, composer state drawers pingdotgg#7150, unified workspace navigation pingdotgg#7153, collapsed
tool activity pingdotgg#7152) lands on surfaces Marcode customizes, so before/after images belong to the
verification pass above.

Checklist

• This PR is small and focused — no: it is a 111-commit upstream sync, which is inherently broad.
• I explained what changed and why
• I included before/after screenshots for any UI changes — see above
• I included a video for animation/interaction changes — not applicable

Verification

Run locally against the merge commit (e39df1e3):

• Typecheck: contracts, client-runtime, web, server (t3), scripts, desktop, mobile,
  shared — all clean (suggestion-level Effect diagnostics only).
• Tests: full apps/web suite (292 files, 2993 tests), full packages/client-runtime (53/685), full
  packages/contracts (20/290), full scripts (22 files), and focused apps/server under
  cli/, cloud/, persistence/, plus serviceLauncher.test.ts and CheckpointReactor.test.ts
  (41 files, 182 tests). All pass.
• vp fmt --check clean across every changed file; vp lint clean (warnings only, all pre-existing).

One pre-existing failure, not caused by this merge:
scripts/update-release-package-versions.test.ts > preserves manifest write context and the filesystem cause chmods a file to 0o400 and expects the write to fail. This container runs as
root, which ignores the permission bit. The file is untouched by this merge and the test passes in
CI.

Coupled vendored subtrees: pnpm-workspace.yaml moved (Clerk bumps) but the effect version is
unchanged and infra/relay/package.json did not move, so neither sync:repos coupling triggered.
pnpm-lock.yaml was regenerated with pnpm install --lockfile-only.

---

Generated by Claude Code

[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	+865 B (+6.7%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+629 B (+9.8%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+236 B (+3.7%)	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	+875 B (+6.8%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+631 B (+9.8%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+244 B (+3.8%)	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: 5bcc188 · PR result: e39df1e · 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 pingdotgg/t3code@b1670ac7 (111 upstream commits, merge base 82b8a938) into main as a
normal two-parent merge on claude/gracious-bohr-x80z9c. 27 conflicted paths were resolved by hand;
no file was taken wholesale from either side.

The full per-path decision record is in the merge commit body. The parts that need a reviewer's eye:

Fork-identity breaks that merged clean and would have failed silently

• apps/server/src/cloud/bootService.ts — upstream's new macOS launchd plist (feat(server): run the background service on macOS via launchd pingdotgg/t3code#6286) exports
  T3CODE_HOME. resolveLauncherBaseDir reads MARCODE_HOME and exits otherwise, so the launch
  agent would never have started a server. Renamed and pinned with a test.
• apps/server/src/cli/triage.ts — upstream's new t3 triage command (feat(cli): npx t3 triage hands broken installs to your own coding agent pingdotgg/t3code#6563) read T3CODE_HOME.
• apps/server/src/cloud/bootService.test.ts — an upstream assertion hardcoded
  systemctl --user disable --now t3code.service; Marcode's unit is marcode.service.
• docs/user/background-service.md — new upstream doc pointed users at
  ~/.config/systemd/user/t3code.service.
• apps/web/src/components/ChatView.tsx — upstream's cmd+enter background draft (feat(web): cmd+enter to create thread in background pingdotgg/t3code#7821) calls
  handleNewThread, which arrived in a hunk Marcode had restructured for the pill-nav header. It
  merged clean into a ChatView that never declared it (caught by typecheck).
• .github/workflows/ci.yml — upstream added three jobs (test_server, rust,
  mobile_native_changes) on its Blacksmith fleet, which this fork cannot schedule on. All mapped to
  GitHub-hosted runners. Upstream also sharded apps/server out of test into test_server, which
  moved WorkspaceFileSystem's tests away from Marcode's ripgrep install step — the step follows
  them.

Marcode contracts held, upstream fixes taken on top

• threadSettled.ts — took upstream's settle-only-once rule (fix(threads): a merged PR settles its thread only once pingdotgg/t3code#7454), kept Marcode's one-hour warm
  window on top, migrated the Marcode tests to the new changeRequest option shape.
• ThreadTerminalDrawer.tsx — kept Marcode's terminal chrome, routed all three of its close
  affordances through upstream's new confirm-before-close (feat(web): confirm before closing a terminal pingdotgg/t3code#7592).
• RightPanelTabs.tsx — took upstream's tab mute (feat(desktop): mute a browser tab pingdotgg/t3code#7252) and shortcut-driven add-surface menu
  (feat(web): add shortcuts to the surface dropdown pingdotgg/t3code#7318); dropped their copy-path action and "Files" entry, since Marcode has no right-panel file
  surface. The menu keeps Marcode's placement beside the surface list.
• settings.tsx / UsagePage.tsx — adopted upstream's WorkspacePageHeader (feat(web): unify workspace navigation pingdotgg/t3code#7153) and passed the
  sidebarless titlebar inset as an override; both routes mount no sidebar, so the header's
  collapsed-sidebar inset never matches.
• ChatHeader.tsx / SidebarChrome.tsx — kept Marcode's title-only header and update-pill-only
  footer against upstream's breadcrumb, inline rename, title action menu, and footer nav.
• Migration 041_AuthSessionClientConnection renumbered to 042; Marcode owns id 33, so shared
  migrations sit one id higher.

Tests added or rewritten to pin the boundary

• ChatHeader.fork.test.tsx (new) — the header renders the title alone: no breadcrumb, rename, or
  action menu.
• bootService.test.ts — the launchd plist exports MARCODE_HOME and no T3CODE_HOME.
• workspaceTitlebar.fork.test.ts — rewritten to follow upstream's header refactor: the drag region
  now lives in WorkspacePageHeader, and each sidebarless call site must supply the unconditional
  inset. (This test failed on the raw merge — the pin worked.)
• upstream-sync-workflow.test.ts — the two CI pins rewritten as invariants (no Blacksmith runner in
  ci.yml; whichever job runs --filter t3 test installs ripgrep) rather than positions, so they
  survive upstream adding jobs.
• Migrations.test.ts — extended to cover id 42.

Why

The daily upstream sync found 111 new commits. This is the reviewable merge; it is a draft because
the per-hotspot decisions above want a human read, and because two things still need attention:

• t3 triage points at upstream. The new apps/server/src/cli/triagePrompt.ts tells the user to
  search issues in pingdotgg/t3code, fetch PLAYBOOK.md from that repo, and file at
  github.com/pingdotgg/t3code/issues/new. Only the MARCODE_HOME read and the command description
  were retargeted — where Marcode users should file triage issues is a product call, and rewriting
  the whole playbook would be a large permanent edit surface in a brand-new upstream file.
• No live client verification. This container has no browser or simulator, so the web and mobile
  surfaces touched here (composer drawers, right-panel tabs, terminal chrome, usage redesign,
  settings/usage headers) have not been driven. Worth one pass with test-t3-app before this comes
  out of draft.

UI Changes

Not captured — this container cannot drive a client. Upstream's own UI work in this range (usage
insights redesign pingdotgg#7147, composer state drawers pingdotgg#7150, unified workspace navigation pingdotgg#7153, collapsed
tool activity pingdotgg#7152) lands on surfaces Marcode customizes, so before/after images belong to the
verification pass above.

Checklist

• This PR is small and focused — no: it is a 111-commit upstream sync, which is inherently broad.
• I explained what changed and why
• I included before/after screenshots for any UI changes — see above
• I included a video for animation/interaction changes — not applicable

Verification

Run locally against the merge commit (e39df1e3):

• Typecheck: contracts, client-runtime, web, server (t3), scripts, desktop, mobile,
  shared — all clean (suggestion-level Effect diagnostics only).
• Tests: full apps/web suite (292 files, 2993 tests), full packages/client-runtime (53/685), full
  packages/contracts (20/290), full scripts (22 files), and focused apps/server under
  cli/, cloud/, persistence/, plus serviceLauncher.test.ts and CheckpointReactor.test.ts
  (41 files, 182 tests). All pass.
• vp fmt --check clean across every changed file; vp lint clean (warnings only, all pre-existing).

One pre-existing failure, not caused by this merge:
scripts/update-release-package-versions.test.ts > preserves manifest write context and the filesystem cause chmods a file to 0o400 and expects the write to fail. This container runs as
root, which ignores the permission bit. The file is untouched by this merge and the test passes in
CI.

Coupled vendored subtrees: pnpm-workspace.yaml moved (Clerk bumps) but the effect version is
unchanged and infra/relay/package.json did not move, so neither sync:repos coupling triggered.
pnpm-lock.yaml was regenerated with pnpm install --lockfile-only.

---

Generated by Claude Code

[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	+865 B (+6.7%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+629 B (+9.8%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+236 B (+3.7%)	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	+875 B (+6.8%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+631 B (+9.8%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+244 B (+3.8%)	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: 5bcc188 · PR result: e39df1e · 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 pingdotgg/t3code@b1670ac7 (111 upstream commits, merge base 82b8a938) into main as a
normal two-parent merge on claude/gracious-bohr-x80z9c. 27 conflicted paths were resolved by hand;
no file was taken wholesale from either side.

The full per-path decision record is in the merge commit body. The parts that need a reviewer's eye:

Fork-identity breaks that merged clean and would have failed silently

• apps/server/src/cloud/bootService.ts — upstream's new macOS launchd plist (feat(server): run the background service on macOS via launchd pingdotgg/t3code#6286) exports
  T3CODE_HOME. resolveLauncherBaseDir reads MARCODE_HOME and exits otherwise, so the launch
  agent would never have started a server. Renamed and pinned with a test.
• apps/server/src/cli/triage.ts — upstream's new t3 triage command (feat(cli): npx t3 triage hands broken installs to your own coding agent pingdotgg/t3code#6563) read T3CODE_HOME.
• apps/server/src/cloud/bootService.test.ts — an upstream assertion hardcoded
  systemctl --user disable --now t3code.service; Marcode's unit is marcode.service.
• docs/user/background-service.md — new upstream doc pointed users at
  ~/.config/systemd/user/t3code.service.
• apps/web/src/components/ChatView.tsx — upstream's cmd+enter background draft (feat(web): cmd+enter to create thread in background pingdotgg/t3code#7821) calls
  handleNewThread, which arrived in a hunk Marcode had restructured for the pill-nav header. It
  merged clean into a ChatView that never declared it (caught by typecheck).
• .github/workflows/ci.yml — upstream added three jobs (test_server, rust,
  mobile_native_changes) on its Blacksmith fleet, which this fork cannot schedule on. All mapped to
  GitHub-hosted runners. Upstream also sharded apps/server out of test into test_server, which
  moved WorkspaceFileSystem's tests away from Marcode's ripgrep install step — the step follows
  them.

Marcode contracts held, upstream fixes taken on top

• threadSettled.ts — took upstream's settle-only-once rule (fix(threads): a merged PR settles its thread only once pingdotgg/t3code#7454), kept Marcode's one-hour warm
  window on top, migrated the Marcode tests to the new changeRequest option shape.
• ThreadTerminalDrawer.tsx — kept Marcode's terminal chrome, routed all three of its close
  affordances through upstream's new confirm-before-close (feat(web): confirm before closing a terminal pingdotgg/t3code#7592).
• RightPanelTabs.tsx — took upstream's tab mute (feat(desktop): mute a browser tab pingdotgg/t3code#7252) and shortcut-driven add-surface menu
  (feat(web): add shortcuts to the surface dropdown pingdotgg/t3code#7318); dropped their copy-path action and "Files" entry, since Marcode has no right-panel file
  surface. The menu keeps Marcode's placement beside the surface list.
• settings.tsx / UsagePage.tsx — adopted upstream's WorkspacePageHeader (feat(web): unify workspace navigation pingdotgg/t3code#7153) and passed the
  sidebarless titlebar inset as an override; both routes mount no sidebar, so the header's
  collapsed-sidebar inset never matches.
• ChatHeader.tsx / SidebarChrome.tsx — kept Marcode's title-only header and update-pill-only
  footer against upstream's breadcrumb, inline rename, title action menu, and footer nav.
• Migration 041_AuthSessionClientConnection renumbered to 042; Marcode owns id 33, so shared
  migrations sit one id higher.

Tests added or rewritten to pin the boundary

• ChatHeader.fork.test.tsx (new) — the header renders the title alone: no breadcrumb, rename, or
  action menu.
• bootService.test.ts — the launchd plist exports MARCODE_HOME and no T3CODE_HOME.
• workspaceTitlebar.fork.test.ts — rewritten to follow upstream's header refactor: the drag region
  now lives in WorkspacePageHeader, and each sidebarless call site must supply the unconditional
  inset. (This test failed on the raw merge — the pin worked.)
• upstream-sync-workflow.test.ts — the two CI pins rewritten as invariants (no Blacksmith runner in
  ci.yml; whichever job runs --filter t3 test installs ripgrep) rather than positions, so they
  survive upstream adding jobs.
• Migrations.test.ts — extended to cover id 42.

Why

The daily upstream sync found 111 new commits. This is the reviewable merge; it is a draft because
the per-hotspot decisions above want a human read, and because two things still need attention:

• t3 triage points at upstream. The new apps/server/src/cli/triagePrompt.ts tells the user to
  search issues in pingdotgg/t3code, fetch PLAYBOOK.md from that repo, and file at
  github.com/pingdotgg/t3code/issues/new. Only the MARCODE_HOME read and the command description
  were retargeted — where Marcode users should file triage issues is a product call, and rewriting
  the whole playbook would be a large permanent edit surface in a brand-new upstream file.
• No live client verification. This container has no browser or simulator, so the web and mobile
  surfaces touched here (composer drawers, right-panel tabs, terminal chrome, usage redesign,
  settings/usage headers) have not been driven. Worth one pass with test-t3-app before this comes
  out of draft.

UI Changes

Not captured — this container cannot drive a client. Upstream's own UI work in this range (usage
insights redesign pingdotgg#7147, composer state drawers pingdotgg#7150, unified workspace navigation pingdotgg#7153, collapsed
tool activity pingdotgg#7152) lands on surfaces Marcode customizes, so before/after images belong to the
verification pass above.

Checklist

• This PR is small and focused — no: it is a 111-commit upstream sync, which is inherently broad.
• I explained what changed and why
• I included before/after screenshots for any UI changes — see above
• I included a video for animation/interaction changes — not applicable

Verification

Run locally against the merge commit (e39df1e3):

• Typecheck: contracts, client-runtime, web, server (t3), scripts, desktop, mobile,
  shared — all clean (suggestion-level Effect diagnostics only).
• Tests: full apps/web suite (292 files, 2993 tests), full packages/client-runtime (53/685), full
  packages/contracts (20/290), full scripts (22 files), and focused apps/server under
  cli/, cloud/, persistence/, plus serviceLauncher.test.ts and CheckpointReactor.test.ts
  (41 files, 182 tests). All pass.
• vp fmt --check clean across every changed file; vp lint clean (warnings only, all pre-existing).

One pre-existing failure, not caused by this merge:
scripts/update-release-package-versions.test.ts > preserves manifest write context and the filesystem cause chmods a file to 0o400 and expects the write to fail. This container runs as
root, which ignores the permission bit. The file is untouched by this merge and the test passes in
CI.

Coupled vendored subtrees: pnpm-workspace.yaml moved (Clerk bumps) but the effect version is
unchanged and infra/relay/package.json did not move, so neither sync:repos coupling triggered.
pnpm-lock.yaml was regenerated with pnpm install --lockfile-only.

---

Generated by Claude Code

[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	+865 B (+6.7%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+629 B (+9.8%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+236 B (+3.7%)	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	+875 B (+6.8%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+631 B (+9.8%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+244 B (+3.8%)	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: 5bcc188 · PR result: e39df1e · 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 pingdotgg/t3code@b1670ac7 (111 upstream commits, merge base 82b8a938) into main as a
normal two-parent merge on claude/gracious-bohr-x80z9c. 27 conflicted paths were resolved by hand;
no file was taken wholesale from either side.

The full per-path decision record is in the merge commit body. The parts that need a reviewer's eye:

Fork-identity breaks that merged clean and would have failed silently

• apps/server/src/cloud/bootService.ts — upstream's new macOS launchd plist (feat(server): run the background service on macOS via launchd pingdotgg/t3code#6286) exports
  T3CODE_HOME. resolveLauncherBaseDir reads MARCODE_HOME and exits otherwise, so the launch
  agent would never have started a server. Renamed and pinned with a test.
• apps/server/src/cli/triage.ts — upstream's new t3 triage command (feat(cli): npx t3 triage hands broken installs to your own coding agent pingdotgg/t3code#6563) read T3CODE_HOME.
• apps/server/src/cloud/bootService.test.ts — an upstream assertion hardcoded
  systemctl --user disable --now t3code.service; Marcode's unit is marcode.service.
• docs/user/background-service.md — new upstream doc pointed users at
  ~/.config/systemd/user/t3code.service.
• apps/web/src/components/ChatView.tsx — upstream's cmd+enter background draft (feat(web): cmd+enter to create thread in background pingdotgg/t3code#7821) calls
  handleNewThread, which arrived in a hunk Marcode had restructured for the pill-nav header. It
  merged clean into a ChatView that never declared it (caught by typecheck).
• .github/workflows/ci.yml — upstream added three jobs (test_server, rust,
  mobile_native_changes) on its Blacksmith fleet, which this fork cannot schedule on. All mapped to
  GitHub-hosted runners. Upstream also sharded apps/server out of test into test_server, which
  moved WorkspaceFileSystem's tests away from Marcode's ripgrep install step — the step follows
  them.

Marcode contracts held, upstream fixes taken on top

• threadSettled.ts — took upstream's settle-only-once rule (fix(threads): a merged PR settles its thread only once pingdotgg/t3code#7454), kept Marcode's one-hour warm
  window on top, migrated the Marcode tests to the new changeRequest option shape.
• ThreadTerminalDrawer.tsx — kept Marcode's terminal chrome, routed all three of its close
  affordances through upstream's new confirm-before-close (feat(web): confirm before closing a terminal pingdotgg/t3code#7592).
• RightPanelTabs.tsx — took upstream's tab mute (feat(desktop): mute a browser tab pingdotgg/t3code#7252) and shortcut-driven add-surface menu
  (feat(web): add shortcuts to the surface dropdown pingdotgg/t3code#7318); dropped their copy-path action and "Files" entry, since Marcode has no right-panel file
  surface. The menu keeps Marcode's placement beside the surface list.
• settings.tsx / UsagePage.tsx — adopted upstream's WorkspacePageHeader (feat(web): unify workspace navigation pingdotgg/t3code#7153) and passed the
  sidebarless titlebar inset as an override; both routes mount no sidebar, so the header's
  collapsed-sidebar inset never matches.
• ChatHeader.tsx / SidebarChrome.tsx — kept Marcode's title-only header and update-pill-only
  footer against upstream's breadcrumb, inline rename, title action menu, and footer nav.
• Migration 041_AuthSessionClientConnection renumbered to 042; Marcode owns id 33, so shared
  migrations sit one id higher.

Tests added or rewritten to pin the boundary

• ChatHeader.fork.test.tsx (new) — the header renders the title alone: no breadcrumb, rename, or
  action menu.
• bootService.test.ts — the launchd plist exports MARCODE_HOME and no T3CODE_HOME.
• workspaceTitlebar.fork.test.ts — rewritten to follow upstream's header refactor: the drag region
  now lives in WorkspacePageHeader, and each sidebarless call site must supply the unconditional
  inset. (This test failed on the raw merge — the pin worked.)
• upstream-sync-workflow.test.ts — the two CI pins rewritten as invariants (no Blacksmith runner in
  ci.yml; whichever job runs --filter t3 test installs ripgrep) rather than positions, so they
  survive upstream adding jobs.
• Migrations.test.ts — extended to cover id 42.

Why

The daily upstream sync found 111 new commits. This is the reviewable merge; it is a draft because
the per-hotspot decisions above want a human read, and because two things still need attention:

• t3 triage points at upstream. The new apps/server/src/cli/triagePrompt.ts tells the user to
  search issues in pingdotgg/t3code, fetch PLAYBOOK.md from that repo, and file at
  github.com/pingdotgg/t3code/issues/new. Only the MARCODE_HOME read and the command description
  were retargeted — where Marcode users should file triage issues is a product call, and rewriting
  the whole playbook would be a large permanent edit surface in a brand-new upstream file.
• No live client verification. This container has no browser or simulator, so the web and mobile
  surfaces touched here (composer drawers, right-panel tabs, terminal chrome, usage redesign,
  settings/usage headers) have not been driven. Worth one pass with test-t3-app before this comes
  out of draft.

UI Changes

Not captured — this container cannot drive a client. Upstream's own UI work in this range (usage
insights redesign pingdotgg#7147, composer state drawers pingdotgg#7150, unified workspace navigation pingdotgg#7153, collapsed
tool activity pingdotgg#7152) lands on surfaces Marcode customizes, so before/after images belong to the
verification pass above.

Checklist

• This PR is small and focused — no: it is a 111-commit upstream sync, which is inherently broad.
• I explained what changed and why
• I included before/after screenshots for any UI changes — see above
• I included a video for animation/interaction changes — not applicable

Verification

Run locally against the merge commit (e39df1e3):

• Typecheck: contracts, client-runtime, web, server (t3), scripts, desktop, mobile,
  shared — all clean (suggestion-level Effect diagnostics only).
• Tests: full apps/web suite (292 files, 2993 tests), full packages/client-runtime (53/685), full
  packages/contracts (20/290), full scripts (22 files), and focused apps/server under
  cli/, cloud/, persistence/, plus serviceLauncher.test.ts and CheckpointReactor.test.ts
  (41 files, 182 tests). All pass.
• vp fmt --check clean across every changed file; vp lint clean (warnings only, all pre-existing).

One pre-existing failure, not caused by this merge:
scripts/update-release-package-versions.test.ts > preserves manifest write context and the filesystem cause chmods a file to 0o400 and expects the write to fail. This container runs as
root, which ignores the permission bit. The file is untouched by this merge and the test passes in
CI.

Coupled vendored subtrees: pnpm-workspace.yaml moved (Clerk bumps) but the effect version is
unchanged and infra/relay/package.json did not move, so neither sync:repos coupling triggered.
pnpm-lock.yaml was regenerated with pnpm install --lockfile-only.

---

Generated by Claude Code

[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	+865 B (+6.7%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+629 B (+9.8%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+236 B (+3.7%)	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	+875 B (+6.8%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+631 B (+9.8%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+244 B (+3.8%)	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: 5bcc188 · PR result: e39df1e · 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 pingdotgg/t3code@b1670ac7 (111 upstream commits, merge base 82b8a938) into main as a
normal two-parent merge on claude/gracious-bohr-x80z9c. 27 conflicted paths were resolved by hand;
no file was taken wholesale from either side.

The full per-path decision record is in the merge commit body. The parts that need a reviewer's eye:

Fork-identity breaks that merged clean and would have failed silently

• apps/server/src/cloud/bootService.ts — upstream's new macOS launchd plist (feat(server): run the background service on macOS via launchd pingdotgg/t3code#6286) exports
  T3CODE_HOME. resolveLauncherBaseDir reads MARCODE_HOME and exits otherwise, so the launch
  agent would never have started a server. Renamed and pinned with a test.
• apps/server/src/cli/triage.ts — upstream's new t3 triage command (feat(cli): npx t3 triage hands broken installs to your own coding agent pingdotgg/t3code#6563) read T3CODE_HOME.
• apps/server/src/cloud/bootService.test.ts — an upstream assertion hardcoded
  systemctl --user disable --now t3code.service; Marcode's unit is marcode.service.
• docs/user/background-service.md — new upstream doc pointed users at
  ~/.config/systemd/user/t3code.service.
• apps/web/src/components/ChatView.tsx — upstream's cmd+enter background draft (feat(web): cmd+enter to create thread in background pingdotgg/t3code#7821) calls
  handleNewThread, which arrived in a hunk Marcode had restructured for the pill-nav header. It
  merged clean into a ChatView that never declared it (caught by typecheck).
• .github/workflows/ci.yml — upstream added three jobs (test_server, rust,
  mobile_native_changes) on its Blacksmith fleet, which this fork cannot schedule on. All mapped to
  GitHub-hosted runners. Upstream also sharded apps/server out of test into test_server, which
  moved WorkspaceFileSystem's tests away from Marcode's ripgrep install step — the step follows
  them.

Marcode contracts held, upstream fixes taken on top

• threadSettled.ts — took upstream's settle-only-once rule (fix(threads): a merged PR settles its thread only once pingdotgg/t3code#7454), kept Marcode's one-hour warm
  window on top, migrated the Marcode tests to the new changeRequest option shape.
• ThreadTerminalDrawer.tsx — kept Marcode's terminal chrome, routed all three of its close
  affordances through upstream's new confirm-before-close (feat(web): confirm before closing a terminal pingdotgg/t3code#7592).
• RightPanelTabs.tsx — took upstream's tab mute (feat(desktop): mute a browser tab pingdotgg/t3code#7252) and shortcut-driven add-surface menu
  (feat(web): add shortcuts to the surface dropdown pingdotgg/t3code#7318); dropped their copy-path action and "Files" entry, since Marcode has no right-panel file
  surface. The menu keeps Marcode's placement beside the surface list.
• settings.tsx / UsagePage.tsx — adopted upstream's WorkspacePageHeader (feat(web): unify workspace navigation pingdotgg/t3code#7153) and passed the
  sidebarless titlebar inset as an override; both routes mount no sidebar, so the header's
  collapsed-sidebar inset never matches.
• ChatHeader.tsx / SidebarChrome.tsx — kept Marcode's title-only header and update-pill-only
  footer against upstream's breadcrumb, inline rename, title action menu, and footer nav.
• Migration 041_AuthSessionClientConnection renumbered to 042; Marcode owns id 33, so shared
  migrations sit one id higher.

Tests added or rewritten to pin the boundary

• ChatHeader.fork.test.tsx (new) — the header renders the title alone: no breadcrumb, rename, or
  action menu.
• bootService.test.ts — the launchd plist exports MARCODE_HOME and no T3CODE_HOME.
• workspaceTitlebar.fork.test.ts — rewritten to follow upstream's header refactor: the drag region
  now lives in WorkspacePageHeader, and each sidebarless call site must supply the unconditional
  inset. (This test failed on the raw merge — the pin worked.)
• upstream-sync-workflow.test.ts — the two CI pins rewritten as invariants (no Blacksmith runner in
  ci.yml; whichever job runs --filter t3 test installs ripgrep) rather than positions, so they
  survive upstream adding jobs.
• Migrations.test.ts — extended to cover id 42.

Why

The daily upstream sync found 111 new commits. This is the reviewable merge; it is a draft because
the per-hotspot decisions above want a human read, and because two things still need attention:

• t3 triage points at upstream. The new apps/server/src/cli/triagePrompt.ts tells the user to
  search issues in pingdotgg/t3code, fetch PLAYBOOK.md from that repo, and file at
  github.com/pingdotgg/t3code/issues/new. Only the MARCODE_HOME read and the command description
  were retargeted — where Marcode users should file triage issues is a product call, and rewriting
  the whole playbook would be a large permanent edit surface in a brand-new upstream file.
• No live client verification. This container has no browser or simulator, so the web and mobile
  surfaces touched here (composer drawers, right-panel tabs, terminal chrome, usage redesign,
  settings/usage headers) have not been driven. Worth one pass with test-t3-app before this comes
  out of draft.

UI Changes

Not captured — this container cannot drive a client. Upstream's own UI work in this range (usage
insights redesign pingdotgg#7147, composer state drawers pingdotgg#7150, unified workspace navigation pingdotgg#7153, collapsed
tool activity pingdotgg#7152) lands on surfaces Marcode customizes, so before/after images belong to the
verification pass above.

Checklist

• This PR is small and focused — no: it is a 111-commit upstream sync, which is inherently broad.
• I explained what changed and why
• I included before/after screenshots for any UI changes — see above
• I included a video for animation/interaction changes — not applicable

Verification

Run locally against the merge commit (e39df1e3):

• Typecheck: contracts, client-runtime, web, server (t3), scripts, desktop, mobile,
  shared — all clean (suggestion-level Effect diagnostics only).
• Tests: full apps/web suite (292 files, 2993 tests), full packages/client-runtime (53/685), full
  packages/contracts (20/290), full scripts (22 files), and focused apps/server under
  cli/, cloud/, persistence/, plus serviceLauncher.test.ts and CheckpointReactor.test.ts
  (41 files, 182 tests). All pass.
• vp fmt --check clean across every changed file; vp lint clean (warnings only, all pre-existing).

One pre-existing failure, not caused by this merge:
scripts/update-release-package-versions.test.ts > preserves manifest write context and the filesystem cause chmods a file to 0o400 and expects the write to fail. This container runs as
root, which ignores the permission bit. The file is untouched by this merge and the test passes in
CI.

Coupled vendored subtrees: pnpm-workspace.yaml moved (Clerk bumps) but the effect version is
unchanged and infra/relay/package.json did not move, so neither sync:repos coupling triggered.
pnpm-lock.yaml was regenerated with pnpm install --lockfile-only.

---

Generated by Claude Code

[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	+865 B (+6.7%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+629 B (+9.8%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+236 B (+3.7%)	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	+875 B (+6.8%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+631 B (+9.8%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+244 B (+3.8%)	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: 5bcc188 · PR result: e39df1e · 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 pingdotgg/t3code@b1670ac7 (111 upstream commits, merge base 82b8a938) into main as a
normal two-parent merge on claude/gracious-bohr-x80z9c. 27 conflicted paths were resolved by hand;
no file was taken wholesale from either side.

The full per-path decision record is in the merge commit body. The parts that need a reviewer's eye:

Fork-identity breaks that merged clean and would have failed silently

• apps/server/src/cloud/bootService.ts — upstream's new macOS launchd plist (feat(server): run the background service on macOS via launchd pingdotgg/t3code#6286) exports
  T3CODE_HOME. resolveLauncherBaseDir reads MARCODE_HOME and exits otherwise, so the launch
  agent would never have started a server. Renamed and pinned with a test.
• apps/server/src/cli/triage.ts — upstream's new t3 triage command (feat(cli): npx t3 triage hands broken installs to your own coding agent pingdotgg/t3code#6563) read T3CODE_HOME.
• apps/server/src/cloud/bootService.test.ts — an upstream assertion hardcoded
  systemctl --user disable --now t3code.service; Marcode's unit is marcode.service.
• docs/user/background-service.md — new upstream doc pointed users at
  ~/.config/systemd/user/t3code.service.
• apps/web/src/components/ChatView.tsx — upstream's cmd+enter background draft (feat(web): cmd+enter to create thread in background pingdotgg/t3code#7821) calls
  handleNewThread, which arrived in a hunk Marcode had restructured for the pill-nav header. It
  merged clean into a ChatView that never declared it (caught by typecheck).
• .github/workflows/ci.yml — upstream added three jobs (test_server, rust,
  mobile_native_changes) on its Blacksmith fleet, which this fork cannot schedule on. All mapped to
  GitHub-hosted runners. Upstream also sharded apps/server out of test into test_server, which
  moved WorkspaceFileSystem's tests away from Marcode's ripgrep install step — the step follows
  them.

Marcode contracts held, upstream fixes taken on top

• threadSettled.ts — took upstream's settle-only-once rule (fix(threads): a merged PR settles its thread only once pingdotgg/t3code#7454), kept Marcode's one-hour warm
  window on top, migrated the Marcode tests to the new changeRequest option shape.
• ThreadTerminalDrawer.tsx — kept Marcode's terminal chrome, routed all three of its close
  affordances through upstream's new confirm-before-close (feat(web): confirm before closing a terminal pingdotgg/t3code#7592).
• RightPanelTabs.tsx — took upstream's tab mute (feat(desktop): mute a browser tab pingdotgg/t3code#7252) and shortcut-driven add-surface menu
  (feat(web): add shortcuts to the surface dropdown pingdotgg/t3code#7318); dropped their copy-path action and "Files" entry, since Marcode has no right-panel file
  surface. The menu keeps Marcode's placement beside the surface list.
• settings.tsx / UsagePage.tsx — adopted upstream's WorkspacePageHeader (feat(web): unify workspace navigation pingdotgg/t3code#7153) and passed the
  sidebarless titlebar inset as an override; both routes mount no sidebar, so the header's
  collapsed-sidebar inset never matches.
• ChatHeader.tsx / SidebarChrome.tsx — kept Marcode's title-only header and update-pill-only
  footer against upstream's breadcrumb, inline rename, title action menu, and footer nav.
• Migration 041_AuthSessionClientConnection renumbered to 042; Marcode owns id 33, so shared
  migrations sit one id higher.

Tests added or rewritten to pin the boundary

• ChatHeader.fork.test.tsx (new) — the header renders the title alone: no breadcrumb, rename, or
  action menu.
• bootService.test.ts — the launchd plist exports MARCODE_HOME and no T3CODE_HOME.
• workspaceTitlebar.fork.test.ts — rewritten to follow upstream's header refactor: the drag region
  now lives in WorkspacePageHeader, and each sidebarless call site must supply the unconditional
  inset. (This test failed on the raw merge — the pin worked.)
• upstream-sync-workflow.test.ts — the two CI pins rewritten as invariants (no Blacksmith runner in
  ci.yml; whichever job runs --filter t3 test installs ripgrep) rather than positions, so they
  survive upstream adding jobs.
• Migrations.test.ts — extended to cover id 42.

Why

The daily upstream sync found 111 new commits. This is the reviewable merge; it is a draft because
the per-hotspot decisions above want a human read, and because two things still need attention:

• t3 triage points at upstream. The new apps/server/src/cli/triagePrompt.ts tells the user to
  search issues in pingdotgg/t3code, fetch PLAYBOOK.md from that repo, and file at
  github.com/pingdotgg/t3code/issues/new. Only the MARCODE_HOME read and the command description
  were retargeted — where Marcode users should file triage issues is a product call, and rewriting
  the whole playbook would be a large permanent edit surface in a brand-new upstream file.
• No live client verification. This container has no browser or simulator, so the web and mobile
  surfaces touched here (composer drawers, right-panel tabs, terminal chrome, usage redesign,
  settings/usage headers) have not been driven. Worth one pass with test-t3-app before this comes
  out of draft.

UI Changes

Not captured — this container cannot drive a client. Upstream's own UI work in this range (usage
insights redesign pingdotgg#7147, composer state drawers pingdotgg#7150, unified workspace navigation pingdotgg#7153, collapsed
tool activity pingdotgg#7152) lands on surfaces Marcode customizes, so before/after images belong to the
verification pass above.

Checklist

• This PR is small and focused — no: it is a 111-commit upstream sync, which is inherently broad.
• I explained what changed and why
• I included before/after screenshots for any UI changes — see above
• I included a video for animation/interaction changes — not applicable

Verification

Run locally against the merge commit (e39df1e3):

• Typecheck: contracts, client-runtime, web, server (t3), scripts, desktop, mobile,
  shared — all clean (suggestion-level Effect diagnostics only).
• Tests: full apps/web suite (292 files, 2993 tests), full packages/client-runtime (53/685), full
  packages/contracts (20/290), full scripts (22 files), and focused apps/server under
  cli/, cloud/, persistence/, plus serviceLauncher.test.ts and CheckpointReactor.test.ts
  (41 files, 182 tests). All pass.
• vp fmt --check clean across every changed file; vp lint clean (warnings only, all pre-existing).

One pre-existing failure, not caused by this merge:
scripts/update-release-package-versions.test.ts > preserves manifest write context and the filesystem cause chmods a file to 0o400 and expects the write to fail. This container runs as
root, which ignores the permission bit. The file is untouched by this merge and the test passes in
CI.

Coupled vendored subtrees: pnpm-workspace.yaml moved (Clerk bumps) but the effect version is
unchanged and infra/relay/package.json did not move, so neither sync:repos coupling triggered.
pnpm-lock.yaml was regenerated with pnpm install --lockfile-only.

---

Generated by Claude Code

[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	+865 B (+6.7%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+629 B (+9.8%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+236 B (+3.7%)	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	+875 B (+6.8%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+631 B (+9.8%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+244 B (+3.8%)	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: 5bcc188 · PR result: e39df1e · 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 pingdotgg/t3code@b1670ac7 (111 upstream commits, merge base 82b8a938) into main as a
normal two-parent merge on claude/gracious-bohr-x80z9c. 27 conflicted paths were resolved by hand;
no file was taken wholesale from either side.

The full per-path decision record is in the merge commit body. The parts that need a reviewer's eye:

Fork-identity breaks that merged clean and would have failed silently

• apps/server/src/cloud/bootService.ts — upstream's new macOS launchd plist (feat(server): run the background service on macOS via launchd pingdotgg/t3code#6286) exports
  T3CODE_HOME. resolveLauncherBaseDir reads MARCODE_HOME and exits otherwise, so the launch
  agent would never have started a server. Renamed and pinned with a test.
• apps/server/src/cli/triage.ts — upstream's new t3 triage command (feat(cli): npx t3 triage hands broken installs to your own coding agent pingdotgg/t3code#6563) read T3CODE_HOME.
• apps/server/src/cloud/bootService.test.ts — an upstream assertion hardcoded
  systemctl --user disable --now t3code.service; Marcode's unit is marcode.service.
• docs/user/background-service.md — new upstream doc pointed users at
  ~/.config/systemd/user/t3code.service.
• apps/web/src/components/ChatView.tsx — upstream's cmd+enter background draft (feat(web): cmd+enter to create thread in background pingdotgg/t3code#7821) calls
  handleNewThread, which arrived in a hunk Marcode had restructured for the pill-nav header. It
  merged clean into a ChatView that never declared it (caught by typecheck).
• .github/workflows/ci.yml — upstream added three jobs (test_server, rust,
  mobile_native_changes) on its Blacksmith fleet, which this fork cannot schedule on. All mapped to
  GitHub-hosted runners. Upstream also sharded apps/server out of test into test_server, which
  moved WorkspaceFileSystem's tests away from Marcode's ripgrep install step — the step follows
  them.

Marcode contracts held, upstream fixes taken on top

• threadSettled.ts — took upstream's settle-only-once rule (fix(threads): a merged PR settles its thread only once pingdotgg/t3code#7454), kept Marcode's one-hour warm
  window on top, migrated the Marcode tests to the new changeRequest option shape.
• ThreadTerminalDrawer.tsx — kept Marcode's terminal chrome, routed all three of its close
  affordances through upstream's new confirm-before-close (feat(web): confirm before closing a terminal pingdotgg/t3code#7592).
• RightPanelTabs.tsx — took upstream's tab mute (feat(desktop): mute a browser tab pingdotgg/t3code#7252) and shortcut-driven add-surface menu
  (feat(web): add shortcuts to the surface dropdown pingdotgg/t3code#7318); dropped their copy-path action and "Files" entry, since Marcode has no right-panel file
  surface. The menu keeps Marcode's placement beside the surface list.
• settings.tsx / UsagePage.tsx — adopted upstream's WorkspacePageHeader (feat(web): unify workspace navigation pingdotgg/t3code#7153) and passed the
  sidebarless titlebar inset as an override; both routes mount no sidebar, so the header's
  collapsed-sidebar inset never matches.
• ChatHeader.tsx / SidebarChrome.tsx — kept Marcode's title-only header and update-pill-only
  footer against upstream's breadcrumb, inline rename, title action menu, and footer nav.
• Migration 041_AuthSessionClientConnection renumbered to 042; Marcode owns id 33, so shared
  migrations sit one id higher.

Tests added or rewritten to pin the boundary

• ChatHeader.fork.test.tsx (new) — the header renders the title alone: no breadcrumb, rename, or
  action menu.
• bootService.test.ts — the launchd plist exports MARCODE_HOME and no T3CODE_HOME.
• workspaceTitlebar.fork.test.ts — rewritten to follow upstream's header refactor: the drag region
  now lives in WorkspacePageHeader, and each sidebarless call site must supply the unconditional
  inset. (This test failed on the raw merge — the pin worked.)
• upstream-sync-workflow.test.ts — the two CI pins rewritten as invariants (no Blacksmith runner in
  ci.yml; whichever job runs --filter t3 test installs ripgrep) rather than positions, so they
  survive upstream adding jobs.
• Migrations.test.ts — extended to cover id 42.

Why

The daily upstream sync found 111 new commits. This is the reviewable merge; it is a draft because
the per-hotspot decisions above want a human read, and because two things still need attention:

• t3 triage points at upstream. The new apps/server/src/cli/triagePrompt.ts tells the user to
  search issues in pingdotgg/t3code, fetch PLAYBOOK.md from that repo, and file at
  github.com/pingdotgg/t3code/issues/new. Only the MARCODE_HOME read and the command description
  were retargeted — where Marcode users should file triage issues is a product call, and rewriting
  the whole playbook would be a large permanent edit surface in a brand-new upstream file.
• No live client verification. This container has no browser or simulator, so the web and mobile
  surfaces touched here (composer drawers, right-panel tabs, terminal chrome, usage redesign,
  settings/usage headers) have not been driven. Worth one pass with test-t3-app before this comes
  out of draft.

UI Changes

Not captured — this container cannot drive a client. Upstream's own UI work in this range (usage
insights redesign pingdotgg#7147, composer state drawers pingdotgg#7150, unified workspace navigation pingdotgg#7153, collapsed
tool activity pingdotgg#7152) lands on surfaces Marcode customizes, so before/after images belong to the
verification pass above.

Checklist

• This PR is small and focused — no: it is a 111-commit upstream sync, which is inherently broad.
• I explained what changed and why
• I included before/after screenshots for any UI changes — see above
• I included a video for animation/interaction changes — not applicable

Verification

Run locally against the merge commit (e39df1e3):

• Typecheck: contracts, client-runtime, web, server (t3), scripts, desktop, mobile,
  shared — all clean (suggestion-level Effect diagnostics only).
• Tests: full apps/web suite (292 files, 2993 tests), full packages/client-runtime (53/685), full
  packages/contracts (20/290), full scripts (22 files), and focused apps/server under
  cli/, cloud/, persistence/, plus serviceLauncher.test.ts and CheckpointReactor.test.ts
  (41 files, 182 tests). All pass.
• vp fmt --check clean across every changed file; vp lint clean (warnings only, all pre-existing).

One pre-existing failure, not caused by this merge:
scripts/update-release-package-versions.test.ts > preserves manifest write context and the filesystem cause chmods a file to 0o400 and expects the write to fail. This container runs as
root, which ignores the permission bit. The file is untouched by this merge and the test passes in
CI.

Coupled vendored subtrees: pnpm-workspace.yaml moved (Clerk bumps) but the effect version is
unchanged and infra/relay/package.json did not move, so neither sync:repos coupling triggered.
pnpm-lock.yaml was regenerated with pnpm install --lockfile-only.

---

Generated by Claude Code

[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	+865 B (+6.7%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.9 KiB	+629 B (+9.8%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+236 B (+3.7%)	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	+875 B (+6.8%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.9 KiB	+631 B (+9.8%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.5 KiB	+244 B (+3.8%)	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: 5bcc188 · PR result: e39df1e · 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.