merge: sync upstream through 0681d8549 (66 commits) - #438
Merged
Conversation
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…dotgg#9013) Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…pingdotgg#9001) Co-authored-by: Guillermo Casanova <guillermo.casanova.b@gmail.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Six repeat contributors remained unvouched. Add their approved accounts to the trust list: - `github:ipanasenko` - `github:nateEc` - `github:maxwellyoung` - `github:tsouth89` - `github:0x4bs3nt` - `github:Adamulek123` This change does not modify runtime or workflow logic. Made by GPT-5.6 Sol in the Codex harness.
…g#9129) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Rodrigo Brechard <rodrigo@clubtidy.fr> Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
…ruma WASM engine (pingdotgg#8360) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…gdotgg#9152) Takes over pingdotgg#6608 by @x1xhlol. Server: thread.message-sent updates the projection row directly and folds latestUserMessageAt in as a running maximum instead of running refreshThreadShellSummary. Client: thread.activity-appended takes an O(1) append path for in-order, unseen activities on reducer-produced arrays, with a WeakMap id index, and falls back to filter and sort for out-of-order, re-delivered, context-window, and snapshot-loaded cases. Reducer benchmark: 10,000 in-order appends went from 1,180 ms to 70 ms. Change authored by Claude Fable 5.1 running in Claude Code, based on work by @x1xhlol. Co-authored-by: Lucas Valbuena <lucknitelol@proton.me>
WebSocket reconnect catch-up only checked the number of missing events, then loaded and decoded the whole replay range before sending it. A handful of events with large tool payloads could allocate gigabytes and OOM the server. Before replaying, run a SQL preflight that counts the events in the range and sums their serialized payload bytes with octet_length(). If the range is over the existing row limit or an 8 MiB byte budget, fall back to the fresh snapshot path. Applies to both thread and shell subscriptions. Authored by @rcawston. Review, octet_length fix, and merge by Claude Fable 5.1 in Claude Code on behalf of @t3dotgg.
…aming (pingdotgg#9145) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…pingdotgg#9140) Co-authored-by: Claude Code <noreply@anthropic.com>
Co-authored-by: Claude Code <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: macroscopeapp[bot] <170038800+macroscopeapp[bot]@users.noreply.github.com> Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…9146) Co-authored-by: Claude Fable 5 <noreply@anthropic.com> Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…dotgg#9075) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…9166) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Classic-merge pingdotgg/t3code main into fork/dev. 3-way weld of 53 conflicts (never whole-file ours/theirs). Keep fork /new, Grok ACP grok-4.6, Direnv, dual confirms, hide-settled/recency, worktree-cleanup confirm, omegent, DPoP, and ForkMigrations. Take upstream citations, remote Mac updates, Claude Fable/catalog, incremental projection, Oniguruma highlighter, file/video/PDF viewer, and related client work.
The merge dropped newCommandId / findThreadRef that omegent and ChatView still call. ProviderRegistry tests need DirenvEnvironment.layerNoop; orchestration mocks need subscribeDomainEvents and getEventReplayStats; desktop update tests need an ElectronApp stub.
Keep fork budgeted listStatus in Sidebar v2. Align steer live-activity row ids, pass maintainVisibleContentPosition through the LegendList test mock, and inline the downloaded-update release-notes button so the toast tests can click it.
`t3 app` tests mock os.homedir so the CLI talks to a fixture socket. Under the fork's isolate:false server project that mock never applies, so the CLI connects to the live Linux desktop socket. Run those tests isolated. Fork kimi is enabled by default, so registry fixtures that disable every other built-in must disable kimi too, and the default provider list includes it.
Incoming SettingsRow reads primary-environment availability, which dereferences catalog.isReady. Under the fork's isolate:false web unit project useAtomValue can be null before the registry hydrates, so the search-target markup test crashed. Treat a missing catalog as not ready.
Incoming citation Range fixtures and the sidebar release-notes toast mock never attach when an earlier web unit file already bound those modules. Run them in the isolated project like the other vi.mock tests.
patroza
marked this pull request as ready for review
September 2, 2026 06:32
Uh oh!
There was an error while loading. Please reload this page.
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 freeto 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.
Why
Bring
fork/devup to pingdotgg/t3codemainat0681d8549.Classic-merge (not squash).
origin/maincould not be fast-forwarded: Protect requires a PR + required checks onrefs/heads/main. Same as #437 — mergeupstream/mainintofork/devvia this PR.Range
fork/dev34d9dcf6f(merge: sync upstream through b883fc066 (41 commits) #437)upstream/main0681d8549(66 commits)1c6a3a918(parents34d9dcf6f+0681d8549)b7d7a4b8dtype weld (omegentfindThreadRef,newCommandId, Direnv/ElectronApp test layers)Weld
53 content conflicts, 3-way, no whole-file ours/theirs.
Keep fork:
/new, Grok ACP +GROK_DEFAULT_MODELgrok-4.6, Direnv, dual confirms, hide-settled/recency, worktree-cleanup confirm, omegent, DPoP, ForkMigrations,VOUCHED.tdstays deleted.Take upstream: assistant citations, remote Mac desktop updates, Claude Fable/model catalog, incremental projection, Oniguruma highlighter, file/video/PDF viewer, quit-shortcut confirmation, and related client work.
Land
gh pr merge --mergeonly after the ship gate and required checks are green. Do not squash.