Merge upstream main (05b697f6a2) into stage by bk-agent-01 · Pull Request #342 · iamtushar324/bkt3code

bk-agent-01 · 2026-10-22T03:56:23Z

Refs: no Linear ticket (requested in the T3 session by tushar; next sync after the promotion, as his Manager session asked).

What this does

This PR merges upstream T3 Code main up to 05b697f6a2 (2026-10-22) into stage. It brings 178 upstream commits on top of PR #336 (163bdeaa11). No new database migrations.

Fork decisions

Upstream moved code into new files. Upstream split ChatView, Sidebar, MessagesTimeline and the settings panels into new hook and component files. The fork's edits now live in those new files, with markers:
- ChatView hooks (useComposerSend, useMultipleModelSend, useProposedPlanSend, useComposerResume, useThreadLifecycle, useRightPanelActions, ChatBannerLane):
  - offline durable-outbox send and operator identity on every turn start (new helper fork/useOperatorStartTurn.ts)
  - analytics events
  - empty send with review comments
  - source-control profile fields on new threads
  - the maximized right-panel preference
- Sidebar row (SidebarThreadRow): the async-question label, long-press menu and thread-scoped VCS status.
- Settings:
  - AuthorizedClientsSettings: proof-of-possession pairing links and the app version.
  - SavedEnvironmentRows: the display URL and environment appearance.
  - ArchivedThreadsPanel: archive reclaim.
- Timeline rows: sender attribution, comment marks, the plan card row, plan-review comment cards and the agent UI work-entry wrapper.
Tooling: upstream moved to pnpm 12.14.0, so the fork's deploy workflows now use it too.
Node: upstream also pins Node 26.12.1, for release executables and CI. Stage and bkt3 still run the server on Node 24.16.0, because codex and pi are installed under it on this host. The stage smoke test checks the runtime.
Not added: upstream's new automation message row does not show the fork's sender attribution. That is a product choice for a later PR.

How I tested

Fork-marker check: passed against upstream 05b697f6a2.
CI on this PR is the gate. dev-server-1 policy: I ran no tests, typechecks or builds locally.
After the merge, I will smoke-test stagebkt3 as for Merge upstream main (163bdeaa11) into stage #336: health, MCP tools, a new session, Claude accounts, webhook delivery and the server log.

🤖 Generated with Claude Code

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

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

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

…dotgg#22733)

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

…rning, setup-done marker (pingdotgg#22718) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

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

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

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

…ir own file (pingdotgg#22675) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

…heir own files (pingdotgg#22676) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

…n their own files (pingdotgg#22677) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

…der live in hooks (pingdotgg#22682) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

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

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

…ive in their own files (pingdotgg#22699) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

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

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

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

…r own components (pingdotgg#22719) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

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

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

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

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

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

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

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

…e branch live in their own components (pingdotgg#22672) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

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

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

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

) Co-authored-by: Pixel Perfect <me@pixp.cc> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

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

…ds with its sidebar (pingdotgg#23144) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

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

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

…ine in place (pingdotgg#23147) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

…its tab bar (pingdotgg#23148) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

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

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

…ngdotgg#22633)

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

…g#23169)

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

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

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

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

…card (pingdotgg#23282) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>

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

…ingdotgg#23314)

…g#23315)

178 upstream commits on top of 163bdea. Upstream split ChatView, Sidebar, MessagesTimeline and the settings panels into new files; the fork's edits follow them there (durable outbox send, operator identity, analytics, comment empty-send, source-control profile fields, sidebar async-question and long-press, pairing proof-of-possession, archive reclaim, plan-review and comment marks in timeline rows). Upstream moved to pnpm 12.14.0; fork deploy workflows follow. No new migrations. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

- MCP thread-lookup fixtures carry the fork's unrestricted operator scope. - Comment marks ignore a snapshot without a comment list (shared query mocks). - Fork mobile sheets use upstream's HORIZONTAL_FORM_SHEET_OPTIONS. - Phase sidebar draft rows pass upstream's new swipe handlers. - Format the Toolyard native access guide with vite-plus 1.3.0. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

bk-agent-01 · 2026-10-22T04:18:16Z

Merge go: Tushar asked in the owning T3 session to pull the latest upstream main into stage ("can you pull the latest main again right now"), and his Manager directed this sync as a separate PR after the bkmain promotion. Every CI check on head 9d606b2 passed. "Mobile Native Static Analysis" waits for a Blacksmith macOS runner that this fork does not have, so it never starts. Merging as a merge commit pinned to that head.

t3dotgg and others added 30 commits October 21, 2026 00:33

fix(server): storage cleanup no longer counts pnpm clones as freed sp…

d0e427d

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

build: upgrade Vite+ to 1.3 and cache typecheck (pingdotgg#22716)

a1dc856

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

test: local test runs use package configs and a clean env (pingdotgg#…

8f66e67

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

fix(mobile): restore low-latency decoding for simulator streams (ping…

ca049dc

…dotgg#22733)

fix(marketing): typecheck cache no longer misses when the shell env c…

ea1c494

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

build(setup): leaner installs on Mac and Linux, cross-device store wa…

618761a

…rning, setup-done marker (pingdotgg#22718) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

build: upgrade pnpm to 12 for 4x faster installs (pingdotgg#22738)

f4a3843

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

refactor(web): the timeline minimap lives in its own file (pingdotgg#…

76e4aac

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

refactor(web): timeline work entry rows and tool icons live in their …

bea8790

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

refactor(web): timeline work group and live activity rows live in the…

9e672d0

…ir own file (pingdotgg#22675) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

refactor(web): timeline user message rows and context chips live in t…

3e36c5e

…heir own files (pingdotgg#22676) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

refactor(web): timeline assistant and orchestration event rows live i…

476e2c3

…n their own files (pingdotgg#22677) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

refactor(web): timeline row derivation, position restore and find rea…

bef9142

…der live in hooks (pingdotgg#22682) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

refactor(web): the command palette's theme items live in their own fi…

9ff8cdc

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

refactor(web): the command palette's thread items come from their own…

767134a

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

refactor(web): the command palette's project items and pure helpers l…

0b7c902

…ive in their own files (pingdotgg#22699) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

refactor(web): the command palette's add-project views are components (…

28a8d2b

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

feat(cli): start, message, and read threads from the terminal with t3…

955b4cc

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

refactor(web): composer attachment tiles live in their own component (p…

7781e52

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

refactor(web): resting image previews and queued attachments are thei…

9576c45

…r own components (pingdotgg#22719) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

refactor(web): composer mode controls and footer actions live in Comp…

94bce7f

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

refactor(web): typing no longer re-renders the composer model picker (p…

17e62e7

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

refactor(web): composer suggestion lists are built by useComposerMenu…

b7b905d

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

refactor(web): the sidebar's thread rows live in their own file (ping…

00ceb2d

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

refactor(web): sidebar list markers and draft rows live in their own …

e7f62ef

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

feat(dev): first dev start seeds real data and warms deps (pingdotgg#…

ad4f18d

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

refactor(web): the pull requests column lives in its own component (p…

09bd654

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

refactor(web): the pull request header's crumbs, title editor and bas…

b302290

…e branch live in their own components (pingdotgg#22672) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

refactor(web): the pull request header's actions live in their own co…

8f7de11

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

refactor(web): the pull request detail loader lives in its own hook (p…

5db0045

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

juliusmarminge and others added 22 commits October 21, 2026 17:58

fix(mobile): deliver the first tab selection after Duo folding (pingd…

61bdec0

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

fix(mobile): use native full-width sheets on iPhone Duo (pingdotgg#22980

13eea3f

) Co-authored-by: Pixel Perfect <me@pixp.cc> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

fix(mobile): the pull requests tab's empty detail asks for a pull req…

added62

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

fix(mobile): the iPhone Duo keeps list titles through folds and unfol…

801701d

…ds with its sidebar (pingdotgg#23144) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

fix(mobile): the iPhone Duo searches from a field at the bottom of it…

9fa551a

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

fix(mobile): a closed search no longer risks freezing the app (pingdo…

37d6fce

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

fix(mobile): folding the Duo keeps the thread's end or the reader's l…

5ed2ea2

…ine in place (pingdotgg#23147) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

fix(mobile): the iPhone Duo's search field and composer line up with …

e6c2aeb

…its tab bar (pingdotgg#23148) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

fix(mobile): Screens 5.0.0-t3.36 stops an iPhone Duo unfold crash (pi…

83a8501

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

fix(mobile): the iPhone Duo's inspector panes use the full column (pi…

89fe509

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

fix(gitcafe): show line counts on linked and listed pull requests (pi…

8acbefe

…ngdotgg#22633)

docs(import): correct conversation size and batch limits (pingdotgg#2…

49e97d4

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

fix(server): stop abandoned turns before continuing threads (pingdotg…

6f6f68a

…g#23169)

feat(server): export how long runs take and how they end (pingdotgg#2…

f8e4834

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

fix(mobile): new-thread heading clears the iPad header (pingdotgg#23206)

6318bfc

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

fix(pi): fork completed turns while the next turn is running (pingdot…

aa0158d

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

fix(mobile): drafts swipe to discard and every row move animates (pin…

b295dd8

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

feat(server): webhook filters fan out over arrays with a [] path wild…

defb7e6

…card (pingdotgg#23282) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>

fix(web): Arabic and Hebrew text reads and navigates right to left (p…

3690c86

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

fix(client-runtime): refresh Git refs when the RPC session changes (p…

a98ebde

…ingdotgg#23314)

fix(web): cap list layout passes to prevent React error 185 (pingdotg…

05b697f

…g#23315)

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 22, 2026

bk-agent-01 merged commit e4526c7 into stage Oct 22, 2026
25 of 26 checks passed

This was referenced Oct 22, 2026

Promote stage to bkt3: upstream main 05b697f6a2 (idle compaction modes) #343

Closed

Promote stage to bkt3 (2026-10-23): upstream 05b697f6a2, SQLite reader fixes, sidebar child group badge #348

Merged

Navigation Menu

Repository navigation

Merge upstream main (05b697f6a2) into stage - #342

Merge upstream main (05b697f6a2) into stage#342
bk-agent-01 merged 180 commits into
stagefrom
merge/upstream-20261022-stage

bk-agent-01 commented Oct 22, 2026

Uh oh!

bk-agent-01 commented Oct 22, 2026

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Conversation

bk-agent-01 commented Oct 22, 2026

What this does

Fork decisions

How I tested

Uh oh!

bk-agent-01 commented Oct 22, 2026

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants