Automatic upstream detection reached conflicted and stopped before any mutation.
| field |
value |
target main |
5bcc188a86c8ef9c91fcdade87f377efa5a15284 |
source main |
2274444e92275fda2033de6636e3143ac3599ffb |
| merge base |
82b8a9380298509d68170961d9717be62836e490 |
| upstream commits |
90 |
| changed paths |
362 |
Conflicting paths
.github/workflows/ci.yml.plans/effect-atom.mdAGENTS.mdapps/server/src/cli/connect.tsapps/server/src/cli/service.tsapps/server/src/persistence/Migrations.tsapps/web/src/components/ChatView.tsxapps/web/src/components/RightPanelTabs.tsxapps/web/src/components/Sidebar.logic.tsapps/web/src/components/Sidebar.tsxapps/web/src/components/ThreadTerminalDrawer.tsxapps/web/src/components/chat/ChatComposer.tsxapps/web/src/components/chat/ChatHeader.tsxapps/web/src/components/chat/ComposerPendingApprovalPanel.tsxapps/web/src/components/chat/MessagesTimeline.tsxapps/web/src/components/files/FileBrowserPanel.tsxapps/web/src/components/files/FilePreviewPanel.tsxapps/web/src/components/pullRequest/PullRequestListFilters.tsxapps/web/src/components/sidebar/SidebarChrome.tsxapps/web/src/components/usage/UsagePage.tsxapps/web/src/index.cssapps/web/src/routes/__root.tsxapps/web/src/routes/_chat.pull-requests.tsxapps/web/src/routes/settings.tsxpackages/client-runtime/src/state/threadSettled.ts
Hotspot matches
apps/marketing/src/lib/macArch.test.ts — owner marketing (Marcode public site and assets)apps/marketing/src/lib/macArch.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/src/components/AppSymbol.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/connection/platform.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/connection/environmentSections.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/connection/environmentSections.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/connection/useConnectionController.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/files/fileTree.test.ts — 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/threads/ComposerCommandPopover.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/composerSlashSkillSearch.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/composerSlashSkillSearch.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/thread-feed-live-follow.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/thread-feed-live-follow.ts — 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/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/lib/authClientMetadata.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/connection.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/state/thread-pr-presentation.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/service.test.ts — owner server-runtime (Compatibility CLI behavior with user-visible Marcode service identity)apps/server/src/cli/service.ts — owner server-runtime (Compatibility CLI behavior with user-visible Marcode service identity)apps/server/src/cli/triage.ts — owner server-runtime (Compatibility CLI behavior with user-visible Marcode service identity)apps/server/src/cli/triagePrompt.test.ts — owner server-runtime (Compatibility CLI behavior with user-visible Marcode service identity)apps/server/src/cli/triagePrompt.ts — owner server-runtime (Compatibility CLI behavior with user-visible Marcode service identity)apps/server/src/cloud/bootService.test.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/bootService.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/cloud/pinnedRuntime.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/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/CodexProvider.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/CodexProvider.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/GrokProvider.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/OpenCodeProvider.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/OpenCodeProvider.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/ProviderInstanceRegistryLive.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/opencodeRuntime.cliParsers.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/opencodeRuntime.inventory.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/opencodeRuntime.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/chat/ChatHeader.tsx — owner web-shell (Marcode portals thread actions into FloatingPillNav)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/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/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)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)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)
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.
Automatic upstream detection reached
conflictedand stopped before any mutation.main5bcc188a86c8ef9c91fcdade87f377efa5a15284main2274444e92275fda2033de6636e3143ac3599ffb82b8a9380298509d68170961d9717be62836e490Conflicting paths
.github/workflows/ci.yml.plans/effect-atom.mdAGENTS.mdapps/server/src/cli/connect.tsapps/server/src/cli/service.tsapps/server/src/persistence/Migrations.tsapps/web/src/components/ChatView.tsxapps/web/src/components/RightPanelTabs.tsxapps/web/src/components/Sidebar.logic.tsapps/web/src/components/Sidebar.tsxapps/web/src/components/ThreadTerminalDrawer.tsxapps/web/src/components/chat/ChatComposer.tsxapps/web/src/components/chat/ChatHeader.tsxapps/web/src/components/chat/ComposerPendingApprovalPanel.tsxapps/web/src/components/chat/MessagesTimeline.tsxapps/web/src/components/files/FileBrowserPanel.tsxapps/web/src/components/files/FilePreviewPanel.tsxapps/web/src/components/pullRequest/PullRequestListFilters.tsxapps/web/src/components/sidebar/SidebarChrome.tsxapps/web/src/components/usage/UsagePage.tsxapps/web/src/index.cssapps/web/src/routes/__root.tsxapps/web/src/routes/_chat.pull-requests.tsxapps/web/src/routes/settings.tsxpackages/client-runtime/src/state/threadSettled.tsHotspot matches
apps/marketing/src/lib/macArch.test.ts— ownermarketing(Marcode public site and assets)apps/marketing/src/lib/macArch.ts— ownermarketing(Marcode public site and assets)apps/marketing/src/pages/download.astro— ownermarketing(Marcode public site and assets)apps/marketing/src/pages/index.astro— ownermarketing(Marcode public site and assets)apps/mobile/src/components/AppSymbol.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/connection/platform.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/connection/environmentSections.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/connection/environmentSections.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/connection/useConnectionController.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/files/fileTree.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/home/HomeScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/projects/AddProjectScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/ComposerCommandPopover.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/ThreadComposer.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/ThreadDetailScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/ThreadFeed.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/composerSlashSkillSearch.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/composerSlashSkillSearch.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/thread-feed-live-follow.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/thread-feed-live-follow.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/thread-list-v2-items.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/threadListV2.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/threadListV2.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/authClientMetadata.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/connection.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/state/thread-pr-presentation.ts— ownermobile(Native client and Marcode branding)apps/server/src/cli/connect.ts— ownerserver-runtime(Compatibility CLI behavior with user-visible Marcode service identity)apps/server/src/cli/service.test.ts— ownerserver-runtime(Compatibility CLI behavior with user-visible Marcode service identity)apps/server/src/cli/service.ts— ownerserver-runtime(Compatibility CLI behavior with user-visible Marcode service identity)apps/server/src/cli/triage.ts— ownerserver-runtime(Compatibility CLI behavior with user-visible Marcode service identity)apps/server/src/cli/triagePrompt.test.ts— ownerserver-runtime(Compatibility CLI behavior with user-visible Marcode service identity)apps/server/src/cli/triagePrompt.ts— ownerserver-runtime(Compatibility CLI behavior with user-visible Marcode service identity)apps/server/src/cloud/bootService.test.ts— ownerserver-runtime(Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/bootService.ts— ownerserver-runtime(Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/http.ts— ownerserver-runtime(Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/pinnedRuntime.ts— ownerserver-runtime(Background service lifecycle and user-visible Marcode server identity)apps/server/src/persistence/Migrations.ts— ownerpersistence(Shared migration registry; Marcode and upstream migrations must retain unique ordered ids)apps/server/src/provider/Layers/CodexAdapter.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/CodexAdapter.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/CodexProvider.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/CodexProvider.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/GrokProvider.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/OpenCodeProvider.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/OpenCodeProvider.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/ProviderInstanceRegistryLive.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/opencodeRuntime.cliParsers.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/opencodeRuntime.inventory.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/opencodeRuntime.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/web/src/components/ChatView.tsx— ownerweb-runtime(Marcode workspace, terminal, and browser integration)apps/web/src/components/CommandPalette.tsx— ownerweb-navigation(Marcode floating-pill entry point plus upstream command-palette intents)apps/web/src/components/Sidebar.logic.test.ts— ownerweb-navigation(Shared legacy, unified-workspace, and sidebar-v2 behavior)apps/web/src/components/Sidebar.logic.ts— ownerweb-navigation(Shared legacy, unified-workspace, and sidebar-v2 behavior)apps/web/src/components/Sidebar.tsx— ownerweb-navigation(Marcode unified project workspace and thread navigation)apps/web/src/components/chat/ChatComposer.tsx— ownerweb-shell(Marcode floating glass composer)apps/web/src/components/chat/ChatHeader.tsx— ownerweb-shell(Marcode portals thread actions into FloatingPillNav)apps/web/src/components/desktopUpdate.logic.test.ts— ownerrelease-branding(User-visible Marcode desktop update copy)apps/web/src/components/desktopUpdate.logic.ts— ownerrelease-branding(User-visible Marcode desktop update copy)apps/web/src/components/files/FileBrowserPanel.tsx— ownereditor-runtime(Marcode retired the right-panel file surface; the floating editor owns file editing)apps/web/src/components/files/FilePreviewPanel.tsx— ownereditor-runtime(Marcode retired the right-panel file surface; the floating editor owns file editing)apps/web/src/components/sidebar/SidebarChrome.tsx— ownerweb-navigation(Marcode keeps brand, settings, and sidebar controls in FloatingPillNav)apps/web/src/components/ui/command.tsx— ownerweb-shell(Shared Marcode portal overlay and backdrop behavior)apps/web/src/hooks/useHandleNewThread.ts— ownerweb-runtime(Unified-workspace placement and upstream draft carry-forward behavior)apps/web/src/index.css— ownerdesign-system(Marcode visual tokens and chrome)packages/client-runtime/src/operations/projects.test.ts— ownerweb-runtime(Project mutation operations shared with Marcode workspace layout)packages/client-runtime/src/operations/projects.ts— ownerweb-runtime(Project mutation operations shared with Marcode workspace layout)packages/contracts/src/settings.test.ts— ownerweb-navigation(Marcode navigation and unified-workspace rollout settings)packages/contracts/src/settings.ts— ownerweb-navigation(Marcode navigation and unified-workspace rollout settings)Reproduce locally (read-only, disposable worktree)
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.