upstream sync blocked: pingdotgg/t3code@a3a8cbd60539

[github-actions]

Automatic upstream detection reached conflicted and stopped before any mutation.

field	value
target main	133f3f735e3bc45def51d989b83a83df55d2a510
source main	a3a8cbd60539b4af4de8f96c892dbd07a2b6c041
merge base	f035a0f4cdf4abaa6704673af7b5a4a321149ba2
upstream commits	32
changed paths	162

Conflicting paths

• apps/server/src/cloud/bootService.test.ts
• apps/server/src/cloud/bootService.ts
• apps/server/src/environment/ServerEnvironment.test.ts
• apps/server/src/environment/ServerEnvironment.ts
• apps/server/src/persistence/Migrations.ts
• apps/web/src/components/ChatMarkdown.tsx
• apps/web/src/components/ChatView.tsx
• apps/web/src/components/ThreadTerminalDrawer.tsx
• apps/web/src/components/chat/OpenInPicker.tsx
• packages/contracts/src/environment.ts
• pnpm-lock.yaml
• scripts/build-desktop-artifact.test.ts

Hotspot matches

• apps/mobile/modules/t3-markdown-text/src/markdownLinks.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/package.json — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/cloud/linkEnvironment.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/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/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/lib/connection.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/markdownLinks.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/use-thread-pr.ts — owner mobile (Native client and Marcode branding)
• 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/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/Layers/ClaudeAdapter.test.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/ClaudeCapabilitiesProbe.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Layers/ClaudeProvider.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/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/ModelManifest.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/ModelManifest.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/acp/AcpRuntimeModel.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/acp/AcpRuntimeModel.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/acp/AcpSessionRuntime.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/model-manifest.json — 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/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/index.css — owner design-system (Marcode visual tokens and chrome)
• 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 hand in #55 (draft): chore(upstream): sync marcode through a3a8cbd6.

Merge commit c13db692 — a normal two-parent merge of pingdotgg/t3code@a3a8cbd6 into origin/main (133f3f73). Twelve conflicts, each combined by hand; the full per-path decision list is in the PR body.

Worth calling out, because it merged cleanly and would not have shown up as a conflict: upstream renamed its project-scoped PR opener to openProjectPullRequest and introduced a new openThreadPullRequest for a thread's linked PR. Marcode's ThreadActionsCluster call site sits outside the conflict region and used the old names, so the pill nav would have silently repointed at the linked-PR opener. Followed upstream's rename at that call site instead.

Leaving this issue open on purpose. docs/operations/upstream-sync.md says to close the tracking issue when the resolution lands — #55 is still a draft and still owes the runbook's live runtime pass over upstream's UI additions. Closing it on merge keeps the signal honest if the PR stalls.

---

Generated by Claude Code

[maarco]

Resolved by #53, which now merges through pingdotgg/t3code@a3a8cbd6 — this issue's exact SHA.

Rather than opening a second PR, the new 8-commit delta was merged forward onto the existing sync branch. #53 was still unmerged, so branching fresh from main would have redone the whole e67074f8 conflict resolution and produced a competing PR. #53 now covers f035a0f4..a3a8cbd6 in two hand-resolved merges (41a142f5 and f07855a4), and supersedes both this issue and #52.

Three conflicts in this delta — upstream's new migration renumbered 043→044, ChatMarkdown.tsx taking upstream's pingdotgg#7140 imports while keeping Marcode's floating editor, and OpenInPicker.tsx taking upstream's label refactor while keeping Marcode's icon. Details in the PR description.

---

Generated by Claude Code