resolve comments

Author: xinyi-gong

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

@@ -858,14 +858,14 @@ public void onChatProgress(ChatProgressValue value) {
 
         // Cache conversation progress on report
         if (persistenceManager != null) {
-          persistenceManager.cacheConversationProgress(this.conversationId, value);
-
-          // Set subagentToolCallId on subagent CopilotTurnData for restoration
-          if (StringUtils.isNotBlank(value.getParentTurnId())
-              && StringUtils.isNotBlank(this.lastRunSubagentToolCallId)) {
-            persistenceManager.setSubagentToolCallId(this.conversationId, value.getTurnId(),
-                this.lastRunSubagentToolCallId);
-          }
+          // Chain setSubagentToolCallId after cacheConversationProgress to avoid race condition
+          // where the subagent CopilotTurnData hasn't been created yet
+          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);
+            }
+          });
         }
         break;
       case end: