Skip to content

merge upstream/main into fork - #321

Merged
adampeterhiggins merged 31 commits into
mainfrom
t3code/sync-upstream-2026-10-15
Oct 15, 2026
Merged

merge upstream/main into fork#321
adampeterhiggins merged 31 commits into
mainfrom
t3code/sync-upstream-2026-10-15

Conversation

@adampeterhiggins

@adampeterhiggins adampeterhiggins commented Oct 15, 2026

Copy link
Copy Markdown
Owner

The fork was 30 commits behind upstream and 360 commits ahead. This merges upstream/main through 339179f while preserving the fork's features and upstream history.

Conflict resolutions:

  • Pull requests: keep filter counts and applied filters, add upstream's sidebar project ordering and Scratch exclusion on web and mobile, and retain both test sets.
  • Threads and notifications: keep account labels, sidebar tab/group behavior and notification rules while incorporating delegated-child attention and upstream's Waiting icon/timer in the fork's shared status component.
  • Storage: combine settled-worktree cleanup with configurable ignored names, inventory and Conductor support, retaining both sets of tests.
  • Orchestration and providers: combine delegation guidance and capabilities, start the new question reactor alongside fork reactors, preserve Claude account handling and managed MCP support, and avoid taking the startup workspace lease twice.
  • Composer and docs: retain fork attachment/reference features alongside cross-environment dropped transcripts. Reviewed docs/fork-differences.md; its descriptions remain accurate.
  • Repair clean-merge imports and test fixtures exposed by typechecking.

Validation: contracts, server, web and mobile typechecks passed. 208 focused tests passed across 10 files, covering startup, storage cleanup, MCP delegation, Claude probing, PR filtering, notifications and affected web fixtures. Storage tests used a canonical TMPDIR to avoid macOS's /var symlink. Targeted formatting/lint passed with no errors (existing warnings remain); git diff --check passed. No browser verification was performed.

Merge with Create a merge commit. It keeps upstream history and the merge base for the next sync.

Model: gpt-6.1-sol. Harness: Codex in T3 Code.

maria-rcks and others added 30 commits October 14, 2026 17:45
@maria-rcks
fix(server): only Claude progress updates before a tool call show as …
cae6c66 
…text (pingdotgg#18923)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
@maria-rcks
fix(pr): keep known state in sync across controls (pingdotgg#18408)
ce6f8ce
@flamboh
fix(web): review summary only says optional when it is (pingdotgg#18451)
7897a69
@flamboh
fix(web): subagent lists in the composer banner no longer start lines…
e093789 
… with a comma (pingdotgg#19170)
@flamboh
fix(web,mobile): pull request filters no longer offer the Scratch fol…
cb395ee 
…der (pingdotgg#19179)
@flamboh
fix(web,mobile): pull request project filter follows the sidebar order (
464fad9 
pingdotgg#19180)
@tris203 @maria-rcks
feat(settings): inactivity auto-settle can keep threads with a PR (pi…
bf8ffe8 
…ngdotgg#14642)

Co-authored-by: maria-rcks <maria@kuuro.net>
@SunkenInTime @claude
fix(server): Claude works next to an enterprise managed-mcp.json (pin…
e47bfe4 
…gdotgg#18706)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@maria-rcks
fix(web,mobile): muse code uses meta's official blue logo (pingdotgg#…
348f217 
…19562)
@maria-rcks
fix(desktop): import CA trust variables from the login shell (pingdot…
aa81d12 
…gg#19604)
@maria-rcks
fix(server): preview copy only forwards text from the viewer's copy k…
78f4b69 
…eys (pingdotgg#19561)
@maria-rcks
fix(muse): Supervised threads ask before commands again (pingdotgg#19558
f87dd14 
)
@t3dotgg @claude
fix(server): restarts no longer stall on old subagent result deliveri…
22af947 
…es (pingdotgg#19631)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @LovelyCodeMonkey @claude
fix(clients): a thread comes back when its subagent needs approval (p…
f4df794 
…ingdotgg#19630)

A delegated subagent waiting on an approval or question now shows on its parent thread: Working section, status badge, notifications, snooze, and the composer banner on web and mobile. Takes over pingdotgg#19614.

Co-authored-by: lovelycodemonkey <ghassemimahyad@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @only21mil @claude
fix(usage): cold usage scans no longer stall the server (pingdotgg#19446
52ffe0c 
)

Co-authored-by: Victor Vogel <263261067+only21mil@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @LovelyCodeMonkey @claude
fix(server): "Always allow this session" stops Codex asking for every…
39aeaf4 
… command (pingdotgg#19635)

After "Always allow this session", the Codex adapter answers later command (or file change) approvals in that thread for the rest of the session. A turn in another runtime mode, or the thread unloading, ends it. Takes over pingdotgg#19598.

Co-authored-by: lovelycodemonkey <ghassemimahyad@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@Yash-Singh1
fix(web): keep vertical cursor stops outside styled markers (pingdotg…
7bdfed9 
…g#19651)
@maria-rcks
fix(web): mermaid code toggle stays in place when switching views (pi…
5a4e998 
…ngdotgg#19601)
@t3dotgg @doubletwisted @claude
fix(server): Reveal in File Explorer and browser launches work on Win…
40a7908 
…dows again (pingdotgg#19656)

Windows PowerShell started with detached: true exits 0 without running its command. Native Windows PowerShell launches (reveal and browser) now start attached, unref'd, with ignored stdio.

Takes over pingdotgg#10387. Fixes pingdotgg#11780.

Co-authored-by: doubletwisted <118005273+doubletwisted@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@shivamhwp PR Batch Tester @claude
fix(server): GitHub App tokens can merge and use other write actions (p…
742c229 
…ingdotgg#19103)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
perf(server): commands on busy threads stop decoding thousands of fin…
ab3a3cd 
…ished tool nodes (pingdotgg#19675)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@RealDoc06 @t3dotgg @claude
fix(server): use workspace-scoped Bitbucket permissions API (pingdotg…
ec1313c 
…g#10984)

Co-authored-by: RealDoc06 <73218979+RealDoc06@users.noreply.github.com>
Co-authored-by: Theo Browne <me@t3.gg>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@Bil0000
fix(composer): read dropped threads across environments (pingdotgg#15210
55dfc5f 
)
@t3-code
test(web): remove duplicate change request parser tests (pingdotgg#13591
755accf 
)

Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
@flamboh @maria-rcks
fix(server): a delegated task's question ends the parent's blocking w…
924fb0c 
…ait (pingdotgg#19538)

Co-authored-by: maria-rcks <maria@kuuro.net>
@flamboh @maria-rcks
fix(server): a delegated task's question now wakes its parent agent (p…
fdacb3a 
…ingdotgg#19521)

Co-authored-by: maria-rcks <maria@kuuro.net>
@flamboh @maria-rcks
fix(server): a cancelled delegated task no longer shows its child's q…
c814e51 
…uestion (pingdotgg#18459)

Co-authored-by: maria-rcks <maria@kuuro.net>
@Bil0000 @maria-rcks
feat(storage): clean up settled thread worktrees (pingdotgg#15208)
21bedfb 
Co-authored-by: maria-rcks <maria@kuuro.net>
@maria-rcks
feat(web,mobile): waiting status shows a dot-dashed icon and a timer (p…
e536bfd 
…ingdotgg#19617)
@Bil0000
feat(pr): delete branches after merge or close (pingdotgg#19257)
339179f
@adampeterhiggins
merge upstream/main into fork
d588255 
# Conflicts:
#	apps/mobile/src/features/pull-requests/PullRequestListFilters.tsx
#	apps/mobile/src/features/pull-requests/PullRequestsScreen.tsx
#	apps/mobile/src/features/pull-requests/pullRequestList.test.ts
#	apps/mobile/src/features/threads/thread-handoff-row.tsx
#	apps/server/src/environment/ServerEnvironment.ts
#	apps/server/src/mcp/toolkits/orchestrator/tools.ts
#	apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts
#	apps/server/src/provider/ClaudeProvider.ts
#	apps/server/src/server.ts
#	apps/server/src/storageCleanup.test.ts
#	apps/server/src/storageCleanup.ts
#	apps/web/src/components/ChatView.tsx
#	apps/web/src/components/Sidebar.tsx
#	apps/web/src/components/ThreadNotificationCoordinator.test.tsx
#	apps/web/src/components/ThreadNotificationCoordinator.tsx
#	apps/web/src/components/chat/ChatComposer.tsx
#	apps/web/src/routes/_chat.pull-requests.tsx
#	docs/user/composer.md
#	packages/contracts/src/environment.ts
@adampeterhiggins
adampeterhiggins merged commit c41a952 into main Oct 15, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@adampeterhiggins @maria-rcks @flamboh @tris203 @SunkenInTime @t3dotgg @Yash-Singh1 @shivamhwp @RealDoc06 @Bil0000