wave-agent-sdk 0.4.0 → 0.5.0

package/src/agent.ts

@@ -1,3 +1,4 @@
+import { ForegroundTaskManager } from "./managers/foregroundTaskManager.js";
 import {
   MessageManager,
   type MessageManagerCallbacks,
@@ -13,9 +14,9 @@ import { McpManager, type McpManagerCallbacks } from "./managers/mcpManager.js";
 import { LspManager } from "./managers/lspManager.js";
 import { BashManager } from "./managers/bashManager.js";
 import {
-  BackgroundBashManager,
-  type BackgroundBashManagerCallbacks,
-} from "./managers/backgroundBashManager.js";
+  BackgroundTaskManager,
+  type BackgroundTaskManagerCallbacks,
+} from "./managers/backgroundTaskManager.js";
 import { SlashCommandManager } from "./managers/slashCommandManager.js";
 import { PluginManager } from "./managers/pluginManager.js";
 import { HookManager } from "./managers/hookManager.js";
@@ -38,6 +39,8 @@ import type {
   Usage,
   PermissionMode,
   PermissionCallback,
+  BackgroundTask,
+  ForegroundTask,
 } from "./types/index.js";
 import { MemoryRuleManager } from "./managers/MemoryRuleManager.js";
 import { LiveConfigManager } from "./managers/liveConfigManager.js";
@@ -100,10 +103,12 @@ export interface AgentOptions {
 
 export interface AgentCallbacks
   extends MessageManagerCallbacks,
-    BackgroundBashManagerCallbacks,
+    BackgroundTaskManagerCallbacks,
     McpManagerCallbacks,
     SubagentManagerCallbacks {
+  onTasksChange?: (tasks: BackgroundTask[]) => void;
   onPermissionModeChange?: (mode: PermissionMode) => void;
+  onBackgroundCurrentTask?: () => void;
 }
 
 export class Agent {
@@ -111,7 +116,7 @@ export class Agent {
   private aiManager: AIManager;
 
   private bashManager: BashManager | null = null;
-  private backgroundBashManager: BackgroundBashManager;
+  private backgroundTaskManager: BackgroundTaskManager;
   private logger?: Logger; // Add optional logger property
   private toolManager: ToolManager; // Add tool registry instance
   private mcpManager: McpManager; // Add MCP manager instance
@@ -126,6 +131,7 @@ export class Agent {
   private reversionManager: ReversionManager;
   private memoryRuleManager: MemoryRuleManager; // Add memory rule manager instance
   private liveConfigManager: LiveConfigManager; // Add live configuration manager
+  private foregroundTaskManager: ForegroundTaskManager;
   private configurationService: ConfigurationService; // Add configuration service
   private workdir: string; // Working directory
   private systemPrompt?: string; // Custom system prompt
@@ -200,8 +206,15 @@ export class Agent {
     // Store options for dynamic configuration resolution
     this.options = options;
 
-    this.backgroundBashManager = new BackgroundBashManager({
-      callbacks,
+    this.foregroundTaskManager = new ForegroundTaskManager();
+
+    this.backgroundTaskManager = new BackgroundTaskManager({
+      callbacks: {
+        ...callbacks,
+        onTasksChange: (tasks) => {
+          callbacks.onTasksChange?.(tasks);
+        },
+      },
       workdir: this.workdir,
     });
     this.mcpManager = new McpManager({ callbacks, logger: this.logger }); // Initialize MCP manager
@@ -230,11 +243,17 @@ export class Agent {
       workdir: this.workdir,
     });
 
+    // Initialize memory rule manager
+    this.memoryRuleManager = new MemoryRuleManager({
+      workdir: this.workdir,
+    });
+
     // Initialize MessageManager
     this.messageManager = new MessageManager({
       callbacks,
       workdir: this.workdir,
       logger: this.logger,
+      memoryRuleManager: this.memoryRuleManager,
     });
 
     // Initialize ReversionManager
@@ -242,11 +261,6 @@ export class Agent {
       new ReversionService(this.messageManager.getTranscriptPath()),
     );
 
-    // Initialize memory rule manager
-    this.memoryRuleManager = new MemoryRuleManager({
-      workdir: this.workdir,
-    });
-
     // Create a wrapper for canUseTool that triggers notification hooks
     const canUseToolWithNotification: PermissionCallback | undefined =
       options.canUseTool
@@ -298,6 +312,8 @@ export class Agent {
       reversionManager: this.reversionManager,
       permissionMode: options.permissionMode, // Let PermissionManager handle defaultMode resolution
       canUseToolCallback: canUseToolWithNotification,
+      backgroundTaskManager: this.backgroundTaskManager,
+      foregroundTaskManager: this.foregroundTaskManager,
     }); // Initialize tool registry with permission support
     this.liveConfigManager = new LiveConfigManager({
       workdir: this.workdir,
@@ -331,6 +347,8 @@ export class Agent {
       getLanguage: () => this.getLanguage(),
       hookManager: this.hookManager,
       onUsageAdded: (usage) => this.addUsage(usage),
+      backgroundTaskManager: this.backgroundTaskManager,
+      memoryRuleManager: this.memoryRuleManager,
     });
 
     // Initialize AI manager with resolved configuration
@@ -338,7 +356,7 @@ export class Agent {
       messageManager: this.messageManager,
       toolManager: this.toolManager,
       logger: this.logger,
-      backgroundBashManager: this.backgroundBashManager,
+      backgroundTaskManager: this.backgroundTaskManager,
       hookManager: this.hookManager,
       permissionManager: this.permissionManager,
       callbacks: {
@@ -362,6 +380,7 @@ export class Agent {
     this.slashCommandManager = new SlashCommandManager({
       messageManager: this.messageManager,
       aiManager: this.aiManager,
+      backgroundTaskManager: this.backgroundTaskManager,
       workdir: this.workdir,
       logger: this.logger,
     });
@@ -456,34 +475,8 @@ export class Agent {
   }
 
   /** Get combined memory content (project + user + modular rules) */
-  public get combinedMemory(): string {
-    let combined = "";
-    if (this._projectMemoryContent.trim()) {
-      combined += this._projectMemoryContent;
-    }
-    if (this._userMemoryContent.trim()) {
-      if (combined) {
-        combined += "\n\n";
-      }
-      combined += this._userMemoryContent;
-    }
-
-    // Add modular memory rules
-    const filesInContext = this.messageManager.getFilesInContext();
-    const activeRules = this.memoryRuleManager.getActiveRules(filesInContext);
-    if (activeRules.length > 0) {
-      this.logger?.debug(
-        `Active modular rules (${activeRules.length}): ${activeRules.map((r) => r.id).join(", ")}`,
-      );
-      if (combined) {
-        combined += "\n\n";
-      }
-      combined += activeRules.map((r) => r.content).join("\n\n");
-    } else {
-      this.logger?.debug("No active modular rules for current context");
-    }
-
-    return combined;
+  public async getCombinedMemory(): Promise<string> {
+    return this.messageManager.getCombinedMemory();
   }
 
   /** Get AI loading status */
@@ -506,12 +499,25 @@ export class Agent {
     id: string,
     filter?: string,
   ): { stdout: string; stderr: string; status: string } | null {
-    return this.backgroundBashManager.getOutput(id, filter);
+    return this.backgroundTaskManager.getOutput(id, filter);
   }
 
   /** Kill background bash shell */
   public killBackgroundShell(id: string): boolean {
-    return this.backgroundBashManager.killShell(id);
+    return this.backgroundTaskManager.stopTask(id);
+  }
+
+  /** Get background task output */
+  public getBackgroundTaskOutput(
+    id: string,
+    filter?: string,
+  ): { stdout: string; stderr: string; status: string } | null {
+    return this.backgroundTaskManager.getOutput(id, filter);
+  }
+
+  /** Stop background task */
+  public stopBackgroundTask(id: string): boolean {
+    return this.backgroundTaskManager.stopTask(id);
   }
 
   /**
@@ -938,14 +944,42 @@ export class Agent {
     this.slashCommandManager.abortCurrentCommand();
   }
 
+  /**
+   * Register a foreground task that can be backgrounded
+   */
+  public registerForegroundTask(task: ForegroundTask): void {
+    this.foregroundTaskManager.registerForegroundTask(task);
+  }
+
+  /**
+   * Unregister a foreground task
+   */
+  public unregisterForegroundTask(id: string): void {
+    this.foregroundTaskManager.unregisterForegroundTask(id);
+  }
+
+  /**
+   * Background the current foreground task
+   */
+  public async backgroundCurrentTask(): Promise<void> {
+    await this.foregroundTaskManager.backgroundCurrentTask();
+    this.options.callbacks?.onBackgroundCurrentTask?.();
+
+    // If there was no foreground task (e.g. a tool that doesn't register one),
+    // or even if there was, we should stop the AI recursion loop.
+    if (!this.foregroundTaskManager.hasActiveTasks()) {
+      this.aiManager.abortRecursion();
+    }
+  }
+
   /** Destroy managers, clean up resources */
   public async destroy(): Promise<void> {
     await this.messageManager.saveSession();
     this.abortAIMessage(); // This will abort tools including Task tool (subagents)
     this.abortBashCommand();
     this.abortSlashCommand();
-    // Cleanup background bash manager
-    this.backgroundBashManager.cleanup();
+    // Cleanup background task manager
+    this.backgroundTaskManager.cleanup();
     // Cleanup MCP connections
     await this.mcpManager.cleanup();
     // Cleanup LSP connections

package/src/constants/tools.ts

@@ -1,7 +1,7 @@
 export const ASK_USER_QUESTION_TOOL_NAME = "AskUserQuestion";
 export const BASH_TOOL_NAME = "Bash";
-export const BASH_OUTPUT_TOOL_NAME = "BashOutput";
-export const KILL_BASH_TOOL_NAME = "KillBash";
+export const TASK_OUTPUT_TOOL_NAME = "TaskOutput";
+export const TASK_STOP_TOOL_NAME = "TaskStop";
 export const DELETE_FILE_TOOL_NAME = "Delete";
 export const EDIT_TOOL_NAME = "Edit";
 export const EXIT_PLAN_MODE_TOOL_NAME = "ExitPlanMode";

package/src/managers/MemoryRuleManager.ts

@@ -148,7 +148,7 @@ export class MemoryRuleManager {
   getActiveRules(filesInContext: string[]): MemoryRule[] {
     const activeRules: MemoryRule[] = [];
     for (const rule of Object.values(this.state.rules)) {
-      if (this.service.isRuleActive(rule, filesInContext)) {
+      if (this.service.isRuleActive(rule, filesInContext, this.workdir)) {
         activeRules.push(rule);
       }
     }

package/src/managers/aiManager.ts

@@ -6,7 +6,6 @@ import {
 import { getMessagesToCompress } from "../utils/messageOperations.js";
 import { convertMessagesForAPI } from "../utils/convertMessagesForAPI.js";
 import { calculateComprehensiveTotalTokens } from "../utils/tokenCalculation.js";
-import * as memory from "../services/memory.js";
 import * as fs from "node:fs/promises";
 import type {
   Logger,
@@ -17,7 +16,7 @@ import type {
 import type { ToolManager } from "./toolManager.js";
 import type { ToolContext, ToolResult } from "../tools/types.js";
 import type { MessageManager } from "./messageManager.js";
-import type { BackgroundBashManager } from "./backgroundBashManager.js";
+import type { BackgroundTaskManager } from "./backgroundTaskManager.js";
 import { ChatCompletionMessageFunctionToolCall } from "openai/resources.js";
 import type { HookManager } from "./hookManager.js";
 import type { ExtendedHookExecutionContext } from "../types/hooks.js";
@@ -36,7 +35,7 @@ export interface AIManagerOptions {
   messageManager: MessageManager;
   toolManager: ToolManager;
   logger?: Logger;
-  backgroundBashManager?: BackgroundBashManager;
+  backgroundTaskManager?: BackgroundTaskManager;
   hookManager?: HookManager;
   permissionManager?: PermissionManager;
   callbacks?: AIManagerCallbacks;
@@ -61,7 +60,7 @@ export class AIManager {
   private logger?: Logger;
   private toolManager: ToolManager;
   private messageManager: MessageManager;
-  private backgroundBashManager?: BackgroundBashManager;
+  private backgroundTaskManager?: BackgroundTaskManager;
   private hookManager?: HookManager;
   private reversionManager?: import("./reversionManager.js").ReversionManager;
   private permissionManager?: PermissionManager;
@@ -80,7 +79,7 @@ export class AIManager {
   constructor(options: AIManagerOptions) {
     this.messageManager = options.messageManager;
     this.toolManager = options.toolManager;
-    this.backgroundBashManager = options.backgroundBashManager;
+    this.backgroundTaskManager = options.backgroundTaskManager;
     this.hookManager = options.hookManager;
     this.reversionManager = options.reversionManager;
     this.permissionManager = options.permissionManager;
@@ -160,6 +159,15 @@ export class AIManager {
     this.setIsLoading(false);
   }
 
+  /**
+   * Abort the AI recursion loop immediately.
+   * This is used when a tool is backgrounded via Ctrl-B, even if no foreground task was active.
+   */
+  public abortRecursion(): void {
+    this.logger?.info("Aborting AI recursion loop");
+    this.abortAIMessage();
+  }
+
   // Helper method to generate compactParams
   private generateCompactParams(
     toolName: string,
@@ -297,9 +305,6 @@ export class AIManager {
       return;
     }
 
-    // Save session in each recursion to ensure message persistence
-    await this.messageManager.saveSession();
-
     // Only create new AbortControllers for the initial call (recursionDepth === 0)
     // For recursive calls, reuse existing controllers to maintain abort signal
     let abortController: AbortController;
@@ -314,10 +319,14 @@ export class AIManager {
       this.toolAbortController = toolAbortController;
     } else {
       // Reuse existing controllers for recursive calls
-      abortController = this.abortController!;
-      toolAbortController = this.toolAbortController!;
+      // Fallback to new controllers if they were cleared (should not happen in normal flow but good for tests)
+      abortController = this.abortController || new AbortController();
+      toolAbortController = this.toolAbortController || new AbortController();
     }
 
+    // Save session in each recursion to ensure message persistence
+    await this.messageManager.saveSession();
+
     // Only set loading state for the initial call
     if (recursionDepth === 0) {
       this.setIsLoading(true);
@@ -333,9 +342,7 @@ export class AIManager {
 
     try {
       // Get combined memory content
-      const combinedMemory = await memory.getCombinedMemoryContent(
-        this.workdir,
-      );
+      const combinedMemory = await this.messageManager.getCombinedMemory();
 
       // Track if assistant message has been created
       let assistantMessageCreated = false;
@@ -618,7 +625,7 @@ export class AIManager {
               // Create tool execution context
               const context: ToolContext = {
                 abortSignal: toolAbortController.signal,
-                backgroundBashManager: this.backgroundBashManager,
+                backgroundTaskManager: this.backgroundTaskManager,
                 workdir: this.workdir,
                 messageId: this.messageManager.getMessages().slice(-1)[0]?.id,
               };
@@ -630,6 +637,23 @@ export class AIManager {
                 context,
               );
 
+              // Check if the tool was backgrounded via Ctrl-B
+              // If it was backgrounded, we should abort the AI recursion
+              if (
+                toolResult.success &&
+                toolResult.content.includes(
+                  "Command was manually backgrounded by user",
+                )
+              ) {
+                this.logger?.info(
+                  `Tool ${toolName} was backgrounded via Ctrl-B, aborting AI recursion`,
+                );
+                // Use abortAIMessage directly instead of abortRecursion to avoid double logging
+                // and ensure we don't trigger the "Request was aborted" error block
+                this.abortAIMessage();
+                return;
+              }
+
               // Update message state - tool execution completed
               this.messageManager.updateToolBlock({
                 id: toolId,
@@ -709,9 +733,18 @@ export class AIManager {
         }
       }
     } catch (error) {
-      this.messageManager.addErrorBlock(
-        error instanceof Error ? error.message : "Unknown error occurred",
-      );
+      // Check if the error is an abort error
+      // Use the local variables to avoid null reference if this.abortController was cleared
+      const isCurrentlyAborted =
+        abortController.signal.aborted || toolAbortController.signal.aborted;
+
+      if (isCurrentlyAborted) {
+        this.logger?.info("AI message processing was aborted");
+      } else {
+        this.messageManager.addErrorBlock(
+          error instanceof Error ? error.message : "Unknown error occurred",
+        );
+      }
     } finally {
       // Only execute cleanup and hooks for the initial call
       if (recursionDepth === 0) {

package/src/managers/backgroundBashManager.ts

@@ -42,6 +42,7 @@ export class BackgroundBashManager {
 
     const shell: BackgroundShell = {
       id,
+      type: "shell",
       process: child,
       command,
       startTime,