chore(upstream): sync marcode through 82b8a938

[maarco]

What Changed

Daily upstream sync: merges 169 commits from pingdotgg/t3code through 82b8a938 (merge base b73232bd) into main via a --no-ff merge. Every conflict was resolved by hand, combining upstream intent with Marcode's product contracts — no file was taken wholesale from either side.

Upstream tip 82b8a938: fix(orchestration): do not revive idle tasks from status-free progress (#7172).

Conflict decisions

Structural / deletions

• apps/desktop/resources/icon.{icns,ico,png} — took upstream's deletion. Upstream now generates desktop icons at build time from assets/ (DesktopAssets.ts, ensureMacIconIcns). Marcode's marks live in assets/, and stageMacIcons still composites them onto the opaque white matte, so the packaged icon is unchanged.
• apps/web/src/components/files/FileBrowserPanel.tsx, FilePreviewPanel.tsx — stayed deleted (Marcode retired the right-panel file surfaces). Upstream's edits were subheader styling + a remote-open gate, both of which live on Marcode's floating-editor path.
• oxlint-plugin-marcode/rules/no-native-title-tooltip.{ts,test.ts} — took upstream's new rule into the renamed plugin dir; retargeted the hardcoded t3code/ prefix to marcode/.

Fork identity (clean merges that would have silently broken)

• vite.config.ts — registered the new rule under marcode/. Landed it at warn (not upstream's error): 35 native title tooltips remain on Marcode-only surfaces (floating editor, floating terminal shell, git actions, open-in picker) upstream never had. The rule reports every one; raise to error once they migrate.
• .agents/skills/test-t3-mobile/scripts/pair-client.sh — upstream's new helper read T3CODE_PORT and launched com.t3tools.t3code.dev; retargeted to MARCODE_PORT / com.t3tools.marcode.dev.
• apps/desktop/src/wsl/DesktopWslServerTree.test.ts — upstream fixture set T3CODE_HOME/T3CODE_MODE; DesktopConfig reads MARCODE_HOME. Retargeted.
• apps/web/src/components/desktopUpdate.logic.test.ts — retargeted upstream's "restart T3 Code?" assertion to Marcode.
• apps/server/src/provider/Layers/CodexSessionRuntime.test.ts — took upstream's codexDefaultModeDeveloperInstructions(browserToolsAvailable) refactor, kept /Marcode/, retargeted the doesNotMatch assertion to "Marcode collaborative browser".
• scripts/build-desktop-artifact.test.ts — retargeted the DMG installer title to "Marcode 1.2.3 Installer".
• apps/desktop/resources/dmg/dmg-background-{latest,nightly}.svg — rebranded "Drag T3 Code to Applications".
• apps/mobile/src/lib/mobileTheme.ts — rebranded the default built-in theme label to Marcode.
• apps/web/src/components/clerk/T3ConnectUserProfilePage.tsx, T3ConnectSidebarSignIn.tsx — upstream's new Connect page + sidebar entry ship "T3 Connect" copy; rebranded to "Marcode Connect" to match ConnectionsSettings.
• apps/server/src/sourceControl/BitbucketSourceControlProvider.ts — kept MARCODE_BITBUCKET_* names, took upstream's added "user read" scope.
• apps/desktop/scripts/electron-launcher.mjs — took upstream's resolveMacLauncherIconPaths/ensureMacIconIcns refactor + LAUNCHER_VERSION 15; kept Marcode's bundle ids, protocol schemes, and disable directive.
• packaging/aur/** left upstream-shaped (Marcode publishes no AUR package).

Marcode product contracts kept (upstream fixes ported on top)

• packages/client-runtime/src/state/threadSettled.ts — took upstream's changeRequestAutoSettles + autoSettleOnMerge setting, applied through Marcode's one-hour warm window instead of settling immediately. Retargeted upstream's immediate-settle test past the warm window and added a test pinning the window over both PR-state signals.
• apps/web/src/diffFileActions.ts / .test.ts — took upstream's resolveDiffPathForWorkspace (repository-relative diff paths in nested projects/worktrees), landed the result in the floating editor instead of the removed right-panel file surface; rewrote the two upstream tests that asserted right-panel state.
• apps/web/src/components/ChatMarkdown.tsx — took upstream's workspace basename lookup for bare filenames, routed its result into the floating editor (upstream's openFileInPanel called useRightPanelStore.openFile, gone in Marcode's store).
• apps/web/src/components/RightPanelTabs.tsx — took upstream's desktop favicon plumbing + Button-based add-panel trigger; dropped the theme prop and PierreEntryIcon (upstream threads them in only for the retired file surface).
• apps/web/src/components/ChatView.tsx — took upstream's surface-keyed PR-tab status fix + workspace file drop target; kept Marcode's hero background, composer inset, and pill-nav-only layout controls (tagged with upstream's data-workspace-titlebar-controls).
• apps/web/src/components/ThreadTerminalDrawer.tsx — kept Marcode's xterm terminal. Upstream migrated this surface to a Ghostty WASM surface; see UI Changes.
• SidebarChrome.tsx, AppSidebarLayout.tsx, threadSidebarWidth.test.ts, ui/tooltip.tsx — kept Marcode's brand-free sidebar header/footer, pill-nav toggle bridge, removal pin, and inline z-index.
• apps/web/src/index.css — took upstream's @variant dark refactor, @layer base stage-art defaults, alert-glass + sidebar-stage-backdrop utilities, and theme-art aliases; kept Marcode's dark palette, sidebar palette, workspace topbar, composer inset, scroll fades, and mono nav voice.
• ConnectionsSettings.tsx (desktop-only gate + Marcode Connect copy), MobileClientsUserProfilePage.tsx (upstream ClerkUserProfilePage refactor + Marcode branding), ChatHeader.tsx (both imports; upstream inline rename left unmounted), useHandleNewThread.ts (Marcode placement options + upstream carryComposerContent).
• Native-title→Tooltip migrations (DraftHeroHeadline, Sidebar woke pill, UsagePage, PullRequestDetailPanel, PullRequestCodeTab) — took upstream's Tooltip structure, kept Marcode's styling and icon sizes.

Tests upstream deleted that pinned Marcode behavior — kept

• infra/relay/scripts/deploy.test.ts (MARCODE_RELAY_URL reconciliation)
• scripts/mobile-showcase.test.ts (marcode:// showcase scene routes)

Why

This is the scheduled fork sync — bringing in 169 upstream correctness, security, and feature commits while preserving Marcode's intentional divergences (floating editor as the only file-editing surface, unified workspace shell, branding, and compatibility identifiers). Hotspot paths were reviewed as mandatory-review, not automatic keep-Marcode: upstream fixes embedded in customized files (diff-path resolution, PR-tab status keying, the autoSettleOnMerge setting, the Bitbucket scope) were all ported on top.

pnpm-workspace.yaml and infra/relay/package.json are unchanged, so no effect-smol / alchemy-effect subtree sync was required.

UI Changes

No intended visual change — Marcode's shell, palette, and surfaces are preserved.

Not ported (flagging): upstream's Ghostty terminal migration (right-click paste + context menu, pingdotgg#5240) was not brought in. Marcode intentionally keeps the xterm terminal for its search feature; this is a documented divergence, and the paste/context-menu work would need re-porting onto xterm by hand. No behavior regressed — the feature simply isn't added.

Verification

• 169 commits merged; pnpm-lock.yaml regenerated with pnpm install --lockfile-only.
• Typecheck green: @t3tools/{web,shared,contracts,client-runtime,scripts,desktop,mobile,oxlint-plugin-marcode}, t3, marcode-relay.
• Lint 0 errors; format clean on all 650 changed files.
• Focused tests: 705 passed across the touched paths.

Full CI (Check, Test, Mobile Native Static Analysis, Release Smoke) runs on this PR.

Checklist

• I explained what changed and why
• This PR is small and focused — N/A: this is the scheduled 169-commit upstream sync
• Before/after screenshots — N/A: no intended UI change
• Video for animation/interaction changes — N/A

🤖 Generated with Claude Code

https://claude.ai/code/session_01Y7hnoykEhpviir998tucot

---

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	11.3 KiB	12.6 KiB	+1.3 KiB (+11.5%)	15.1 KiB	✅
Codex	Thread snapshot wire	5.5 KiB	6.3 KiB	+839 B (+15.0%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	5.9 KiB	6.3 KiB	+489 B (+8.2%)	7.8 KiB	✅
Codex	Live turn WebSocket decoded	49.7 KiB	51.8 KiB	+2.1 KiB (+4.2%)	66.4 KiB	✅
Codex	Live turn messages	16	16	0 (0.0%)	21	✅
Claude	Total thread wire	11.3 KiB	12.6 KiB	+1.3 KiB (+11.2%)	15.1 KiB	✅
Claude	Thread snapshot wire	5.5 KiB	6.3 KiB	+815 B (+14.5%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	5.8 KiB	6.3 KiB	+483 B (+8.1%)	7.8 KiB	✅
Claude	Live turn WebSocket decoded	50.6 KiB	52.7 KiB	+2.1 KiB (+4.2%)	66.4 KiB	✅
Claude	Live turn messages	16	16	0 (0.0%)	21	✅

Baseline: 1af3478 · PR result: 720bbde · 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: 99.9 KiB
• Claude decoded thread snapshot: 100.6 KiB

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