upstream sync blocked: pingdotgg/t3code@b73232bdd31e

[github-actions]

Automatic upstream detection reached conflicted and stopped before any mutation.

field	value
target main	7c0314e288458cb0c8d4498dc76c12a5cdbe8ce4
source main	b73232bdd31e83914a8a943960c7dc4b6390b39b
merge base	3da7f9c5c35d0c1f2a1b4420fbc10016e11ce069
upstream commits	24
changed paths	76

Conflicting paths

• apps/web/package.json
• apps/web/src/components/AppSidebarLayout.tsx
• apps/web/src/components/GitActionsControl.tsx
• apps/web/src/components/RightPanelTabs.tsx
• apps/web/src/components/sidebar/SidebarChrome.tsx
• apps/web/src/components/ui/autocomplete.tsx
• apps/web/src/components/ui/combobox.tsx
• apps/web/src/components/ui/popover.tsx
• apps/web/src/components/ui/select.tsx
• apps/web/src/index.css
• pnpm-lock.yaml

Hotspot matches

• apps/mobile/src/features/home/HomeRouteScreen.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/home/HomeScreen.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/home/useThreadListActions.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/ThreadFeed.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/thread-list-items.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/thread-list-v2-items.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/thread-title-regeneration-menu.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/thread-title-regeneration-menu.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/server/src/cloud/CliTokenManager.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)
• apps/server/src/cloud/publicConfig.test.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)
• apps/server/src/cloud/publicConfig.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)
• 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/chat/ChatComposer.tsx — owner web-shell (Marcode floating glass composer)
• apps/web/src/components/sidebar/SidebarChrome.tsx — owner web-navigation (Marcode keeps brand, settings, and sidebar controls in FloatingPillNav)
• apps/web/src/components/ui/menu.tsx — owner web-shell (Shared Marcode portal overlay and floating-layer behavior)
• apps/web/src/components/ui/popover.tsx — owner web-shell (Shared Marcode portal overlay and floating-layer behavior)
• 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 #25 — draft PR merging pingdotgg/t3code@b73232bdd31e on branch claude/gracious-bohr-9g2trc (merge commit 0edf16a7).

Eleven conflicts, each combined rather than taken from one side; the per-path decisions are in the PR body. Two upstream changes that would have been quietly lost are called out there: SidebarUpdateArchitectureWarning (upstream split the Intel-on-Apple-Silicon warning out of SidebarUpdatePill, which Marcode's footer renders alone) and the disabled-push upload icon from pingdotgg#6207.

Closing as completed — the next scheduled run sees a new merge base and returns to clean-merge.

---

Generated by Claude Code