fix(orchestrator): Keep agent output attached after a mid-turn steer - #4547

Closed

mwolson wants to merge 223 commits into

pingdotgg:t3code/codex-turn-mappingfrom

mwolson:fix/orphaned-output-after-early-settle

Commits on Aug 10, 2026

Integrate Codex app-server support

juliusmarminge
and
codex
committed
0b0ae80
nit
juliusmarminge
committed
d770995
revert more
juliusmarminge
committed
eca0684
resynclock
juliusmarminge
committed
c9d5301
Delay Codex provider availability until checked
juliusmarminge
committed
e4e8ad3
Return Cursor ACP runtime with explicit scope
juliusmarminge
committed
6a3a6e4
Normalize Codex IDs and preserve streamed stdout decoding
juliusmarminge
committed
4b70d92
Scope Codex session runtime lifetimes
juliusmarminge
committed
2509aaf
decoders
juliusmarminge
committed
04c4dd0
Flush native logs on adapter shutdown
juliusmarminge
committed
1a78c11
Switch Codex provider checks to app-server probe
juliusmarminge
committed
e153393
Address Codex review feedback

juliusmarminge
and
codex
committed
74d1713
Fix Codex provider status test expectations

juliusmarminge
and
codex
committed
9a16dbc
Add orchestration v2 docs and probe fixtures
juliusmarminge
committed
ea38f86
Add orchestration v2 replay and service contracts

juliusmarminge
and
codex
committed
bf150de
Map Codex turns into orchestration v2
juliusmarminge
committed
4e825f9
Implement orchestration v2 runtime

juliusmarminge
and
codex
committed
a5c0918
Add thread fork lineage and lazy context transfer
juliusmarminge
committed
d121c84
Add orchestration V2 backend checklist
juliusmarminge
committed
ec38d99
Add merge-back context handoff support
juliusmarminge
committed
3439d31
Add V2 command capability policy

juliusmarminge
and
codex
committed
c4a5cdf
Add Claude replay fixture recorder
juliusmarminge
committed
ad1f6b2
Extract Claude SDK query runner from provider adapter
juliusmarminge
committed
bfd7ce9
Add model selection to orchestration runs
juliusmarminge
committed
d26a750
Map Claude replay fixtures to multi-turn turns
juliusmarminge
committed
3d10fc1
Map Claude turns to runtime query policies

juliusmarminge
and
codex
committed
097fc53
Support active Claude steering and turn replay mapping
juliusmarminge
committed
e7152fc
Add turn-interrupt replay coverage and protocol logging
juliusmarminge
committed
cdc2f4b
Document Cursor SDK MCP projection for V2
juliusmarminge
committed
330fab0
feat(orchestration-v2): wire claude adapter primitives

juliusmarminge
and
codex
committed
486e2d8
feat(orchestration-v2): support cross-provider handoff

juliusmarminge
and
codex
committed
4386c17
fix(orchestration-v2): resolve cross-provider forks

juliusmarminge
and
codex
committed
b08096d
feat(orchestration-v2): add merge-back replay coverage

juliusmarminge
and
codex
committed
1c4ccb8
fix(orchestration-v2): compose provider switch merge context

juliusmarminge
and
codex
committed
389d7dd
fix(orchestration-v2): preserve source history on merged switch

juliusmarminge
and
codex
committed
fc62f11
Map orchestration v2 WS methods to auth scopes
juliusmarminge
committed
d37991d
feat(orchestration-v2): model native subagents

juliusmarminge
and
codex
committed
aefd548
wip
juliusmarminge
committed
853d3ef
refactor(orchestration-v2): adopt host process spawn policy

juliusmarminge
and
codex
committed
93f4d99
Add orchestration MCP toolkit
juliusmarminge
committed
0b38fca
Add Cursor SDK orchestration replay support
juliusmarminge
committed
9b3a781
Handle segmented Cursor turns and stable visible timelines
juliusmarminge
committed
47f2b5a
Add ACP replay harness and session lifecycle support
juliusmarminge
committed
a09c802
Add MCP thread management and Codex turn mapping

Julius Marminge
authored and
juliusmarminge
committed
cc9b8db
Add Orchestration V2 application integration plan

Julius Marminge
authored and
juliusmarminge
committed
74029e0
Map orchestration turns to provider instances

Julius Marminge
authored and
juliusmarminge
committed
a051ecc
Share Codex sessions across orchestration threads

Julius Marminge
authored and
juliusmarminge
committed
88b0628
Align orchestration V2 with Effect service conventions

Julius Marminge
authored and
juliusmarminge
committed
774d17f
Start orchestration V2 application services

Julius Marminge
authored and
juliusmarminge
committed
f8b552c
Complete orchestration V2 application services

Julius Marminge
authored and
juliusmarminge
committed
8768c15
Require MCP registry for V2 provider sessions

Julius Marminge
authored and
juliusmarminge
committed
1715e54
Remove MCP credential expiration

Julius Marminge
authored and
juliusmarminge
committed
e14288e
Guarantee MCP revocation during session release

Julius Marminge
authored and
juliusmarminge
committed
4913a39
Integrate orchestration v2 with the application runtime

Julius Marminge
authored and
juliusmarminge
committed
73e9a00
Split the V2 frontend plan into parity and enrichment phases

Julius Marminge
authored and
juliusmarminge
committed
ad5ed3c
Complete orchestration V2 frontend cutover

Julius Marminge
authored and
juliusmarminge
committed
b8ec2fd
Integrate orchestration V2 controls and process recovery

Julius Marminge
authored and
juliusmarminge
committed
345cab1
Handle preparing turns across provider orchestration
juliusmarminge
committed
ef01cb9
Record created threads and subagent progress
juliusmarminge
committed
404af3f
Map thread panel into title bar and sidebar

juliusmarminge
and
codex
committed
64fb063
Reserve space for inline thread details panel
juliusmarminge
committed
d72c907
Split open-in editor controls into panel and toolbar variants
juliusmarminge
committed
6d110b3
Hide subagent threads and simplify thread controls
juliusmarminge
committed
034f013
Render mobile timelines from V2 turn items

juliusmarminge
and
codex
committed
3f6358a
Enrich mobile V2 execution items

juliusmarminge
and
codex
committed
0deab02
Expose V2 thread workflows on mobile

juliusmarminge
and
codex
committed
5ecb78a
Retire V1 client orchestration parity

juliusmarminge
and
codex
committed
efa2bfe
Add iOS associated domains for Clerk
juliusmarminge
committed
bdbae0d
Map Grok task envelopes to subagent lineage
juliusmarminge
committed
a8e35ff
Adopt userdata-v2 and subagent activity mapping
juliusmarminge
committed
a531814
Map nested Codex subagent threads correctly
juliusmarminge
committed
bd83917
Clarify thread relationship icons and ordering
juliusmarminge
committed
91897f7
Keep persistent cards visible in folded turns
juliusmarminge
committed
c6c8eec
Require Cursor API key for provider checks
juliusmarminge
committed
d480f42
fix(web): align thread details panel controls and menus (#3606)

maria-rcks
authored and
juliusmarminge
committed
081e8fb
Switch Cursor provider to the official SDK
juliusmarminge
committed
e686e09
Remove early access badges from Cursor and Grok
juliusmarminge
committed
b02390f
Allow provider switching via handoff in chat threads
juliusmarminge
committed
d2078a2
Fix Claude task turn mapping

juliusmarminge
and
codex
committed
84ca291
feat: scheduled tasks (automations) (#3638)

juliusmarminge
and
claude
committed
a0890aa
feat(orchestrator): Add shared provider continuation and background item plumbing

mwolson
authored and
juliusmarminge
committed
eb08eb6
[orchestrator-v2] fix(orchestrator): Restore Claude session continuity for resume, wake, and idle release (#3860)

committed
9194ef3
[orchestrator-v2] fix(orchestrator): Codex background command completion and subagent resume (#3908)

mwolson
authored and
juliusmarminge
committed
e731bb2
fix(orchestrator): scope Claude MCP tool pre-approval (#3862)

PixPMusic
authored and
juliusmarminge
committed
2236e45
feat(orchestrator): pass model options through MCP thread targets (#3872)

PixPMusic
authored and
juliusmarminge
committed
d1bdf78
fix(orchestrator): align Claude permission replay with SDK

juliusmarminge
and
codex
committed
561fb9e
fix(ci): restore Claude permission request identity

juliusmarminge
and
codex
committed
fda1773
test(desktop): expect orchestrator v2 state directory

juliusmarminge
and
codex
committed
5bee234
fix(claude): redact launch arguments from protocol logs

juliusmarminge
and
codex
committed
43e032d
fix(claude): preserve approvals with full-access sandbox

juliusmarminge
and
codex
committed
6a14c66
fix(claude): allow questions during plan mode

juliusmarminge
and
codex
committed
8a48db4
fix(claude): honor never-approval runtime policies

juliusmarminge
and
codex
committed
c2a890a
fix(claude): enforce read-only tool availability

juliusmarminge
and
codex
committed
fffc7c1
fix(claude): reopen queries after MCP credential rotation

juliusmarminge
and
codex
committed
02e8a89
fix(acp): release turns after interrupt timeout

juliusmarminge
and
codex
committed
44ca782
fix(acp): bind MCP credentials to activated threads

juliusmarminge
and
codex
committed
bab386e
fix(orchestrator): harden Grok v2 lifecycle (#3578)

authored and
juliusmarminge
committed
5fc2f9b
fix(orchestrator): dedupe Grok continuation dispatch

juliusmarminge
and
codex
committed
26111b2
fix(orchestrator): Harden Grok v2 runtime lifecycle

mwolson
authored and
juliusmarminge
committed
9462eee
test(orchestrator): align integration fixtures

juliusmarminge
and
codex
committed
0fb7024
fix(mobile): support Hermes collection sorting

juliusmarminge
and
codex
committed
38e46e7
fix(grok): align ACP extensions with open source runtime

juliusmarminge
and
codex
committed
e50314b
Render T3 MCP tools with branded timeline labels
juliusmarminge
committed
1c2cb22
Unify T3 MCP tool presentation across clients
juliusmarminge
committed
c123607
fix(orchestration): clarify agent delegation and scheduling

juliusmarminge
and
codex
committed
64267fd
fix(server): preserve released migration ordering

juliusmarminge
and
codex
committed
4721840
fix(web): restore v2 composer chrome

juliusmarminge
and
codex
committed
1f44475
fix(web): remove stacked composer shadows

juliusmarminge
and
codex
committed
1908806
refactor(web): use shared glass surfaces

juliusmarminge
and
codex
committed
95ef780
fix(web): layer nested panel popups correctly

juliusmarminge
and
codex
committed
cc3aaeb
fix(web): contain thread details panel effects

juliusmarminge
and
codex
committed
2d9f35b
test(orchestrator): Align post-merge CTM fixtures (#4193)

mwolson
authored and
juliusmarminge
committed
96e221a
fix(orchestrator): Preserve claude/codex post-interrupt recovery state (#4229)

mwolson
authored and
juliusmarminge
committed
8a0d5b2
test(orchestrator): align Codex approval reviewer replays (#4457)
juliusmarminge
committed
8378c5d
fix(orchestrator): hydrate shell cache and group multi-environment projects (#3640)

mwolson
authored and
juliusmarminge
committed
475c725
feat(subagents): disclose projected results consistently (#3866)

authored and
juliusmarminge
committed
c224bd9
Add worktree handoff and status tools to the t3-code MCP server (#3754)

authored and
juliusmarminge
committed
d7379fe
fix(mobile): wait for fork shell before navigation

juliusmarminge
and
codex
committed
6d74c10
fix(server): keep derived threads awake

juliusmarminge
and
codex
committed
7834327
fix(server): enforce ACP auth and preserve fork provenance

juliusmarminge
and
codex
committed
cd789f2
fix(server): clean up Claude replay failures

juliusmarminge
and
codex
committed
7d60ddf
test(orchestrator): align merged V2 compatibility checks

juliusmarminge
and
codex
committed
a995fbc
fix(grok): Prevent spurious wake run after in-turn monitors

mwolson
authored and
juliusmarminge
committed
4fc9aec
fix(acp): Preserve wake evidence across an app-owned wake

mwolson
authored and
juliusmarminge
committed
02911be
fix(orchestrator): Wake settled parents when delegated children finish

authored and
juliusmarminge
committed
a35bd19
fix(claude): Settle positive task-notification results

authored and
juliusmarminge
committed
dc3cda1
fix: hide subagent threads from v2 lists

authored and
juliusmarminge
committed
3786a70
fix: ignore subagents when sorting sidebar projects

authored and
juliusmarminge
committed
2417d1b
fix(web): restore checked-in project scripts

juliusmarminge
and
codex
committed
81c840e
chore(orchestrator): refresh checks after main sync

juliusmarminge
and
codex
committed
ce1411f
feat: migrate v1 state into orchestrator v2 (#4400)

juliusmarminge
and
codex
committed
f73d069
fix(orchestrator): schedule effects from durable deadlines (#4656)

juliusmarminge
and
codex
committed
c60722e
fix(orchestration): harden scheduled task startup

juliusmarminge
and
codex
committed
a908b23
fix(mobile): preserve active thread state

juliusmarminge
and
codex
committed
92930ad
fix(orchestration): preserve legacy schedule compatibility

juliusmarminge
and
codex
committed
4f704d2
fix(contracts): reject invalid legacy intervals

juliusmarminge
and
codex
committed
04eaecc
fix(acp): make xai cancellation reliable

juliusmarminge
and
codex
committed
9a8a1f2
fix(orchestration): handle checkpoint-wait runs

juliusmarminge
and
codex
committed
79d8def
fix(orchestration): cancel queued work on archive

juliusmarminge
and
codex
committed
0fb1d24
fix(mobile): allow archiving post-provider work

juliusmarminge
and
codex
committed
f404535
fix(mobile): distinguish queued and waiting archive states

juliusmarminge
and
codex
committed
9f46021
fix(cursor): log close attempts before execution

juliusmarminge
and
codex
committed
9baf3f7
fix(acp): discover final teardown descendants

juliusmarminge
and
codex
committed
4f830f1
fix(checkpoints): preserve valid run history

juliusmarminge
and
codex
committed
024902e
fix(orchestration): preserve imported conversation state

juliusmarminge
and
codex
committed
d252f3a
fix(acp): enforce task and permission invariants

juliusmarminge
and
codex
committed
66bff7f
fix(testkit): harden provider replay recording

juliusmarminge
and
codex
committed
6892b41
fix(server): isolate deterministic attachment ids

juliusmarminge
and
codex
committed
154d8c8
fix(claude): preserve explicit model options

juliusmarminge
and
codex
committed
14987ea
fix(web): enforce secure provider field defaults

juliusmarminge
and
codex
committed
3e4b7d6
fix(client): preserve live thread relationships

juliusmarminge
and
codex
committed
c938204
fix(checkpoints): retain thread-start baseline after failed runs

juliusmarminge
and
codex
committed
98deae5
fix(mobile): gate thread controls on live runs

juliusmarminge
and
codex
committed
5006de4
fix(orchestrator): address late review findings

juliusmarminge
and
codex
committed
d6b912c
fix(orchestrator): handle fresh review edge cases

juliusmarminge
and
codex
committed
bd643ab
fix(orchestrator): harden provider edge cases

juliusmarminge
and
codex
committed
8773649
fix(orchestrator): execute resolved runtime responses

juliusmarminge
and
codex
committed
241783d
fix(orchestrator): release stranded effect claims

juliusmarminge
and
codex
committed
a904494
fix(worktrees): make handoff rollback atomic

juliusmarminge
and
codex
committed
f6a9693
fix(orchestrator): avoid replaying settled effects

juliusmarminge
and
codex
committed
e962b17
fix(orchestrator): preserve retryable effect failures

juliusmarminge
and
codex
committed
9ca5ee7
fix(orchestrator): preserve terminal effect outcomes

juliusmarminge
and
codex
committed
1c68b48
fix(orchestrator): validate replay edge cases

juliusmarminge
and
codex
committed
cbd9896
fix(orchestrator): decode direct Claude result blocks

juliusmarminge
and
codex
committed
1de8942
fix(orchestrator): close cancellation edge cases

juliusmarminge
and
codex
committed
e6fe621
fix(orchestrator): validate rollback and search links

juliusmarminge
and
codex
committed
f62933d
fix(server): preserve project mutation client errors

juliusmarminge
and
codex
committed
2fe0dae
fix(orchestrator): preserve migrated and nested history

juliusmarminge
and
codex
committed
8078267
fix: address orchestration review findings

juliusmarminge
and
codex
committed
bd5310c
fix(mobile): label queued message intent

juliusmarminge
and
codex
committed
6455a02
fix: address orchestration review findings

juliusmarminge
and
codex
committed
8872102
fix: preserve orchestration task identity

juliusmarminge
and
codex
committed
a410c2d
fix: address latest orchestration review findings

juliusmarminge
and
codex
committed
adf3621
fix: preserve thread management failure semantics

juliusmarminge
and
codex
committed
deb4d57
fix: close failed provider adapter scopes

juliusmarminge
and
codex
committed
46342d8
feat(server): surface legacy thread migration progress
juliusmarminge
committed
a646c6b
feat(orchestration): track provider retries and thread visits
juliusmarminge
committed
4ba7211
[codex] feat(web): show git progress in the commit button (#4963)

juliusmarminge
and
codex
committed
fa94c40
perf(orchestration): per-thread shell deltas, visit throttling, event compaction (#4971)

juliusmarminge
and
claude
committed
275d307
fix(chat): prevent stale timeline scroll and rerenders
juliusmarminge
committed
60088fb
fix(relay): stop replaying the whole event store into the awareness relay

juliusmarminge
and
claude
committed
42733d3
perf(web): keep timeline minimap animations off the main thread

juliusmarminge
and
claude
committed
e5b9546
feat(orchestration): port thread title regeneration to the v2 runtime

juliusmarminge
and
claude
committed
df81329
fix(orchestration): thread visits no longer create activity loops (#5038)

Yusuf007R
authored and
juliusmarminge
committed
c83ed4c
fix(orchestration): promoted queued messages keep the queued_turn intent

juliusmarminge
and
claude
committed
10addb0
refactor(orchestration): split thread-not-sendable into typed errors

juliusmarminge
and
claude
committed
fb37332
fix(web): remove elevated thread details panel styling
juliusmarminge
committed
7db2a49
fix(web): keep Git progress title anchored
juliusmarminge
committed
4f70fcb
fix: reconcile rebase with latest main

maria-rcks
authored and
juliusmarminge
committed
ab978b6
fix(orchestration-v2): restore generated thread titles (#5176)

Yusuf007R
authored and
juliusmarminge
committed
1955e2b
fix(orchestrator): Order thread lineage by creation time (#5310)

mwolson
authored and
juliusmarminge
committed
112dcea
fix(server): restore worktree branch naming in the v2 orchestrator (#5309)

juliusmarminge
and
claude
committed
d1a202e
feat(chat): refine V2 conversation UI (#5307)

maria-rcks
authored and
juliusmarminge
committed
a5ee6ea
fix: adopt effect beta.103 APIs in rebased v2 code

juliusmarminge
and
claude
committed
586e024
fix: send mcp-protocol-version header in worktree registration test

juliusmarminge
and
claude
committed
571fa94
fix(web): restore compact header sizing for project script controls

juliusmarminge
and
claude
committed
be08ead
test(server): cover v2 thread title regeneration

juliusmarminge
and
claude
committed
653c698
chore: resolve lint warnings across v2 code

juliusmarminge
and
claude
committed
aa0751b
fix(test): keep codex replay recovery off the repo checkout

juliusmarminge
and
claude
committed
2199531
fix(orchestrator): Prevent redundant delegated completion turns (#5311)

mwolson
authored and
juliusmarminge
committed
fbb47a4
fix(server): stop tying codex text-generation temp files to the caller's scope (#5406)

juliusmarminge
and
claude
committed
0867f0f
fix(web): remove open PR actions from git controls
juliusmarminge
committed
f7a7f20
fix(server): renumber v2 migrations after main's 036_ProjectionThreadsPinned

juliusmarminge
and
claude
committed
cfb4571
fix: port main fixes stranded by the v2 rewrite

juliusmarminge
and
claude
committed
3448e9a
test(server): align migration expectations with renumbered ids

juliusmarminge
and
claude
committed
36d180b
feat(orchestrator): Surface waiting background work (#4378)

mwolson
authored and
juliusmarminge
committed
9124b94
fix(web): align git action progress button layout
juliusmarminge
committed
16bd686
fix: repair conflict-marker artifacts from rebase auto-resolutions

juliusmarminge
and
claude
committed
61384a3
fix(server): renumber v2 migrations after main's 037_ProjectionTurnsKeysetIndex

juliusmarminge
and
claude
committed
41e5692
fix: port main fixes stranded by the v2 rewrite (round 2)

juliusmarminge
and
claude
committed
06aab68
chore(web): prune plan-sidebar leftovers after the inline-plans rework

juliusmarminge
and
claude
committed
9977a32
fix(web): port the refined live-follow gesture gating to the v2 timeline

juliusmarminge
and
claude
committed
ab912d4
fix(web): let LegendList own end-follow and disclosure anchoring (#5449)

juliusmarminge
and
claude
committed
01feae2
fix(web): show Git action success inline in panel
juliusmarminge
committed
d515bb3
fix: repair rerere-damaged files and reconcile main's round-3 features with v2

juliusmarminge
and
claude
committed
a90e347
chore(server): renumber v2 migrations 038-046 to 041-049 after main's 038-040

juliusmarminge
and
claude
committed
c8ac342
fix(server): port round-3 main fixes into the v2 orchestrator

juliusmarminge
and
claude
committed
1e74732
test(web): restore main's right-panel migration expectations after the panel-visibility merge

juliusmarminge
and
claude
committed
523ef2a
test(server): expect attachment saved-at lines in ClaudeAdapterV2 turn text

juliusmarminge
and
claude
committed
a27c1cc
fix(web): restore the branch's slim chat header

juliusmarminge
and
claude
committed
ff032dd

Uh oh!

Commits

Commits on Aug 10, 2026