Repository navigation
chore: sync the fork with upstream 66b8a94f8d - #22
Merged
Merged
Conversation
…arkers (pingdotgg#39217) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…lapse all (pingdotgg#39213) Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#39235) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…uage (pingdotgg#39225) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#39253) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…nal closed (pingdotgg#39260) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ithout model controls (pingdotgg#23586)
… wording fixes in six more locales (pingdotgg#38947)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ActivePort write (pingdotgg#38727) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#25519) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
… actions (pingdotgg#31545) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…als (pingdotgg#35343) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ngdotgg#37978) Co-authored-by: T3 Code <t3code@outpost.asia-east1-c.c.lucid-meridian-447091-ea9.internal> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ngdotgg#37020) Co-authored-by: 尤嘉兴 <youjiaxing@dianchu.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#35307) Signed-off-by: bettercallcaleb <121191527+bettercallcaleb@users.noreply.github.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ojection read span (pingdotgg#39284) Co-authored-by: mInrOz <14320143+mInrOz@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#39294) Co-authored-by: Martin Bergo <14320143+mInrOz@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ommits are on a branch (pingdotgg#34967)
…ter fresh sessions (pingdotgg#39281)
…g#39283) Co-authored-by: ravdeep kainth <kainth.ravdeep@gmail.com> Co-authored-by: voida6 <voida6@users.noreply.github.com>
…'s default branch (pingdotgg#32841) Co-authored-by: Ajraba04 <143622128+Ajraba04@users.noreply.github.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#39331) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…achmentsDir from additionalDirectories (pingdotgg#37997) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ersedes it (pingdotgg#34634) Co-authored-by: Julius Marminge <julius0216@outlook.com>
(cherry picked from commit f0b4502)
(cherry picked from commit e5dc6ef)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#39328) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gned-in ControlMaster (pingdotgg#30616)
…hrottled for hours (pingdotgg#39287)
…background wait between turns (pingdotgg#38638) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#39192) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#39340) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#39306) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pload fails (pingdotgg#38395) Co-authored-by: Julius Marminge <julius0216@outlook.com>
… whole turn history (pingdotgg#39325)
Syncs the fork with pingdotgg/t3code main, 93 commits newer than the last sync base 8edefc8. A real merge keeps fork main an ancestor, so the PR merges without a force-push. One conflict, in ProviderTurnStartService.ts: upstream pingdotgg#39306 wraps the text sent to the provider in withMessageSenderNote, and the fork sends RESUME_PROMPT when Resume is pressed on a session without native resume. The sender note now wraps whichever text the fork picks, so a Resume a person pressed still sends "Continue where you left off." unchanged. The other 30 files changed on both sides merged without conflicts, among them AGENTS.md, the web and mobile i18n catalogs, ClaudeAdapterV2.ts and its test, Orchestrator.ts, ProviderTurnStartService.test.ts, ChatView.tsx, threadWorkflows.ts and its test, use-thread-composer-state.ts and ThreadSettingsSections.tsx. Origin: Tomáš asked to sync the fork with upstream.
Appends the progress entry for the merge of upstream main 66b8a94 (93 commits) into fork main: the one conflict and how it was resolved, the upstream changes checked against fork features, the check, boot and review results, the new migration for the hub switch, and the 61 upstream commits that landed overnight and are left for the next sync. Origin: Tomáš asked to sync the fork with upstream and to add a progress entry in the same PR.
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.
Problem
After #19, fork main was 93 upstream commits behind, so it was missing upstream's newer server, client and provider fixes. This brings in upstream main
66b8a94f8dand keeps every fork feature.Change
66b8a94f8dis merged into fork main2f21fd0fbe(29aceeea47). Fork main stays an ancestor, so this merges without a force-push and the fork's commits keep their ids.ProviderTurnStartService.ts. Upstream fix(server): agents can tell another agent's message from the user's pingdotgg/t3code#39306 wraps the text sent to the provider inwithMessageSenderNote, which tells the agent when another agent, a scheduled task or a T3 tool sent the message. The fork sends "Continue where you left off." when Resume is pressed on a session without native resume. The note now wraps whichever text the fork picks. Clients always send Resume ascreatedBy: "user", which gets no note, so Resume still sends the bare prompt. The other 30 files changed on both sides merged cleanly, among themAGENTS.mdand the web and mobile catalogs./goal clearand/goal resumewith the thread's stored model. Auto routing also matches a routed selection by its stampedautooption, so the command is routed like a typed message, as on web.MemoryHighfor agents on hosts without swap): both hubs have swap.docs/progress.mdentry (05adeb7419).Fork features kept: Auto Low/Medium/High routed by live limits and weekly pace, failover to the next subscription on a usage limit, the
Auto level:line in Auto-routed Claude prompts, Auto in the model picker, Resume on every provider, the pooled usage view and reset advice, unknown (not 0%) usage for Grok unified-billing accounts, and the fork's Resume-after-limits and Usage copy in every language.Verification (hub2)
git diff upstream/main...origin/main(old base8edefc8818) andgit diff upstream/main...HEADare both 75 files, +3637/−242. Per file, the lines the fork adds and removes are identical in 74. The 75th is the conflict above.vp run check:changed upstream/main(the fork's 75 files): unused patches, format, lint, knip, graphql, typecheck of 42 packages, 1105 tests in 31 files (the fork's 15 test files among them) and react compiler all pass.vp run i18n:check: catalogs match the source in web, mobile and desktop..t3, seeded from a read-only snapshot of the live database (never~/.t3/userdata), with settings holding only the two Auto instances and auto-resume off. Migration101_DelegatedTaskReadIndexesapplied to the snapshot, and the server ran 15 minutes with its Claude drivers, provider probes and usage sweeps. Of 4147 trace spans, the only failures were two lookups for managed Codex and Antigravity installs this fresh data dir lacks, and two spans interrupted at shutdown. No agent turn was sent.Notes
agent-context-increaselabel is needed.101_DelegatedTaskReadIndexesadds two partial indexes. The Node pins did not change.da54e47f26). They merge without textual conflicts but touch 29 fork files, among themthreadExecution.ts(the Resume gate),server.ts,Orchestrator.tsandClaudeAdapterV2.ts, so they are left for the next sync.gh pr merge --merge) works without a force-push.