Repository navigation
chore(sync): merge pingdotgg/t3code main - #535
Merged
Merged
Conversation
…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>
…ingdotgg#35361) 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
|
Important
This repository does not receive automatic reviews because it has fewer than 10 stars.
|
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.
🤖 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 upstreamloadOverHttp/ early load. Moved the forksyncTimings.mark(..., "httpSnapshotApplied")intoapplyHttpSnapshot, 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.pyall pass. Fork test chunks pass except tests that also fail on plain fork main on the Mac: the worktree path test (/varvs/private/var), two Linux icon tests (case-insensitive file system), andForkContextMenuHost.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).