Merge upstream main (163bdeaa11) into stage by bk-agent-01 · Pull Request #336 · iamtushar324/bkt3code

bk-agent-01 · 2026-10-21T07:36:09Z

Refs: no Linear ticket (requested in the T3 session by tushar: "can you pull the latest main again right now").

What this does

This PR merges upstream T3 Code main up to 163bdeaa11 (2026-10-21) into stage. It brings 68 upstream commits on top of PR #331 (dac3437d94). The main upstream changes:

Upstream deleted about 11k low-value tests, which makes CI faster and less flaky. Upstream also banned tests that wait on real time, poll, or set their own timeouts.
Scheduled-task webhooks now skip repeated deliveries and combine close ones, and they support event filters (feat(scheduled-tasks): replay dedupe and coalescing for webhook deliveries pingdotgg/t3code#22234, feat(scheduled-tasks): event filters for webhook deliveries pingdotgg/t3code#22194).
Mermaid diagrams now render with pele (feat(web): render Mermaid diagrams with pele pingdotgg/t3code#21472). Upstream removed the mermaid dependency.
About 15 mobile fixes, and a delegate and Grok fix (fix(server): delegates finish when their leftover work settles, and Grok commands stop holding runs open pingdotgg/t3code#22709).

Fork decisions

Migration: upstream 067 (WebhookDedupe) registers at fork id 1059. Upstream 063 is still not registered.
Tests:
- Where upstream deleted a test that the fork had only adjusted, I took the deletion.
- The fork's own test cases are kept.
- One fork test now uses a queue and a Deferred instead of polling.
- Coverage lost: no test now checks the fork's CSP frame-src addition (challenges.cloudflare.com). This is a follow-up.
Plan-review diagrams: the fork's plan-review Mermaid block now uses upstream's MermaidDiagram, so plans and chat share one renderer and one sanitizer.
Release workflow: I kept upstream's job structure (test_web, Windows builds on Linux with verify_runner) and mapped its runners to GitHub-hosted ones. Release jobs run only in pingdotgg/t3code.

How I tested

Fork-marker check: passed against upstream 163bdeaa11.
Import scan: no broken relative imports.
CI on this PR is the gate. dev-server-1 policy: I ran no tests, typechecks or builds locally.

🤖 Generated with Claude Code

Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>

…g#22194) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

…dotgg#22488)

…eries (pingdotgg#22234)

…erShell (pingdotgg#22494) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

…sts over REST (pingdotgg#22495) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

…ingdotgg#22521) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

…ction (pingdotgg#22526) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

…tes (pingdotgg#22524) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

pingdotgg#22533) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

pingdotgg#22523) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>

)

pingdotgg#22570) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

…ingdotgg#22557) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

…gdotgg#22559) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

…gg#22613) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

…ped-usage warnings (pingdotgg#22558) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

…otgg#22627)

… keys (pingdotgg#22645) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

…w CI runners (pingdotgg#22649) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

…ject icon (pingdotgg#22621)

…ck (pingdotgg#22653) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

…es and redirects (pingdotgg#21503)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

…cache (pingdotgg#22712) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

…g#22717) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

…rok commands stop holding runs open (pingdotgg#22709) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Fuksss <fuxik12345@gmail.com>

68 upstream commits on top of dac3437, including upstream's test pruning and test-hygiene bans. Upstream migration 067 (WebhookDedupe) registers at fork id 1059. The plan-review Mermaid block now uses upstream's pele-based MermaidDiagram (upstream dropped mermaid). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

- Re-export resolveChangeRequestPresentation and deriveLogicalProjectKey, which upstream stopped exporting; the fork phase sidebar and smart-git button use them. - formatWorkingDurationLabel moved to client-runtime models; the phase sidebar's snoozeWakeDescription lives in a fork module now that upstream dropped it. - Upstream's new orphaned follow-up MCP test gets the fork scope fields; the archive undo test expects the fork's duplicate-archive guard. - Formatting for apps/web/package.json and PlanReviewNodes. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

- Fork tests follow upstream's new test-hygiene rules (no real-clock or frame waits, no wall-clock reads). - The skipped upstream 063 test is removed; the fork keeps 063 unregistered. - The mobile plan-comment test re-imports countReviewCommentContexts. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

bk-agent-01 · 2026-10-21T08:15:47Z

Merged at head ed0da71 (all CI green) on tushar's request in the T3 session: "can you pull the latest main again right now" (go to merge and deploy stage given earlier in the same session). Deploy verification follows.

t3-code-bot Bot and others added 30 commits October 20, 2026 13:14

fix(web): restore left-aligned markdown table cells (pingdotgg#22482)

860e6d2

Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>

feat(scheduled-tasks): event filters for webhook deliveries (pingdotg…

0c85b0d

…g#22194) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

fix(mobile): prevent update checker from crashing iOS at launch (ping…

ec58572

…dotgg#22488)

feat(scheduled-tasks): replay dedupe and coalescing for webhook deliv…

2ebe280

…eries (pingdotgg#22234)

ci(release): Make Windows arm64 CI job 50% faster (pingdotgg#22428)

14b47ee

ci(release): Windows arm64 verify no longer runs the crashing ARM Pow…

4c48118

…erShell (pingdotgg#22494) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

refactor(source-control): GitCafe creates repositories and pull reque…

ca140c4

…sts over REST (pingdotgg#22495) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

test(web): fix release browser test failures (pingdotgg#22508)

5bcc90e

fix(mobile): connecting an environment no longer crashes the header (p…

c8667fd

…ingdotgg#22521) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

fix(mobile): folded Back clears the detail route before the next sele…

4af3231

…ction (pingdotgg#22526) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

ci(release): release tests stop timing out and finish in about 5 minu…

fe27e8e

…tes (pingdotgg#22524) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

test(server): Claude steer test no longer hangs for 120s under CI load (

5d27ecd

pingdotgg#22533) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

test: remove the timing races behind recurring CI and release failures (

f9dd259

pingdotgg#22523) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

feat(web): render Mermaid diagrams with pele (pingdotgg#21472)

fcb20e4

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>

fix(mobile): keep home brand visible during secondary retries (pingdo…

327f3fc

…tgg#21388)

fix(mobile): collapse pull request repository errors (pingdotgg#21389)

043c9c3

fix(mobile): show terminal arrow keys before secondary controls (ping…

e27fffa

…dotgg#21398)

fix(mobile): update outdated servers and respect provider permissions (…

145d73b

…pingdotgg#21402)

fix(mobile): live activity tracks thread status and settlement (pingd…

2f6755b

…otgg#21405)

fix(mobile): use current checkout for non-git projects (pingdotgg#21404)

4db2533

fix(mobile): add project and checkout removal (pingdotgg#21409)

0dc38c7

fix(mobile): show plans and fold settled progress notes (pingdotgg#21393

77e4f56

)

fix(mobile): open transcript file links at the resolved path (pingdot…

afc33ff

…gg#21403)

fix(mobile): lock the composer while queued edits save (pingdotgg#21390)

834ae4f

fix(mobile): bring model controls in line with web (pingdotgg#21406)

f16251f

fix(mobile): restore archive and thread action undo (pingdotgg#21401)

6efe9a0

fix(mobile): expose background work and thread status actions (pingdo…

fe414eb

…tgg#21395)

fix(web): keep approval menu actions compact (pingdotgg#22566)

d356059

fix(web): main typecheck passes again after the Mermaid switch to pele (

c3540a7

pingdotgg#22570) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

test: delete 11k low-signal tests so CI runs faster and flakes less (p…

05696c6

…ingdotgg#22557) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

juliusmarminge and others added 20 commits October 20, 2026 18:50

fix(server): make the remaining flaky server tests deterministic (pin…

31dcc7c

…gdotgg#22559) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

fix(mobile): composer chips match chat chips (pingdotgg#22518)

ecfe4f7

fix(mobile): show each turn's diffstat on its work row (pingdotgg#21392)

8bbb85c

chore(release): prepare v0.1.1

c22ace2

fix(web): silence notifications when stopping a watch (pingdotgg#22615)

4741dc5

ci(release): build macOS desktop on Blacksmith runners again (pingdot…

e64766c

…gg#22613) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

fix(usage): Codex compaction and resumed sessions no longer show skip…

733a303

…ped-usage warnings (pingdotgg#22558) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

fix(web): thread search shows the same PR badge as the sidebar (pingd…

8a9d0e0

…otgg#22627)

Delete .github/workflows/cursor-hygiene-webhook.yml

3e250a8

fix(desktop): bump Electron to 44.9.3 to block compromised eMudhra CA…

61e2747

… keys (pingdotgg#22645) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

test(web): ChatView's React Compiler check no longer times out on slo…

4f651cb

…w CI runners (pingdotgg#22649) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

fix(web): thread links render as chips, and thread chips show the pro…

15dc7b0

…ject icon (pingdotgg#22621)

fix(server): Stop on a delegate always clears it, even when it is stu…

6a6c84f

…ck (pingdotgg#22653) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

feat(web): composer stays usable during approvals, and sending declin…

a93b03c

…es and redirects (pingdotgg#21503)

docs(agents): name the fast commands and stop polling (pingdotgg#22711)

73daccf

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

fix(desktop): new worktrees install Electron from the local download …

a5d66e2

…cache (pingdotgg#22712) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

test(server): split replay fixtures into per-provider files (pingdotg…

dd8452a

…g#22717) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

fix(server): delegates finish when their leftover work settles, and G…

163bdea

…rok commands stop holding runs open (pingdotgg#22709) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Fuksss <fuxik12345@gmail.com>

chore: mark the mobile composer import seam

7e1d90b

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL 📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. labels Oct 21, 2026

bk-agent-01 and others added 2 commits October 21, 2026 07:45

bk-agent-01 merged commit 6586cce into stage Oct 21, 2026
25 of 26 checks passed

This was referenced Oct 21, 2026

Promote stage to bkt3: upstream main 163bdeaa11 with idle-thread compaction #337

Merged

fix(server): account policies no longer freeze the server reading the shell #338

Merged

Merge upstream main (05b697f6a2) into stage #342

Merged

Navigation Menu

Repository navigation

Merge upstream main (163bdeaa11) into stage - #336

Merge upstream main (163bdeaa11) into stage#336
bk-agent-01 merged 72 commits into
stagefrom
merge/upstream-20261021-stage

bk-agent-01 commented Oct 21, 2026

Uh oh!

Uh oh!

bk-agent-01 commented Oct 21, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Conversation

bk-agent-01 commented Oct 21, 2026

What this does

Fork decisions

How I tested

Uh oh!

Uh oh!

bk-agent-01 commented Oct 21, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants