Skip to content

chore(upstream): merge pingdotgg/t3code@d73fd1279a9c (WIP, 338 paths unresolved) - #96

Draft
maarco wants to merge 3370 commits into
mainfrom
integrate/upstream-d73fd1279a
Draft

maarco wants to merge 3370 commits into
mainfrom
integrate/upstream-d73fd1279a

Conversation

@maarco

@maarco maarco commented Oct 26, 2026 •

Copy link
Copy Markdown
Owner

Upstream merge of pingdotgg/t3code@d73fd1279a9c (3,367 commits past the last sync at d15210cd3da7). Draft, not mergeable yet. Supersedes the stale blocked sync in #95.

State

  • 438 paths conflicted. 207 are resolved, 231 still need work (listed below).
  • Resolved: 46 oxlint rule files (moved to oxlint-plugin-marcode/, rule prefix t3code/ to marcode/), 42 upstream-deleted tests whose Marcode edits were identity-only, 12 retired files kept deleted (components/files/, T3Wordmark.tsx), and 97 files where Marcode's only change was the T3 to Marcode rename (took upstream's hunk, re-applied the rename).
  • Follow-up on those 97: 52 still contain visible T3 Code strings or T3CODE_ env names outside the conflict hunks and need a per-line identity pass.
  • Unresolved files are committed with conflict markers or Marcode-side content so the delta is reviewable. CI is expected to fail; GitHub reporting it as mergeable only reflects that the markers are committed.
  • Main blocker: upstream replaced apps/server/src/orchestration/ with orchestration-v2/. Marcode's workspace-layout changes in the old decider/projector/engine/ProjectionPipeline files must be re-applied on the v2 files. 16 Marcode-only tests (workspace layout, migrations 036-048 renumbering, branding, theme) are held back for the same reason.

Verification

  • claude-review errors out on an 18k-file diff, so a human or other review pass is needed at the end. Native fingerprint diff was cancelled at its Setup step and has been re-run.
  • None run yet (no typecheck, no tests). The merge-head sentinel stayed d73fd1279a while resolving.
  • Two haiku agents did the mechanical batches; their 42 test deletions were judged identity-only from diffs and are not re-verified.

Unresolved paths (231 total)

apps/web (72)
  • apps/web/index.html
  • apps/web/package.json
  • apps/web/src/appearanceFonts.ts
  • apps/web/src/branding.test.ts
  • apps/web/src/branding.ts
  • apps/web/src/clientPersistenceStorage.test.ts
  • apps/web/src/components/AppSidebarLayout.tsx
  • apps/web/src/components/BranchToolbar.logic.test.ts
  • apps/web/src/components/ChatMarkdown.tsx
  • apps/web/src/components/ChatView.logic.test.ts
  • apps/web/src/components/ChatView.tsx
  • apps/web/src/components/CommandPalette.logic.test.ts
  • apps/web/src/components/GitActionsControl.logic.test.ts
  • apps/web/src/components/GitActionsControl.tsx
  • apps/web/src/components/ProjectScriptsControl.tsx
  • apps/web/src/components/RightPanelTabs.test.tsx
  • apps/web/src/components/RightPanelTabs.tsx
  • apps/web/src/components/Sidebar.logic.test.ts
  • apps/web/src/components/Sidebar.logic.ts
  • apps/web/src/components/Sidebar.tsx
  • apps/web/src/components/SidebarStageBackdrop.test.tsx
  • apps/web/src/components/ThreadTerminalDrawer.test.ts
  • apps/web/src/components/ThreadTerminalDrawer.tsx
  • apps/web/src/components/chat/ChatComposer.tsx
  • apps/web/src/components/chat/ChatHeader.test.ts
  • apps/web/src/components/chat/ChatHeader.tsx
  • apps/web/src/components/chat/DraftHeroHeadline.tsx
  • apps/web/src/components/chat/MessagesTimeline.test.tsx
  • apps/web/src/components/chat/MessagesTimeline.tsx
  • apps/web/src/components/chat/OpenInPicker.tsx
  • apps/web/src/components/clerk/MobileClientsUserProfilePage.tsx
  • apps/web/src/components/clerk/T3ConnectSidebarSignIn.tsx
  • apps/web/src/components/cloud/CloudEnvironmentConnectList.tsx
  • apps/web/src/components/desktop/SshPasswordPromptDialog.tsx
  • apps/web/src/components/files/ProjectFilePicker.tsx
  • apps/web/src/components/files/fileSaveCoordinator.test.ts
  • apps/web/src/components/files/fileSaveCoordinator.ts
  • apps/web/src/components/files/projectFilesQueryState.ts
  • apps/web/src/components/onboarding/FirstRunGate.tsx
  • apps/web/src/components/onboarding/WelcomeWizard.tsx
  • apps/web/src/components/preview/PreviewPanelShell.tsx
  • apps/web/src/components/pullRequest/PullRequestCodeTab.tsx
  • apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
  • apps/web/src/components/pullRequest/PullRequestReviewAnnotation.tsx
  • apps/web/src/components/pullRequest/PullRequestTimelineTab.tsx
  • apps/web/src/components/settings/ConnectionsSettings.tsx
  • apps/web/src/components/settings/DiagnosticsSettings.tsx
  • apps/web/src/components/settings/SettingsFontPreviews.tsx
  • apps/web/src/components/settings/SettingsSidebarNav.tsx
  • apps/web/src/components/settings/settingsSearch.ts
  • apps/web/src/components/sidebar/SidebarChrome.tsx
  • apps/web/src/components/threadSidebarWidth.ts
  • apps/web/src/components/ui/dialog.tsx
  • apps/web/src/components/ui/popover.tsx
  • apps/web/src/components/ui/sheet.tsx
  • apps/web/src/components/ui/tooltip.tsx
  • apps/web/src/components/usage/UsagePage.tsx
  • apps/web/src/diffFileActions.test.ts
  • apps/web/src/diffFileActions.ts
  • apps/web/src/hooks/useHandleNewThread.ts
  • apps/web/src/hooks/useTheme.test.ts
  • apps/web/src/hooks/useTheme.ts
  • apps/web/src/index.css
  • apps/web/src/main.tsx
  • apps/web/src/rightPanelStore.test.ts
  • apps/web/src/rightPanelStore.ts
  • apps/web/src/routes/__root.tsx
  • apps/web/src/routes/_chat.pull-requests.tsx
  • apps/web/src/routes/_chat.settings.tsx
  • apps/web/src/terminal/ghostty/surface.ts
  • apps/web/src/worktreeCleanup.test.ts
  • apps/web/vite.config.ts
apps/server (64)
  • apps/server/scripts/marcode-sqlite-state.test.ts
  • apps/server/scripts/marcode-sqlite-state.ts
  • apps/server/scripts/migrate-dev-db.ts
  • apps/server/src/auth/RpcAuthorization.ts
  • apps/server/src/cli/app.test.ts
  • apps/server/src/cli/app.ts
  • apps/server/src/cli/config.test.ts
  • apps/server/src/cli/config.ts
  • apps/server/src/cli/connect.ts
  • apps/server/src/cli/pair.ts
  • apps/server/src/cli/service.test.ts
  • apps/server/src/cli/theme.ts
  • apps/server/src/cli/trace.ts
  • apps/server/src/cli/triage.ts
  • apps/server/src/cloud/bootService.test.ts
  • apps/server/src/cloud/bootService.ts
  • apps/server/src/cloud/publicConfig.ts
  • apps/server/src/cloud/relayResponse.ts
  • apps/server/src/environment/ServerEnvironment.ts
  • apps/server/src/git/GitManager.test.ts
  • apps/server/src/git/GitWorkflowService.ts
  • apps/server/src/http.ts
  • apps/server/src/orchestration-v2/Layers/ProjectionPipeline.workspaceLayout.test.ts
  • apps/server/src/orchestration-v2/Layers/ProjectionSnapshotQuery.workspaceLayout.test.ts
  • apps/server/src/orchestration-v2/decider.workspaceLayout.test.ts
  • apps/server/src/orchestration-v2/projector.workspaceLayout.test.ts
  • apps/server/src/orchestration/Layers/OrchestrationEngine.ts
  • apps/server/src/orchestration/Layers/ProjectionPipeline.ts
  • apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
  • apps/server/src/orchestration/Schemas.ts
  • apps/server/src/orchestration/commandInvariants.test.ts
  • apps/server/src/orchestration/commandInvariants.ts
  • apps/server/src/orchestration/decider.ts
  • apps/server/src/orchestration/projector.ts
  • apps/server/src/os-jank.test.ts
  • apps/server/src/os-jank.ts
  • apps/server/src/persistence/Layers/ProjectionProjects.ts
  • apps/server/src/persistence/Layers/ProjectionRepositories.test.ts
  • apps/server/src/persistence/Migrations.test.ts
  • apps/server/src/persistence/Migrations.ts
  • apps/server/src/persistence/Migrations/036_ProjectionThreadTitleRegeneration.test.ts
  • apps/server/src/persistence/Migrations/041_ProjectionProjectFaviconPath.test.ts
  • apps/server/src/persistence/Migrations/042_AuthSessionClientConnection.test.ts
  • apps/server/src/persistence/Migrations/043_ProjectionThreadLinkedPullRequest.test.ts
  • apps/server/src/persistence/Migrations/048_ProjectionProjectIcon.test.ts
  • apps/server/src/persistence/Services/ProjectionProjects.ts
  • apps/server/src/project/AgentSessionImporter.test.ts
  • apps/server/src/project/AgentSessionScanner.test.ts
  • apps/server/src/project/ProjectSetupScriptRunner.test.ts
  • apps/server/src/provider/CodexDeveloperInstructions.ts
  • apps/server/src/provider/CodexProvider.ts
  • apps/server/src/provider/GrokProvider.test.ts
  • apps/server/src/provider/Layers/CodexSessionRuntime.test.ts
  • apps/server/src/relay/AgentAwarenessRelay.test.ts
  • apps/server/src/serverRuntimeStartup.test.ts
  • apps/server/src/serviceLauncher.test.ts
  • apps/server/src/serviceLauncher.ts
  • apps/server/src/telemetry/Identify.ts
  • apps/server/src/textGeneration/CodexTextGeneration.test.ts
  • apps/server/src/vcs/GitVcsDriverCore.test.ts
  • apps/server/src/vcs/GitVcsDriverCore.ts
  • apps/server/src/workspace/WorkspaceFileSystem.test.ts
  • apps/server/src/workspace/WorkspaceFileSystem.ts
  • apps/server/src/ws.ts
apps/desktop (20)
  • apps/desktop/package.json
  • apps/desktop/scripts/dev-electron.mjs
  • apps/desktop/scripts/electron-launcher.mjs
  • apps/desktop/scripts/electron-launcher.test.mjs
  • apps/desktop/src/app/DesktopAppIdentity.test.ts
  • apps/desktop/src/app/DesktopAppIdentity.ts
  • apps/desktop/src/app/DesktopClerk.test.ts
  • apps/desktop/src/app/DesktopEarlyElectronStartup.test.ts
  • apps/desktop/src/app/DesktopEnvironment.test.ts
  • apps/desktop/src/app/DesktopEnvironment.ts
  • apps/desktop/src/app/DesktopLinuxUrlHandler.test.ts
  • apps/desktop/src/app/DesktopPreReadyPlatform.test.ts
  • apps/desktop/src/backend/DesktopBackendConfiguration.test.ts
  • apps/desktop/src/backend/DesktopBackendConfiguration.ts
  • apps/desktop/src/backend/DesktopServerExposure.test.ts
  • apps/desktop/src/electron/ElectronProtocol.test.ts
  • apps/desktop/src/window/DesktopApplicationMenu.test.ts
  • apps/desktop/src/window/DesktopApplicationMenu.ts
  • apps/desktop/src/wsl/DesktopWslEnvironment.test.ts
  • apps/desktop/src/wsl/DesktopWslEnvironment.ts
packages/client-runtime (13)
  • packages/client-runtime/src/operations/projects.test.ts
  • packages/client-runtime/src/platform/persistence.test.ts
  • packages/client-runtime/src/rpc/client.ts
  • packages/client-runtime/src/state/entities.test.ts
  • packages/client-runtime/src/state/projectCommands.test.ts
  • packages/client-runtime/src/state/projectCommands.ts
  • packages/client-runtime/src/state/projectEntities.ts
  • packages/client-runtime/src/state/shellReducer.test.ts
  • packages/client-runtime/src/state/threadSnapshotHttp.ts
  • packages/client-runtime/src/state/threads-atoms.test.ts
  • packages/client-runtime/src/state/threads-pagination.test.ts
  • packages/client-runtime/src/state/threads-sync.test.ts
  • packages/client-runtime/src/state/threads.ts
packages/contracts (12)
  • packages/contracts/src/desktopBootstrap.ts
  • packages/contracts/src/environment.test.ts
  • packages/contracts/src/environment.ts
  • packages/contracts/src/git.ts
  • packages/contracts/src/ipc.ts
  • packages/contracts/src/orchestration.test.ts
  • packages/contracts/src/orchestration.ts
  • packages/contracts/src/project.test.ts
  • packages/contracts/src/pullRequest.ts
  • packages/contracts/src/rpc.ts
  • packages/contracts/src/settings.test.ts
  • packages/contracts/src/terminal.test.ts
scripts (11)
  • scripts/build-desktop-artifact.test.ts
  • scripts/build-desktop-artifact.ts
  • scripts/dev-runner.test.ts
  • scripts/dev-runner.ts
  • scripts/lib/cli-external-packages.test.ts
  • scripts/lib/icon-export.test.ts
  • scripts/lib/icon-export.ts
  • scripts/merge-update-manifests.test.ts
  • scripts/mobile-showcase-environment.ts
  • scripts/notify-discord-release.test.ts
  • scripts/setup-worktree.ts
apps/mobile (9)
  • apps/mobile/app.config.ts
  • apps/mobile/src/Stack.tsx
  • apps/mobile/src/components/BrandMark.tsx
  • apps/mobile/src/components/CompactBrandTitle.tsx
  • apps/mobile/src/features/cloud/ConnectOnboardingRouteScreen.tsx
  • apps/mobile/src/features/home/homeThreadList.test.ts
  • apps/mobile/src/features/threads/thread-work-log.tsx
  • apps/mobile/src/lib/mobileBranding.ts
  • apps/mobile/src/lib/openExternalUrl.test.ts
apps/marketing (4)
  • apps/marketing/src/layouts/Layout.astro
  • apps/marketing/src/pages/privacy-policy.astro
  • apps/marketing/src/pages/security-policy.astro
  • apps/marketing/src/pages/terms-of-service.astro
docs (4)
  • docs/README.md
  • docs/operations/observability.md
  • docs/user/remote-access.md
  • docs/user/welcome-wizard.md
packages/shared (3)
  • packages/shared/package.json
  • packages/shared/src/devHome.ts
  • packages/shared/src/shell.test.ts
.github (2)
  • .github/workflows/ci.yml
  • .github/workflows/deploy-relay.yml
infra (2)
  • infra/relay/src/agentActivity/ApnsDeliveries.test.ts
  • infra/relay/src/deploymentConfig.test.ts
packages/provider-grok (2)
  • packages/provider-grok/src/server/acpSupport.test.ts
  • packages/provider-grok/src/server/status.ts
packages/provider-opencode (2)
  • packages/provider-opencode/src/server/textGeneration.test.ts
  • packages/provider-opencode/src/server/textGeneration.ts
packages/source-control-bitbucket (2)
  • packages/source-control-bitbucket/src/server/BitbucketApi.test.ts
  • packages/source-control-bitbucket/src/server/BitbucketApi.ts
AGENTS.md (1)
  • AGENTS.md
README.md (1)
  • README.md
knip.jsonc (1)
  • knip.jsonc
packages/source-control-azure-devops (1)
  • packages/source-control-azure-devops/src/server/AzureDevOpsCli.test.ts
packages/source-control-gitlab (1)
  • packages/source-control-gitlab/src/server/GitLabCli.test.ts
packages/ssh (1)
  • packages/ssh/src/tunnel.ts
pnpm-lock.yaml (1)
  • pnpm-lock.yaml
third-party-licenses.config.json (1)
  • third-party-licenses.config.json
vite.config.ts (1)
  • vite.config.ts

🤖 Generated with Claude Code

maria-rcks and others added 30 commits October 25, 2026 20:38
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…5001)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#23966)

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… channel (pingdotgg#24340)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
…tgg#24964)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#23973)

Signed-off-by: Yordis Prieto <yordisstudio@Yordiss-Mac-Studio.local>
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: Yordis Prieto <yordisstudio@Yordiss-Mac-Studio.local>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…es (pingdotgg#22907)

Co-authored-by: Victor Vogel <satsdev@only21mil.xyz>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
`vp run mobile:e2e [--device <id>] [--concurrency <n>]` boots dedicated
simulators, installs the cached dev client, starts a fixture server and
Metro, pairs automatically, then runs home -> open thread -> back. Each
step records video and checks the settled chrome (tab bar, back button,
composer) from accessibility snapshots, and compares video frames to the
settled screenshots to catch chrome that lags a transition, such as the
workspace tabs drawn over an entering thread (pingdotgg#24666). Results land in
artifacts/mobile-e2e/<run>/index.html with screenshots, videos, frame
sheets and the first offending frame.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
5f1f604 was committed from a tree based on an older main, so it reverted
upstream changes outside the e2e runner (including pingdotgg#23973, pingdotgg#22907, pingdotgg#22849).
This restores every file to e3592ef and keeps only the runner's own
changes (scripts/mobile-e2e.ts, scripts/mobile-showcase.ts, package and
lockfile entries, .gitignore).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…off is pending (pingdotgg#22902)

Co-authored-by: Marve10s <igrimanigroman@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#22918)

Co-authored-by: chief-archivist <thecradlearchives@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ng (pingdotgg#22915)

Co-authored-by: Victor Vogel <satsdev@only21mil.xyz>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… edge (pingdotgg#22872)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ys (pingdotgg#23972)

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…get (pingdotgg#25055)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#24980)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ffects (pingdotgg#24970)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…24973)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#24974)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Project516 and others added 25 commits October 26, 2026 12:47
… compromised eMudhra intermediates (pingdotgg#25572)

Co-authored-by: Theo Browne <me@t3.gg>
…ng on every store change (pingdotgg#25366)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#25475)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…each (pingdotgg#25616)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#25636)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…vailable" (pingdotgg#25627)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ring a flush (pingdotgg#25653)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…hare one visibility observer (pingdotgg#25630)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ep-awake (pingdotgg#25631)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…long thread (pingdotgg#23780)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: nibarAhmed <61316519+nibarAhmed@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
pingdotgg#25526)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
…of per-row effects (pingdotgg#25612)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… message (pingdotgg#18359)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
…used pages (pingdotgg#25651)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ft's insert point (pingdotgg#25681)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ke on CI (pingdotgg#25664)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…unresolved)

Draft integration of upstream through d73fd12. 100 conflicted paths are
resolved (46 oxlint plugin adds, 42 upstream-deleted tests, 12 retired files).
The remaining 338 paths are committed with conflict markers or Marcode-side
content and must be resolved before this can merge. The list is in the PR
description. CI is expected to fail until then.
@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL labels Oct 26, 2026
97 files where Marcode's only change was the T3 to Marcode identity rename:
took upstream's hunk and re-applied the rename. 52 of them still contain
visible T3 Code strings or T3CODE_ env names outside conflict hunks and need
a per-line identity pass.
Move Marcode's project workspace-layout command, invariants, projection
and thread-delete prune onto upstream's orchestration-v2 (new
ProjectWorkspaceLayout.ts, one-line seams in ProjectCommands, ProjectStore,
EventSink). The layout command now goes through projects.mutate. Remove the
old orchestration/ files and contracts orchestration.ts that upstream
deleted. Not yet typechecked or tested: the worktree has no node_modules.
Migration id collision (Marcode 33-55 vs upstream 34-69) is unresolved.

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XXL vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.