upstream sync blocked: pingdotgg/t3code@184d8ef33b8f

[github-actions]

Automatic upstream detection reached conflicted and stopped before any mutation.

field	value
target main	1af3478a59c99de26d5ff7268a519dff3ffa72ba
source main	184d8ef33b8f42869fb84f66a33984185b81dc47
merge base	b73232bdd31e83914a8a943960c7dc4b6390b39b
upstream commits	45
changed paths	277

Conflicting paths

• .agents/skills/test-t3-mobile/SKILL.md
• AGENTS.md
• apps/web/src/components/AppSidebarLayout.tsx
• apps/web/src/components/ChatView.tsx
• apps/web/src/components/RightPanelTabs.tsx
• apps/web/src/components/chat/ChatHeader.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
• packages/client-runtime/src/state/threadSettled.ts
• pnpm-lock.yaml
• scripts/build-desktop-artifact.ts

Hotspot matches

• apps/mobile/app.config.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-composer-editor/ios/T3ComposerEditorView.swift — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-markdown-text/src/NativeMarkdownBlock.ios.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-markdown-text/src/SelectableMarkdownText.ios.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-markdown-text/src/nativeMarkdownText.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3HeaderButtonView.kt — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3NativeControlsModule.kt — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-native-controls/ios/T3HeaderButtonView.swift — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-native-controls/ios/T3NativeControlsModule.swift — owner mobile (Native client and Marcode branding)
• apps/mobile/src/Stack.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/components/ComposerToolbar.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/components/GlassSurface.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/agent-awareness/remoteRegistration.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/agent-awareness/remoteRegistration.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/connection/ConnectionsNewRouteScreen.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/files/FileTreeBrowser.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/home/HomeHeader.tsx — owner mobile (Native client and Marcode branding)
• 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/layout/native-mail-search-toolbar.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/projects/AddProjectScreen.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/review/ReviewSheet.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/settings/SettingsRouteScreen.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/terminal/ThreadTerminalRouteScreen.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/ComposerCommandPopover.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/GitActionProgressOverlay.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/NewTaskDraftScreen.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/NewTaskRouteScreen.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/ThreadComposer.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/ThreadDetailScreen.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/features/threads/ThreadNavigationSidebar.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/ThreadRouteScreen.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/ThreadSettingsSheet.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/legacy-plan-mode.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/legacy-plan-mode.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/new-task-context-presentation.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/new-task-context-presentation.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/new-task-flow-provider.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/new-task-project-selection.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/new-task-project-selection.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/sidebar-header-actions.android.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-settings-menu.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/thread-settings-menu.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/thread-settings-options.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/thread-settings-options.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/thread-settings-sheet-state.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/thread-settings-sheet-state.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/threadListV2.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/threadListV2.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/use-legacy-plan-mode-enabled.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/use-thread-settings-sheet-presentation.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/updates/app-updates.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/updates/app-updates.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/atomic-file.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/composerImages.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/foreground-handoff.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/foreground-handoff.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/layoutMetrics.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/nativeMarkdownText.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/native/T3ComposerEditor.ios.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/native/T3ComposerEditor.native.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/native/T3HeaderButton.android.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/native/composerEditorRevision.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/native/composerEditorRevision.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/native/native-glass.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/native/sheet-surface.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/persistence/mobile-preferences.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/queries.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/thread-outbox-model.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/thread-outbox-storage.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/thread-outbox.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/thread-outbox.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/use-composer-drafts.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/use-composer-drafts.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/use-thread-composer-state.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/use-thread-outbox-drain.ts — owner mobile (Native client and Marcode branding)
• apps/server/src/cli/connect.ts — owner server-runtime (Compatibility CLI behavior with user-visible Marcode service identity)
• apps/server/src/cloud/config.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)
• apps/server/src/provider/CodexDeveloperInstructions.ts — owner provider-runtime (Provider-specific Marcode behavior)
• 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.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/chat/ChatHeader.tsx — owner web-shell (Marcode portals thread actions into FloatingPillNav)
• 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/index.css — owner design-system (Marcode visual tokens and chrome)
• apps/web/src/rightPanelStore.ts — owner web-runtime (Marcode multi-surface state)
• packages/contracts/src/settings.test.ts — owner web-navigation (Marcode navigation and unified-workspace rollout settings)
• packages/contracts/src/settings.ts — owner web-navigation (Marcode navigation and unified-workspace rollout settings)

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 #31 — pingdotgg/t3code@184d8ef3 merged by hand on claude/gracious-bohr-w8msaa (merge commit 83199eba).

15 conflicts resolved path by path, each combining upstream's intent with Marcode's; the per-path decisions are in the PR body and the merge commit message. Four fork-boundary breaks in upstream's new pair-client.sh merged without a conflict (T3CODE_PORT, the t3code-dev scheme, the com.t3tools.t3code.dev package) and are fixed, with scripts/mobile-pairing-helper.fork.test.ts added to pin them.

---

Generated by Claude Code