resolve comments

Author: xinyi-gong

com.microsoft.copilot.eclipse.core/src/com/microsoft/copilot/eclipse/core/persistence/ConversationPersistenceManager.java

@@ -556,12 +556,14 @@ public ConversationDataFactory getDataFactory() {
    * @param conversationId the conversation ID
    * @param subagentTurnId the subagent's turn ID
    * @param toolCallId the run_subagent tool call ID from the parent turn
+   * @return a future that completes when the tool call ID has been set
    */
-  public void setSubagentToolCallId(String conversationId, String subagentTurnId, String toolCallId) {
+  public CompletableFuture<Void> setSubagentToolCallId(String conversationId, String subagentTurnId,
+      String toolCallId) {
     if (toolCallId == null || subagentTurnId == null) {
-      return;
+      return CompletableFuture.completedFuture(null);
     }
-    CompletableFuture.runAsync(() -> {
+    return CompletableFuture.runAsync(() -> {
       lock.writeLock().lock();
       try {
         ConversationData conversation = getConversationFromCacheOrLoadFromDisk(conversationId);

com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/chat/ChatView.java

@@ -858,14 +858,17 @@ public void onChatProgress(ChatProgressValue value) {
 
         // Cache conversation progress on report
         if (persistenceManager != null) {
-          // Chain setSubagentToolCallId after cacheConversationProgress to avoid race condition
-          // where the subagent CopilotTurnData hasn't been created yet
+          final String currentConversationId = this.conversationId;
           final String subagentToolCallId = this.lastRunSubagentToolCallId;
-          persistenceManager.cacheConversationProgress(this.conversationId, value).thenRun(() -> {
-            if (StringUtils.isNotBlank(value.getParentTurnId()) && StringUtils.isNotBlank(subagentToolCallId)) {
-              persistenceManager.setSubagentToolCallId(this.conversationId, value.getTurnId(), subagentToolCallId);
-            }
-          });
+          persistenceManager.cacheConversationProgress(currentConversationId, value)
+              .thenCompose(v -> {
+                if (StringUtils.isNotBlank(value.getParentTurnId())
+                    && StringUtils.isNotBlank(subagentToolCallId)) {
+                  return persistenceManager.setSubagentToolCallId(
+                      currentConversationId, value.getTurnId(), subagentToolCallId);
+                }
+                return CompletableFuture.completedFuture(null);
+              });
         }
         break;
       case end:
@@ -1173,7 +1176,7 @@ private void clearCurrentConversation() {
 
   @Override
   public void onCancel() {
-    // Destroy the conversation on the server to stop any in-progress processing
+    // Send conversation/destroy to cancel in-progress turns
     if (StringUtils.isNotBlank(this.conversationId)) {
       CopilotLanguageServerConnection ls = CopilotCore.getPlugin().getCopilotLanguageServer();
       if (ls != null) {