upstream sync blocked: pingdotgg/t3code@49c0d96edf28

[github-actions]

Automatic upstream detection reached conflicted and stopped before any mutation.

field	value
target main	2f4132946eeb6b81f20c8cb146db30e47466bfac
source main	49c0d96edf280f1fe6750a83161a3a2cff0f25ef
merge base	89c5a192f4d36bcf4201e8b490ab5ad37a4adac7
upstream commits	65
changed paths	12080

Conflicting paths

• AGENTS.md
• apps/desktop/src/app/DesktopObservability.test.ts
• apps/desktop/src/electron/ElectronWindow.test.ts
• apps/mobile/src/features/cloud/CloudWaitlistEnrollment.tsx
• apps/mobile/src/features/settings/SettingsRouteScreen.tsx
• apps/server/src/cli/config.ts
• apps/server/src/http.ts
• apps/server/src/server.test.ts
• apps/server/src/telemetry/AnalyticsService.test.ts
• apps/server/src/vcs/GitVcsDriverCore.test.ts
• apps/server/src/vcs/GitVcsDriverCore.ts
• apps/server/src/ws.ts
• apps/web/src/components/AppSidebarLayout.tsx
• apps/web/src/components/ChatMarkdown.tsx
• apps/web/src/components/ChatView.tsx
• apps/web/src/components/ProjectScriptsControl.tsx
• apps/web/src/components/Sidebar.tsx
• apps/web/src/components/SidebarStageBackdrop.tsx
• apps/web/src/components/chat/ChatHeader.tsx
• apps/web/src/components/chat/DraftHeroHeadline.tsx
• apps/web/src/components/clerk/T3ConnectSidebarSignIn.tsx
• apps/web/src/components/files/FileBrowserPanel.tsx
• apps/web/src/components/sidebar/SidebarChrome.tsx
• packages/client-runtime/src/rpc/client.ts
• pnpm-lock.yaml
• scripts/build-desktop-artifact.test.ts
• scripts/build-desktop-artifact.ts

Hotspot matches

• apps/mobile/src/Stack.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/connection/background-activity-scopes.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/connection/background-activity.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/connection/background-activity.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/connection/environment-cache-store.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/connection/environment-cache-store.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/connection/runtime.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/cloud/CloudWaitlistEnrollment.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/cloud/cloudWaitlistJoin.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/cloud/cloudWaitlistJoin.ts — 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/CloudEnvironmentRows.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/HomeScreen.tsx — 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/settings/SettingsWaitlistRouteScreen.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-v2-items.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/threads/use-thread-list-v2-enabled.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/threadActivity.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/threadActivity.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/persistence/mobile-database.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/persistence/mobile-preferences.ts — owner mobile (Native client and Marcode branding)
• apps/server/src/cli/config.test.ts — owner server-runtime (Compatibility CLI behavior with user-visible Marcode service identity)
• apps/server/src/cli/config.ts — owner server-runtime (Compatibility CLI behavior with user-visible Marcode service identity)
• apps/server/src/cloud/http.test.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)
• apps/server/src/cloud/http.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)
• apps/server/src/provider/Drivers/ClaudeDriver.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Drivers/CodexDriver.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Drivers/CursorDriver.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Drivers/GrokDriver.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Drivers/OpenCodeDriver.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Layers/ClaudeAdapter.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Layers/CodexAdapter.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Layers/CodexAdapter.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Layers/EventNdjsonLogger.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Layers/EventNdjsonLogger.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Layers/ProviderEventLoggers.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Layers/ProviderRegistry.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Layers/ProviderService.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/makeManagedServerProvider.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/makeManagedServerProvider.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/ProjectScriptsControl.tsx — owner web-runtime (Unified-workspace command placement and checked-in t3.json action imports)
• 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/components/clerk/T3ConnectSidebarSignIn.tsx — owner product-identity (User-visible Marcode Connect identity)
• 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/sidebar/SidebarChrome.tsx — owner web-navigation (Marcode keeps brand, settings, and sidebar controls in FloatingPillNav)
• apps/web/src/components/ui/command.tsx — owner web-shell (Shared Marcode portal overlay and backdrop 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/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 #5, which merged pingdotgg/t3code@ca72e381c — a descendant of the sha this issue names. Merge commit fc9dcff.