upstream sync blocked: pingdotgg/t3code@9513e62e240b

[github-actions]

Automatic upstream detection reached conflicted and stopped before any mutation.

field	value
target main	1af3478a59c99de26d5ff7268a519dff3ffa72ba
source main	9513e62e240bdf1da285e4f3304bc52787125671
merge base	b73232bdd31e83914a8a943960c7dc4b6390b39b
upstream commits	18
changed paths	124

Conflicting paths

• apps/web/src/components/ChatView.tsx
• apps/web/src/components/clerk/MobileClientsUserProfilePage.tsx
• apps/web/src/components/pullRequest/PullRequestTimelineTab.tsx
• apps/web/src/components/sidebar/SidebarChrome.tsx
• apps/web/src/components/ui/tooltip.tsx
• apps/web/src/hooks/useHandleNewThread.ts
• apps/web/src/routes/_chat.pull-requests.tsx

Hotspot matches

• apps/mobile/src/features/threads/ComposerCommandPopover.tsx — owner mobile (Native client and Marcode branding)
• apps/server/src/provider/CodexDeveloperInstructions.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/web/src/components/ChatView.tsx — owner web-runtime (Marcode workspace, terminal, and browser integration)
• apps/web/src/components/CommandPalette.tsx — owner web-navigation (Marcode floating-pill entry point plus upstream command-palette intents)
• apps/web/src/components/Sidebar.logic.test.ts — owner web-navigation (Shared legacy, unified-workspace, and sidebar-v2 behavior)
• apps/web/src/components/Sidebar.logic.ts — owner web-navigation (Shared legacy, unified-workspace, and sidebar-v2 behavior)
• apps/web/src/components/Sidebar.tsx — owner web-navigation (Marcode unified project workspace and thread navigation)
• apps/web/src/components/clerk/T3ConnectSidebarSignIn.tsx — owner product-identity (User-visible Marcode Connect identity)
• apps/web/src/components/sidebar/SidebarChrome.tsx — owner web-navigation (Marcode keeps brand, settings, and sidebar controls in FloatingPillNav)
• apps/web/src/components/ui/alert-dialog.tsx — owner web-shell (Shared Marcode portal overlay and backdrop behavior)
• apps/web/src/hooks/useHandleNewThread.ts — owner web-runtime (Unified-workspace placement and upstream draft carry-forward behavior)
• apps/web/src/rightPanelStore.ts — owner web-runtime (Marcode multi-surface state)

Reproduce locally (read-only, disposable worktree)

vp run upstream:plan

The bot did not resolve conflicts, did not push an integration branch, and did not open a
pull request. Resolve this by hand: see docs/operations/upstream-sync.md.

[maarco]

Resolved by #29, which merges pingdotgg/t3code@9e201941 — 9513e62e is an ancestor of that SHA, so this block is included in that sync.

Eight conflicts resolved by hand on claude/gracious-bohr-tbslho; the per-path decisions are in the PR description.

Leaving this open until #29 lands on main, per docs/operations/upstream-sync.md ("Close the tracking issue when the resolution lands").

---

Generated by Claude Code

[maarco]

Resolved by #31. pingdotgg/t3code@9513e62e is an ancestor of 184d8ef3, so it is inside the range that merge brings in — no separate resolution needed.

---

Generated by Claude Code