Skip to content

chore(upstream): sync marcode through 52b2bf77a941 - #75

Merged
maarco merged 60 commits into
mainfrom
chore/upstream-52b2bf77a941
Sep 7, 2026
Merged

chore(upstream): sync marcode through 52b2bf77a941#75
maarco merged 60 commits into
mainfrom
chore/upstream-52b2bf77a941

Conversation

@maarco

@maarco maarco commented Sep 7, 2026 •
edited
Loading

Copy link
Copy Markdown
Owner

problem

The previous upstream sync flow allowed multiple stale PRs and accumulated Marcode behavior directly inside upstream-owned files. This integration replaces that topology with one fresh merge from current main and establishes explicit fork boundaries.

source and target

  • target base: origin/main / c6d0a68
  • upstream source: upstream/main / 52b2bf7
  • merge base: 223ff44
  • branch: chore/upstream-52b2bf77a941
  • merge commit parents are exactly current main and upstream source

integration decisions

Resolved the seven conflicts manually:

  • marketing download: kept upstream nightly release behavior and corrected visible Marcode branding while preserving the compatible t3@nightly command
  • mobile home list: adopted upstream pending-task timestamps while preserving Marcode workspace-layout defaults
  • migrations: froze Marcode history 1–49 and appended upstream active-order migration as 50; reserved 9000+ for future Marcode-only migrations
  • web sidebar: kept upstream drag behavior and retained Marcode typography/icon decisions plus the unified workspace seam
  • retired the upstream reintroduced right-panel file-path surface
  • theme test: preserved the marcode:theme storage key and onboarding dark-mode invariant

fork boundary changes

  • added .github/fork-boundary.yml with owners, invariants, compatibility identifiers, focused tests, and live proof for declared seams
  • extracted Marcode chat ambient/composer CSS from index.css into a Marcode-owned module
  • kept Marcode-owned modules for chat chrome, right-panel policy/store, sidebar layout, thread actions, and unified workspace mounting
  • centralized fork-owned branding/service identity without renaming upstream compatibility identifiers
  • added single-flight upstream-sync guard: one open sync PR, current-base check, deterministic chore/upstream- branch, and reuse/update behavior
  • added machine-readable fork-boundary validation to the sync workflow

verification

  • CI run 34078538540 passed: Check, Test, all three server shards, Release Smoke, Rust, Mobile Native Changes, fingerprint, PR size, and PR vouch
  • Test completed with 353 test files and 4,396 tests passing
  • focused formatter and lint passed
  • shared, server, web, mobile, marketing, and desktop typechecks passed
  • boundary CLI check against the current upstream plan passed; 3 declared seams matched
  • clean merge: no unresolved files or conflict markers
  • live server startup passed on isolated .marcode; migrations 1–50 replayed successfully
  • live web passed on an authenticated integration branch; project-scoped sidebar rendered the unified workspace surface and chat/composer shell
  • the Claude review action failed before producing a review; it is not a required branch-protection check and emitted no review or inline findings
  • mobile runtime is not available on this host: no iOS Simulator and no Android SDK/emulator

This PR is ready for merge.

UtkarshUsername and others added 30 commits September 6, 2026 21:33
@UtkarshUsername
fix(web): show Tux icon for WSL environments (pingdotgg#8511)
72cb638
@AksharP5
perf(web): speed up folder menu sorting (pingdotgg#10190)
64fafbd
@extoci @shivamhwp
style(web): fix inconsistencies in new settings layouts (pingdotgg#10177
29d03ec 
)

Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
@juliusmarminge
feat(threads): persist manual active thread order (pingdotgg#9729)
2d645df
@juliusmarminge
feat(mobile): arrange active threads from both thread lists (pingdotg…
6766e68 
…g#9730)
@juliusmarminge
feat(web): drag threads across sections with consistent motion (pingd…
4023d93 
…otgg#9731)
@juliusmarminge
feat(web): simplify sidebar drag destination cues (pingdotgg#9750)
9a47c7b
@juliusmarminge @claude
fix(mobile): keep pending tasks queued when a send fails in flight (p…
36c48a6 
…ingdotgg#10245)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge @claude
feat(mobile): show new-task drafts alongside pending tasks in the thr…
c0bf354 
…ead list (pingdotgg#10260)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge @claude
feat(mobile): allow several new-task drafts per project (pingdotgg#10327
8e129a0 
)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@StiensWout
fix(mobile): slide settled threads out before collapsing (pingdotgg#1…
9846915 
…0345)
@juliusmarminge
fix(clients): show feedback results in composer banners (pingdotgg#10398
95d9937 
)
@UtkarshUsername
fix(server): stop Windows terminal polling from spiking CPU (pingdotg…
ea646c0 
…g#9476)
@t3dotgg @claude
fix(web): onboarding installs agents without needing Node or npm (pin…
c2c4185 
…gdotgg#10402)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
@t3dotgg
fix(server): allow settling threads with unanswered async questions (p…
7ac93e3 
…ingdotgg#10400)
@t3dotgg @claude
feat(ci): ship stable releases from the latest nightly commit (pingdo…
001f06d 
…tgg#10410)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
@t3dotgg @claude
feat(marketing): add a nightly channel to the download page (pingdotg…
075a86e 
…g#10408)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
@Lucenx9
fix(web): keep settings inputs focused during IME composition (pingdo…
9c96ac2 
…tgg#10262)

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
@yashranaway
fix(server): preserve Codex reset credits during usage updates (pingd…
f1a0811 
…otgg#10308)
@yashranaway
docs: link the repository security reporting policy (pingdotgg#10303)
e15ffb9
@maria-rcks
fix(web): only show auto balance errors after failed checks (pingdotg…
2d6a379 
…g#10407)
@maria-rcks
fix(web): improve preview recording frame delivery (pingdotgg#10403)
3941c2a
@juliusmarminge
Modify model and budget settings in ui-consistency.md
3cd2cbb 
Updated model version and adjusted budget limits for PRs and runs.
@juliusmarminge
Update model and effort in effect-service-conventions
f5a1ec5
@juliusmarminge
Fix duplicate maxBudgetPerRun entry in UI consistency
0032892
@maxwellyoung
fix(server): preserve inline provider secrets on redacted saves (ping…
ac4f1a2 
…dotgg#10054)
@juliusmarminge
Fix formatting of maxBudgetPerPR in conventions file
d57bdf3
@extoci
fix(web, mobile): replace Apple desktop machine labels (pingdotgg#10396)
2108996
@Neel2107
fix(web): hide browser when the right panel starts closing (pingdotgg…
7e8ae6b 
…#10385)
@maria-rcks
fix(web): keep settings section headings description-free (pingdotgg#…
4538770 
…10415)
realbakari and others added 17 commits September 6, 2026 16:49
@realbakari
fix(codex): accept misalignment policy errors on thread resume (pingd…
9513925 
…otgg#10373)
@t3dotgg @yashranaway
fix(server): skip disabled settlement lookups (pingdotgg#10424)
d3d4ea4 
Co-authored-by: adityagarud <garudaditya079@gmail.com>
@t3dotgg @claude
fix(server): run OpenCode CLI commands sequentially (pingdotgg#10427)
9ab0635 
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
@SunkenInTime @claude @juliusmarminge
feat(web): name the drop action while dragging sidebar threads (pingd…
5b0c923 
…otgg#10378)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@t3dotgg @claude
perf(web): keep the sidebar responsive during bulk thread updates (pi…
252df77 
…ngdotgg#10413)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
@t3dotgg @claude
fix(web): onboarding wizard now supports light mode (pingdotgg#10432)
ec36176 
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
@t3dotgg @claude
feat(threads): dismiss async questions without replying (pingdotgg#10431
7112697 
)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
@t3dotgg @claude
fix(web): stop collapsing the composer when it loses focus (pingdotgg…
a12589d 
…#10437)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
@maria-rcks
fix(server): keep interrupted threads resumable after restarts (pingd…
1abc717 
…otgg#10421)
@maria-rcks
fix(web): show load balancing note for a single machine (pingdotgg#10433
efeac14 
)
@Yash-Singh1
fix(server): follow placeholder branches after checkout updates (ping…
1e740e4 
…dotgg#10441)
@Yash-Singh1
fix(mobile): expand single-line tool details in work logs (pingdotgg#…
8c9a49a 
…10442)
@Yash-Singh1
fix(server): import transcripts with oversized tool records (pingdotg…
95f9b14 
…g#10430)
@t3dotgg
fix(marketing): deploy site with nightly releases (pingdotgg#10443)
0860cea
@Yash-Singh1
fix(web): preserve multiline composer drafts during timeline scrolling (
a07715c 
pingdotgg#10444)
@Noojuno
fix(server): handle JSON-wrapped titles and verbose Claude output (pi…
52b2bf7 
…ngdotgg#10446)
@maarco
chore(upstream): merge pingdotgg/t3code@52b2bf77a941
b7939c3
@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL 📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. labels Sep 7, 2026
@github-actions

github-actions Bot commented Sep 7, 2026 •
edited
Loading

Copy link
Copy Markdown

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider Metric Main baseline This PR Impact PR ceiling
Codex Total thread wire 13.6 KiB 13.6 KiB −15 B (−0.1%) 15.1 KiB ✅
Codex Thread snapshot wire 7.0 KiB 7.1 KiB +12 B (+0.2%) 7.3 KiB ✅
Codex Live turn WebSocket wire 6.6 KiB 6.5 KiB −27 B (−0.4%) 7.8 KiB ✅
Codex Live turn WebSocket decoded 57.1 KiB 57.0 KiB −44 B (−0.1%) 66.4 KiB ✅
Codex Live turn messages 10 9 −1 (−10.0%) 21 ✅
Claude Total thread wire 13.6 KiB 13.4 KiB −148 B (−1.1%) 15.1 KiB ✅
Claude Thread snapshot wire 7.0 KiB 7.1 KiB +11 B (+0.2%) 7.3 KiB ✅
Claude Live turn WebSocket wire 6.5 KiB 6.4 KiB −159 B (−2.4%) 7.8 KiB ✅
Claude Live turn WebSocket decoded 57.8 KiB 56.9 KiB −928 B (−1.6%) 66.4 KiB ✅
Claude Live turn messages 9 7 −2 (−22.2%) 21 ✅

Baseline: c6d0a68 · PR result: 6d651bc · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

  • Codex decoded thread snapshot: 113.9 KiB
  • Claude decoded thread snapshot: 114.6 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

@maarco
maarco marked this pull request as ready for review September 7, 2026 03:59
@maarco
maarco merged commit b25b24b into main Sep 7, 2026
26 of 29 checks passed
@maarco maarco mentioned this pull request Sep 7, 2026
Draft
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. size:XXL vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.