🤖 fix: reduce task tool errors during workspace removal

Change-Id: I638aef9035b6de82d84dde49314ba15f81ee9332
Signed-off-by: Thomas Kosiewski <[email protected]>

Author: ThomasK33

src/node/services/agentPresets.ts

@@ -63,6 +63,7 @@ const RESEARCH_PRESET: AgentPreset = {
       "- Do not edit files.",
       "- Do not run bash commands unless explicitly enabled (assume it is not).",
       "- If the task tool is available and you need repository exploration beyond file_read, delegate to an Explore sub-agent.",
+      "- Use task_list only for discovery (e.g. after interruptions). Do not poll task_list to wait; use task_await to wait for completion.",
     ],
     delegation: [
       '- If available, use: task({ subagent_type: "explore", prompt: "..." }) when you need repo exploration.',
@@ -90,6 +91,7 @@ const EXPLORE_PRESET: AgentPreset = {
       "- Do not edit files.",
       "- Treat bash as read-only: prefer commands like rg, ls, cat, git show, git diff (read-only).",
       "- If the task tool is available and you need external information, delegate to a Research sub-agent.",
+      "- Use task_list only for discovery (e.g. after interruptions). Do not poll task_list to wait; use task_await to wait for completion.",
     ],
     delegation: [
       '- If available, use: task({ subagent_type: "research", prompt: "..." }) when you need web research.',

src/node/services/backgroundProcessManager.ts

@@ -107,6 +107,9 @@ export class BackgroundProcessManager extends EventEmitter<BackgroundProcessMana
 
   constructor(bgOutputDir: string) {
     super();
+    // Background bash status can have many concurrent subscribers (e.g. multiple workspaces).
+    // Raise the default listener cap to avoid noisy MaxListenersExceededWarning.
+    this.setMaxListeners(50);
     this.bgOutputDir = bgOutputDir;
   }
 

src/node/services/streamManager.ts

@@ -1481,6 +1481,13 @@ export class StreamManager extends EventEmitter {
   ): Promise<Result<StreamToken, SendMessageError>> {
     const typedWorkspaceId = workspaceId as WorkspaceId;
 
+    if (messages.length === 0) {
+      return Err({
+        type: "unknown",
+        raw: "Invalid prompt: messages must not be empty",
+      });
+    }
+
     // Get or create mutex for this workspace
     if (!this.streamLocks.has(typedWorkspaceId)) {
       this.streamLocks.set(typedWorkspaceId, new AsyncMutex());

src/node/services/workspaceService.ts

@@ -113,6 +113,8 @@ export class WorkspaceService extends EventEmitter {
   private readonly postCompactionRefreshTimers = new Map<string, NodeJS.Timeout>();
   // Tracks workspaces currently being renamed to prevent streaming during rename
   private readonly renamingWorkspaces = new Set<string>();
+  // Tracks workspaces currently being removed to prevent new sessions/streams during deletion.
+  private readonly removingWorkspaces = new Set<string>();
 
   constructor(
     private readonly config: Config,
@@ -631,18 +633,19 @@ export class WorkspaceService extends EventEmitter {
   }
 
   async remove(workspaceId: string, force = false): Promise<Result<void>> {
+    const wasRemoving = this.removingWorkspaces.has(workspaceId);
+    this.removingWorkspaces.add(workspaceId);
+
     // Try to remove from runtime (filesystem)
     try {
       // Stop any active stream before deleting metadata/config to avoid tool calls racing with removal.
       try {
-        if (this.aiService.isStreaming(workspaceId)) {
-          const stopResult = await this.aiService.stopStream(workspaceId, { abandonPartial: true });
-          if (!stopResult.success) {
-            log.debug("Failed to stop stream during workspace removal", {
-              workspaceId,
-              error: stopResult.error,
-            });
-          }
+        const stopResult = await this.aiService.stopStream(workspaceId, { abandonPartial: true });
+        if (!stopResult.success) {
+          log.debug("Failed to stop stream during workspace removal", {
+            workspaceId,
+            error: stopResult.error,
+          });
         }
       } catch (error: unknown) {
         log.debug("Failed to stop stream during workspace removal (threw)", { workspaceId, error });
@@ -706,6 +709,10 @@ export class WorkspaceService extends EventEmitter {
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       return Err(`Failed to remove workspace: ${message}`);
+    } finally {
+      if (!wasRemoving) {
+        this.removingWorkspaces.delete(workspaceId);
+      }
     }
   }
 
@@ -1173,6 +1180,23 @@ export class WorkspaceService extends EventEmitter {
         });
       }
 
+      // Block streaming while workspace is being removed to prevent races with config/session deletion.
+      if (this.removingWorkspaces.has(workspaceId)) {
+        log.debug("sendMessage blocked: workspace is being removed", { workspaceId });
+        return Err({
+          type: "unknown",
+          raw: "Workspace is being deleted. Please wait and try again.",
+        });
+      }
+
+      // Guard: avoid creating sessions for workspaces that don't exist anymore.
+      if (!this.config.findWorkspace(workspaceId)) {
+        return Err({
+          type: "unknown",
+          raw: "Workspace not found. It may have been deleted.",
+        });
+      }
+
       // Guard: queued agent tasks must not start streaming via generic sendMessage calls.
       // They should only be started by TaskService once a parallel slot is available.
       if (!internal?.allowQueuedAgentTask) {
@@ -1329,6 +1353,15 @@ export class WorkspaceService extends EventEmitter {
         });
       }
 
+      // Block streaming while workspace is being removed to prevent races with config/session deletion.
+      if (this.removingWorkspaces.has(workspaceId)) {
+        log.debug("resumeStream blocked: workspace is being removed", { workspaceId });
+        return Err({
+          type: "unknown",
+          raw: "Workspace is being deleted. Please wait and try again.",
+        });
+      }
+
       // Guard: avoid creating sessions for workspaces that don't exist anymore.
       if (!this.config.findWorkspace(workspaceId)) {
         return Err({