upstream sync blocked: pingdotgg/t3code@a041981276b4

[github-actions]

Automatic upstream detection reached conflicted and stopped before any mutation.

field	value
target main	9c69f8b5e67eae0d0435e89eaca17a1ac9781a0b
source main	a041981276b4c789fed8132e3b8a320749bf25e8
merge base	e6987965f65914861f0dabd0db03729fe5cd2508
upstream commits	57
changed paths	361

Conflicting paths

• .github/workflows/ci.yml
• AGENTS.md
• README.md
• apps/mobile/package.json
• apps/mobile/src/features/home/HomeHeader.tsx
• apps/mobile/src/features/threads/ThreadComposer.tsx
• apps/server/src/cli/connect.ts
• apps/server/src/cloud/selfUpdate.test.ts
• apps/server/src/persistence/Migrations.ts
• apps/server/src/ws.ts
• apps/web/package.json
• apps/web/src/components/ThreadTerminalDrawer.test.ts
• apps/web/src/components/ThreadTerminalDrawer.tsx
• apps/web/src/components/files/FileBrowserPanel.tsx
• apps/web/src/components/files/FilePreviewPanel.tsx
• docs/README.md
• docs/architecture/overview.md
• docs/getting-started/quick-start.md
• docs/internals/project-workspace-layout.md
• docs/operations/ci.md
• docs/operations/observability.md
• docs/operations/release.md
• docs/reference/scripts.md
• docs/user/keybindings.md
• docs/user/source-control.md
• oxlint-plugin-marcode/test/utils.ts
• packages/contracts/src/rpc.ts
• pnpm-lock.yaml
• scripts/mobile-showcase.test.ts
• scripts/mobile-showcase.ts

Hotspot matches

• apps/marketing/src/layouts/Layout.astro — owner marketing (Marcode public site and assets)
• apps/marketing/src/lib/site.ts — owner marketing (Marcode public site and assets)
• apps/marketing/src/pages/download.astro — owner marketing (Marcode public site and assets)
• apps/marketing/src/pages/index.astro — owner marketing (Marcode public site and assets)
• apps/mobile/app.config.ts — 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-native-controls/ios/T3NativeControlsModule.swift — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-terminal/README.md — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-terminal/THIRD_PARTY_NOTICES.md — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-terminal/android/src/main/cpp/CMakeLists.txt — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-terminal/scripts/build-libghostty-android.sh — owner mobile (Native client and Marcode branding)
• apps/mobile/package.json — owner mobile (Native client and Marcode branding)
• apps/mobile/src/Stack.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/components/AppSymbol.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/components/CompactBrandTitle.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/components/ProjectFavicon.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/components/projectFaviconCache.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/components/projectFaviconCache.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/connection/app-state-wakeups.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/connection/app-state-wakeups.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/connection/platform.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/cloud/linkEnvironment.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/connection/pairing.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/connection/pairing.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/files/ThreadFilesRouteScreen.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/home/homeThreadList.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/home/homeThreadList.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/home/thread-swipe-actions.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/layout/native-mail-search-toolbar.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/projects/AddProjectScreen.logic.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/projects/AddProjectScreen.logic.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/settings/SettingsRouteScreen.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/sharing/IncomingShareProvider.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/sharing/incoming-share-native.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/sharing/incoming-share-native.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/shortcuts/useAppShortcuts.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/showcase/ShowcaseCaptureCoordinator.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/showcase/nativeShowcaseScene.ts — 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/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/new-task-flow-provider.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/sidebar-navigation-shell.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-search-match.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/thread-work-log.tsx — 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/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/appearancePreferences.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/layoutMetrics.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/mobileBranding.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/mobileBranding.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/modelOptions.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/modelOptions.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/threadActivity.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/native/StackHeader.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/state/queries.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/thread-outbox-manager.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-selected-thread-requests.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/cli/invocation.test.ts — owner server-runtime (Compatibility CLI behavior with user-visible Marcode service identity)
• apps/server/src/cli/invocation.ts — owner server-runtime (Compatibility CLI behavior with user-visible Marcode service identity)
• apps/server/src/cli/pair.test.ts — owner server-runtime (Compatibility CLI behavior with user-visible Marcode service identity)
• apps/server/src/cli/pair.ts — owner server-runtime (Compatibility CLI behavior with user-visible Marcode service identity)
• apps/server/src/cloud/selfUpdate.test.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)
• apps/server/src/cloud/selfUpdate.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)
• apps/server/src/persistence/Migrations.ts — owner persistence (Shared migration registry; Marcode and upstream migrations must retain unique ordered ids)
• apps/server/src/provider/Layers/ProviderSessionReaper.test.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/chat/ChatComposer.tsx — owner web-shell (Marcode floating glass composer)
• apps/web/src/components/desktopUpdate.logic.test.ts — owner release-branding (User-visible Marcode desktop update copy)
• apps/web/src/components/desktopUpdate.logic.ts — owner release-branding (User-visible Marcode desktop update copy)
• apps/web/src/components/files/FileBrowserPanel.tsx — owner editor-runtime (Marcode retired the right-panel file surface; the floating editor owns file editing)
• apps/web/src/components/files/FilePreviewPanel.tsx — owner editor-runtime (Marcode retired the right-panel file surface; the floating editor owns file editing)
• apps/web/src/components/files/ProjectFilePicker.logic.test.ts — owner editor-runtime (Marcode retired the right-panel file surface; the floating editor owns file editing)
• apps/web/src/components/files/ProjectFilePicker.logic.ts — owner editor-runtime (Marcode retired the right-panel file surface; the floating editor owns file editing)
• apps/web/src/components/files/ProjectFilePicker.tsx — owner editor-runtime (Marcode retired the right-panel file surface; the floating editor owns file editing)
• apps/web/src/components/files/fileLineReveal.test.ts — owner editor-runtime (Marcode retired the right-panel file surface; the floating editor owns file editing)
• apps/web/src/components/files/fileLineReveal.ts — owner editor-runtime (Marcode retired the right-panel file surface; the floating editor owns file editing)
• apps/web/src/components/files/projectFilesQueryState.ts — owner editor-runtime (Marcode retired the right-panel file surface; the floating editor owns file editing)
• 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)
• docs/architecture/overview.md — owner architecture (Shared architecture index includes Marcode-owned subsystems)
• packages/client-runtime/src/operations/projects.test.ts — owner web-runtime (Project mutation operations shared with Marcode workspace layout)
• packages/client-runtime/src/operations/projects.ts — owner web-runtime (Project mutation operations shared with Marcode workspace layout)

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 #5, which merged pingdotgg/t3code@ca72e381c — a descendant of the sha this issue names. Merge commit fc9dcff.