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

Merged
juliusmarminge merged 1 commit into
pingdotgg:t3code/codex-turn-mappingfrom
mwolson:fix/codex-v2
Jul 12, 2026
Merged

[orchestrator-v2] fix(orchestrator): Codex background command completion and subagent resume#3908
juliusmarminge merged 1 commit into
pingdotgg:t3code/codex-turn-mappingfrom
mwolson:fix/codex-v2

Conversation

@mwolson

@mwolsonmwolson commented Jul 12, 2026

Copy link
Copy Markdown
Contributor

What Changed

  • Preserve Codex turn context long enough to project command completions that
    arrive after the root turn settles.
  • Request one continuation run for each newly completed post-settle background
    command, while avoiding wakes for commands completed during the root turn.
  • Reopen and hydrate resumed Codex subagents, and keep sessions resident while
    tracked background commands or subagents are still active.
  • Add replay coverage for post-settle command completion, continuation
    deduplication, subagent resume, and pending-background state.

Why

Codex app-server can continue emitting command and subagent lifecycle events
after turn/completed. The adapter removed the owning turn from activeTurns
at settlement, so a later item/completed could not resolve its projection
context. The command card remained running, its final output was lost, and the
root agent was not notified. Resuming a completed subagent had a similar stale
projection problem because its new lifecycle was not reopened before the next
child turn.

Problem and Fix

Problem and Why it HappenedFix
Post-settle command completion could not resolve an active turn, leaving the item running and dropping final output.Retain settled turn context while tracked background items remain, then project the late completion and release the context when drained.
A completed background command did not wake the root agent.Offer a continuation through the shared continuation queue once per completed post-settle command.
Resuming a completed subagent left its prior result and terminal state in the projection.Reopen the subagent lifecycle on the resumed child turn and apply its later result and terminal state.
Idle release could stop a Codex session with provider work still active.Report pending tracked commands and subagents through hasPendingBackgroundWork.

Validation

  • vp check: pass with zero errors
  • vp run typecheck: pass across all 15 packages
  • vp test run apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts apps/server/src/orchestration-v2/RunExecutionService.test.ts: 30 tests pass
  • Headless Codex smoke and continuation packs: all pass, including strengthened
    assertions that command and subagent turn items reach completed
  • AppImage manual matrix: prompts 1 through 8 pass, including two-command wake
    ordering, mixed command and subagent activity, subagent resume, and the
    in-turn no-wake case

Checklist

  • This PR is small and focused
  • I explained what changed and why

Note

Medium Risk
Changes Codex turn lifecycle, continuation scheduling, and session pinning in orchestration-v2; behavior is well covered by new replay tests but incorrect continuation or release logic could affect run completion or duplicate wakes.

Overview
Fixes Codex adapter handling when app-server events arrive after turn/completed, which previously dropped late item/completed projections and left background commands stuck.

The adapter now keeps settled turn context while in-flight commandExecution items are tracked, resolves late completions via resolveItemEventContext, and offers one continuation per newly completed post-settle command through ProviderContinuationRequests (with deduplication and codexBackgroundCommandDetail for the wake message). Commands that finish before settle do not trigger continuations; failed/interrupted turns stop tracking so late completions cannot wake stopped work.

Subagent projection is broadened: resumed child turns re-emit running state, terminal node/task updates apply beyond the first turn, and agent messages update subagent results without the old first-turn-only guard. hasPendingBackgroundWork reports active background commands or running subagents so idle release does not tear down sessions too early.

Adds replay tests for post-settle command wake, pre-settle no-wake, and resumed subagent hydration; exports makeReplayServerConfig from the testkit for harness reuse.

Reviewed by Cursor Bugbot for commit f6f10b4. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix Codex background command completion and subagent resume in orchestrator adapter

  • Adds post-settle background command tracking in CodexAdapterV2: settled turn contexts are retained until all running background commands complete, allowing late item.completed events to be projected correctly.
  • Offers a ProviderContinuationRequest when a root turn's background command completes after turn settle, using a new codexBackgroundCommandDetail helper that formats command text, exit code, and output tail (capped at 1,000 chars).
  • Emits subagent.updated to running when a subsequent provider turn starts for a subagent task that wasn't already running, and emits status updates consistently on subagent completion.
  • Exposes hasPendingBackgroundWork on the adapter runtime, returning true while any command items or subagents are still running.
  • Adds integration tests covering post-settle completion, pre-settle no-continuation, and subagent resume with hydration of late results.

Macroscope summarized f6f10b4.

…esume
Codex can settle a turn while background commands or resumed subagents
are still running. The adapter previously dropped their post-settle
events because turn context was deleted on turn/completed.
- Retain settled turn context when running command items remain so late
item/completed events still project turn item updates
- Offer a provider continuation request when a root background command
completes after settle, with a detail summarizing command, exit code,
and output tail
- Relax the providerTurnOrdinal === 1 guards so resumed subagent turns
flip the subagent back to running and hydrate the new result
- Report pending background work (running command items or subagents)
so idle session release is deferred until it drains
- Add replay-transcript adapter tests covering both scenarios
@coderabbitai

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: edad5d2a-bb88-4b58-ab37-8c0ff70d5635

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actionsgithub-actionsBot added size:L 100-499 changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list. labels Jul 12, 2026
@mwolsonmwolson changed the title fix(orchestrator): Codex background command completion and subagent resume[orchestrator-v2] fix(orchestrator): Codex background command completion and subagent resumeJul 12, 2026
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Needs human review

This PR adds new runtime behavior for tracking background commands past turn settlement and triggering continuation requests when they complete. While well-tested, the changes affect orchestration flow decisions and should be reviewed by someone familiar with the CodexAdapter's event processing model.

You can customize Macroscope's approvability policy. Learn more.

@juliusmarminge
juliusmarminge merged commit c14c908 into pingdotgg:t3code/codex-turn-mappingJul 12, 2026
16 checks passed
@mwolson
mwolson deleted the fix/codex-v2 branch July 12, 2026 14:38
juliusmarminge pushed a commit that referenced this pull request Jul 20, 2026
maria-rcks pushed a commit that referenced this pull request Aug 3, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 4, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 4, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 5, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 7, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 10, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 11, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 12, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 14, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 14, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 15, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 17, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 30, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 30, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 1, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 2, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 2, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@mwolson@juliusmarminge
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

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

Merged
juliusmarminge merged 1 commit into
pingdotgg:t3code/codex-turn-mappingfrom
mwolson:fix/codex-v2
Jul 12, 2026
Merged

[orchestrator-v2] fix(orchestrator): Codex background command completion and subagent resume#3908
juliusmarminge merged 1 commit into
pingdotgg:t3code/codex-turn-mappingfrom
mwolson:fix/codex-v2

Conversation

@mwolson

@mwolsonmwolson commented Jul 12, 2026

Copy link
Copy Markdown
Contributor

What Changed

  • Preserve Codex turn context long enough to project command completions that
    arrive after the root turn settles.
  • Request one continuation run for each newly completed post-settle background
    command, while avoiding wakes for commands completed during the root turn.
  • Reopen and hydrate resumed Codex subagents, and keep sessions resident while
    tracked background commands or subagents are still active.
  • Add replay coverage for post-settle command completion, continuation
    deduplication, subagent resume, and pending-background state.

Why

Codex app-server can continue emitting command and subagent lifecycle events
after turn/completed. The adapter removed the owning turn from activeTurns
at settlement, so a later item/completed could not resolve its projection
context. The command card remained running, its final output was lost, and the
root agent was not notified. Resuming a completed subagent had a similar stale
projection problem because its new lifecycle was not reopened before the next
child turn.

Problem and Fix

Problem and Why it HappenedFix
Post-settle command completion could not resolve an active turn, leaving the item running and dropping final output.Retain settled turn context while tracked background items remain, then project the late completion and release the context when drained.
A completed background command did not wake the root agent.Offer a continuation through the shared continuation queue once per completed post-settle command.
Resuming a completed subagent left its prior result and terminal state in the projection.Reopen the subagent lifecycle on the resumed child turn and apply its later result and terminal state.
Idle release could stop a Codex session with provider work still active.Report pending tracked commands and subagents through hasPendingBackgroundWork.

Validation

  • vp check: pass with zero errors
  • vp run typecheck: pass across all 15 packages
  • vp test run apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts apps/server/src/orchestration-v2/RunExecutionService.test.ts: 30 tests pass
  • Headless Codex smoke and continuation packs: all pass, including strengthened
    assertions that command and subagent turn items reach completed
  • AppImage manual matrix: prompts 1 through 8 pass, including two-command wake
    ordering, mixed command and subagent activity, subagent resume, and the
    in-turn no-wake case

Checklist

  • This PR is small and focused
  • I explained what changed and why

Note

Medium Risk
Changes Codex turn lifecycle, continuation scheduling, and session pinning in orchestration-v2; behavior is well covered by new replay tests but incorrect continuation or release logic could affect run completion or duplicate wakes.

Overview
Fixes Codex adapter handling when app-server events arrive after turn/completed, which previously dropped late item/completed projections and left background commands stuck.

The adapter now keeps settled turn context while in-flight commandExecution items are tracked, resolves late completions via resolveItemEventContext, and offers one continuation per newly completed post-settle command through ProviderContinuationRequests (with deduplication and codexBackgroundCommandDetail for the wake message). Commands that finish before settle do not trigger continuations; failed/interrupted turns stop tracking so late completions cannot wake stopped work.

Subagent projection is broadened: resumed child turns re-emit running state, terminal node/task updates apply beyond the first turn, and agent messages update subagent results without the old first-turn-only guard. hasPendingBackgroundWork reports active background commands or running subagents so idle release does not tear down sessions too early.

Adds replay tests for post-settle command wake, pre-settle no-wake, and resumed subagent hydration; exports makeReplayServerConfig from the testkit for harness reuse.

Reviewed by Cursor Bugbot for commit f6f10b4. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix Codex background command completion and subagent resume in orchestrator adapter

  • Adds post-settle background command tracking in CodexAdapterV2: settled turn contexts are retained until all running background commands complete, allowing late item.completed events to be projected correctly.
  • Offers a ProviderContinuationRequest when a root turn's background command completes after turn settle, using a new codexBackgroundCommandDetail helper that formats command text, exit code, and output tail (capped at 1,000 chars).
  • Emits subagent.updated to running when a subsequent provider turn starts for a subagent task that wasn't already running, and emits status updates consistently on subagent completion.
  • Exposes hasPendingBackgroundWork on the adapter runtime, returning true while any command items or subagents are still running.
  • Adds integration tests covering post-settle completion, pre-settle no-continuation, and subagent resume with hydration of late results.

Macroscope summarized f6f10b4.

…esume
Codex can settle a turn while background commands or resumed subagents
are still running. The adapter previously dropped their post-settle
events because turn context was deleted on turn/completed.
- Retain settled turn context when running command items remain so late
item/completed events still project turn item updates
- Offer a provider continuation request when a root background command
completes after settle, with a detail summarizing command, exit code,
and output tail
- Relax the providerTurnOrdinal === 1 guards so resumed subagent turns
flip the subagent back to running and hydrate the new result
- Report pending background work (running command items or subagents)
so idle session release is deferred until it drains
- Add replay-transcript adapter tests covering both scenarios
@coderabbitai

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: edad5d2a-bb88-4b58-ab37-8c0ff70d5635

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actionsgithub-actionsBot added size:L 100-499 changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list. labels Jul 12, 2026
@mwolsonmwolson changed the title fix(orchestrator): Codex background command completion and subagent resume[orchestrator-v2] fix(orchestrator): Codex background command completion and subagent resumeJul 12, 2026
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Needs human review

This PR adds new runtime behavior for tracking background commands past turn settlement and triggering continuation requests when they complete. While well-tested, the changes affect orchestration flow decisions and should be reviewed by someone familiar with the CodexAdapter's event processing model.

You can customize Macroscope's approvability policy. Learn more.

@juliusmarminge
juliusmarminge merged commit c14c908 into pingdotgg:t3code/codex-turn-mappingJul 12, 2026
16 checks passed
@mwolson
mwolson deleted the fix/codex-v2 branch July 12, 2026 14:38
juliusmarminge pushed a commit that referenced this pull request Jul 20, 2026
maria-rcks pushed a commit that referenced this pull request Aug 3, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 4, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 4, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 5, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 7, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 10, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 11, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 12, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 14, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 14, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 15, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 17, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 30, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 30, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 1, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 2, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 2, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@mwolson@juliusmarminge
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

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

Merged
juliusmarminge merged 1 commit into
pingdotgg:t3code/codex-turn-mappingfrom
mwolson:fix/codex-v2
Jul 12, 2026
Merged

[orchestrator-v2] fix(orchestrator): Codex background command completion and subagent resume#3908
juliusmarminge merged 1 commit into
pingdotgg:t3code/codex-turn-mappingfrom
mwolson:fix/codex-v2

Conversation

@mwolson

@mwolsonmwolson commented Jul 12, 2026

Copy link
Copy Markdown
Contributor

What Changed

  • Preserve Codex turn context long enough to project command completions that
    arrive after the root turn settles.
  • Request one continuation run for each newly completed post-settle background
    command, while avoiding wakes for commands completed during the root turn.
  • Reopen and hydrate resumed Codex subagents, and keep sessions resident while
    tracked background commands or subagents are still active.
  • Add replay coverage for post-settle command completion, continuation
    deduplication, subagent resume, and pending-background state.

Why

Codex app-server can continue emitting command and subagent lifecycle events
after turn/completed. The adapter removed the owning turn from activeTurns
at settlement, so a later item/completed could not resolve its projection
context. The command card remained running, its final output was lost, and the
root agent was not notified. Resuming a completed subagent had a similar stale
projection problem because its new lifecycle was not reopened before the next
child turn.

Problem and Fix

Problem and Why it HappenedFix
Post-settle command completion could not resolve an active turn, leaving the item running and dropping final output.Retain settled turn context while tracked background items remain, then project the late completion and release the context when drained.
A completed background command did not wake the root agent.Offer a continuation through the shared continuation queue once per completed post-settle command.
Resuming a completed subagent left its prior result and terminal state in the projection.Reopen the subagent lifecycle on the resumed child turn and apply its later result and terminal state.
Idle release could stop a Codex session with provider work still active.Report pending tracked commands and subagents through hasPendingBackgroundWork.

Validation

  • vp check: pass with zero errors
  • vp run typecheck: pass across all 15 packages
  • vp test run apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts apps/server/src/orchestration-v2/RunExecutionService.test.ts: 30 tests pass
  • Headless Codex smoke and continuation packs: all pass, including strengthened
    assertions that command and subagent turn items reach completed
  • AppImage manual matrix: prompts 1 through 8 pass, including two-command wake
    ordering, mixed command and subagent activity, subagent resume, and the
    in-turn no-wake case

Checklist

  • This PR is small and focused
  • I explained what changed and why

Note

Medium Risk
Changes Codex turn lifecycle, continuation scheduling, and session pinning in orchestration-v2; behavior is well covered by new replay tests but incorrect continuation or release logic could affect run completion or duplicate wakes.

Overview
Fixes Codex adapter handling when app-server events arrive after turn/completed, which previously dropped late item/completed projections and left background commands stuck.

The adapter now keeps settled turn context while in-flight commandExecution items are tracked, resolves late completions via resolveItemEventContext, and offers one continuation per newly completed post-settle command through ProviderContinuationRequests (with deduplication and codexBackgroundCommandDetail for the wake message). Commands that finish before settle do not trigger continuations; failed/interrupted turns stop tracking so late completions cannot wake stopped work.

Subagent projection is broadened: resumed child turns re-emit running state, terminal node/task updates apply beyond the first turn, and agent messages update subagent results without the old first-turn-only guard. hasPendingBackgroundWork reports active background commands or running subagents so idle release does not tear down sessions too early.

Adds replay tests for post-settle command wake, pre-settle no-wake, and resumed subagent hydration; exports makeReplayServerConfig from the testkit for harness reuse.

Reviewed by Cursor Bugbot for commit f6f10b4. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix Codex background command completion and subagent resume in orchestrator adapter

  • Adds post-settle background command tracking in CodexAdapterV2: settled turn contexts are retained until all running background commands complete, allowing late item.completed events to be projected correctly.
  • Offers a ProviderContinuationRequest when a root turn's background command completes after turn settle, using a new codexBackgroundCommandDetail helper that formats command text, exit code, and output tail (capped at 1,000 chars).
  • Emits subagent.updated to running when a subsequent provider turn starts for a subagent task that wasn't already running, and emits status updates consistently on subagent completion.
  • Exposes hasPendingBackgroundWork on the adapter runtime, returning true while any command items or subagents are still running.
  • Adds integration tests covering post-settle completion, pre-settle no-continuation, and subagent resume with hydration of late results.

Macroscope summarized f6f10b4.

…esume
Codex can settle a turn while background commands or resumed subagents
are still running. The adapter previously dropped their post-settle
events because turn context was deleted on turn/completed.
- Retain settled turn context when running command items remain so late
item/completed events still project turn item updates
- Offer a provider continuation request when a root background command
completes after settle, with a detail summarizing command, exit code,
and output tail
- Relax the providerTurnOrdinal === 1 guards so resumed subagent turns
flip the subagent back to running and hydrate the new result
- Report pending background work (running command items or subagents)
so idle session release is deferred until it drains
- Add replay-transcript adapter tests covering both scenarios
@coderabbitai

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: edad5d2a-bb88-4b58-ab37-8c0ff70d5635

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actionsgithub-actionsBot added size:L 100-499 changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list. labels Jul 12, 2026
@mwolsonmwolson changed the title fix(orchestrator): Codex background command completion and subagent resume[orchestrator-v2] fix(orchestrator): Codex background command completion and subagent resumeJul 12, 2026
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Needs human review

This PR adds new runtime behavior for tracking background commands past turn settlement and triggering continuation requests when they complete. While well-tested, the changes affect orchestration flow decisions and should be reviewed by someone familiar with the CodexAdapter's event processing model.

You can customize Macroscope's approvability policy. Learn more.

@juliusmarminge
juliusmarminge merged commit c14c908 into pingdotgg:t3code/codex-turn-mappingJul 12, 2026
16 checks passed
@mwolson
mwolson deleted the fix/codex-v2 branch July 12, 2026 14:38
juliusmarminge pushed a commit that referenced this pull request Jul 20, 2026
maria-rcks pushed a commit that referenced this pull request Aug 3, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 4, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 4, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 5, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 7, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 10, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 11, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 12, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 14, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 14, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 15, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 17, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 30, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 30, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 1, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 2, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 2, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@mwolson@juliusmarminge
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

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

Merged
juliusmarminge merged 1 commit into
pingdotgg:t3code/codex-turn-mappingfrom
mwolson:fix/codex-v2
Jul 12, 2026
Merged

[orchestrator-v2] fix(orchestrator): Codex background command completion and subagent resume#3908
juliusmarminge merged 1 commit into
pingdotgg:t3code/codex-turn-mappingfrom
mwolson:fix/codex-v2

Conversation

@mwolson

@mwolsonmwolson commented Jul 12, 2026

Copy link
Copy Markdown
Contributor

What Changed

  • Preserve Codex turn context long enough to project command completions that
    arrive after the root turn settles.
  • Request one continuation run for each newly completed post-settle background
    command, while avoiding wakes for commands completed during the root turn.
  • Reopen and hydrate resumed Codex subagents, and keep sessions resident while
    tracked background commands or subagents are still active.
  • Add replay coverage for post-settle command completion, continuation
    deduplication, subagent resume, and pending-background state.

Why

Codex app-server can continue emitting command and subagent lifecycle events
after turn/completed. The adapter removed the owning turn from activeTurns
at settlement, so a later item/completed could not resolve its projection
context. The command card remained running, its final output was lost, and the
root agent was not notified. Resuming a completed subagent had a similar stale
projection problem because its new lifecycle was not reopened before the next
child turn.

Problem and Fix

Problem and Why it HappenedFix
Post-settle command completion could not resolve an active turn, leaving the item running and dropping final output.Retain settled turn context while tracked background items remain, then project the late completion and release the context when drained.
A completed background command did not wake the root agent.Offer a continuation through the shared continuation queue once per completed post-settle command.
Resuming a completed subagent left its prior result and terminal state in the projection.Reopen the subagent lifecycle on the resumed child turn and apply its later result and terminal state.
Idle release could stop a Codex session with provider work still active.Report pending tracked commands and subagents through hasPendingBackgroundWork.

Validation

  • vp check: pass with zero errors
  • vp run typecheck: pass across all 15 packages
  • vp test run apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts apps/server/src/orchestration-v2/RunExecutionService.test.ts: 30 tests pass
  • Headless Codex smoke and continuation packs: all pass, including strengthened
    assertions that command and subagent turn items reach completed
  • AppImage manual matrix: prompts 1 through 8 pass, including two-command wake
    ordering, mixed command and subagent activity, subagent resume, and the
    in-turn no-wake case

Checklist

  • This PR is small and focused
  • I explained what changed and why

Note

Medium Risk
Changes Codex turn lifecycle, continuation scheduling, and session pinning in orchestration-v2; behavior is well covered by new replay tests but incorrect continuation or release logic could affect run completion or duplicate wakes.

Overview
Fixes Codex adapter handling when app-server events arrive after turn/completed, which previously dropped late item/completed projections and left background commands stuck.

The adapter now keeps settled turn context while in-flight commandExecution items are tracked, resolves late completions via resolveItemEventContext, and offers one continuation per newly completed post-settle command through ProviderContinuationRequests (with deduplication and codexBackgroundCommandDetail for the wake message). Commands that finish before settle do not trigger continuations; failed/interrupted turns stop tracking so late completions cannot wake stopped work.

Subagent projection is broadened: resumed child turns re-emit running state, terminal node/task updates apply beyond the first turn, and agent messages update subagent results without the old first-turn-only guard. hasPendingBackgroundWork reports active background commands or running subagents so idle release does not tear down sessions too early.

Adds replay tests for post-settle command wake, pre-settle no-wake, and resumed subagent hydration; exports makeReplayServerConfig from the testkit for harness reuse.

Reviewed by Cursor Bugbot for commit f6f10b4. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix Codex background command completion and subagent resume in orchestrator adapter

  • Adds post-settle background command tracking in CodexAdapterV2: settled turn contexts are retained until all running background commands complete, allowing late item.completed events to be projected correctly.
  • Offers a ProviderContinuationRequest when a root turn's background command completes after turn settle, using a new codexBackgroundCommandDetail helper that formats command text, exit code, and output tail (capped at 1,000 chars).
  • Emits subagent.updated to running when a subsequent provider turn starts for a subagent task that wasn't already running, and emits status updates consistently on subagent completion.
  • Exposes hasPendingBackgroundWork on the adapter runtime, returning true while any command items or subagents are still running.
  • Adds integration tests covering post-settle completion, pre-settle no-continuation, and subagent resume with hydration of late results.

Macroscope summarized f6f10b4.

…esume
Codex can settle a turn while background commands or resumed subagents
are still running. The adapter previously dropped their post-settle
events because turn context was deleted on turn/completed.
- Retain settled turn context when running command items remain so late
item/completed events still project turn item updates
- Offer a provider continuation request when a root background command
completes after settle, with a detail summarizing command, exit code,
and output tail
- Relax the providerTurnOrdinal === 1 guards so resumed subagent turns
flip the subagent back to running and hydrate the new result
- Report pending background work (running command items or subagents)
so idle session release is deferred until it drains
- Add replay-transcript adapter tests covering both scenarios
@coderabbitai

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: edad5d2a-bb88-4b58-ab37-8c0ff70d5635

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actionsgithub-actionsBot added size:L 100-499 changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list. labels Jul 12, 2026
@mwolsonmwolson changed the title fix(orchestrator): Codex background command completion and subagent resume[orchestrator-v2] fix(orchestrator): Codex background command completion and subagent resumeJul 12, 2026
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Needs human review

This PR adds new runtime behavior for tracking background commands past turn settlement and triggering continuation requests when they complete. While well-tested, the changes affect orchestration flow decisions and should be reviewed by someone familiar with the CodexAdapter's event processing model.

You can customize Macroscope's approvability policy. Learn more.

@juliusmarminge
juliusmarminge merged commit c14c908 into pingdotgg:t3code/codex-turn-mappingJul 12, 2026
16 checks passed
@mwolson
mwolson deleted the fix/codex-v2 branch July 12, 2026 14:38
juliusmarminge pushed a commit that referenced this pull request Jul 20, 2026
maria-rcks pushed a commit that referenced this pull request Aug 3, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 4, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 4, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 5, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 7, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 10, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 11, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 12, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 14, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 14, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 15, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 17, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 30, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 30, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 1, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 2, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 2, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@mwolson@juliusmarminge
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

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

Merged
juliusmarminge merged 1 commit into
pingdotgg:t3code/codex-turn-mappingfrom
mwolson:fix/codex-v2
Jul 12, 2026
Merged

[orchestrator-v2] fix(orchestrator): Codex background command completion and subagent resume#3908
juliusmarminge merged 1 commit into
pingdotgg:t3code/codex-turn-mappingfrom
mwolson:fix/codex-v2

Conversation

@mwolson

@mwolsonmwolson commented Jul 12, 2026

Copy link
Copy Markdown
Contributor

What Changed

  • Preserve Codex turn context long enough to project command completions that
    arrive after the root turn settles.
  • Request one continuation run for each newly completed post-settle background
    command, while avoiding wakes for commands completed during the root turn.
  • Reopen and hydrate resumed Codex subagents, and keep sessions resident while
    tracked background commands or subagents are still active.
  • Add replay coverage for post-settle command completion, continuation
    deduplication, subagent resume, and pending-background state.

Why

Codex app-server can continue emitting command and subagent lifecycle events
after turn/completed. The adapter removed the owning turn from activeTurns
at settlement, so a later item/completed could not resolve its projection
context. The command card remained running, its final output was lost, and the
root agent was not notified. Resuming a completed subagent had a similar stale
projection problem because its new lifecycle was not reopened before the next
child turn.

Problem and Fix

Problem and Why it HappenedFix
Post-settle command completion could not resolve an active turn, leaving the item running and dropping final output.Retain settled turn context while tracked background items remain, then project the late completion and release the context when drained.
A completed background command did not wake the root agent.Offer a continuation through the shared continuation queue once per completed post-settle command.
Resuming a completed subagent left its prior result and terminal state in the projection.Reopen the subagent lifecycle on the resumed child turn and apply its later result and terminal state.
Idle release could stop a Codex session with provider work still active.Report pending tracked commands and subagents through hasPendingBackgroundWork.

Validation

  • vp check: pass with zero errors
  • vp run typecheck: pass across all 15 packages
  • vp test run apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts apps/server/src/orchestration-v2/RunExecutionService.test.ts: 30 tests pass
  • Headless Codex smoke and continuation packs: all pass, including strengthened
    assertions that command and subagent turn items reach completed
  • AppImage manual matrix: prompts 1 through 8 pass, including two-command wake
    ordering, mixed command and subagent activity, subagent resume, and the
    in-turn no-wake case

Checklist

  • This PR is small and focused
  • I explained what changed and why

Note

Medium Risk
Changes Codex turn lifecycle, continuation scheduling, and session pinning in orchestration-v2; behavior is well covered by new replay tests but incorrect continuation or release logic could affect run completion or duplicate wakes.

Overview
Fixes Codex adapter handling when app-server events arrive after turn/completed, which previously dropped late item/completed projections and left background commands stuck.

The adapter now keeps settled turn context while in-flight commandExecution items are tracked, resolves late completions via resolveItemEventContext, and offers one continuation per newly completed post-settle command through ProviderContinuationRequests (with deduplication and codexBackgroundCommandDetail for the wake message). Commands that finish before settle do not trigger continuations; failed/interrupted turns stop tracking so late completions cannot wake stopped work.

Subagent projection is broadened: resumed child turns re-emit running state, terminal node/task updates apply beyond the first turn, and agent messages update subagent results without the old first-turn-only guard. hasPendingBackgroundWork reports active background commands or running subagents so idle release does not tear down sessions too early.

Adds replay tests for post-settle command wake, pre-settle no-wake, and resumed subagent hydration; exports makeReplayServerConfig from the testkit for harness reuse.

Reviewed by Cursor Bugbot for commit f6f10b4. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix Codex background command completion and subagent resume in orchestrator adapter

  • Adds post-settle background command tracking in CodexAdapterV2: settled turn contexts are retained until all running background commands complete, allowing late item.completed events to be projected correctly.
  • Offers a ProviderContinuationRequest when a root turn's background command completes after turn settle, using a new codexBackgroundCommandDetail helper that formats command text, exit code, and output tail (capped at 1,000 chars).
  • Emits subagent.updated to running when a subsequent provider turn starts for a subagent task that wasn't already running, and emits status updates consistently on subagent completion.
  • Exposes hasPendingBackgroundWork on the adapter runtime, returning true while any command items or subagents are still running.
  • Adds integration tests covering post-settle completion, pre-settle no-continuation, and subagent resume with hydration of late results.

Macroscope summarized f6f10b4.

…esume
Codex can settle a turn while background commands or resumed subagents
are still running. The adapter previously dropped their post-settle
events because turn context was deleted on turn/completed.
- Retain settled turn context when running command items remain so late
item/completed events still project turn item updates
- Offer a provider continuation request when a root background command
completes after settle, with a detail summarizing command, exit code,
and output tail
- Relax the providerTurnOrdinal === 1 guards so resumed subagent turns
flip the subagent back to running and hydrate the new result
- Report pending background work (running command items or subagents)
so idle session release is deferred until it drains
- Add replay-transcript adapter tests covering both scenarios
@coderabbitai

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: edad5d2a-bb88-4b58-ab37-8c0ff70d5635

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actionsgithub-actionsBot added size:L 100-499 changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list. labels Jul 12, 2026
@mwolsonmwolson changed the title fix(orchestrator): Codex background command completion and subagent resume[orchestrator-v2] fix(orchestrator): Codex background command completion and subagent resumeJul 12, 2026
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Needs human review

This PR adds new runtime behavior for tracking background commands past turn settlement and triggering continuation requests when they complete. While well-tested, the changes affect orchestration flow decisions and should be reviewed by someone familiar with the CodexAdapter's event processing model.

You can customize Macroscope's approvability policy. Learn more.

@juliusmarminge
juliusmarminge merged commit c14c908 into pingdotgg:t3code/codex-turn-mappingJul 12, 2026
16 checks passed
@mwolson
mwolson deleted the fix/codex-v2 branch July 12, 2026 14:38
juliusmarminge pushed a commit that referenced this pull request Jul 20, 2026
maria-rcks pushed a commit that referenced this pull request Aug 3, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 4, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 4, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 5, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 7, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 10, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 11, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 12, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 14, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 14, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 15, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 17, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 30, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 30, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 1, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 2, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 2, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@mwolson@juliusmarminge
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

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

Merged
juliusmarminge merged 1 commit into
pingdotgg:t3code/codex-turn-mappingfrom
mwolson:fix/codex-v2
Jul 12, 2026
Merged

[orchestrator-v2] fix(orchestrator): Codex background command completion and subagent resume#3908
juliusmarminge merged 1 commit into
pingdotgg:t3code/codex-turn-mappingfrom
mwolson:fix/codex-v2

Conversation

@mwolson

@mwolsonmwolson commented Jul 12, 2026

Copy link
Copy Markdown
Contributor

What Changed

  • Preserve Codex turn context long enough to project command completions that
    arrive after the root turn settles.
  • Request one continuation run for each newly completed post-settle background
    command, while avoiding wakes for commands completed during the root turn.
  • Reopen and hydrate resumed Codex subagents, and keep sessions resident while
    tracked background commands or subagents are still active.
  • Add replay coverage for post-settle command completion, continuation
    deduplication, subagent resume, and pending-background state.

Why

Codex app-server can continue emitting command and subagent lifecycle events
after turn/completed. The adapter removed the owning turn from activeTurns
at settlement, so a later item/completed could not resolve its projection
context. The command card remained running, its final output was lost, and the
root agent was not notified. Resuming a completed subagent had a similar stale
projection problem because its new lifecycle was not reopened before the next
child turn.

Problem and Fix

Problem and Why it HappenedFix
Post-settle command completion could not resolve an active turn, leaving the item running and dropping final output.Retain settled turn context while tracked background items remain, then project the late completion and release the context when drained.
A completed background command did not wake the root agent.Offer a continuation through the shared continuation queue once per completed post-settle command.
Resuming a completed subagent left its prior result and terminal state in the projection.Reopen the subagent lifecycle on the resumed child turn and apply its later result and terminal state.
Idle release could stop a Codex session with provider work still active.Report pending tracked commands and subagents through hasPendingBackgroundWork.

Validation

  • vp check: pass with zero errors
  • vp run typecheck: pass across all 15 packages
  • vp test run apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts apps/server/src/orchestration-v2/RunExecutionService.test.ts: 30 tests pass
  • Headless Codex smoke and continuation packs: all pass, including strengthened
    assertions that command and subagent turn items reach completed
  • AppImage manual matrix: prompts 1 through 8 pass, including two-command wake
    ordering, mixed command and subagent activity, subagent resume, and the
    in-turn no-wake case

Checklist

  • This PR is small and focused
  • I explained what changed and why

Note

Medium Risk
Changes Codex turn lifecycle, continuation scheduling, and session pinning in orchestration-v2; behavior is well covered by new replay tests but incorrect continuation or release logic could affect run completion or duplicate wakes.

Overview
Fixes Codex adapter handling when app-server events arrive after turn/completed, which previously dropped late item/completed projections and left background commands stuck.

The adapter now keeps settled turn context while in-flight commandExecution items are tracked, resolves late completions via resolveItemEventContext, and offers one continuation per newly completed post-settle command through ProviderContinuationRequests (with deduplication and codexBackgroundCommandDetail for the wake message). Commands that finish before settle do not trigger continuations; failed/interrupted turns stop tracking so late completions cannot wake stopped work.

Subagent projection is broadened: resumed child turns re-emit running state, terminal node/task updates apply beyond the first turn, and agent messages update subagent results without the old first-turn-only guard. hasPendingBackgroundWork reports active background commands or running subagents so idle release does not tear down sessions too early.

Adds replay tests for post-settle command wake, pre-settle no-wake, and resumed subagent hydration; exports makeReplayServerConfig from the testkit for harness reuse.

Reviewed by Cursor Bugbot for commit f6f10b4. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix Codex background command completion and subagent resume in orchestrator adapter

  • Adds post-settle background command tracking in CodexAdapterV2: settled turn contexts are retained until all running background commands complete, allowing late item.completed events to be projected correctly.
  • Offers a ProviderContinuationRequest when a root turn's background command completes after turn settle, using a new codexBackgroundCommandDetail helper that formats command text, exit code, and output tail (capped at 1,000 chars).
  • Emits subagent.updated to running when a subsequent provider turn starts for a subagent task that wasn't already running, and emits status updates consistently on subagent completion.
  • Exposes hasPendingBackgroundWork on the adapter runtime, returning true while any command items or subagents are still running.
  • Adds integration tests covering post-settle completion, pre-settle no-continuation, and subagent resume with hydration of late results.

Macroscope summarized f6f10b4.

…esume
Codex can settle a turn while background commands or resumed subagents
are still running. The adapter previously dropped their post-settle
events because turn context was deleted on turn/completed.
- Retain settled turn context when running command items remain so late
item/completed events still project turn item updates
- Offer a provider continuation request when a root background command
completes after settle, with a detail summarizing command, exit code,
and output tail
- Relax the providerTurnOrdinal === 1 guards so resumed subagent turns
flip the subagent back to running and hydrate the new result
- Report pending background work (running command items or subagents)
so idle session release is deferred until it drains
- Add replay-transcript adapter tests covering both scenarios
@coderabbitai

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: edad5d2a-bb88-4b58-ab37-8c0ff70d5635

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actionsgithub-actionsBot added size:L 100-499 changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list. labels Jul 12, 2026
@mwolsonmwolson changed the title fix(orchestrator): Codex background command completion and subagent resume[orchestrator-v2] fix(orchestrator): Codex background command completion and subagent resumeJul 12, 2026
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Needs human review

This PR adds new runtime behavior for tracking background commands past turn settlement and triggering continuation requests when they complete. While well-tested, the changes affect orchestration flow decisions and should be reviewed by someone familiar with the CodexAdapter's event processing model.

You can customize Macroscope's approvability policy. Learn more.

@juliusmarminge
juliusmarminge merged commit c14c908 into pingdotgg:t3code/codex-turn-mappingJul 12, 2026
16 checks passed
@mwolson
mwolson deleted the fix/codex-v2 branch July 12, 2026 14:38
juliusmarminge pushed a commit that referenced this pull request Jul 20, 2026
maria-rcks pushed a commit that referenced this pull request Aug 3, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 4, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 4, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 5, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 7, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 10, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 11, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 12, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 14, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 14, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 15, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 17, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 30, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 30, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 1, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 2, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 2, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@mwolson@juliusmarminge
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

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

Merged
juliusmarminge merged 1 commit into
pingdotgg:t3code/codex-turn-mappingfrom
mwolson:fix/codex-v2
Jul 12, 2026
Merged

[orchestrator-v2] fix(orchestrator): Codex background command completion and subagent resume#3908
juliusmarminge merged 1 commit into
pingdotgg:t3code/codex-turn-mappingfrom
mwolson:fix/codex-v2

Conversation

@mwolson

@mwolsonmwolson commented Jul 12, 2026

Copy link
Copy Markdown
Contributor

What Changed

  • Preserve Codex turn context long enough to project command completions that
    arrive after the root turn settles.
  • Request one continuation run for each newly completed post-settle background
    command, while avoiding wakes for commands completed during the root turn.
  • Reopen and hydrate resumed Codex subagents, and keep sessions resident while
    tracked background commands or subagents are still active.
  • Add replay coverage for post-settle command completion, continuation
    deduplication, subagent resume, and pending-background state.

Why

Codex app-server can continue emitting command and subagent lifecycle events
after turn/completed. The adapter removed the owning turn from activeTurns
at settlement, so a later item/completed could not resolve its projection
context. The command card remained running, its final output was lost, and the
root agent was not notified. Resuming a completed subagent had a similar stale
projection problem because its new lifecycle was not reopened before the next
child turn.

Problem and Fix

Problem and Why it HappenedFix
Post-settle command completion could not resolve an active turn, leaving the item running and dropping final output.Retain settled turn context while tracked background items remain, then project the late completion and release the context when drained.
A completed background command did not wake the root agent.Offer a continuation through the shared continuation queue once per completed post-settle command.
Resuming a completed subagent left its prior result and terminal state in the projection.Reopen the subagent lifecycle on the resumed child turn and apply its later result and terminal state.
Idle release could stop a Codex session with provider work still active.Report pending tracked commands and subagents through hasPendingBackgroundWork.

Validation

  • vp check: pass with zero errors
  • vp run typecheck: pass across all 15 packages
  • vp test run apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts apps/server/src/orchestration-v2/RunExecutionService.test.ts: 30 tests pass
  • Headless Codex smoke and continuation packs: all pass, including strengthened
    assertions that command and subagent turn items reach completed
  • AppImage manual matrix: prompts 1 through 8 pass, including two-command wake
    ordering, mixed command and subagent activity, subagent resume, and the
    in-turn no-wake case

Checklist

  • This PR is small and focused
  • I explained what changed and why

Note

Medium Risk
Changes Codex turn lifecycle, continuation scheduling, and session pinning in orchestration-v2; behavior is well covered by new replay tests but incorrect continuation or release logic could affect run completion or duplicate wakes.

Overview
Fixes Codex adapter handling when app-server events arrive after turn/completed, which previously dropped late item/completed projections and left background commands stuck.

The adapter now keeps settled turn context while in-flight commandExecution items are tracked, resolves late completions via resolveItemEventContext, and offers one continuation per newly completed post-settle command through ProviderContinuationRequests (with deduplication and codexBackgroundCommandDetail for the wake message). Commands that finish before settle do not trigger continuations; failed/interrupted turns stop tracking so late completions cannot wake stopped work.

Subagent projection is broadened: resumed child turns re-emit running state, terminal node/task updates apply beyond the first turn, and agent messages update subagent results without the old first-turn-only guard. hasPendingBackgroundWork reports active background commands or running subagents so idle release does not tear down sessions too early.

Adds replay tests for post-settle command wake, pre-settle no-wake, and resumed subagent hydration; exports makeReplayServerConfig from the testkit for harness reuse.

Reviewed by Cursor Bugbot for commit f6f10b4. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix Codex background command completion and subagent resume in orchestrator adapter

  • Adds post-settle background command tracking in CodexAdapterV2: settled turn contexts are retained until all running background commands complete, allowing late item.completed events to be projected correctly.
  • Offers a ProviderContinuationRequest when a root turn's background command completes after turn settle, using a new codexBackgroundCommandDetail helper that formats command text, exit code, and output tail (capped at 1,000 chars).
  • Emits subagent.updated to running when a subsequent provider turn starts for a subagent task that wasn't already running, and emits status updates consistently on subagent completion.
  • Exposes hasPendingBackgroundWork on the adapter runtime, returning true while any command items or subagents are still running.
  • Adds integration tests covering post-settle completion, pre-settle no-continuation, and subagent resume with hydration of late results.

Macroscope summarized f6f10b4.

…esume
Codex can settle a turn while background commands or resumed subagents
are still running. The adapter previously dropped their post-settle
events because turn context was deleted on turn/completed.
- Retain settled turn context when running command items remain so late
item/completed events still project turn item updates
- Offer a provider continuation request when a root background command
completes after settle, with a detail summarizing command, exit code,
and output tail
- Relax the providerTurnOrdinal === 1 guards so resumed subagent turns
flip the subagent back to running and hydrate the new result
- Report pending background work (running command items or subagents)
so idle session release is deferred until it drains
- Add replay-transcript adapter tests covering both scenarios
@coderabbitai

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: edad5d2a-bb88-4b58-ab37-8c0ff70d5635

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actionsgithub-actionsBot added size:L 100-499 changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list. labels Jul 12, 2026
@mwolsonmwolson changed the title fix(orchestrator): Codex background command completion and subagent resume[orchestrator-v2] fix(orchestrator): Codex background command completion and subagent resumeJul 12, 2026
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Needs human review

This PR adds new runtime behavior for tracking background commands past turn settlement and triggering continuation requests when they complete. While well-tested, the changes affect orchestration flow decisions and should be reviewed by someone familiar with the CodexAdapter's event processing model.

You can customize Macroscope's approvability policy. Learn more.

@juliusmarminge
juliusmarminge merged commit c14c908 into pingdotgg:t3code/codex-turn-mappingJul 12, 2026
16 checks passed
@mwolson
mwolson deleted the fix/codex-v2 branch July 12, 2026 14:38
juliusmarminge pushed a commit that referenced this pull request Jul 20, 2026
maria-rcks pushed a commit that referenced this pull request Aug 3, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 4, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 4, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 5, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 7, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 10, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 11, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 12, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 14, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 14, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 15, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 17, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 30, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 30, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 1, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 2, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 2, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@mwolson@juliusmarminge
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

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

Merged
juliusmarminge merged 1 commit into
pingdotgg:t3code/codex-turn-mappingfrom
mwolson:fix/codex-v2
Jul 12, 2026
Merged

[orchestrator-v2] fix(orchestrator): Codex background command completion and subagent resume#3908
juliusmarminge merged 1 commit into
pingdotgg:t3code/codex-turn-mappingfrom
mwolson:fix/codex-v2

Conversation

@mwolson

@mwolsonmwolson commented Jul 12, 2026

Copy link
Copy Markdown
Contributor

What Changed

  • Preserve Codex turn context long enough to project command completions that
    arrive after the root turn settles.
  • Request one continuation run for each newly completed post-settle background
    command, while avoiding wakes for commands completed during the root turn.
  • Reopen and hydrate resumed Codex subagents, and keep sessions resident while
    tracked background commands or subagents are still active.
  • Add replay coverage for post-settle command completion, continuation
    deduplication, subagent resume, and pending-background state.

Why

Codex app-server can continue emitting command and subagent lifecycle events
after turn/completed. The adapter removed the owning turn from activeTurns
at settlement, so a later item/completed could not resolve its projection
context. The command card remained running, its final output was lost, and the
root agent was not notified. Resuming a completed subagent had a similar stale
projection problem because its new lifecycle was not reopened before the next
child turn.

Problem and Fix

Problem and Why it HappenedFix
Post-settle command completion could not resolve an active turn, leaving the item running and dropping final output.Retain settled turn context while tracked background items remain, then project the late completion and release the context when drained.
A completed background command did not wake the root agent.Offer a continuation through the shared continuation queue once per completed post-settle command.
Resuming a completed subagent left its prior result and terminal state in the projection.Reopen the subagent lifecycle on the resumed child turn and apply its later result and terminal state.
Idle release could stop a Codex session with provider work still active.Report pending tracked commands and subagents through hasPendingBackgroundWork.

Validation

  • vp check: pass with zero errors
  • vp run typecheck: pass across all 15 packages
  • vp test run apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts apps/server/src/orchestration-v2/RunExecutionService.test.ts: 30 tests pass
  • Headless Codex smoke and continuation packs: all pass, including strengthened
    assertions that command and subagent turn items reach completed
  • AppImage manual matrix: prompts 1 through 8 pass, including two-command wake
    ordering, mixed command and subagent activity, subagent resume, and the
    in-turn no-wake case

Checklist

  • This PR is small and focused
  • I explained what changed and why

Note

Medium Risk
Changes Codex turn lifecycle, continuation scheduling, and session pinning in orchestration-v2; behavior is well covered by new replay tests but incorrect continuation or release logic could affect run completion or duplicate wakes.

Overview
Fixes Codex adapter handling when app-server events arrive after turn/completed, which previously dropped late item/completed projections and left background commands stuck.

The adapter now keeps settled turn context while in-flight commandExecution items are tracked, resolves late completions via resolveItemEventContext, and offers one continuation per newly completed post-settle command through ProviderContinuationRequests (with deduplication and codexBackgroundCommandDetail for the wake message). Commands that finish before settle do not trigger continuations; failed/interrupted turns stop tracking so late completions cannot wake stopped work.

Subagent projection is broadened: resumed child turns re-emit running state, terminal node/task updates apply beyond the first turn, and agent messages update subagent results without the old first-turn-only guard. hasPendingBackgroundWork reports active background commands or running subagents so idle release does not tear down sessions too early.

Adds replay tests for post-settle command wake, pre-settle no-wake, and resumed subagent hydration; exports makeReplayServerConfig from the testkit for harness reuse.

Reviewed by Cursor Bugbot for commit f6f10b4. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix Codex background command completion and subagent resume in orchestrator adapter

  • Adds post-settle background command tracking in CodexAdapterV2: settled turn contexts are retained until all running background commands complete, allowing late item.completed events to be projected correctly.
  • Offers a ProviderContinuationRequest when a root turn's background command completes after turn settle, using a new codexBackgroundCommandDetail helper that formats command text, exit code, and output tail (capped at 1,000 chars).
  • Emits subagent.updated to running when a subsequent provider turn starts for a subagent task that wasn't already running, and emits status updates consistently on subagent completion.
  • Exposes hasPendingBackgroundWork on the adapter runtime, returning true while any command items or subagents are still running.
  • Adds integration tests covering post-settle completion, pre-settle no-continuation, and subagent resume with hydration of late results.

Macroscope summarized f6f10b4.

…esume
Codex can settle a turn while background commands or resumed subagents
are still running. The adapter previously dropped their post-settle
events because turn context was deleted on turn/completed.
- Retain settled turn context when running command items remain so late
item/completed events still project turn item updates
- Offer a provider continuation request when a root background command
completes after settle, with a detail summarizing command, exit code,
and output tail
- Relax the providerTurnOrdinal === 1 guards so resumed subagent turns
flip the subagent back to running and hydrate the new result
- Report pending background work (running command items or subagents)
so idle session release is deferred until it drains
- Add replay-transcript adapter tests covering both scenarios
@coderabbitai

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: edad5d2a-bb88-4b58-ab37-8c0ff70d5635

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actionsgithub-actionsBot added size:L 100-499 changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list. labels Jul 12, 2026
@mwolsonmwolson changed the title fix(orchestrator): Codex background command completion and subagent resume[orchestrator-v2] fix(orchestrator): Codex background command completion and subagent resumeJul 12, 2026
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Needs human review

This PR adds new runtime behavior for tracking background commands past turn settlement and triggering continuation requests when they complete. While well-tested, the changes affect orchestration flow decisions and should be reviewed by someone familiar with the CodexAdapter's event processing model.

You can customize Macroscope's approvability policy. Learn more.

@juliusmarminge
juliusmarminge merged commit c14c908 into pingdotgg:t3code/codex-turn-mappingJul 12, 2026
16 checks passed
@mwolson
mwolson deleted the fix/codex-v2 branch July 12, 2026 14:38
juliusmarminge pushed a commit that referenced this pull request Jul 20, 2026
maria-rcks pushed a commit that referenced this pull request Aug 3, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 4, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 4, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 5, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 7, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 10, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 11, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 12, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 14, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 14, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 15, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 17, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 28, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 29, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 30, 2026
juliusmarminge pushed a commit that referenced this pull request Aug 30, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 1, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 2, 2026
juliusmarminge pushed a commit that referenced this pull request Sep 2, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@mwolson@juliusmarminge