Conversation
Contributor
📝 WalkthroughWalkthroughThis PR separates delegated-task eviction from delegation repair, preserves interrupted parent-child links, adds explicit subtask abandonment through the API and webview, updates delegated/interrupted task UI, and adds unit and end-to-end coverage. ChangesSubtask lifecycle and abandonment
Estimated code review effort: 4 (Complex) | ~60 minutes Possibly related issues
Possibly related PRs
Suggested labels: Suggested reviewers: 🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
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. Comment |
Codecov Report❌ Patch coverage is 📢 Thoughts on this report? Let us know! |
edelauna
changed the title
edelauna
marked this pull request as ready for review
July 18, 2026 22:39
edelauna
requested review from
JamesRobert20,
hannesrudolph,
navedmerchant and
taltas
as code owners
July 18, 2026 22:39
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 8
🧹 Nitpick comments (1)
webview-ui/src/i18n/locales/ca/chat.json (1)
21-22: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low valueTranslate new localization keys.
The new localization keys for subtask states were added with English fallback strings across non-English locales. Updating them to their respective translated values ensures a consistent localized user experience.
webview-ui/src/i18n/locales/ca/chat.json#L21-L22: Update to Catalan:"waitingOnSubtask": "Esperant la subtasca","goToSubtask": "Anar a la subtasca".webview-ui/src/i18n/locales/ca/history.json#L58-L59: Update to Catalan:"delegatedTag": "Esperant la subtasca","interruptedTag": "Interromput".webview-ui/src/i18n/locales/de/chat.json#L21-L22: Update to German:"waitingOnSubtask": "Warten auf Teilaufgabe","goToSubtask": "Zur Teilaufgabe".webview-ui/src/i18n/locales/de/history.json#L58-L59: Update to German:"delegatedTag": "Warten auf Teilaufgabe","interruptedTag": "Unterbrochen".webview-ui/src/i18n/locales/es/chat.json#L21-L22: Update to Spanish:"waitingOnSubtask": "Esperando subtarea","goToSubtask": "Ir a la subtarea".webview-ui/src/i18n/locales/es/history.json#L58-L59: Update to Spanish:"delegatedTag": "Esperando subtarea","interruptedTag": "Interrumpido".webview-ui/src/i18n/locales/fr/chat.json#L21-L22: Update to French:"waitingOnSubtask": "En attente de la sous-tâche","goToSubtask": "Aller à la sous-tâche".webview-ui/src/i18n/locales/fr/history.json#L58-L59: Update to French:"delegatedTag": "En attente de la sous-tâche","interruptedTag": "Interrompu".
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@apps/vscode-e2e/src/fixtures/subtasks.ts`:
- Around line 388-392: Update the child fixture’s predicate to exclude requests
containing SUBTASK_ABANDON_PARENT_PROMPT, matching the interrupted scenario’s
parent-request exclusion. Keep the existing child marker, tool-call, and
follow-up answer checks unchanged so only the intended child request is
accepted.
In `@src/core/webview/__tests__/ClineProvider.taskHistory.spec.ts`:
- Around line 809-810: Replace the fixed 10 ms sleeps after TaskCompleted
emissions in the task-history tests with awaited completion of the listener
promises. Update the fake emitter used by ClineProvider task-history tests to
collect listener return promises and make emit() await them, then await emit()
directly at the affected cases around task-cb-1 and the additional TaskCompleted
scenarios.
In `@src/core/webview/ClineProvider.ts`:
- Around line 533-540: Update provider disposal to call evictCurrentTask()
instead of removeClineFromStack(), ensuring an active delegated child is marked
interrupted during shutdown while preserving the existing disposal flow.
- Around line 600-609: The in-lock transition in markDelegatedChildInterrupted
must proceed only when childHistory.status is exactly "active". Update the guard
to skip every other status, including "completed", then validate the
active-to-interrupted transition before calling
updateTaskHistory(interruptedChild).
- Around line 3599-3615: Update the delegation flow around atomicReadAndUpdate
to execute under runDelegationTransition(), removing the pre-lock
existingAwaitedChildStatus snapshot. Inside the updater, read
historyItem.awaitingChildId and its current status together, and only sever the
link when that exact child is confirmed interrupted; otherwise throw and
preserve rollback behavior.
- Around line 541-553: Ensure interruption-persistence failures are propagated
instead of swallowed: update markDelegatedChildInterrupted and its callers,
including evictCurrentTask and the corresponding paths near createTask and
abandonSubtask, to preserve rejection. Remove ineffective non-fatal catches and
prevent createTask from opening a replacement task when eviction fails, leaving
the live child/history state consistent.
In `@webview-ui/src/i18n/locales/nl/chat.json`:
- Around line 21-22: Replace the English fallback values for waitingOnSubtask
and goToSubtask with accurate Dutch translations in
webview-ui/src/i18n/locales/nl/chat.json:21-22, Polish translations in
webview-ui/src/i18n/locales/pl/chat.json:21-22, Brazilian Portuguese
translations in webview-ui/src/i18n/locales/pt-BR/chat.json:21-22, Russian
translations in webview-ui/src/i18n/locales/ru/chat.json:21-22, and Turkish
translations in webview-ui/src/i18n/locales/tr/chat.json:21-22. Also localize
the newly added status-label keys in
webview-ui/src/i18n/locales/nl/history.json:51-52,
webview-ui/src/i18n/locales/pl/history.json:51-52,
webview-ui/src/i18n/locales/pt-BR/history.json:51-52, and
webview-ui/src/i18n/locales/ru/history.json:51-52, preserving the existing keys
and JSON structure.
In `@webview-ui/src/i18n/locales/tr/history.json`:
- Around line 51-52: Replace the English placeholder values for delegatedTag and
interruptedTag with Turkish translations in
webview-ui/src/i18n/locales/tr/history.json:51-52. Add Vietnamese navigation
labels in webview-ui/src/i18n/locales/vi/chat.json:21-22 and Vietnamese status
labels in webview-ui/src/i18n/locales/vi/history.json:51-52. Add Simplified
Chinese navigation and status labels in
webview-ui/src/i18n/locales/zh-CN/chat.json:21-22 and
webview-ui/src/i18n/locales/zh-CN/history.json:51-52, and Traditional Chinese
equivalents in webview-ui/src/i18n/locales/zh-TW/chat.json:21-22 and
webview-ui/src/i18n/locales/zh-TW/history.json:51-52; preserve the existing
translation keys and JSON structure.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro Plus
Run ID: 285a6a43-99ec-47fe-afa2-80fc1187e121
📒 Files selected for processing (61)
apps/vscode-e2e/src/fixtures/subtasks.tsapps/vscode-e2e/src/suite/subtasks.test.tspackages/types/src/api.tspackages/types/src/vscode-extension-host.tssrc/__tests__/abandonSubtask.spec.tssrc/__tests__/api-subtask.spec.tssrc/__tests__/helpers/provider-stub.tssrc/__tests__/history-resume-delegation.spec.tssrc/__tests__/provider-delegation.spec.tssrc/__tests__/removeClineFromStack-delegation.spec.tssrc/__tests__/single-open-invariant.spec.tssrc/activate/__tests__/registerCommands.spec.tssrc/activate/registerCommands.tssrc/core/webview/ClineProvider.tssrc/core/webview/__tests__/ClineProvider.flicker-free-cancel.spec.tssrc/core/webview/__tests__/ClineProvider.taskHistory.spec.tssrc/core/webview/__tests__/webviewMessageHandler.abandonSubtask.spec.tssrc/core/webview/webviewMessageHandler.tssrc/extension/api.tswebview-ui/src/components/chat/TaskHeader.tsxwebview-ui/src/components/chat/__tests__/TaskHeader.spec.tsxwebview-ui/src/components/history/SubtaskRow.tsxwebview-ui/src/components/history/TaskItemFooter.tsxwebview-ui/src/components/history/TaskStatusBadge.tsxwebview-ui/src/components/history/__tests__/TaskItemFooter.spec.tsxwebview-ui/src/i18n/locales/ca/chat.jsonwebview-ui/src/i18n/locales/ca/history.jsonwebview-ui/src/i18n/locales/de/chat.jsonwebview-ui/src/i18n/locales/de/history.jsonwebview-ui/src/i18n/locales/en/chat.jsonwebview-ui/src/i18n/locales/en/history.jsonwebview-ui/src/i18n/locales/es/chat.jsonwebview-ui/src/i18n/locales/es/history.jsonwebview-ui/src/i18n/locales/fr/chat.jsonwebview-ui/src/i18n/locales/fr/history.jsonwebview-ui/src/i18n/locales/hi/chat.jsonwebview-ui/src/i18n/locales/hi/history.jsonwebview-ui/src/i18n/locales/id/chat.jsonwebview-ui/src/i18n/locales/id/history.jsonwebview-ui/src/i18n/locales/it/chat.jsonwebview-ui/src/i18n/locales/it/history.jsonwebview-ui/src/i18n/locales/ja/chat.jsonwebview-ui/src/i18n/locales/ja/history.jsonwebview-ui/src/i18n/locales/ko/chat.jsonwebview-ui/src/i18n/locales/ko/history.jsonwebview-ui/src/i18n/locales/nl/chat.jsonwebview-ui/src/i18n/locales/nl/history.jsonwebview-ui/src/i18n/locales/pl/chat.jsonwebview-ui/src/i18n/locales/pl/history.jsonwebview-ui/src/i18n/locales/pt-BR/chat.jsonwebview-ui/src/i18n/locales/pt-BR/history.jsonwebview-ui/src/i18n/locales/ru/chat.jsonwebview-ui/src/i18n/locales/ru/history.jsonwebview-ui/src/i18n/locales/tr/chat.jsonwebview-ui/src/i18n/locales/tr/history.jsonwebview-ui/src/i18n/locales/vi/chat.jsonwebview-ui/src/i18n/locales/vi/history.jsonwebview-ui/src/i18n/locales/zh-CN/chat.jsonwebview-ui/src/i18n/locales/zh-CN/history.jsonwebview-ui/src/i18n/locales/zh-TW/chat.jsonwebview-ui/src/i18n/locales/zh-TW/history.json
Comment on lines
+21
to
+22
| "waitingOnSubtask": "Waiting on subtask", | ||
| "goToSubtask": "Go to subtask" |
Contributor
There was a problem hiding this comment.
🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win
Localize all newly added strings.
The same English fallback text was added to multiple non-English locale files, so users see untranslated navigation and status labels.
webview-ui/src/i18n/locales/nl/chat.json#L21-L22: provide Dutch task-navigation translations.webview-ui/src/i18n/locales/nl/history.json#L51-L52: provide Dutch status-label translations.webview-ui/src/i18n/locales/pl/chat.json#L21-L22: provide Polish task-navigation translations.webview-ui/src/i18n/locales/pl/history.json#L51-L52: provide Polish status-label translations.webview-ui/src/i18n/locales/pt-BR/chat.json#L21-L22: provide Brazilian Portuguese task-navigation translations.webview-ui/src/i18n/locales/pt-BR/history.json#L51-L52: provide Brazilian Portuguese status-label translations.webview-ui/src/i18n/locales/ru/chat.json#L21-L22: provide Russian task-navigation translations.webview-ui/src/i18n/locales/ru/history.json#L51-L52: provide Russian status-label translations.webview-ui/src/i18n/locales/tr/chat.json#L21-L22: provide Turkish task-navigation translations.
📍 Affects 9 files
webview-ui/src/i18n/locales/nl/chat.json#L21-L22(this comment)webview-ui/src/i18n/locales/nl/history.json#L51-L52webview-ui/src/i18n/locales/pl/chat.json#L21-L22webview-ui/src/i18n/locales/pl/history.json#L51-L52webview-ui/src/i18n/locales/pt-BR/chat.json#L21-L22webview-ui/src/i18n/locales/pt-BR/history.json#L51-L52webview-ui/src/i18n/locales/ru/chat.json#L21-L22webview-ui/src/i18n/locales/ru/history.json#L51-L52webview-ui/src/i18n/locales/tr/chat.json#L21-L22
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@webview-ui/src/i18n/locales/nl/chat.json` around lines 21 - 22, Replace the
English fallback values for waitingOnSubtask and goToSubtask with accurate Dutch
translations in webview-ui/src/i18n/locales/nl/chat.json:21-22, Polish
translations in webview-ui/src/i18n/locales/pl/chat.json:21-22, Brazilian
Portuguese translations in webview-ui/src/i18n/locales/pt-BR/chat.json:21-22,
Russian translations in webview-ui/src/i18n/locales/ru/chat.json:21-22, and
Turkish translations in webview-ui/src/i18n/locales/tr/chat.json:21-22. Also
localize the newly added status-label keys in
webview-ui/src/i18n/locales/nl/history.json:51-52,
webview-ui/src/i18n/locales/pl/history.json:51-52,
webview-ui/src/i18n/locales/pt-BR/history.json:51-52, and
webview-ui/src/i18n/locales/ru/history.json:51-52, preserving the existing keys
and JSON structure.
Contributor
There was a problem hiding this comment.
Verified at c13507c: the new waitingOnSubtask/goToSubtask and delegatedTag/interruptedTag values are English in all 16 non-English locales (checked de, fr, nl directly). These dictionaries are otherwise fully translated (e.g. backToParentTask is localized in de/nl), so the placeholders read as mixed-language UI rather than an established fallback convention here. If translation is intentionally follow-up work, worth saying so in the PR description, which currently claims the keys are "present in all 18 locale files".
Contributor
There was a problem hiding this comment.
Skipped: comment is from another GitHub bot.
github-actions
Bot
added
the
awaiting-review
Contributor
|
7 issues outstanding. Findings verified against the code were posted as replies on the matching review threads; the one finding with no existing thread is carried below.
Reviewed c13507c |
github-actions
Bot
added
awaiting-review
…ildInterrupted, evict on disposal, fix delegateParentAndOpenChild TOCTOU, translate i18n keys
github-actions
Bot
added
awaiting-review
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Related GitHub Issue
Closes: #559
Description
This PR implements the Abandon Subtask flow end-to-end: a parent task that is waiting on a delegated subtask can sever the link if that subtask is interrupted, restoring the parent to active without losing the subtask's history.
Key changes:
Task lifecycle (
ClineProvider,webviewMessageHandler,extension/api):abandonSubtask()atomically severs the parent-child link in the history store, transitions parentdelegated → active, and closes the live child instance before the write so a latersaveClineMessagescan't silently reattach it. A TOCTOU guard re-checks child status inside the per-parent delegation lock.evictCurrentTask(): public method that snapshots the current task, pops it viaremoveClineFromStack, then callsmarkDelegatedChildInterruptedif the child was active+delegated — so the+button andclearCurrentTaskboth correctly interrupt an active delegated child rather than losing the delegation state.onTaskCompletedclosure: explicitly transitions the task tocompletedin the history store before re-emitting the event, ensuring a priorinterruptedstatus (from a cancel followed by resumption and completion) is overwritten rather than preserved by the store's merge.History UI (
HistoryView,TaskGroupItem,TaskItem,TaskItemFooter,SubtaskRow): delegation status badges (delegatedTag,interruptedTag).i18n: all new keys present in all 18 locale files (
en+ 17 others).sequenceIndexexhaustion across sibling tests.Test coverage additions:
evictCurrentTask,markDelegatedChildInterrupted(TOCTOU + error paths),onTaskCompleted(real closure viataskCreationCallback)abandonSubtask: sever, ordering (close before write), TOCTOU, active-child guard, stale-parent guardabandonSubtaskWithIdwebview message handler: happy path + error catch/logAPI.clearCurrentTaskandAPI.abandonSubtaskpassthroughplusButtonClickedcommand handler callsevictCurrentTaskTest Procedure
new_taskto delegate to a subtask, then navigate away (interrupting the subtask). In History, open the parent — it should show a "Delegated" badge and an "Abandon Subtask" button. Confirm the dialog; the parent returns to active and the subtask is no longer linked.pnpm --filter zoo-code testPre-Submission Checklist
Summary by CodeRabbit