Skip to content

chore(upstream): sync marcode through ca72e381c - #5

Merged
maarco merged 64 commits into
mainfrom
integrate/upstream-ca72e381
Aug 1, 2026
Merged

chore(upstream): sync marcode through ca72e381c#5
maarco merged 64 commits into
mainfrom
integrate/upstream-ca72e381

Conversation

@maarco

@maarco maarco commented Aug 1, 2026

Copy link
Copy Markdown
Owner

Merges pingdotgg/t3code@ca72e381c into Marcode. 63 upstream commits, merge base e6987965, 33 conflicts resolved by hand.

Supersedes the blocked-sync tracking issues #1, #3 and #4 — all three name upstream shas that are ancestors of ca72e381c.

Hotspot decisions

path decision
apps/web/src/components/ThreadTerminalDrawer.tsx Upstream replaced xterm with a Ghostty surface. Marcode keeps its xterm drawer; apps/web/src/terminal/ghostty/** lands unused as the migration path. Deferred, not discarded.
apps/web/src/components/files/** Right-panel file surface stays retired. Upstream's new ProjectFilePicker and ProjectContentSearchDialog open files through the floating editor instead.
apps/web/src/components/Sidebar.tsx Marcode's chrome kept (floating nav owns settings); upstream's SidebarSeparator removal carried over since its import is gone.
apps/web/src/components/ProjectScriptsControl.tsx Marcode's pill controls kept; upstream's compact control width ported onto the surviving Tooltip buttons.
apps/web/src/components/CommandPalette.tsx Upstream replaced toggleOpen with toggleMode(mode); the floating pill nav listener follows it.
apps/server/src/persistence/Migrations.ts Marcode keeps id 33 (ProjectWorkspaceLayout). Upstream's ProjectionThreadTitleRegeneration shifts to 36 so applied installs never renumber.
apps/server/src/cli/**, apps/server/src/cloud/** Upstream behavior taken (serveCommand, systemctl --no-block); Marcode service identity (marcode.service) and copy kept.
apps/mobile/** CompactBrandTitle uses MarcodeMark; showcase targets the production variant with Marcode's scheme and package id.
docs/** Upstream's architecture/ + reference/internals/ restructure adopted; Marcode branding and Marcode-only pages kept in the index.
.github/workflows/ci.yml Marcode's macos-26 runner kept rather than upstream's Blacksmith runners.

Coupled changes

effect-version-subtree reported blocking, but pnpm-workspace.yaml moved only Clerk versions — effect stayed at 4.0.0-beta.102, so .repos/effect-smol is still in sync. No subtree sync needed.

pnpm-lock.yaml was regenerated with pnpm 11.10.0, not hand-merged.

Verification

  • Full workspace typecheck clean, 15 packages.
  • Lint clean, exit 0, zero errors.
  • apps/web: 209 test files, 1986 tests pass.
  • Focused server (persistence, cloud, cli), scripts and oxlint-plugin-marcode suites pass.
  • vp fmt --check clean on every hand-edited file.

Follow-up

The Ghostty terminal migration is deliberately deferred. apps/web/src/terminal/ghostty/** is in the tree with its own passing tests but nothing imports it yet.

t3-code Bot and others added 30 commits July 29, 2026 20:56
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…it (pingdotgg#4949)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…oring (pingdotgg#4967)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…g#4807)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…hy (pingdotgg#4988)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…tgg#4855)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
MaxAnderson95 and others added 22 commits July 31, 2026 00:19
… to new tasks (pingdotgg#5064)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ngdotgg#4955)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…oot (pingdotgg#5102)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: T3 Code Test <t3code-test@example.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ydration (pingdotgg#5147)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Brings in 63 upstream commits (merge base e698796). 33 conflicts resolved by
hand, combining upstream intent with Marcode's product behavior.

Notable decisions:

- Docs: adopted upstream's docs/ restructure (architecture/ + reference/ ->
  internals/), kept Marcode branding and the Marcode-only pages in the index.
- Migrations: Marcode keeps id 33 (ProjectWorkspaceLayout); upstream's new
  ProjectionThreadTitleRegeneration shifts to 36 so applied installs never
  renumber. Guard test pins the tail and now also asserts ascending ids.
- Terminal: upstream replaced xterm with a Ghostty surface. Marcode keeps its
  xterm drawer for now; the new apps/web/src/terminal/ghostty module lands
  unused as the migration path. Deferred, not discarded.
- Right-panel file surface stays retired: upstream's new ProjectFilePicker and
  ProjectContentSearchDialog now open files through the floating editor.
- CommandPalette: upstream replaced toggleOpen with toggleMode(mode); the
  floating pill nav listener follows it.
- Mobile: CompactBrandTitle uses MarcodeMark; showcase targets the production
  variant with Marcode's scheme and package id.
- ProjectScriptsControl/Sidebar keep Marcode's chrome; upstream's compact
  control width and SidebarSeparator removal are carried over.
- CI keeps Marcode's macos-26 runner rather than upstream's Blacksmith runners.
- pnpm-lock.yaml regenerated with pnpm 11.10.0, not hand-merged.

Verification: full workspace typecheck clean (15 packages), lint clean,
apps/web 209 files / 1986 tests pass, focused server, scripts and oxlint-plugin
suites pass. effect-version-subtree coupling checked: pnpm-workspace.yaml moved
but effect stayed at 4.0.0-beta.102, so the vendored subtree is still in sync.
@maarco maarco added the upstream-sync Upstream T3 Code sync label Aug 1, 2026
@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL labels Aug 1, 2026
@maarco
maarco merged commit fc9dcff into main Aug 1, 2026
11 checks passed
@maarco
maarco deleted the integrate/upstream-ca72e381 branch August 1, 2026 04:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XXL upstream-sync Upstream T3 Code sync 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.