chore(upstream): sync marcode through ca72e381c - #5
Merged
Conversation
…gdotgg#4905) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
pingdotgg#4897) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ngdotgg#4882) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…it (pingdotgg#4949) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ingdotgg#4867) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…gdotgg#4964) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…oring (pingdotgg#4967) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ingdotgg#4975) 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>
…ngdotgg#4771) Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
…dotgg#5055) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
… 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>
…dotgg#5095) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…pingdotgg#5094) 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.
This was referenced Aug 1, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges
pingdotgg/t3code@ca72e381cinto Marcode. 63 upstream commits, merge basee6987965, 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
apps/web/src/components/ThreadTerminalDrawer.tsxapps/web/src/terminal/ghostty/**lands unused as the migration path. Deferred, not discarded.apps/web/src/components/files/**ProjectFilePickerandProjectContentSearchDialogopen files through the floating editor instead.apps/web/src/components/Sidebar.tsxSidebarSeparatorremoval carried over since its import is gone.apps/web/src/components/ProjectScriptsControl.tsxapps/web/src/components/CommandPalette.tsxtoggleOpenwithtoggleMode(mode); the floating pill nav listener follows it.apps/server/src/persistence/Migrations.tsProjectWorkspaceLayout). Upstream'sProjectionThreadTitleRegenerationshifts to 36 so applied installs never renumber.apps/server/src/cli/**,apps/server/src/cloud/**serveCommand,systemctl --no-block); Marcode service identity (marcode.service) and copy kept.apps/mobile/**CompactBrandTitleusesMarcodeMark; showcase targets the production variant with Marcode's scheme and package id.docs/**architecture/+reference/→internals/restructure adopted; Marcode branding and Marcode-only pages kept in the index..github/workflows/ci.ymlmacos-26runner kept rather than upstream's Blacksmith runners.Coupled changes
effect-version-subtreereported blocking, butpnpm-workspace.yamlmoved only Clerk versions —effectstayed at4.0.0-beta.102, so.repos/effect-smolis still in sync. No subtree sync needed.pnpm-lock.yamlwas regenerated with pnpm 11.10.0, not hand-merged.Verification
apps/web: 209 test files, 1986 tests pass.oxlint-plugin-marcodesuites pass.vp fmt --checkclean 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.