Automatic upstream detection reached conflicted and stopped before any mutation.
| field |
value |
target main |
fddb63a76b59f509b60a35334cbfa030956239db |
source main |
6154b46cb86b038f1b54c32690a794ac639520ca |
| merge base |
89c5a192f4d36bcf4201e8b490ab5ad37a4adac7 |
| upstream commits |
97 |
| changed paths |
12245 |
Conflicting paths
AGENTS.mdREADME.mdapps/desktop/src/app/DesktopObservability.test.tsapps/desktop/src/electron/ElectronWindow.test.tsapps/mobile/src/features/cloud/CloudWaitlistEnrollment.tsxapps/mobile/src/features/settings/SettingsRouteScreen.tsxapps/mobile/src/features/threads/ThreadComposer.tsxapps/server/src/cli/config.tsapps/server/src/cli/connect.tsapps/server/src/http.tsapps/server/src/persistence/Migrations.tsapps/server/src/server.test.tsapps/server/src/telemetry/AnalyticsService.test.tsapps/server/src/vcs/GitVcsDriverCore.test.tsapps/server/src/vcs/GitVcsDriverCore.tsapps/server/src/ws.tsapps/web/src/components/AppSidebarLayout.tsxapps/web/src/components/ChatMarkdown.tsxapps/web/src/components/ChatView.tsxapps/web/src/components/ProjectScriptsControl.tsxapps/web/src/components/Sidebar.tsxapps/web/src/components/SidebarStageBackdrop.tsxapps/web/src/components/chat/ChatHeader.tsxapps/web/src/components/chat/DraftHeroHeadline.tsxapps/web/src/components/clerk/T3ConnectSidebarSignIn.tsxapps/web/src/components/files/FileBrowserPanel.tsxapps/web/src/components/files/FilePreviewPanel.tsxapps/web/src/components/files/fileContentRevision.test.tsapps/web/src/components/files/fileContentRevision.tsapps/web/src/components/sidebar/SidebarChrome.tsxdocs/README.mddocs/architecture/overview.mddocs/getting-started/quick-start.mddocs/internals/project-workspace-layout.mddocs/operations/ci.mddocs/operations/observability.mddocs/operations/release.mddocs/reference/scripts.mddocs/user/keybindings.mddocs/user/source-control.mdpackages/client-runtime/src/rpc/client.tspackages/contracts/src/rpc.tspnpm-lock.yamlscripts/build-desktop-artifact.test.tsscripts/build-desktop-artifact.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/modules/t3-composer-editor/ios/T3ComposerEditorView.swift — 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/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/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/platform.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/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/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/settings/SettingsWaitlistRouteScreen.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/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/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/threads/use-thread-list-v2-enabled.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/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/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-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/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/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/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/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/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/Layers/ProviderSessionReaper.test.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.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/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/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/fileContentRevision.test.ts — owner editor-runtime (Marcode retired the right-panel file surface; the floating editor owns file editing)apps/web/src/components/files/fileContentRevision.ts — 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/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)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)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.mainfddb63a76b59f509b60a35334cbfa030956239dbmain6154b46cb86b038f1b54c32690a794ac639520ca89c5a192f4d36bcf4201e8b490ab5ad37a4adac7Conflicting paths
AGENTS.mdREADME.mdapps/desktop/src/app/DesktopObservability.test.tsapps/desktop/src/electron/ElectronWindow.test.tsapps/mobile/src/features/cloud/CloudWaitlistEnrollment.tsxapps/mobile/src/features/settings/SettingsRouteScreen.tsxapps/mobile/src/features/threads/ThreadComposer.tsxapps/server/src/cli/config.tsapps/server/src/cli/connect.tsapps/server/src/http.tsapps/server/src/persistence/Migrations.tsapps/server/src/server.test.tsapps/server/src/telemetry/AnalyticsService.test.tsapps/server/src/vcs/GitVcsDriverCore.test.tsapps/server/src/vcs/GitVcsDriverCore.tsapps/server/src/ws.tsapps/web/src/components/AppSidebarLayout.tsxapps/web/src/components/ChatMarkdown.tsxapps/web/src/components/ChatView.tsxapps/web/src/components/ProjectScriptsControl.tsxapps/web/src/components/Sidebar.tsxapps/web/src/components/SidebarStageBackdrop.tsxapps/web/src/components/chat/ChatHeader.tsxapps/web/src/components/chat/DraftHeroHeadline.tsxapps/web/src/components/clerk/T3ConnectSidebarSignIn.tsxapps/web/src/components/files/FileBrowserPanel.tsxapps/web/src/components/files/FilePreviewPanel.tsxapps/web/src/components/files/fileContentRevision.test.tsapps/web/src/components/files/fileContentRevision.tsapps/web/src/components/sidebar/SidebarChrome.tsxdocs/README.mddocs/architecture/overview.mddocs/getting-started/quick-start.mddocs/internals/project-workspace-layout.mddocs/operations/ci.mddocs/operations/observability.mddocs/operations/release.mddocs/reference/scripts.mddocs/user/keybindings.mddocs/user/source-control.mdpackages/client-runtime/src/rpc/client.tspackages/contracts/src/rpc.tspnpm-lock.yamlscripts/build-desktop-artifact.test.tsscripts/build-desktop-artifact.tsHotspot matches
apps/marketing/src/layouts/Layout.astro— ownermarketing(Marcode public site and assets)apps/marketing/src/lib/site.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/modules/t3-composer-editor/ios/T3ComposerEditorView.swift— ownermobile(Native client and Marcode branding)apps/mobile/package.json— ownermobile(Native client and Marcode branding)apps/mobile/src/Stack.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/connection/app-state-wakeups.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/connection/app-state-wakeups.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/connection/background-activity-scopes.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/connection/background-activity.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/connection/background-activity.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/connection/environment-cache-store.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/connection/environment-cache-store.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/connection/platform.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/connection/runtime.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/cloud/CloudWaitlistEnrollment.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/cloud/cloudWaitlistJoin.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/cloud/cloudWaitlistJoin.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/cloud/linkEnvironment.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/connection/CloudEnvironmentRows.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/home/HomeHeader.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/home/HomeRouteScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/home/HomeScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/home/homeThreadList.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/home/homeThreadList.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/projects/AddProjectScreen.logic.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/projects/AddProjectScreen.logic.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/projects/AddProjectScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/settings/SettingsRouteScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/settings/SettingsWaitlistRouteScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/sharing/IncomingShareProvider.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/sharing/incoming-share-native.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/sharing/incoming-share-native.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/shortcuts/useAppShortcuts.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/NewTaskDraftScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/NewTaskRouteScreen.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/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/thread-list-items.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/thread-search-match.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/thread-work-log.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/features/threads/use-thread-list-v2-enabled.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/updates/app-updates.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/updates/app-updates.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/appearancePreferences.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/threadActivity.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/threadActivity.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/persistence/mobile-database.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/persistence/mobile-preferences.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/state/queries.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/state/thread-outbox-manager.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/state/thread-outbox.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/state/thread-outbox.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/state/use-selected-thread-requests.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/state/use-thread-composer-state.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/state/use-thread-outbox-drain.ts— ownermobile(Native client and Marcode branding)apps/server/src/cli/config.test.ts— ownerserver-runtime(Compatibility CLI behavior with user-visible Marcode service identity)apps/server/src/cli/config.ts— ownerserver-runtime(Compatibility CLI behavior with user-visible Marcode service identity)apps/server/src/cli/connect.ts— ownerserver-runtime(Compatibility CLI behavior with user-visible Marcode service identity)apps/server/src/cli/invocation.test.ts— ownerserver-runtime(Compatibility CLI behavior with user-visible Marcode service identity)apps/server/src/cli/invocation.ts— ownerserver-runtime(Compatibility CLI behavior with user-visible Marcode service identity)apps/server/src/cloud/http.test.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/selfUpdate.test.ts— ownerserver-runtime(Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/selfUpdate.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/Drivers/ClaudeDriver.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Drivers/CodexDriver.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Drivers/CursorDriver.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Drivers/GrokDriver.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Drivers/OpenCodeDriver.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/ClaudeAdapter.ts— ownerprovider-runtime(Provider-specific Marcode behavior)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/EventNdjsonLogger.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/EventNdjsonLogger.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/ProviderEventLoggers.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/ProviderRegistry.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/ProviderService.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/ProviderSessionReaper.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/makeManagedServerProvider.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/makeManagedServerProvider.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/web/src/components/AppSidebarLayout.tsx— ownerweb-navigation(Marcode floating navigation shell and upstream sidebar selection)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/ProjectScriptsControl.tsx— ownerweb-runtime(Unified-workspace command placement and checked-in t3.json action imports)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/clerk/T3ConnectSidebarSignIn.tsx— ownerproduct-identity(User-visible Marcode Connect identity)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/files/ProjectFilePicker.logic.test.ts— ownereditor-runtime(Marcode retired the right-panel file surface; the floating editor owns file editing)apps/web/src/components/files/ProjectFilePicker.logic.ts— ownereditor-runtime(Marcode retired the right-panel file surface; the floating editor owns file editing)apps/web/src/components/files/ProjectFilePicker.tsx— ownereditor-runtime(Marcode retired the right-panel file surface; the floating editor owns file editing)apps/web/src/components/files/fileContentRevision.test.ts— ownereditor-runtime(Marcode retired the right-panel file surface; the floating editor owns file editing)apps/web/src/components/files/fileContentRevision.ts— ownereditor-runtime(Marcode retired the right-panel file surface; the floating editor owns file editing)apps/web/src/components/files/fileLineReveal.test.ts— ownereditor-runtime(Marcode retired the right-panel file surface; the floating editor owns file editing)apps/web/src/components/files/fileLineReveal.ts— ownereditor-runtime(Marcode retired the right-panel file surface; the floating editor owns file editing)apps/web/src/components/files/projectFilesQueryState.ts— 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)docs/architecture/overview.md— ownerarchitecture(Shared architecture index includes Marcode-owned subsystems)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.