wave-agent-sdk 0.2.1 → 0.5.0

package/src/tools/bashTool.ts

@@ -4,8 +4,7 @@ import { stripAnsiColors } from "../utils/stringUtils.js";
 import type { ToolPlugin, ToolResult, ToolContext } from "./types.js";
 import {
   BASH_TOOL_NAME,
-  BASH_OUTPUT_TOOL_NAME,
-  KILL_BASH_TOOL_NAME,
+  TASK_OUTPUT_TOOL_NAME,
   GLOB_TOOL_NAME,
   GREP_TOOL_NAME,
   READ_TOOL_NAME,
@@ -89,7 +88,7 @@ Usage notes:
           },
           run_in_background: {
             type: "boolean",
-            description: `Set to true to run this command in the background. Use ${BASH_OUTPUT_TOOL_NAME} to read the output later.`,
+            description: `Set to true to run this command in the background. Use ${TASK_OUTPUT_TOOL_NAME} to read the output later.`,
           },
         },
         required: ["command"],
@@ -164,20 +163,20 @@ Usage notes:
 
     if (runInBackground) {
       // Background execution
-      const backgroundBashManager = context?.backgroundBashManager;
-      if (!backgroundBashManager) {
+      const backgroundTaskManager = context?.backgroundTaskManager;
+      if (!backgroundTaskManager) {
         return {
           success: false,
           content: "",
-          error: "Background bash manager not available",
+          error: "Background task manager not available",
         };
       }
 
-      const shellId = backgroundBashManager.startShell(command, timeout);
+      const { id: taskId } = backgroundTaskManager.startShell(command, timeout);
       return {
         success: true,
-        content: `Command started in background with ID: ${shellId}. Use ${BASH_OUTPUT_TOOL_NAME} tool with bash_id="${shellId}" to monitor output.`,
-        shortResult: `Background process ${shellId} started`,
+        content: `Command started in background with ID: ${taskId}. Use TaskOutput tool with task_id="${taskId}" to monitor output.`,
+        shortResult: `Background process ${taskId} started`,
       };
     }
 
@@ -195,6 +194,41 @@ Usage notes:
       let outputBuffer = "";
       let errorBuffer = "";
       let isAborted = false;
+      let isBackgrounded = false;
+
+      const foregroundTaskId = `bash_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
+
+      // Register as foreground task
+      if (context.foregroundTaskManager && command) {
+        context.foregroundTaskManager.registerForegroundTask({
+          id: foregroundTaskId,
+          backgroundHandler: async () => {
+            isBackgrounded = true;
+            if (timeoutHandle) {
+              clearTimeout(timeoutHandle);
+            }
+
+            const backgroundTaskManager = context.backgroundTaskManager;
+            if (backgroundTaskManager) {
+              const taskId = backgroundTaskManager.adoptProcess(
+                child,
+                command,
+                outputBuffer,
+                errorBuffer,
+              );
+              resolve({
+                success: true,
+                content: `Command moved to background with ID: ${taskId}. Use TaskOutput tool with task_id="${taskId}" to monitor output.`,
+                shortResult: `Process ${taskId} backgrounded`,
+              });
+            } else {
+              handleAbort(
+                "Failed to background: Background task manager not available",
+              );
+            }
+          },
+        });
+      }
 
       // Set up timeout
       let timeoutHandle: NodeJS.Timeout | undefined;
@@ -257,29 +291,45 @@ Usage notes:
       // Handle abort signal from context
       if (context?.abortSignal) {
         if (context.abortSignal.aborted) {
-          handleAbort();
+          if (!isBackgrounded) {
+            handleAbort();
+          }
           return;
         }
         // Use { once: true } to prevent listener accumulation on signal reuse
-        context.abortSignal.addEventListener("abort", () => handleAbort(), {
-          once: true,
-        });
+        context.abortSignal.addEventListener(
+          "abort",
+          () => {
+            if (!isBackgrounded) {
+              handleAbort();
+            }
+          },
+          {
+            once: true,
+          },
+        );
       }
 
       child.stdout?.on("data", (data) => {
-        if (!isAborted) {
+        if (!isAborted && !isBackgrounded) {
           outputBuffer += stripAnsiColors(data.toString());
         }
       });
 
       child.stderr?.on("data", (data) => {
-        if (!isAborted) {
+        if (!isAborted && !isBackgrounded) {
           errorBuffer += stripAnsiColors(data.toString());
         }
       });
 
       child.on("exit", (code) => {
-        if (!isAborted) {
+        if (context.foregroundTaskManager) {
+          context.foregroundTaskManager.unregisterForegroundTask(
+            foregroundTaskId,
+          );
+        }
+
+        if (!isAborted && !isBackgrounded) {
           if (timeoutHandle) {
             clearTimeout(timeoutHandle);
           }
@@ -309,7 +359,13 @@ Usage notes:
       });
 
       child.on("error", (error) => {
-        if (!isAborted) {
+        if (context.foregroundTaskManager) {
+          context.foregroundTaskManager.unregisterForegroundTask(
+            foregroundTaskId,
+          );
+        }
+
+        if (!isAborted && !isBackgrounded) {
           if (timeoutHandle) {
             clearTimeout(timeoutHandle);
           }
@@ -334,186 +390,3 @@ Usage notes:
     return `${command}${runInBackground ? " (background)" : ""}`;
   },
 };
-
-/**
- * BashOutput tool - retrieves output from background bash shells
- */
-export const bashOutputTool: ToolPlugin = {
-  name: BASH_OUTPUT_TOOL_NAME,
-  config: {
-    type: "function",
-    function: {
-      name: BASH_OUTPUT_TOOL_NAME,
-      description:
-        "Retrieves output from a running or completed background bash shell",
-      parameters: {
-        type: "object",
-        properties: {
-          bash_id: {
-            type: "string",
-            description:
-              "The ID of the background shell to retrieve output from",
-          },
-          filter: {
-            type: "string",
-            description:
-              "Optional regular expression to filter the output lines. Only lines matching this regex will be included in the result. Any lines that do not match will no longer be available to read.",
-          },
-        },
-        required: ["bash_id"],
-      },
-    },
-  },
-  execute: async (
-    args: Record<string, unknown>,
-    context: ToolContext,
-  ): Promise<ToolResult> => {
-    const bashId = args.bash_id as string;
-    const filter = args.filter as string | undefined;
-
-    if (!bashId || typeof bashId !== "string") {
-      return {
-        success: false,
-        content: "",
-        error: "bash_id parameter is required and must be a string",
-      };
-    }
-
-    const backgroundBashManager = context?.backgroundBashManager;
-    if (!backgroundBashManager) {
-      return {
-        success: false,
-        content: "",
-        error: "Background bash manager not available",
-      };
-    }
-
-    const output = backgroundBashManager.getOutput(bashId, filter);
-    if (!output) {
-      return {
-        success: false,
-        content: "",
-        error: `Background shell with ID ${bashId} not found`,
-      };
-    }
-
-    const shell = backgroundBashManager.getShell(bashId);
-    if (!shell) {
-      return {
-        success: false,
-        content: "",
-        error: `Background shell with ID ${bashId} not found`,
-      };
-    }
-
-    let content = "";
-    if (output.stdout) {
-      content += stripAnsiColors(output.stdout);
-    }
-    if (output.stderr) {
-      content += (content ? "\n" : "") + stripAnsiColors(output.stderr);
-    }
-
-    const finalContent = content || "No output available";
-    const processedContent =
-      finalContent.length > MAX_OUTPUT_LENGTH
-        ? finalContent.substring(0, MAX_OUTPUT_LENGTH) +
-          "\n\n... (output truncated)"
-        : finalContent;
-
-    return {
-      success: true,
-      content: processedContent,
-      shortResult: `${bashId}: ${output.status}${shell.exitCode !== undefined ? ` (${shell.exitCode})` : ""}`,
-      error: undefined,
-    };
-  },
-  formatCompactParams: (params: Record<string, unknown>) => {
-    const bashId = params.bash_id as string;
-    const filter = params.filter as string | undefined;
-    return filter ? `${bashId} filtered: ${filter}` : bashId;
-  },
-};
-
-/**
- * KillBash tool - kills a running background bash shell
- */
-export const killBashTool: ToolPlugin = {
-  name: KILL_BASH_TOOL_NAME,
-  config: {
-    type: "function",
-    function: {
-      name: KILL_BASH_TOOL_NAME,
-      description: "Kills a running background bash shell by its ID",
-      parameters: {
-        type: "object",
-        properties: {
-          shell_id: {
-            type: "string",
-            description: "The ID of the background shell to kill",
-          },
-        },
-        required: ["shell_id"],
-      },
-    },
-  },
-  execute: async (
-    args: Record<string, unknown>,
-    context: ToolContext,
-  ): Promise<ToolResult> => {
-    const shellId = args.shell_id as string;
-
-    if (!shellId || typeof shellId !== "string") {
-      return {
-        success: false,
-        content: "",
-        error: "shell_id parameter is required and must be a string",
-      };
-    }
-
-    const backgroundBashManager = context?.backgroundBashManager;
-    if (!backgroundBashManager) {
-      return {
-        success: false,
-        content: "",
-        error: "Background bash manager not available",
-      };
-    }
-
-    const shell = backgroundBashManager.getShell(shellId);
-    if (!shell) {
-      return {
-        success: false,
-        content: "",
-        error: `Background shell with ID ${shellId} not found`,
-      };
-    }
-
-    if (shell.status !== "running") {
-      return {
-        success: false,
-        content: "",
-        error: `Background shell ${shellId} is not running (status: ${shell.status})`,
-      };
-    }
-
-    const killed = backgroundBashManager.killShell(shellId);
-    if (killed) {
-      return {
-        success: true,
-        content: `Background shell ${shellId} has been killed`,
-        shortResult: `Killed ${shellId}`,
-      };
-    } else {
-      return {
-        success: false,
-        content: "",
-        error: `Failed to kill background shell ${shellId}`,
-      };
-    }
-  },
-  formatCompactParams: (params: Record<string, unknown>) => {
-    const shellId = params.shell_id as string;
-    return shellId;
-  },
-};

package/src/tools/deleteFileTool.ts

@@ -76,9 +76,24 @@ export const deleteFileTool: ToolPlugin = {
         }
       }
 
+      // Record snapshot for reversion
+      let snapshotId: string | undefined;
+      if (context.reversionManager && context.messageId) {
+        snapshotId = await context.reversionManager.recordSnapshot(
+          context.messageId,
+          filePath,
+          "delete",
+        );
+      }
+
       // Delete file
       await unlink(filePath);
 
+      // Commit snapshot on success
+      if (context.reversionManager && snapshotId) {
+        await context.reversionManager.commitSnapshot(snapshotId);
+      }
+
       logger.debug(`Successfully deleted file: ${filePath}`);
 
       return {

package/src/tools/editTool.ts

@@ -2,10 +2,7 @@ import { readFile, writeFile } from "fs/promises";
 import { logger } from "../utils/globalLogger.js";
 import type { ToolPlugin, ToolResult, ToolContext } from "./types.js";
 import { resolvePath, getDisplayPath } from "../utils/path.js";
-import {
-  findIndentationInsensitiveMatch,
-  escapeRegExp,
-} from "../utils/editUtils.js";
+import { escapeRegExp, analyzeEditMismatch } from "../utils/editUtils.js";
 import { EDIT_TOOL_NAME, READ_TOOL_NAME } from "../constants/tools.js";
 
 /**
@@ -114,17 +111,16 @@ export const editTool: ToolPlugin = {
         };
       }
 
-      // Check if old_string exists (with smart indentation matching)
-      const matchedOldString = findIndentationInsensitiveMatch(
-        originalContent,
-        oldString,
-      );
+      // Check if old_string exists
+      const matchedOldString = originalContent.includes(oldString)
+        ? oldString
+        : null;
 
       if (!matchedOldString) {
         return {
           success: false,
           content: "",
-          error: `old_string not found in file`,
+          error: analyzeEditMismatch(originalContent, oldString),
         };
       }
 
@@ -184,9 +180,23 @@ export const editTool: ToolPlugin = {
         }
       }
 
+      // Record snapshot for reversion
+      let snapshotId: string | undefined;
+      if (context.reversionManager && context.messageId) {
+        snapshotId = await context.reversionManager.recordSnapshot(
+          context.messageId,
+          resolvedPath,
+          "modify",
+        );
+      }
+
       // Write file
       try {
         await writeFile(resolvedPath, newContent, "utf-8");
+        // Commit snapshot on success
+        if (context.reversionManager && snapshotId) {
+          await context.reversionManager.commitSnapshot(snapshotId);
+        }
       } catch (writeError) {
         return {
           success: false,

package/src/tools/multiEditTool.ts

@@ -2,10 +2,7 @@ import { readFile, writeFile } from "fs/promises";
 import { logger } from "../utils/globalLogger.js";
 import type { ToolPlugin, ToolResult, ToolContext } from "./types.js";
 import { resolvePath, getDisplayPath } from "../utils/path.js";
-import {
-  findIndentationInsensitiveMatch,
-  escapeRegExp,
-} from "../utils/editUtils.js";
+import { escapeRegExp, analyzeEditMismatch } from "../utils/editUtils.js";
 import {
   MULTI_EDIT_TOOL_NAME,
   EDIT_TOOL_NAME,
@@ -184,17 +181,16 @@ export const multiEditTool: ToolPlugin = {
           continue;
         }
 
-        // Check if old_string exists (with smart indentation matching)
-        const matchedOldString = findIndentationInsensitiveMatch(
-          currentContent,
-          edit.old_string,
-        );
+        // Check if old_string exists
+        const matchedOldString = currentContent.includes(edit.old_string)
+          ? edit.old_string
+          : null;
 
         if (!matchedOldString) {
           return {
             success: false,
             content: "",
-            error: `Edit operation ${i + 1}: old_string not found in current content`,
+            error: `Edit operation ${i + 1}: ${analyzeEditMismatch(currentContent, edit.old_string)}`,
           };
         }
 
@@ -202,7 +198,7 @@ export const multiEditTool: ToolPlugin = {
 
         if (replaceAll) {
           // Replace all matches
-          const regex = new RegExp(escapeRegExp(matchedOldString), "g");
+          const regex = new RegExp(escapeRegExp(edit.old_string), "g");
           currentContent = currentContent.replace(regex, edit.new_string);
           replacementCount = (currentContent.match(regex) || []).length;
           appliedEdits.push(
@@ -257,9 +253,23 @@ export const multiEditTool: ToolPlugin = {
         }
       }
 
+      // Record snapshot for reversion
+      let snapshotId: string | undefined;
+      if (context.reversionManager && context.messageId) {
+        snapshotId = await context.reversionManager.recordSnapshot(
+          context.messageId,
+          resolvedPath,
+          isNewFile ? "create" : "modify",
+        );
+      }
+
       // Write file
       try {
         await writeFile(resolvedPath, currentContent, "utf-8");
+        // Commit snapshot on success
+        if (context.reversionManager && snapshotId) {
+          await context.reversionManager.commitSnapshot(snapshotId);
+        }
       } catch (writeError) {
         return {
           success: false,

package/src/tools/taskOutputTool.ts

@@ -0,0 +1,174 @@
+import { TASK_OUTPUT_TOOL_NAME } from "../constants/tools.js";
+import { ToolContext, ToolPlugin, ToolResult } from "./types.js";
+import { stripAnsiColors } from "../utils/stringUtils.js";
+
+const MAX_OUTPUT_LENGTH = 30000;
+
+export const taskOutputTool: ToolPlugin = {
+  name: TASK_OUTPUT_TOOL_NAME,
+  config: {
+    type: "function",
+    function: {
+      name: TASK_OUTPUT_TOOL_NAME,
+      description:
+        "Retrieves output from a running or completed background task",
+      parameters: {
+        type: "object",
+        properties: {
+          task_id: {
+            type: "string",
+            description:
+              "The ID of the background task to retrieve output from",
+          },
+          filter: {
+            type: "string",
+            description:
+              "Optional regular expression to filter the output lines.",
+          },
+          block: {
+            type: "boolean",
+            description:
+              "If true, wait for the task to complete before returning output. If false, return current output immediately.",
+          },
+        },
+        required: ["task_id"],
+      },
+    },
+  },
+  execute: async (
+    args: Record<string, unknown>,
+    context: ToolContext,
+  ): Promise<ToolResult> => {
+    const taskId = args.task_id as string;
+    const filter = args.filter as string | undefined;
+    const block = args.block as boolean | undefined;
+
+    if (!taskId || typeof taskId !== "string") {
+      return {
+        success: false,
+        content: "",
+        error: "task_id parameter is required and must be a string",
+      };
+    }
+
+    const backgroundTaskManager = context?.backgroundTaskManager;
+    if (!backgroundTaskManager) {
+      return {
+        success: false,
+        content: "",
+        error: "Background task manager not available",
+      };
+    }
+
+    const getResult = () => {
+      const output = backgroundTaskManager.getOutput(taskId, filter);
+      if (!output) return null;
+
+      let content = "";
+      if (output.stdout) {
+        content += stripAnsiColors(output.stdout);
+      }
+      if (output.stderr) {
+        content += (content ? "\n" : "") + stripAnsiColors(output.stderr);
+      }
+
+      const finalContent = content || "No output available";
+      const processedContent =
+        finalContent.length > MAX_OUTPUT_LENGTH
+          ? finalContent.substring(0, MAX_OUTPUT_LENGTH) +
+            "\n\n... (output truncated)"
+          : finalContent;
+
+      return {
+        success: true,
+        content: processedContent,
+        shortResult: `${taskId}: ${output.status}`,
+      };
+    };
+
+    if (block) {
+      // Polling for completion
+      return new Promise((resolve) => {
+        let timeoutHandle: NodeJS.Timeout | null = null;
+        let isAborted = false;
+
+        const cleanup = () => {
+          if (timeoutHandle) {
+            clearTimeout(timeoutHandle);
+            timeoutHandle = null;
+          }
+        };
+
+        const onAbort = () => {
+          isAborted = true;
+          cleanup();
+          resolve({
+            success: false,
+            content: "",
+            error: "Task output retrieval was aborted",
+          });
+        };
+
+        if (context.abortSignal) {
+          if (context.abortSignal.aborted) {
+            onAbort();
+            return;
+          }
+          context.abortSignal.addEventListener("abort", onAbort, {
+            once: true,
+          });
+        }
+
+        const check = () => {
+          if (isAborted) return;
+
+          const task = backgroundTaskManager.getTask(taskId);
+          if (!task) {
+            if (context.abortSignal) {
+              context.abortSignal.removeEventListener("abort", onAbort);
+            }
+            resolve({
+              success: false,
+              content: "",
+              error: `Task with ID ${taskId} not found`,
+            });
+            return;
+          }
+
+          if (task.status !== "running") {
+            if (context.abortSignal) {
+              context.abortSignal.removeEventListener("abort", onAbort);
+            }
+            const result = getResult();
+            resolve(
+              result || {
+                success: false,
+                content: "",
+                error: "Task not found",
+              },
+            );
+          } else {
+            timeoutHandle = setTimeout(check, 500);
+          }
+        };
+        check();
+      });
+    }
+
+    const result = getResult();
+    if (!result) {
+      return {
+        success: false,
+        content: "",
+        error: `Task with ID ${taskId} not found`,
+      };
+    }
+
+    return result;
+  },
+  formatCompactParams: (params: Record<string, unknown>) => {
+    const taskId = params.task_id as string;
+    const block = params.block as boolean;
+    return `${taskId}${block ? " (blocking)" : ""}`;
+  },
+};