fix - subagent progress isolation, persistence, and restoration during session switching#166
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes subagent progress/event routing and persistence so that subagent execution stays scoped to the correct conversation during session switching, and restores subagent output nested under the parent run_subagent card when loading history.
Changes:
- Add conversation-scoped progress filtering (
isProgressForCurrentConversation) and sendconversation/destroyon cancel/switch to stop server-side processing. - Persist subagent linkage metadata (
parentTurnId,subagentToolCallId) and skip subagent turns when rebuilding main-conversation history for CLS. - Restore persisted subagent output into the parent turn’s
SubagentMessageBlockvia tool-call-id keyed block lookup.
Reviewed changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/chat/ChatView.java | Filters progress events by conversation/subagent conversation and restores subagent turns into parent blocks; adds destroy on cancel. |
| com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/chat/BaseTurnWidget.java | Tracks subagent blocks by toolCallId and provides a restoration injection path. |
| com.microsoft.copilot.eclipse.swtbot.test/test-plans/subagent/subagent.md | Adds a manual test plan covering live execution, persistence, switching, and cancel scenarios. |
| com.microsoft.copilot.eclipse.core/src/com/microsoft/copilot/eclipse/core/persistence/CopilotTurnData.java | Persists parentTurnId and subagentToolCallId for restoration/linking. |
| com.microsoft.copilot.eclipse.core/src/com/microsoft/copilot/eclipse/core/persistence/ConversationPersistenceManager.java | Marks subagent turns with parentTurnId and adds async setter for subagentToolCallId. |
| com.microsoft.copilot.eclipse.core/src/com/microsoft/copilot/eclipse/core/persistence/ConversationDataFactory.java | Excludes subagent turns from the turn list sent back to CLS. |
| com.microsoft.copilot.eclipse.core/src/com/microsoft/copilot/eclipse/core/lsp/protocol/ConversationDestroyParams.java | Introduces params type for conversation/destroy. |
| com.microsoft.copilot.eclipse.core/src/com/microsoft/copilot/eclipse/core/lsp/CopilotLanguageServerConnection.java | Adds client helper to call conversation/destroy. |
| com.microsoft.copilot.eclipse.core/src/com/microsoft/copilot/eclipse/core/lsp/CopilotLanguageServer.java | Adds the conversation/destroy JSON-RPC request. |
# Conflicts: # com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/chat/BaseTurnWidget.java
jdneo
reviewed
May 10, 2026
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
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.
fix #160, #163
Summary
Fixes subagent progress events leaking into unrelated conversations when switching sessions, adds conversation/destroy to stop CLS processing on cancel/switch, and correctly persists and restores subagent execution content inside SubagentMessageBlock cards.
Changes
Progress event isolation
onCancel() sends destroyConversation() to CLS for both main and subagent conversations, stopping server-side LLM calls
Subagent persistence
Subagent restoration
Test plan