Automatic upstream detection reached conflicted and stopped before any mutation.
| field |
value |
target main |
2ffb1404d11fdd6666523e354b92382594a72c22 |
source main |
f2d5fc91e3030e5c3956fdadc13e1eaa25bcabe3 |
| merge base |
82b8a9380298509d68170961d9717be62836e490 |
| upstream commits |
25 |
| changed paths |
93 |
Conflicting paths
apps/server/src/cli/connect.tsapps/server/src/cli/service.tsapps/web/src/components/ChatView.tsxapps/web/src/components/RightPanelTabs.tsxapps/web/src/components/chat/ChatHeader.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/features/home/HomeScreen.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/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/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/provider/Layers/GrokProvider.test.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/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.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)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.main2ffb1404d11fdd6666523e354b92382594a72c22mainf2d5fc91e3030e5c3956fdadc13e1eaa25bcabe382b8a9380298509d68170961d9717be62836e490Conflicting paths
apps/server/src/cli/connect.tsapps/server/src/cli/service.tsapps/web/src/components/ChatView.tsxapps/web/src/components/RightPanelTabs.tsxapps/web/src/components/chat/ChatHeader.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/features/home/HomeScreen.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/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/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/provider/Layers/GrokProvider.test.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/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.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)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.