merge: sync upstream through 06de9e90a (121 commits) - #423
Merged
Conversation
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: 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: 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: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.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: John William Creighton (s243a) <s243a@users.noreply.github.com> Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…ngdotgg#6326) Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: Alex Southwell <4596216+saphid@users.noreply.github.com>
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
…nment (pingdotgg#7292) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…otgg#7286) Co-authored-by: Codesmith <codesmith-bot@users.noreply.github.com>
…pingdotgg#7283) Co-authored-by: Codesmith <codesmith-bot@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: mweinbach <maxweinbach5@gmail.com>
…gdotgg#8144) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Classic-merge 121 upstream commits (pingdotgg/t3code through 06de9e9) into fork/dev so the deploy branch keeps upstream as a second parent.
github-actions
Bot
added
the
📱 Native Change
… weld Keep queue-bound mobile sends from scrolling, accept Codex localMessages on the steered feed, land inactive pins in the settled recency section (pingdotgg#7969), and keep send-disabled covering both feedback uploads and loading messages.
Windows workspace paths must go through classifyMarkdownImageSource so relative and drive-letter forms keep their signed-asset paths. The fork normalizer only covers Codex `attachment:` / generated_images URIs the shared classifier blocks.
Keep clearing the session before provider interrupt, then still record a failed interrupt unless a newer ready snapshot won the race. Tests now expect migrations 041/042, Claude /compact, ACP runtime item ids, and bootstrap thread.delete on worktree failure.
The new upload-queue tests mocked `@t3tools/client-runtime/state/runtime` without spreading the real module. Under the fork's isolate:false unit project that incomplete mock leaked into PullRequestListFilters.
patroza
marked this pull request as ready for review
August 25, 2026 09:36
2 tasks
patroza
added a commit
that referenced
this pull request
Aug 25, 2026
## Why Fork CI on the #423 merge SHA (`1b3f2f52e`) failed its **Test** job while Check / Release Smoke / Mobile Native / Upstream Lineage Guard were green. The only failure was the pingdotgg#8006 perf assertion: `session-logic.test.ts > session activity performance > updates 20,000 ordered tool activities within 100 ms` `AssertionError: expected 139.01 to be less than 100` That merge tree is identical to the last green PR tip (`2efc0552e`). Same code, noisier GitHub-hosted runner. ## What - Skip the copy+sort in `deriveWorkLogEntries` when activities are already ordered (the streaming-append path ChatView actually hits). - Widen the budget from 100ms to 250ms. That still fails a quadratic rebuild; 100ms was too tight for this runner class. ## Test plan - [x] `vp test run apps/web/src/session-logic.test.ts -t "orders work log by activity sequence|session activity performance"` - [ ] Fork CI Test on this PR / then on `fork/dev` after merge Co-authored-by: T3 Code PR Stack <41898282+github-actions[bot]@users.noreply.github.com>
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
20 participants
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.
Merges 121 upstream commits (
pingdotgg/t3codethrough06de9e90a) intofork/dev.Important
Land with a merge commit, not squash.
gh pr merge <n> --merge— never the GitHub button (it remembers squash and drops the second parent). Squashing collapses lineage sofork/dev..upstream/mainre-reports already-merged work as missing.origin/maincould not be fast-forwarded: the Protect upstream main ruleset requires a PR and has no bypass actors. This merge still usesupstream/main(06de9e90a) as the second parent, so lineage onfork/devis intact.Incoming product (headlines)
/compact/ context-meter Compact (feat(claude): compact old threads before they burn through usage pingdotgg/t3code#8144)/feedback(feat(codex): submit thread feedback to OpenAI pingdotgg/t3code#7949)/and$menus (feat(composer): list skills with slash commands pingdotgg/t3code#7737, feat(web): redesign skills in$menu and in/menu pingdotgg/t3code#8009)Weld points
Workflows — kept new jobs (server shards, rust, mobile-native change gate, release
quality) on GitHub-hostedubuntu-24.04/macos-15. Did not restore.github/VOUCHED.td. Fork-only workflows (fork-ci, lineage guard, etc.) survived.ChatView/ChatComposer— upstream structure (submissionIntent, compact meter, signed uploads, linked-PR, feedback) with fork extras ported on: queued chips / turn outbox,environmentUnavailable, usage snapshot, iOS attach input,sendDisabledReason(feedbackUploadingthen messages-loading),isPreparingWorktreeUi,onStartNewThread.Sidebar— took pingdotgg#7969 settle-then-pin (pinned settled threads live in the settled tail). Kept identity claim, ownership filter, env filter, settled-shelf persistence, usage dots.ChatMarkdown— oneimghandler: upstreamclassifyMarkdownImageSourceplus forkattachment:/ generated_images viaisLocalMarkdownImageSrc→ChatMarkdownWorkspaceImage.Server — unioned fork diagnostics / product handshake / Grok resync / PortExposure /
settleAllAfterServerRestartwith upstreamdispatchFromClient+ client origin, attachment upload RPCs,provider-sessions.reconcile,ServerSettingsLayer← SQLite,compactSession. Kept forkmergeProviderSnapshotstests. Cursor stays default-off.Desktop — fork
pickApplication+ localeditor://allowlist with upstream multi-file picker and remote-SSH checks.Mobile — board mode, list-mode titles, identity filter, steering queue + Codex feedback; linked-PR list identity; shelf persistence.
pnpm-lock.yamlregenerated (CI= pnpm install --no-frozen-lockfile).rererewas disabled.Verification
vpr typecheck— clean across the workspace (suggestions only)vp checkon files changed vsfork/dev— 0 errors, 39 warnings (same class as prior syncs)Migrations.ts(upstream), notForkMigrations.ts