fix(orchestrator): Keep Claude child work on the child thread

[mwolson]

What Changed

A Claude child can keep talking after the parent root settles. Later text, tools, and results were landing on the parent thread, so the child's work showed up in the wrong conversation. Those later frames now stay on the child.

A blank or whitespace Agent prompt, or progress that arrived before the real prompt, opened the child with an empty "Sent by another agent" bubble. The child now waits for real prompt text before showing that opening message. A child that never gets a prompt still runs. It just starts with no blank bubble.

Checked on a live Claude thread. One Agent launched with a single space, another with a real prompt. The blank child had no user message. The sibling had exactly one opening message with the real prompt.

Why

Settle on the parent is not the end of that child's stream. Routing later frames with the parent's turn mixed the two conversations.

The empty bubble was the same class of mistake: the child thread showed a user message that nobody sent.

Review both here. #5388 claude-postsettle-attribution is closed as absorbed.

UI Changes

Child output after the parent settles stays in the child thread on web and mobile. A blank Agent launch no longer creates an empty "Sent by another agent" bubble.

No before/after screenshots.

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

---

Note

Medium Risk
Touches Claude subagent lifecycle, wake buffering, and tool-result attribution in orchestration-v2; incorrect routing could misplace child-thread events or drop legitimate wake traffic.

Overview
Subagent child threads no longer get an opening “Sent by another agent” user message when the prompt is empty, whitespace-only, or not known yet. A shared hasSubagentPromptText guard is used in the ACP, Codex, Cursor, and Claude adapters; Claude additionally emits that opening message only when prompt text first becomes non-empty (e.g. after task_progress before task_started).

Claude adapter changes tighten how subagents are registered and how wake-buffer frames are handled: registration work is consolidated inside session state updates with an emitPromptMessage flag, wake messages for failed or unknown tasks are dropped earlier (with cleanup on stale task_notifications), and tool results for Agent launches resolve subagents by task id / launch aliases, buffer unresolved launches, and skip results tied to failed wake drains.

A replay fixture and unit tests cover blank prompts and late prompt arrival.

^{Reviewed by Cursor Bugbot for commit ac5be27. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Keep Claude child work on the child thread, gate empty subagent prompts

• Adds shared hasSubagentPromptText in SubagentProjection.ts and uses it across ACP, Codex, Cursor, and Claude adapters so blank or whitespace-only prompts no longer emit empty opening user messages or turn items
• Reworks registerSessionSubagent in ClaudeAdapterV2.ts to preserve prior task state across updates, support reopen semantics (clearing stale results and tool calls), emit the opening prompt at most once, and maintain extra bookkeeping (taskIdByToolUseId, pending resume IDs, terminal item ID sets, generation)
• Rewrites bufferWakeMessage to attribute wake evidence to known, non-failed subagent or background tasks per native thread, and rewrites the tool_result handling loop to correctly resolve subagents by tool_use_id or task_id, buffer messages for unregistered Agent launches, and skip failed-successor tasks
• Adds replay fixture claude_subagent_empty_prompt covering a blank prompt, a whitespace-only prompt, and a late-arriving prompt
• Behavioral Change: subagent opening prompts are now emitted at most once and only when non-whitespace text first becomes available; tool results and wake messages for unknown or failed tasks are now suppressed rather than processed

^{Macroscope summarized ac5be27.}

[coderabbitai]

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 Plus

Run ID: 7340cd12-4409-4cc1-b8b5-91ab73df863b

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

---

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

• X
• Mastodon
• Reddit
• LinkedIn

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

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — The PR changes production subagent lifecycle, wake/replay, resume attribution, and child-thread projection behavior across multiple adapters. Its stateful Claude changes are broad, and unresolved concerns remain around registry persistence, continuation attribution, reopen handling, and launch-result replay.

^{You can add or adjust custom eligibility rules. Learn more.}

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 4 potential issues.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit ac5be27. Configure here.}

[mwolson]

What Changed

A Claude child can keep talking after the parent root settles. Later text, tools, and results were landing on the parent thread, so the child's work showed up in the wrong conversation. Those later frames now stay on the child.

A blank or whitespace Agent prompt, or progress that arrived before the real prompt, opened the child with an empty "Sent by another agent" bubble. The child now waits for real prompt text before showing that opening message. A child that never gets a prompt still runs. It just starts with no blank bubble.

Checked on a live Claude thread. One Agent launched with a single space, another with a real prompt. The blank child had no user message. The sibling had exactly one opening message with the real prompt.

Why

Settle on the parent is not the end of that child's stream. Routing later frames with the parent's turn mixed the two conversations.

The empty bubble was the same class of mistake: the child thread showed a user message that nobody sent.

Review both here. #5388 claude-postsettle-attribution is closed as absorbed.

UI Changes

Child output after the parent settles stays in the child thread on web and mobile. A blank Agent launch no longer creates an empty "Sent by another agent" bubble.

No before/after screenshots.

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

---

Note

Medium Risk
Touches Claude subagent lifecycle, wake buffering, and tool-result attribution in orchestration-v2; incorrect routing could misplace child-thread events or drop legitimate wake traffic.

Overview
Subagent child threads no longer get an opening “Sent by another agent” user message when the prompt is empty, whitespace-only, or not known yet. A shared hasSubagentPromptText guard is used in the ACP, Codex, Cursor, and Claude adapters; Claude additionally emits that opening message only when prompt text first becomes non-empty (e.g. after task_progress before task_started).

Claude adapter changes tighten how subagents are registered and how wake-buffer frames are handled: registration work is consolidated inside session state updates with an emitPromptMessage flag, wake messages for failed or unknown tasks are dropped earlier (with cleanup on stale task_notifications), and tool results for Agent launches resolve subagents by task id / launch aliases, buffer unresolved launches, and skip results tied to failed wake drains.

A replay fixture and unit tests cover blank prompts and late prompt arrival.

^{Reviewed by Cursor Bugbot for commit ac5be27. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Keep Claude child work on the child thread, gate empty subagent prompts

• Adds shared hasSubagentPromptText in SubagentProjection.ts and uses it across ACP, Codex, Cursor, and Claude adapters so blank or whitespace-only prompts no longer emit empty opening user messages or turn items
• Reworks registerSessionSubagent in ClaudeAdapterV2.ts to preserve prior task state across updates, support reopen semantics (clearing stale results and tool calls), emit the opening prompt at most once, and maintain extra bookkeeping (taskIdByToolUseId, pending resume IDs, terminal item ID sets, generation)
• Rewrites bufferWakeMessage to attribute wake evidence to known, non-failed subagent or background tasks per native thread, and rewrites the tool_result handling loop to correctly resolve subagents by tool_use_id or task_id, buffer messages for unregistered Agent launches, and skip failed-successor tasks
• Adds replay fixture claude_subagent_empty_prompt covering a blank prompt, a whitespace-only prompt, and a late-arriving prompt
• Behavioral Change: subagent opening prompts are now emitted at most once and only when non-whitespace text first becomes available; tool results and wake messages for unknown or failed tasks are now suppressed rather than processed

^{Macroscope summarized ac5be27.}

[coderabbitai]

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 Plus

Run ID: 7340cd12-4409-4cc1-b8b5-91ab73df863b

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

---

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

• X
• Mastodon
• Reddit
• LinkedIn

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

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — The PR changes production subagent lifecycle, wake/replay, resume attribution, and child-thread projection behavior across multiple adapters. Its stateful Claude changes are broad, and unresolved concerns remain around registry persistence, continuation attribution, reopen handling, and launch-result replay.

^{You can add or adjust custom eligibility rules. Learn more.}

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 4 potential issues.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit ac5be27. Configure here.}

[mwolson]

What Changed

A Claude child can keep talking after the parent root settles. Later text, tools, and results were landing on the parent thread, so the child's work showed up in the wrong conversation. Those later frames now stay on the child.

A blank or whitespace Agent prompt, or progress that arrived before the real prompt, opened the child with an empty "Sent by another agent" bubble. The child now waits for real prompt text before showing that opening message. A child that never gets a prompt still runs. It just starts with no blank bubble.

Checked on a live Claude thread. One Agent launched with a single space, another with a real prompt. The blank child had no user message. The sibling had exactly one opening message with the real prompt.

Why

Settle on the parent is not the end of that child's stream. Routing later frames with the parent's turn mixed the two conversations.

The empty bubble was the same class of mistake: the child thread showed a user message that nobody sent.

Review both here. #5388 claude-postsettle-attribution is closed as absorbed.

UI Changes

Child output after the parent settles stays in the child thread on web and mobile. A blank Agent launch no longer creates an empty "Sent by another agent" bubble.

No before/after screenshots.

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

---

Note

Medium Risk
Touches Claude subagent lifecycle, wake buffering, and tool-result attribution in orchestration-v2; incorrect routing could misplace child-thread events or drop legitimate wake traffic.

Overview
Subagent child threads no longer get an opening “Sent by another agent” user message when the prompt is empty, whitespace-only, or not known yet. A shared hasSubagentPromptText guard is used in the ACP, Codex, Cursor, and Claude adapters; Claude additionally emits that opening message only when prompt text first becomes non-empty (e.g. after task_progress before task_started).

Claude adapter changes tighten how subagents are registered and how wake-buffer frames are handled: registration work is consolidated inside session state updates with an emitPromptMessage flag, wake messages for failed or unknown tasks are dropped earlier (with cleanup on stale task_notifications), and tool results for Agent launches resolve subagents by task id / launch aliases, buffer unresolved launches, and skip results tied to failed wake drains.

A replay fixture and unit tests cover blank prompts and late prompt arrival.

^{Reviewed by Cursor Bugbot for commit ac5be27. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Keep Claude child work on the child thread, gate empty subagent prompts

• Adds shared hasSubagentPromptText in SubagentProjection.ts and uses it across ACP, Codex, Cursor, and Claude adapters so blank or whitespace-only prompts no longer emit empty opening user messages or turn items
• Reworks registerSessionSubagent in ClaudeAdapterV2.ts to preserve prior task state across updates, support reopen semantics (clearing stale results and tool calls), emit the opening prompt at most once, and maintain extra bookkeeping (taskIdByToolUseId, pending resume IDs, terminal item ID sets, generation)
• Rewrites bufferWakeMessage to attribute wake evidence to known, non-failed subagent or background tasks per native thread, and rewrites the tool_result handling loop to correctly resolve subagents by tool_use_id or task_id, buffer messages for unregistered Agent launches, and skip failed-successor tasks
• Adds replay fixture claude_subagent_empty_prompt covering a blank prompt, a whitespace-only prompt, and a late-arriving prompt
• Behavioral Change: subagent opening prompts are now emitted at most once and only when non-whitespace text first becomes available; tool results and wake messages for unknown or failed tasks are now suppressed rather than processed

^{Macroscope summarized ac5be27.}

[coderabbitai]

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 Plus

Run ID: 7340cd12-4409-4cc1-b8b5-91ab73df863b

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

---

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

• X
• Mastodon
• Reddit
• LinkedIn

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

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — The PR changes production subagent lifecycle, wake/replay, resume attribution, and child-thread projection behavior across multiple adapters. Its stateful Claude changes are broad, and unresolved concerns remain around registry persistence, continuation attribution, reopen handling, and launch-result replay.

^{You can add or adjust custom eligibility rules. Learn more.}

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 4 potential issues.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit ac5be27. Configure here.}

[mwolson]

What Changed

A Claude child can keep talking after the parent root settles. Later text, tools, and results were landing on the parent thread, so the child's work showed up in the wrong conversation. Those later frames now stay on the child.

A blank or whitespace Agent prompt, or progress that arrived before the real prompt, opened the child with an empty "Sent by another agent" bubble. The child now waits for real prompt text before showing that opening message. A child that never gets a prompt still runs. It just starts with no blank bubble.

Checked on a live Claude thread. One Agent launched with a single space, another with a real prompt. The blank child had no user message. The sibling had exactly one opening message with the real prompt.

Why

Settle on the parent is not the end of that child's stream. Routing later frames with the parent's turn mixed the two conversations.

The empty bubble was the same class of mistake: the child thread showed a user message that nobody sent.

Review both here. #5388 claude-postsettle-attribution is closed as absorbed.

UI Changes

Child output after the parent settles stays in the child thread on web and mobile. A blank Agent launch no longer creates an empty "Sent by another agent" bubble.

No before/after screenshots.

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

---

Note

Medium Risk
Touches Claude subagent lifecycle, wake buffering, and tool-result attribution in orchestration-v2; incorrect routing could misplace child-thread events or drop legitimate wake traffic.

Overview
Subagent child threads no longer get an opening “Sent by another agent” user message when the prompt is empty, whitespace-only, or not known yet. A shared hasSubagentPromptText guard is used in the ACP, Codex, Cursor, and Claude adapters; Claude additionally emits that opening message only when prompt text first becomes non-empty (e.g. after task_progress before task_started).

Claude adapter changes tighten how subagents are registered and how wake-buffer frames are handled: registration work is consolidated inside session state updates with an emitPromptMessage flag, wake messages for failed or unknown tasks are dropped earlier (with cleanup on stale task_notifications), and tool results for Agent launches resolve subagents by task id / launch aliases, buffer unresolved launches, and skip results tied to failed wake drains.

A replay fixture and unit tests cover blank prompts and late prompt arrival.

^{Reviewed by Cursor Bugbot for commit ac5be27. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Keep Claude child work on the child thread, gate empty subagent prompts

• Adds shared hasSubagentPromptText in SubagentProjection.ts and uses it across ACP, Codex, Cursor, and Claude adapters so blank or whitespace-only prompts no longer emit empty opening user messages or turn items
• Reworks registerSessionSubagent in ClaudeAdapterV2.ts to preserve prior task state across updates, support reopen semantics (clearing stale results and tool calls), emit the opening prompt at most once, and maintain extra bookkeeping (taskIdByToolUseId, pending resume IDs, terminal item ID sets, generation)
• Rewrites bufferWakeMessage to attribute wake evidence to known, non-failed subagent or background tasks per native thread, and rewrites the tool_result handling loop to correctly resolve subagents by tool_use_id or task_id, buffer messages for unregistered Agent launches, and skip failed-successor tasks
• Adds replay fixture claude_subagent_empty_prompt covering a blank prompt, a whitespace-only prompt, and a late-arriving prompt
• Behavioral Change: subagent opening prompts are now emitted at most once and only when non-whitespace text first becomes available; tool results and wake messages for unknown or failed tasks are now suppressed rather than processed

^{Macroscope summarized ac5be27.}

[coderabbitai]

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 Plus

Run ID: 7340cd12-4409-4cc1-b8b5-91ab73df863b

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

---

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

• X
• Mastodon
• Reddit
• LinkedIn

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

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — The PR changes production subagent lifecycle, wake/replay, resume attribution, and child-thread projection behavior across multiple adapters. Its stateful Claude changes are broad, and unresolved concerns remain around registry persistence, continuation attribution, reopen handling, and launch-result replay.

^{You can add or adjust custom eligibility rules. Learn more.}

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 4 potential issues.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit ac5be27. Configure here.}

[mwolson]

What Changed

A Claude child can keep talking after the parent root settles. Later text, tools, and results were landing on the parent thread, so the child's work showed up in the wrong conversation. Those later frames now stay on the child.

A blank or whitespace Agent prompt, or progress that arrived before the real prompt, opened the child with an empty "Sent by another agent" bubble. The child now waits for real prompt text before showing that opening message. A child that never gets a prompt still runs. It just starts with no blank bubble.

Checked on a live Claude thread. One Agent launched with a single space, another with a real prompt. The blank child had no user message. The sibling had exactly one opening message with the real prompt.

Why

Settle on the parent is not the end of that child's stream. Routing later frames with the parent's turn mixed the two conversations.

The empty bubble was the same class of mistake: the child thread showed a user message that nobody sent.

Review both here. #5388 claude-postsettle-attribution is closed as absorbed.

UI Changes

Child output after the parent settles stays in the child thread on web and mobile. A blank Agent launch no longer creates an empty "Sent by another agent" bubble.

No before/after screenshots.

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

---

Note

Medium Risk
Touches Claude subagent lifecycle, wake buffering, and tool-result attribution in orchestration-v2; incorrect routing could misplace child-thread events or drop legitimate wake traffic.

Overview
Subagent child threads no longer get an opening “Sent by another agent” user message when the prompt is empty, whitespace-only, or not known yet. A shared hasSubagentPromptText guard is used in the ACP, Codex, Cursor, and Claude adapters; Claude additionally emits that opening message only when prompt text first becomes non-empty (e.g. after task_progress before task_started).

Claude adapter changes tighten how subagents are registered and how wake-buffer frames are handled: registration work is consolidated inside session state updates with an emitPromptMessage flag, wake messages for failed or unknown tasks are dropped earlier (with cleanup on stale task_notifications), and tool results for Agent launches resolve subagents by task id / launch aliases, buffer unresolved launches, and skip results tied to failed wake drains.

A replay fixture and unit tests cover blank prompts and late prompt arrival.

^{Reviewed by Cursor Bugbot for commit ac5be27. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Keep Claude child work on the child thread, gate empty subagent prompts

• Adds shared hasSubagentPromptText in SubagentProjection.ts and uses it across ACP, Codex, Cursor, and Claude adapters so blank or whitespace-only prompts no longer emit empty opening user messages or turn items
• Reworks registerSessionSubagent in ClaudeAdapterV2.ts to preserve prior task state across updates, support reopen semantics (clearing stale results and tool calls), emit the opening prompt at most once, and maintain extra bookkeeping (taskIdByToolUseId, pending resume IDs, terminal item ID sets, generation)
• Rewrites bufferWakeMessage to attribute wake evidence to known, non-failed subagent or background tasks per native thread, and rewrites the tool_result handling loop to correctly resolve subagents by tool_use_id or task_id, buffer messages for unregistered Agent launches, and skip failed-successor tasks
• Adds replay fixture claude_subagent_empty_prompt covering a blank prompt, a whitespace-only prompt, and a late-arriving prompt
• Behavioral Change: subagent opening prompts are now emitted at most once and only when non-whitespace text first becomes available; tool results and wake messages for unknown or failed tasks are now suppressed rather than processed

^{Macroscope summarized ac5be27.}

[coderabbitai]

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 Plus

Run ID: 7340cd12-4409-4cc1-b8b5-91ab73df863b

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

---

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

• X
• Mastodon
• Reddit
• LinkedIn

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

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — The PR changes production subagent lifecycle, wake/replay, resume attribution, and child-thread projection behavior across multiple adapters. Its stateful Claude changes are broad, and unresolved concerns remain around registry persistence, continuation attribution, reopen handling, and launch-result replay.

^{You can add or adjust custom eligibility rules. Learn more.}

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 4 potential issues.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit ac5be27. Configure here.}

[mwolson]

What Changed

A Claude child can keep talking after the parent root settles. Later text, tools, and results were landing on the parent thread, so the child's work showed up in the wrong conversation. Those later frames now stay on the child.

A blank or whitespace Agent prompt, or progress that arrived before the real prompt, opened the child with an empty "Sent by another agent" bubble. The child now waits for real prompt text before showing that opening message. A child that never gets a prompt still runs. It just starts with no blank bubble.

Checked on a live Claude thread. One Agent launched with a single space, another with a real prompt. The blank child had no user message. The sibling had exactly one opening message with the real prompt.

Why

Settle on the parent is not the end of that child's stream. Routing later frames with the parent's turn mixed the two conversations.

The empty bubble was the same class of mistake: the child thread showed a user message that nobody sent.

Review both here. #5388 claude-postsettle-attribution is closed as absorbed.

UI Changes

Child output after the parent settles stays in the child thread on web and mobile. A blank Agent launch no longer creates an empty "Sent by another agent" bubble.

No before/after screenshots.

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

---

Note

Medium Risk
Touches Claude subagent lifecycle, wake buffering, and tool-result attribution in orchestration-v2; incorrect routing could misplace child-thread events or drop legitimate wake traffic.

Overview
Subagent child threads no longer get an opening “Sent by another agent” user message when the prompt is empty, whitespace-only, or not known yet. A shared hasSubagentPromptText guard is used in the ACP, Codex, Cursor, and Claude adapters; Claude additionally emits that opening message only when prompt text first becomes non-empty (e.g. after task_progress before task_started).

Claude adapter changes tighten how subagents are registered and how wake-buffer frames are handled: registration work is consolidated inside session state updates with an emitPromptMessage flag, wake messages for failed or unknown tasks are dropped earlier (with cleanup on stale task_notifications), and tool results for Agent launches resolve subagents by task id / launch aliases, buffer unresolved launches, and skip results tied to failed wake drains.

A replay fixture and unit tests cover blank prompts and late prompt arrival.

^{Reviewed by Cursor Bugbot for commit ac5be27. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Keep Claude child work on the child thread, gate empty subagent prompts

• Adds shared hasSubagentPromptText in SubagentProjection.ts and uses it across ACP, Codex, Cursor, and Claude adapters so blank or whitespace-only prompts no longer emit empty opening user messages or turn items
• Reworks registerSessionSubagent in ClaudeAdapterV2.ts to preserve prior task state across updates, support reopen semantics (clearing stale results and tool calls), emit the opening prompt at most once, and maintain extra bookkeeping (taskIdByToolUseId, pending resume IDs, terminal item ID sets, generation)
• Rewrites bufferWakeMessage to attribute wake evidence to known, non-failed subagent or background tasks per native thread, and rewrites the tool_result handling loop to correctly resolve subagents by tool_use_id or task_id, buffer messages for unregistered Agent launches, and skip failed-successor tasks
• Adds replay fixture claude_subagent_empty_prompt covering a blank prompt, a whitespace-only prompt, and a late-arriving prompt
• Behavioral Change: subagent opening prompts are now emitted at most once and only when non-whitespace text first becomes available; tool results and wake messages for unknown or failed tasks are now suppressed rather than processed

^{Macroscope summarized ac5be27.}

[coderabbitai]

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 Plus

Run ID: 7340cd12-4409-4cc1-b8b5-91ab73df863b

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

---

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

• X
• Mastodon
• Reddit
• LinkedIn

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

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — The PR changes production subagent lifecycle, wake/replay, resume attribution, and child-thread projection behavior across multiple adapters. Its stateful Claude changes are broad, and unresolved concerns remain around registry persistence, continuation attribution, reopen handling, and launch-result replay.

^{You can add or adjust custom eligibility rules. Learn more.}

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 4 potential issues.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit ac5be27. Configure here.}

[mwolson]

What Changed

A Claude child can keep talking after the parent root settles. Later text, tools, and results were landing on the parent thread, so the child's work showed up in the wrong conversation. Those later frames now stay on the child.

A blank or whitespace Agent prompt, or progress that arrived before the real prompt, opened the child with an empty "Sent by another agent" bubble. The child now waits for real prompt text before showing that opening message. A child that never gets a prompt still runs. It just starts with no blank bubble.

Checked on a live Claude thread. One Agent launched with a single space, another with a real prompt. The blank child had no user message. The sibling had exactly one opening message with the real prompt.

Why

Settle on the parent is not the end of that child's stream. Routing later frames with the parent's turn mixed the two conversations.

The empty bubble was the same class of mistake: the child thread showed a user message that nobody sent.

Review both here. #5388 claude-postsettle-attribution is closed as absorbed.

UI Changes

Child output after the parent settles stays in the child thread on web and mobile. A blank Agent launch no longer creates an empty "Sent by another agent" bubble.

No before/after screenshots.

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

---

Note

Medium Risk
Touches Claude subagent lifecycle, wake buffering, and tool-result attribution in orchestration-v2; incorrect routing could misplace child-thread events or drop legitimate wake traffic.

Overview
Subagent child threads no longer get an opening “Sent by another agent” user message when the prompt is empty, whitespace-only, or not known yet. A shared hasSubagentPromptText guard is used in the ACP, Codex, Cursor, and Claude adapters; Claude additionally emits that opening message only when prompt text first becomes non-empty (e.g. after task_progress before task_started).

Claude adapter changes tighten how subagents are registered and how wake-buffer frames are handled: registration work is consolidated inside session state updates with an emitPromptMessage flag, wake messages for failed or unknown tasks are dropped earlier (with cleanup on stale task_notifications), and tool results for Agent launches resolve subagents by task id / launch aliases, buffer unresolved launches, and skip results tied to failed wake drains.

A replay fixture and unit tests cover blank prompts and late prompt arrival.

^{Reviewed by Cursor Bugbot for commit ac5be27. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Keep Claude child work on the child thread, gate empty subagent prompts

• Adds shared hasSubagentPromptText in SubagentProjection.ts and uses it across ACP, Codex, Cursor, and Claude adapters so blank or whitespace-only prompts no longer emit empty opening user messages or turn items
• Reworks registerSessionSubagent in ClaudeAdapterV2.ts to preserve prior task state across updates, support reopen semantics (clearing stale results and tool calls), emit the opening prompt at most once, and maintain extra bookkeeping (taskIdByToolUseId, pending resume IDs, terminal item ID sets, generation)
• Rewrites bufferWakeMessage to attribute wake evidence to known, non-failed subagent or background tasks per native thread, and rewrites the tool_result handling loop to correctly resolve subagents by tool_use_id or task_id, buffer messages for unregistered Agent launches, and skip failed-successor tasks
• Adds replay fixture claude_subagent_empty_prompt covering a blank prompt, a whitespace-only prompt, and a late-arriving prompt
• Behavioral Change: subagent opening prompts are now emitted at most once and only when non-whitespace text first becomes available; tool results and wake messages for unknown or failed tasks are now suppressed rather than processed

^{Macroscope summarized ac5be27.}

[coderabbitai]

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 Plus

Run ID: 7340cd12-4409-4cc1-b8b5-91ab73df863b

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

---

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

• X
• Mastodon
• Reddit
• LinkedIn

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

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — The PR changes production subagent lifecycle, wake/replay, resume attribution, and child-thread projection behavior across multiple adapters. Its stateful Claude changes are broad, and unresolved concerns remain around registry persistence, continuation attribution, reopen handling, and launch-result replay.

^{You can add or adjust custom eligibility rules. Learn more.}

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 4 potential issues.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit ac5be27. Configure here.}

[mwolson]

What Changed

A Claude child can keep talking after the parent root settles. Later text, tools, and results were landing on the parent thread, so the child's work showed up in the wrong conversation. Those later frames now stay on the child.

A blank or whitespace Agent prompt, or progress that arrived before the real prompt, opened the child with an empty "Sent by another agent" bubble. The child now waits for real prompt text before showing that opening message. A child that never gets a prompt still runs. It just starts with no blank bubble.

Checked on a live Claude thread. One Agent launched with a single space, another with a real prompt. The blank child had no user message. The sibling had exactly one opening message with the real prompt.

Why

Settle on the parent is not the end of that child's stream. Routing later frames with the parent's turn mixed the two conversations.

The empty bubble was the same class of mistake: the child thread showed a user message that nobody sent.

Review both here. #5388 claude-postsettle-attribution is closed as absorbed.

UI Changes

Child output after the parent settles stays in the child thread on web and mobile. A blank Agent launch no longer creates an empty "Sent by another agent" bubble.

No before/after screenshots.

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

---

Note

Medium Risk
Touches Claude subagent lifecycle, wake buffering, and tool-result attribution in orchestration-v2; incorrect routing could misplace child-thread events or drop legitimate wake traffic.

Overview
Subagent child threads no longer get an opening “Sent by another agent” user message when the prompt is empty, whitespace-only, or not known yet. A shared hasSubagentPromptText guard is used in the ACP, Codex, Cursor, and Claude adapters; Claude additionally emits that opening message only when prompt text first becomes non-empty (e.g. after task_progress before task_started).

Claude adapter changes tighten how subagents are registered and how wake-buffer frames are handled: registration work is consolidated inside session state updates with an emitPromptMessage flag, wake messages for failed or unknown tasks are dropped earlier (with cleanup on stale task_notifications), and tool results for Agent launches resolve subagents by task id / launch aliases, buffer unresolved launches, and skip results tied to failed wake drains.

A replay fixture and unit tests cover blank prompts and late prompt arrival.

^{Reviewed by Cursor Bugbot for commit ac5be27. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Keep Claude child work on the child thread, gate empty subagent prompts

• Adds shared hasSubagentPromptText in SubagentProjection.ts and uses it across ACP, Codex, Cursor, and Claude adapters so blank or whitespace-only prompts no longer emit empty opening user messages or turn items
• Reworks registerSessionSubagent in ClaudeAdapterV2.ts to preserve prior task state across updates, support reopen semantics (clearing stale results and tool calls), emit the opening prompt at most once, and maintain extra bookkeeping (taskIdByToolUseId, pending resume IDs, terminal item ID sets, generation)
• Rewrites bufferWakeMessage to attribute wake evidence to known, non-failed subagent or background tasks per native thread, and rewrites the tool_result handling loop to correctly resolve subagents by tool_use_id or task_id, buffer messages for unregistered Agent launches, and skip failed-successor tasks
• Adds replay fixture claude_subagent_empty_prompt covering a blank prompt, a whitespace-only prompt, and a late-arriving prompt
• Behavioral Change: subagent opening prompts are now emitted at most once and only when non-whitespace text first becomes available; tool results and wake messages for unknown or failed tasks are now suppressed rather than processed

^{Macroscope summarized ac5be27.}

[coderabbitai]

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 Plus

Run ID: 7340cd12-4409-4cc1-b8b5-91ab73df863b

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

---

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

• X
• Mastodon
• Reddit
• LinkedIn

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

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — The PR changes production subagent lifecycle, wake/replay, resume attribution, and child-thread projection behavior across multiple adapters. Its stateful Claude changes are broad, and unresolved concerns remain around registry persistence, continuation attribution, reopen handling, and launch-result replay.

^{You can add or adjust custom eligibility rules. Learn more.}

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 4 potential issues.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit ac5be27. Configure here.}