upstream sync blocked: pingdotgg/t3code@78f462c4e18c

[github-actions]

Automatic upstream detection reached conflicted and stopped before any mutation.

field	value
target main	8a6745f4d4f02156985aac9841eea0c2c37fec16
source main	78f462c4e18c8ea5e5037dc916389a3b72246025
merge base	1a003e383ac6b10258b8100c2617d938c4f06c69
upstream commits	28
changed paths	75

Conflicting paths

• apps/server/src/http.ts
• apps/web/src/components/AppSidebarLayout.tsx
• apps/web/src/components/chat/ChatHeader.tsx
• apps/web/src/components/chat/DraftHeroHeadline.tsx
• apps/web/src/routes/__root.tsx

Hotspot matches

• apps/mobile/src/components/ControlPill.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/ThreadFeed.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/threadActivity.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/wideMarkdownBlocks.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/wideMarkdownBlocks.ts — owner mobile (Native client and Marcode branding)
• apps/web/src/components/AppSidebarLayout.tsx — owner web-navigation (Marcode floating navigation shell and upstream sidebar selection)
• 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.tsx — owner web-navigation (Marcode unified project workspace and thread navigation)
• apps/web/src/components/chat/ChatComposer.tsx — owner web-shell (Marcode floating glass composer)
• apps/web/src/components/chat/ChatHeader.tsx — owner web-shell (Marcode portals thread actions into FloatingPillNav)
• apps/web/src/index.css — owner design-system (Marcode visual tokens and chrome)

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 hand in #21 (draft), which merges pingdotgg/t3code@78f462c4e18c8ea5e5037dc916389a3b72246025 on branch claude/gracious-bohr-ipvnfy.

Five conflicts, all resolved by combining both intents — apps/server/src/http.ts (upstream SVG sandboxing + Marcode's marcode:// renderer origins), apps/web/src/routes/__root.tsx, apps/web/src/components/chat/DraftHeroHeadline.tsx, apps/web/src/components/AppSidebarLayout.tsx, and apps/web/src/components/chat/ChatHeader.tsx. Per-path reasoning is in the PR description.

Closing this tracker; the PR stays draft pending the four required checks and live client verification.

---

Generated by Claude Code