Merge upstream e6987965f into Marcode - #2

Merged

maarco merged 80 commits into

mainfrom

integrate/upstream-e6987965

Jul 31, 2026

maarco commented Jul 29, 2026

Owner

What changed

Integrates upstream pingdotgg/t3code commit e6987965f into Marcode as a two-parent merge commit, preserving Marcode-specific behavior and applying the documented conflict-resolution rules.

Included

59 upstream commits across the integration surface
Marcode branding, floating-editor, unified-workspace, and compatibility boundaries preserved
Upstream Markdown inline-code/file-link behavior incorporated alongside Marcode editor behavior
Upstream VCS snapshot/caching changes incorporated
Repository-owned $marcode-upstream-integration skill added with merge-state protection rules
Stale upstream VCS assertion corrected to match the upstream stderr-reporting behavior

Validation

Web typecheck: passed
Mobile typecheck: passed
Server focused tests: 120/120 passed
VCS tests: 53/53 passed
Client-runtime RPC tests: 12/12 passed
Desktop/build tests: 37/37 passed
Zero unmerged paths, conflict markers, or .bak artifacts

Remaining verification notes

Live browser control was unavailable in the agent session; the local IPv6 web endpoint returned Marcode HTML.
No iOS Simulator runtime/device or Android SDK/adb was available for live mobile verification.
ChatHeader.test.ts remains blocked by the local @aliimam/icons package entry resolution issue.

This PR is intentionally draft for review before merging into main.

t3dotgg and others added 30 commits

July 27, 2026 02:56


          fix: cut websocket throughput in half by pruning activity payloads (p…

d60f6e9

…ingdotgg#4622)


          perf(mobile): defer work-log detail serialization (pingdotgg#4607)

b4680cb


          test: account for lazy thread feed details (pingdotgg#4628)

23ea08d


          feat(relay): limit managed tunnels per user (pingdotgg#4530)

a78f245

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>


          Add managed tunnel limits migration (pingdotgg#4635)

2b06c08


          Add background preview capture and picture-in-picture support (pingdo…

f4c3943

…tgg#4397)

Co-authored-by: codex <codex@users.noreply.github.com>


          feat(web): prompt stash — cmd+S saves the composer to a per-provider …

200fa82

…queue (pingdotgg#4453)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>


          Upgrade Effect and Alchemy betas (pingdotgg#4643)

108e017

Prepare Relay production infrastructure for the PlanetScale PS_20 HA topology, upgrade Effect and Alchemy to compatible betas, reconcile migration state, and preserve patched MCP session termination behavior.\n\nCo-authored-by: codex <codex@users.noreply.github.com>


          feat: allow new thread creation through project breadcrumbs (pingdotg…

bdf99c1

…g#4638)


          fix(web): scope PR state to the thread branch (pingdotgg#4460)

Co-authored-by: codex <codex@users.noreply.github.com>


          Drop redundant Relay user indexes (pingdotgg#4648)

d2d40b6

Co-authored-by: codex <codex@users.noreply.github.com>


          feat(connect): release the Cloudflare tunnel when the environment shu…

96398e3

…ts down (pingdotgg#4531)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>


          Fix Relay Worker RuntimeContext wiring (pingdotgg#4653)

180620e

Co-authored-by: codex <codex@users.noreply.github.com>


          Fix live sidebar resize limits and defer Alchemy runtime context (pin…

da11342

…gdotgg#4655)


          fix(web): constrain branch toolbar context (pingdotgg#4657)

32843c2


          Keep MCP credentials alive across provider turns (pingdotgg#4659)

0e19c10


          fix: close actions dropdown when editing (pingdotgg#4660)

f0121f3


          fix(preview): stabilize PiP viewport identity (pingdotgg#4661)

32af2f0

Co-authored-by: codex <codex@users.noreply.github.com>


          Add glass styling for thread tooltips and simplify preview tab handli…

80ead5f

…ng (pingdotgg#4665)


          Use tarball archiving for hosted web deploys (pingdotgg#4669)

5ba6ef7


          fix(server): bound editor discovery during config loading (pingdotgg#…

6e3b738

…4291)


          Prevent draft thread detail polling before shell registration (pingdo…

e77f42c

…tgg#4670)

Co-authored-by: codex <codex@users.noreply.github.com>


          feat: add configurable source control writing settings (pingdotgg#4204)

10bca3f

Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>


          feat(diff-panel): show total line additions and deletions (pingdotgg#…

eea3ea4

…4674)


          Clear provider update actions while updating (pingdotgg#4676)

6afbed3


          Fix sidebar highlighting for draft threads (pingdotgg#4679)

6a3df51


          Use glass surfaces for web toasts (pingdotgg#4681)

3957a95


          Show origin ref in branch trigger label (pingdotgg#4680)

a2ffb12

Co-authored-by: codex <codex@users.noreply.github.com>


          fix(mobile): match react version to react-native 0.85.3 vendored rend…

1153afb

…erer (19.2.3) (pingdotgg#4675)


          chore(release): prepare v0.0.29

831eb66

juliusmarminge and others added 16 commits

July 29, 2026 00:03


          refactor(server): use native HTTP compression streams (pingdotgg#4798)

8650f05

Co-authored-by: codex <codex@users.noreply.github.com>


          Remove Connect waitlist and add GA announcement tooling (pingdotgg#4691)

60af905


          Fix Connect sign-in settings label (pingdotgg#4806)

1b61ce1


          chore(release): prepare v0.0.30

694f8d1


          fix(desktop): restore T3 Connect sign-in (pingdotgg#4809)

1b4830f

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>


          Simplify files panel header (pingdotgg#4828)

08e4932


          build(desktop): reduce installed app size by ~300MB (pingdotgg#4824)

72b960f


          Update model version from claude-opus-4-8 to claude-opus-5 (pingdotgg…

c3e8fb6

…#4832)


          Preserve the thread shell while detail loads (pingdotgg#4830)

3137c2b


          Reduce idle work and disk churn with native resource diagnostics (pin…

49c0d96

…gdotgg#2679)

Co-authored-by: codex <codex@users.noreply.github.com>


          fix(server): detect repositories after initialization (pingdotgg#4848)

d19039a


          perf(server): merge separate staged/unstaged numstat calls into singl…

faea70a

…e diff HEAD --numstat (pingdotgg#4843)


          fix(git): disable external diff for review diff previews (pingdotgg#4854

85a8986


          Fix editable file focus and live syntax highlighting (pingdotgg#3979)

fc28abf


          fix(web): remember the rendered-markdown choice across threads (pingd…

e698796

…otgg#4853)

Co-authored-by: Simon Doba <simon.doba@orbit.de>
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>


          Merge upstream e698796

c701a1a

github-actions Bot added size:XXL vouch:trusted labels

maarco added 9 commits

July 30, 2026 22:41


          fix(upstream): clear merge CI failures

bc6eb72


          fix(ci): wire renamed oxlint plugin workspace

a8d3dd5


          fix(relay): align renamed service keys

48a742d


          fix(ci): remove stale desktop artifact import

cfe5981


          fix(auth): preserve legacy rpc scopes

22b0685


          test(web): align fork-specific branch and backdrop cases

578efbc


          test(web): keep image compression case within timeout

ed60261


          test(brand): align repository identity fixtures

725d9df


          test(git): keep derived fork fixture aligned

46fa0bd

maarco marked this pull request as ready for review

July 31, 2026 14:33

maarco merged commit 9c69f8b into main

12 checks passed

maarco deleted the integrate/upstream-e6987965 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 vouch:trusted