Skip to content

chore(sync): merge pingdotgg/t3code main - #535

Merged
Yarden-zamir merged 12 commits into
mainfrom
fork-sync/2026-11-12-1639
Nov 12, 2026
Merged

Yarden-zamir merged 12 commits into
mainfrom
fork-sync/2026-11-12-1639

Conversation

@Yarden-zamir

Copy link
Copy Markdown
Owner

🤖 Merge of pingdotgg/t3code main into fork main: 9 upstream commits, up to 2b4a9c7 "test(web): inline confirm tests no longer race the 3s disarm timer".

What upstream brought

Conflicts and how I resolved them

  • Orchestrator.ts (dispatchMessage): kept the fork thread kind refusal first, then the upstream full-history reload on a provider switch.
  • packages/client-runtime/src/state/shell.ts: took the upstream loadOverHttp / early load. Moved the fork syncTimings.mark(..., "httpSnapshotApplied") into applyHttpSnapshot, so it marks both the early load and the subscription load.

Fork fixes

None needed.

Agent context budget

Unchanged; the budget test passes.

Checks run on the Mac

checks.py all pass. Fork test chunks pass except tests that also fail on plain fork main on the Mac: the worktree path test (/var vs /private/var), two Linux icon tests (case-insensitive file system), and ForkContextMenuHost.fork.browser.test.tsx (keyboard tests time out on the loaded Mac; 4 of 10 fail on fork main too). client-runtime state, connection and fork tests, and the server tests that upstream changed, pass.

Evals: not run (no API key runs allowed).

t3dotgg and others added 12 commits November 12, 2026 04:55
…on its history read (pingdotgg#35180)

Replaces pingdotgg#34641. Refs pingdotgg#29468.

Co-authored-by: Braulio Oliveira <brauliobo@gmail.com>
Co-authored-by: Theo Browne <me@theo.li>
Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
…gdotgg#35286)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…otgg#35287)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…dit from here keeps your files (pingdotgg#35291)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…d trips (pingdotgg#35071)

The prepare-time shell load follows the idea and structure of pingdotgg#27413.

Co-authored-by: ahalekelly <7078138+ahalekelly@users.noreply.github.com>
Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
…ng long thread (pingdotgg#35224)

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
…rip (pingdotgg#35325)

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
… each key (pingdotgg#35360)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…efore it toggles (pingdotgg#35359)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
# Conflicts:
#	apps/server/src/orchestration-v2/Orchestrator.ts
#	packages/client-runtime/src/state/shell.ts
@coderabbitai

coderabbitai Bot commented Nov 12, 2026 •

Copy link
Copy Markdown

Important

  • Trigger review

This repository does not receive automatic reviews because it has fewer than 10 stars.

Run configuration

  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

@Yarden-zamir
Yarden-zamir marked this pull request as ready for review November 12, 2026 17:06
@Yarden-zamir
Yarden-zamir merged commit b2bc41b into main Nov 12, 2026
23 checks passed
@Yarden-zamir
Yarden-zamir deleted the fork-sync/2026-11-12-1639 branch November 12, 2026 17:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants