chore(orchestrator): reconcile current main with V2 - #10051

Open

saphid wants to merge 376 commits into

pingdotgg:t3code/codex-turn-mappingfrom

saphid:work/v2-main-sync-20260905

This pull request is big! We're only showing the most recent 250 commits

Commits on Sep 5, 2026

fix(web): restore checked-in project scripts

juliusmarminge
and
codex
committed
379e3bb
chore(orchestrator): refresh checks after main sync

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

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

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

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

juliusmarminge
and
codex
committed
629fce4
fix(orchestration): preserve legacy schedule compatibility

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

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

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

juliusmarminge
and
codex
committed
5c1afa6
fix(orchestration): cancel queued work on archive

juliusmarminge
and
codex
committed
9977b2b
fix(mobile): allow archiving post-provider work

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

juliusmarminge
and
codex
committed
707bb9f
fix(cursor): log close attempts before execution

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

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

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

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

juliusmarminge
and
codex
committed
0aeda7b
fix(testkit): harden provider replay recording

juliusmarminge
and
codex
committed
243d064
fix(server): isolate deterministic attachment ids

juliusmarminge
and
codex
committed
769a5a5
fix(claude): preserve explicit model options

juliusmarminge
and
codex
committed
70559c9
fix(web): enforce secure provider field defaults

juliusmarminge
and
codex
committed
28d9d30
fix(client): preserve live thread relationships

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

juliusmarminge
and
codex
committed
48d2e07
fix(mobile): gate thread controls on live runs

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

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

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

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

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

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

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

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

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

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

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

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

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

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

juliusmarminge
and
codex
committed
2569d7c
fix(orchestrator): preserve migrated and nested history

juliusmarminge
and
codex
committed
ce040b9
fix: address orchestration review findings

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

juliusmarminge
and
codex
committed
936c3ab
fix: address orchestration review findings

juliusmarminge
and
codex
committed
45cd5a3
fix: preserve orchestration task identity

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

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

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

juliusmarminge
and
codex
committed
1656f83
feat(server): surface legacy thread migration progress
juliusmarminge
committed
30e1a1e
feat(orchestration): track provider retries and thread visits
juliusmarminge
committed
1b587e7
[codex] feat(web): show git progress in the commit button (#4963)

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

juliusmarminge
and
claude
committed
a80533b
fix(chat): prevent stale timeline scroll and rerenders
juliusmarminge
committed
6609f3a
fix(relay): stop replaying the whole event store into the awareness relay

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

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

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

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

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

juliusmarminge
and
claude
committed
a107a7a
fix(web): remove elevated thread details panel styling
juliusmarminge
committed
d94e783
fix(web): keep Git progress title anchored
juliusmarminge
committed
698708f
fix: reconcile rebase with latest main

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

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

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

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

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

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

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

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

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

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

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

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

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

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

juliusmarminge
and
claude
committed
879b5ba
test(server): align migration expectations with renumbered ids

juliusmarminge
and
claude
committed
4f68e07
feat(orchestrator): Surface waiting background work (#4378)

mwolson
authored and
juliusmarminge
committed
cd23b3f
fix(web): align git action progress button layout
juliusmarminge
committed
1ad32fc
fix: repair conflict-marker artifacts from rebase auto-resolutions

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

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

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

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

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

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

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

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

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

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

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

juliusmarminge
and
claude
committed
546511e
feat(web): add pull request actions to thread details
juliusmarminge
committed
26502bc
fix(mobile): port main's composer stabilization into the v2 thread screens

juliusmarminge
and
claude
committed
c670f75
fix(web): reconcile main's round-5 features after the rebase

juliusmarminge
and
claude
committed
2279244
feat(web): prioritize pull request row actions
juliusmarminge
committed
881325f
fix(web): restore main's collapse chrome and tab-status keying on the PR panel

juliusmarminge
and
claude
committed
e3883a9
feat(orchestration): bound thread history and resume payloads
juliusmarminge
committed
7d42d31
feat(contracts): track thread title regeneration
juliusmarminge
committed
587d127
fix: reconcile main's round-6 features after the rebase

juliusmarminge
and
claude
committed
05732a5
fix(web): keep the titlebar layout controls fixed across right-panel toggles

juliusmarminge
and
claude
committed
25cc71a
fix(web): align titlebar clusters to one shared pixel inset

juliusmarminge
and
claude
committed
c53a534
fix(web): size the titlebar layout-control icons like the sidebar trigger

juliusmarminge
and
claude
committed
dc296a3
perf(server): keep shell snapshots bounded and active-only
juliusmarminge
committed
9b52132
fix: reconcile main's round-8 features after the rebase

juliusmarminge
and
claude
committed
7e05b91
fix(server): reject replaying a command receipt across threads in v2

juliusmarminge
and
claude
committed
adf137f
feat(mobile): surface prominent activity status and metadata
juliusmarminge
committed
165ecf4
fix: reconcile main's round-9 features after the rebase

juliusmarminge
and
claude
committed
82272f7
feat(server): honor withheld agent browser access in the v2 runtime

juliusmarminge
and
claude
committed
98558f6
fix(web): restore the titlebar sizing and timeline fade lost to main's style simplification

juliusmarminge
and
claude
committed
b8e714a
refactor(web): finish aligning the branch with main's style simplification

juliusmarminge
and
claude
committed
372aa12
fix(orchestration): show provider retries in the work log
juliusmarminge
committed
002c962
fix: reconcile main's round-10 features after the rebase

juliusmarminge
and
claude
committed
fca1f3d
fix(web): stop mis-marking recovered and text-reported tool failures in the v2 work log

juliusmarminge
and
claude
committed
df71f08
feat(orchestration-v2): project linked pull requests on threads (#8160)

juliusmarminge
and
claude
committed
d14f023
feat(orchestration-v2): carry approval options and app names to the client (#8058)

juliusmarminge
and
claude
committed
1c0bb7f
feat(orchestration-v2): route Codex thread feedback uploads through v2 (#7949)

juliusmarminge
and
claude
committed
ea87825
feat(analytics): credit v2 threads and turns to the starting client (#7774)

juliusmarminge
and
claude
committed
8622f36
fix(grok): fail hung prompts on xAI rate-limit completions (#8358, partial)

juliusmarminge
and
claude
committed
1672ad3
feat(orchestration-v2): show live context usage in the meter (#8144)

juliusmarminge
and
claude
committed
c1e2f1d
fix(web): keep following the stream after returning to the live edge (#6519)

juliusmarminge
and
claude
committed
6bfd5b1
feat(grok): capture exit_plan_mode into the v2 proposed-plan card (#8358)

juliusmarminge
and
claude
committed
c9b8971
fix(web): repaint the composer glass and strip the thread-panel popover chrome

juliusmarminge
and
claude
committed
acc4856
fix(web): adopt main's attached-composer surface contract so the glass survives shoulder tabs

juliusmarminge
and
claude
committed
91de447
fix(web): converge ChatComposer on main's drawer-era body

juliusmarminge
and
claude
committed
2ada78c
fix(web): collapse settled tool runs behind main's summary toggles

juliusmarminge
and
claude
committed
8990bfc
fix(web): surface v2 todo-list plans as task progress

juliusmarminge
and
claude
committed
918ba5e
fix(web): show the command on collapsed tool rows, not its stdout

juliusmarminge
and
claude
committed
ea4c19a
fix(web): collapsed tool rows preview inputs for every tool type

juliusmarminge
and
claude
committed
1c561db
fix: reconcile main's round-11 features after the rebase

juliusmarminge
and
claude
committed
0043ea0
fix(opencode): route child-session approvals through the v2 adapter

juliusmarminge
and
claude
committed
c242344
fix: reconcile main's round-12 features after the rebase

juliusmarminge
and
claude
committed
5fc3ec5
fix: restore main's automatic thread settling after the revert

juliusmarminge
and
claude
committed
43754d8
fix(web): restore the full-screen file-drop target over the chat column

juliusmarminge
and
claude
committed
756586e
feat(server): claim uploaded attachments at v2 dispatch

juliusmarminge
and
claude
committed
989feda
feat(web): show attachments on queued messages and edit them in the composer

juliusmarminge
and
claude
committed
5d17b2e
fix(web): drag-to-reorder queued messages and retire stale pending rows

juliusmarminge
and
claude
committed
d53dbca
fix: reconcile main's round-14 features after the rebase

juliusmarminge
and
claude
committed
74737da
fix(web): dedupe the composer glass styles and align the chat column width

juliusmarminge
and
claude
committed
f502d32
fix(mobile): replace remaining dark: utilities with adaptive semantic tokens

juliusmarminge
and
claude
committed
9fd12b2
fix(lint): allowlist the queue and relationships interop boundaries

juliusmarminge
and
claude
committed
999dd54
fix(server): inject HostProcessPlatform into the Grok plan extractor

juliusmarminge
and
claude
committed
4b04bdd
chore: retrigger ci

juliusmarminge
and
claude
committed
40044cb
chore: refresh macroscope ui-consistency check

juliusmarminge
and
claude
committed
dad6906
fix: reconcile main's round-16 features after the rebase

juliusmarminge
and
claude
committed
e2bc222
fix(web): keep failed tool items in the collapsed group summaries

juliusmarminge
and
claude
committed
baad1d3
fix(server): keep Claude session approvals ephemeral
juliusmarminge
committed
9b0256e
fix(orchestration): reanchor unsettled threads
juliusmarminge
committed
2f28e2b
fix(server): observe pre-aborted Claude approvals
juliusmarminge
committed
78c2c5e
fix(server): include service launcher in bundle build
juliusmarminge
committed
d95edb1
fix(orchestration): preserve legacy thread metadata
juliusmarminge
committed
e72208f
fix(web): honor disabled legacy plan mode
juliusmarminge
committed
67cee03
fix(server): preserve Claude subagent models
juliusmarminge
committed
36540a5
fix(orchestration): honor migrated thread visibility in search
juliusmarminge
committed
ae84cc4
fix(orchestration): recreate missing worktrees before turns
juliusmarminge
committed
846906b
fix(clients): restore Codex feedback submission
juliusmarminge
committed
f8b7821
fix(server): preserve generic provider attachments
juliusmarminge
committed
1db36ed
fix(web): load workspace markdown images through assets
juliusmarminge
committed
ed85eec
fix(web): preserve Windows markdown paths
juliusmarminge
committed
a910f34
fix(server): keep current provider context usage
juliusmarminge
committed
1a3dd35
fix(web): restore markdown file chip actions
juliusmarminge
committed
ad6a9f7
fix(web): scope markdown actions to their environment
juliusmarminge
committed
e111c05
fix(protocol): reject incompatible orchestration peers
juliusmarminge
committed
76430cd
docs: explain legacy thread migration
juliusmarminge
committed
b991834
docs: state portable handoff limits
juliusmarminge
committed
01fb9b2
chore(repo): remove tracked audit scratch files
juliusmarminge
committed
b3bd9c4
fix(server): guard OpenCode prompt admission races
juliusmarminge
committed
312d998
fix(server): restore Claude structured questions
juliusmarminge
committed
ee8d6f8
fix(server): project Claude plans and todos
juliusmarminge
committed
9d8ad3a
perf(orchestration): bound history reads in SQL
juliusmarminge
committed
34c720d
perf(orchestration): bound complete thread snapshots
juliusmarminge
committed
3467a51
fix(server): restore Claude resume compaction
juliusmarminge
committed
f7511d3
fix(server): allow protocol negotiation in CORS
juliusmarminge
committed
22acb61
fix(server): preserve provider usage in persisted turns
juliusmarminge
committed
d81a2f0
fix(server): preserve Claude planning lifecycle
juliusmarminge
committed
ef7f805
fix(server): normalize Claude question answers
juliusmarminge
committed
96d86de
fix(server): correlate OpenCode prompt admission
juliusmarminge
committed
7ac8986
fix(clients): anchor feedback in conversation order
juliusmarminge
committed
54044e3
fix(web): retain markdown workspace ownership
juliusmarminge
committed
0b9a275
fix(orchestration): page history through its true end
juliusmarminge
committed
d4c2e78
fix(server): cancel pending OpenCode prompts safely
juliusmarminge
committed
1106aea
fix(orchestration): retain nested fork history when paging
juliusmarminge
committed
e5ae3d4
fix(server): recover OpenCode status reconciliation
juliusmarminge
committed
f1478a9
fix(orchestration): select visible history before limiting SQL
juliusmarminge
committed
bb95b1f
fix(web): port composer activity and grouping to orchestration v2
juliusmarminge
committed
cc8c663
fix(web): align queue headers and prevent stash overlap
juliusmarminge
committed
041c2ef
fix(web): share the outline for joined composer tabs
juliusmarminge
committed
d29886b
fix(web): keep stash separate from the composer activity column
juliusmarminge
committed
d46cee6
refactor(web): use shared banner rows for queued messages
juliusmarminge
committed
d237255
fix(web): keep queued message editing inside the queue panel
juliusmarminge
committed
1dba1e9
fix(web): keep queued messages in place while editing
juliusmarminge
committed
52c0431
fix(web): match composer actions to draft and modifier state
juliusmarminge
committed
f4990e8
fix(web): keep composer shortcut tooltip stable on Mod
juliusmarminge
committed
9704a94
feat(web): summarize T3 orchestration actions
juliusmarminge
committed
e3cf4e7
feat(mobile): port chat summaries and transitions to orchestration v2
juliusmarminge
committed
a1859c1
fix(chat): remove added tool summary status counts
juliusmarminge
committed
ed00e2c
fix(mobile): keep scroll bounds current after animations
juliusmarminge
committed
46ccba0
fix: reconcile main's round-17 features after the rebase

juliusmarminge
and
claude
committed
9d90e5b
feat(web): port working and thinking timeline rows to orchestration v2

juliusmarminge
and
claude
committed
786a258
fix: reconcile main's round-18 features after the rebase

juliusmarminge
and
claude
committed
7b13bca
feat(server): evaluate automatic thread settlement in the v2 orchestrator

juliusmarminge
and
claude
committed
41a58ee
fix: reconcile main's round-19 features after the rebase

juliusmarminge
and
claude
committed
446c14a
fix(web): right-align the stash shoulder tab again

juliusmarminge
and
claude
committed
5c4cee5
fix(web): realign the composer and timeline with main

juliusmarminge
and
claude
committed
1f285d9
fix: reconcile main's round-20 features after the rebase

juliusmarminge
and
claude
committed
d36b2bc
fix(server): reduce v2 recovery and runtime resource usage
juliusmarminge
committed
036b876
fix: reconcile main updates with orchestration v2
juliusmarminge
committed
25d2531
fix(orchestration): stabilize Codex turn mapping and settlement
juliusmarminge
committed
6502e22
fix(chat): match main timer and task placement
juliusmarminge
committed
e1898cf
fix(mobile): restore composer and timeline behavior from main
juliusmarminge
committed
7d703c2
fix(orchestrator): Stop treating a wait timeout as a dead child (#7427)

mwolson
authored and
juliusmarminge
committed
1eb7dfa
fix(orchestrator): Show when a completed delegated child still has work (#4793)

mwolson
and
juliusmarminge
committed
5670f77
fix(orchestrator): Stop finished Codex turns from sitting on Waiting (#7105)

mwolson
and
juliusmarminge
committed
19444d5
chore: format v2 files flagged by CI
juliusmarminge
committed
8bb2b08
test(server): include the shell indexes migration
juliusmarminge
committed
83a241d
fix(mobile): pin the patched notifications dependency
juliusmarminge
committed
0805dd5
fix(client-runtime): resolve work log source imports
juliusmarminge
committed
4167566
test(server): refresh replay runtime instruction expectations
juliusmarminge
committed
497419e
test(server): correlate OpenCode replay message identities
juliusmarminge
committed
992a704
ci: run checks on v2 branch pushes
juliusmarminge
committed
fd632e4
test(server): use Effect Vitest for Cursor provider checks
juliusmarminge
committed
8072d19
fix: reconcile main updates with orchestration v2
juliusmarminge
committed
c9e7758
fix(server): explain fetch failures during worktree preparation
juliusmarminge
committed
8905dac
fix: reconcile upstream fixes with orchestration v2
juliusmarminge
committed
2ac9bfe
fix(server): reconcile historical V2 migration manifests
github-actions[bot]
committed
c45eb66
fix(server): make project removal honor v2 threads
juliusmarminge
committed
b9fa139
chore(orchestrator): reconcile current main with V2
github-actions[bot]
committed
6dfcd12
chore(orchestrator): reconcile V2 entries with main unused-code checks
github-actions[bot]
committed
da3cf59
chore(server): remove orphan checkpoint service declarations
github-actions[bot]
committed
3c22054
chore(orchestrator): reconcile V2 with pre-wizard main
github-actions[bot]
committed
3e32c15
chore(orchestrator): reconcile frozen main with V2 session imports
github-actions[bot]
committed
1178c8f
fix(orchestrator): align merged migration count and replay formatting
github-actions[bot]
committed
1a45956
fix(orchestrator): identify import source write failures
github-actions[bot]
committed
cc1f3d0
fix(mobile): render generic message attachments (#9929)

authored
475aa8c
fix(mobile): use the archive eligibility guard when dispatching (#9930)

authored
315f53f

Commits on Sep 6, 2026

Commits on Sep 7, 2026

Merge remote-tracking branch 'origin/t3code/codex-turn-mapping' into ready/pr-10051
saphid
committed
643cacc
merge: include historical V2 migration reconciliation
saphid
committed
86f72e6
Merge upstream main and reconcile V2 runtime and client behavior
saphid
committed
0bb721a
Merge current main release and attachment icons into V2 bridge
saphid
committed
2eb2424
merge(main): port pending thread creation to V2 bridge
saphid
committed
c799952
fix(ci): reconcile bridge checks after main merge
saphid
committed
71deee9
docs(web): remove stale comment after bridge cleanup
saphid
committed
b2fd49f
fix(relay): export the V2 server route group
saphid
committed
54b1c1c
fix(web): retain command palette PR badges
saphid
committed
61c87ae

Uh oh!

Commits

Commits on Sep 5, 2026