resolve comments

Author: xinyi-gong

com.microsoft.copilot.eclipse.core/src/com/microsoft/copilot/eclipse/core/lsp/protocol/ConversationCreateParams.java

@@ -225,7 +225,7 @@ public int hashCode() {
     result = prime * result
         + Objects.hash(capabilities, chatMode, computeSuggestions, customChatModeId, model, needToolCallConfirmation,
             references, source, textDocument, userLanguage, workDoneToken, workspaceFolder, workspaceFolders,
-            modelProviderName, todoList);
+            modelProviderName, todoList, conversationId, restoreToTurnId);
     return result;
   }
 
@@ -251,7 +251,9 @@ public boolean equals(Object obj) {
         && Objects.equals(workDoneToken, other.workDoneToken) && Objects.equals(workspaceFolder, other.workspaceFolder)
         && Objects.equals(workspaceFolders, other.workspaceFolders)
         && Objects.equals(modelProviderName, other.modelProviderName)
-        && Objects.equals(todoList, other.todoList);
+        && Objects.equals(todoList, other.todoList)
+        && Objects.equals(conversationId, other.conversationId)
+        && Objects.equals(restoreToTurnId, other.restoreToTurnId);
   }
 
   @Override
@@ -274,6 +276,8 @@ public String toString() {
     builder.append("customChatModeId", customChatModeId);
     builder.append("needToolCallConfirmation", needToolCallConfirmation);
     builder.append("todoList", todoList);
+    builder.append("conversationId", conversationId);
+    builder.append("restoreToTurnId", restoreToTurnId);
     return builder.toString();
   }
 }

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

@@ -207,37 +207,37 @@ public List<Turn> convertToTurns(List<AbstractTurnData> turnDataList) {
     // Defensive copy to avoid ConcurrentModificationException if another thread mutates the list while iterating.
     List<AbstractTurnData> snapshot = new ArrayList<>(turnDataList);
     List<Turn> result = new ArrayList<>(snapshot.size());
-    Turn pendingTurn = null;
+    Turn unpairedUserTurn = null;
 
     for (AbstractTurnData turnData : snapshot) {
       if (turnData == null) {
         continue;
       }
       if (turnData instanceof UserTurnData userTurnData) {
-        // Flush any pending turn without a response
-        if (pendingTurn != null) {
-          result.add(pendingTurn);
+        // Flush any unpaired user turn without a response
+        if (unpairedUserTurn != null) {
+          result.add(unpairedUserTurn);
         }
         String requestText = userTurnData.getMessage() != null ? userTurnData.getMessage().getText() : "";
         Either<String, List<ChatCompletionContentPart>> request = Either
             .forLeft(requestText == null ? "" : requestText);
-        pendingTurn = new Turn(request, null, null, turnData.getTurnId());
+        unpairedUserTurn = new Turn(request, null, null, turnData.getTurnId());
       } else if (turnData instanceof CopilotTurnData copilotTurnData) {
         String responseText = extractResponseFromCopilotTurnData(copilotTurnData);
-        if (pendingTurn != null) {
-          // Pair the response with the pending user turn
-          pendingTurn.setResponse(responseText);
-          result.add(pendingTurn);
-          pendingTurn = null;
+        if (unpairedUserTurn != null) {
+          // Pair the response with the unpaired user turn
+          unpairedUserTurn.setResponse(responseText);
+          result.add(unpairedUserTurn);
+          unpairedUserTurn = null;
         } else {
           // Orphaned copilot turn (no preceding user turn), create a standalone turn
           result.add(new Turn(Either.forLeft(""), responseText, null, turnData.getTurnId()));
         }
       }
     }
-    // Flush any remaining pending turn (user message without a response)
-    if (pendingTurn != null) {
-      result.add(pendingTurn);
+    // Flush any remaining unpaired user turn (user message without a response)
+    if (unpairedUserTurn != null) {
+      result.add(unpairedUserTurn);
     }
     return result;
   }

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

@@ -111,6 +111,7 @@ public class ChatView extends ViewPart implements ChatProgressListener, MessageL
   private String conversationId = "";
   private String subagentConversationId = null;
   private ConversationState conversationState = ConversationState.NEW_CONVERSATION;
+  private CompletableFuture<?> persistUserTurnFuture = CompletableFuture.completedFuture(null);
   private Set<CompletableFuture<?>> conversationFutures = new HashSet<>();
   private IEventBroker eventBroker = PlatformUI.getWorkbench().getService(IEventBroker.class);
   private DragReferenceManager dragReferenceManager;
@@ -796,9 +797,12 @@ public void onChatProgress(ChatProgressValue value) {
         // Cache conversation progress on begin
         persistenceManager.cacheConversationProgress(this.conversationId, value);
 
-        // Set the CLS-assigned turnId on the last user turn that doesn't have one yet
+        // Set the CLS-assigned turnId on the last user turn that doesn't have one yet.
+        // Chain off persistUserTurnFuture to ensure the UserTurnData has been created first.
         if (StringUtils.isNotBlank(value.getTurnId())) {
-          persistenceManager.setUserTurnId(this.conversationId, value.getTurnId());
+          final String convId = this.conversationId;
+          final String turnId = value.getTurnId();
+          persistUserTurnFuture.thenRun(() -> persistenceManager.setUserTurnId(convId, turnId));
         }
 
         // Hide handoff container when new turn starts
@@ -948,8 +952,8 @@ private void onSendInternal(String workDoneToken, String message, String agentSl
     if (conversationState == ConversationState.CONTINUED_CONVERSATION) {
       // Continue existing conversation - persist user message and send to existing conversation
       if (persistenceManager != null) {
-        persistenceManager.persistUserTurnInfo(conversationId, null, processedMessage, activeModel,
-            chatModeName, customChatModeId, currentFile, references);
+        this.persistUserTurnFuture = persistenceManager.persistUserTurnInfo(conversationId, null, processedMessage,
+            activeModel, chatModeName, customChatModeId, currentFile, references);
       }
 
       // Get current todo list to sync with the server
@@ -994,11 +998,10 @@ private void onSendInternal(String workDoneToken, String message, String agentSl
       if (conversationState == ConversationState.NEW_HISTORY_BASED_CONVERSATION) {
         // Load turns from the history conversation and persist user turn with current conversation ID
         turns = persistenceManager.loadConversationTurns(this.conversationId);
-        persistenceManager.persistUserTurnInfo(this.conversationId, null, processedMessage, activeModel,
-            chatModeName, customChatModeId, currentFile, references);
+        this.persistUserTurnFuture = persistenceManager.persistUserTurnInfo(this.conversationId, null,
+            processedMessage, activeModel, chatModeName, customChatModeId, currentFile, references);
 
         // Set conversationId and last completed turnId for CLS server-side session restoration.
-        // Only use turnId from turns that have a response (completed turns), not cancelled ones.
         restoredConversationId = this.conversationId;
         if (turns != null && !turns.isEmpty()) {
           for (int i = turns.size() - 1; i >= 0; i--) {
@@ -1018,8 +1021,8 @@ private void onSendInternal(String workDoneToken, String message, String agentSl
       } else if (conversationState == ConversationState.NEW_CONVERSATION) {
         // Generate a temporary ID for brand new conversation and persist user turn
         this.conversationId = UUID.randomUUID().toString();
-        persistenceManager.persistUserTurnInfo(this.conversationId, null, processedMessage, activeModel,
-            chatModeName, customChatModeId, currentFile, references);
+        this.persistUserTurnFuture = persistenceManager.persistUserTurnInfo(this.conversationId, null,
+            processedMessage, activeModel, chatModeName, customChatModeId, currentFile, references);
       }
 
       CompletableFuture<ChatCreateResult> createConversationFuture = null;