onDrain callback

Author: ibolton336

vscode/core/src/solutionWorkflowOrchestrator.ts

@@ -130,6 +130,42 @@ export class SolutionWorkflowOrchestrator {
 
     // Set up the resolver function
     this.state.resolvePendingInteraction = this.createInteractionResolver();
+
+    // Register onDrain handler to trigger cleanup when queue empties
+    // This catches cases where the queue drains naturally without resolver calls
+    this.queueManager.onDrain(() => {
+      this.handleQueueDrained();
+    });
+  }
+
+  /**
+   * Handle queue drain event - check if cleanup should happen
+   * Called automatically when the queue becomes empty
+   */
+  private handleQueueDrained(): void {
+    this.logger.debug("Queue drained, checking cleanup conditions", {
+      workflowRunCompleted: this.workflowRunCompleted,
+      pendingInteractionsSize: this.pendingInteractions.size,
+      isWaitingForUserInteraction: this.state.data.isWaitingForUserInteraction,
+      isFetchingSolution: this.state.data.isFetchingSolution,
+    });
+
+    // Check all cleanup conditions
+    const allComplete =
+      this.pendingInteractions.size === 0 &&
+      !this.state.data.isWaitingForUserInteraction &&
+      this.queueManager!.getQueueLength() === 0;
+
+    if (allComplete && this.workflowRunCompleted && this.state.data.isFetchingSolution) {
+      this.logger.info("Queue drained and all conditions met - triggering cleanup");
+      this.finalCleanup();
+    } else {
+      this.logger.debug("Queue drained but not all conditions met for cleanup", {
+        allComplete,
+        workflowRunCompleted: this.workflowRunCompleted,
+        isFetchingSolution: this.state.data.isFetchingSolution,
+      });
+    }
   }
 
   /**

vscode/core/src/utilities/ModifiedFiles/queueManager.ts

@@ -12,6 +12,7 @@ export class MessageQueueManager {
   private isProcessingQueue = false;
   private processingTimer: NodeJS.Timeout | null = null;
   private logger: Logger;
+  private onDrainCallback?: () => void;
 
   constructor(
     private state: ExtensionState,
@@ -27,6 +28,13 @@ export class MessageQueueManager {
     });
   }
 
+  /**
+   * Register a callback to be invoked when the queue drains (becomes empty)
+   */
+  onDrain(callback: () => void): void {
+    this.onDrainCallback = callback;
+  }
+
   /**
    * Adds a message to the queue
    */
@@ -159,6 +167,17 @@ export class MessageQueueManager {
       });
     } finally {
       this.isProcessingQueue = false;
+
+      // If queue is now empty and we have a drain callback, invoke it
+      // This allows the orchestrator to check if cleanup should happen
+      if (this.messageQueue.length === 0 && this.onDrainCallback) {
+        this.logger.debug("Queue drained, invoking onDrain callback");
+        try {
+          this.onDrainCallback();
+        } catch (error) {
+          this.logger.error("Error in onDrain callback:", error);
+        }
+      }
     }
   }