wave-agent-sdk 0.6.1 → 0.6.3

package/src/tools/taskManagementTools.ts

@@ -114,6 +114,15 @@ NOTE that you should not use this tool if there is only one trivial task to do.
 
     const taskId = await taskManager.createTask(task);
 
+    if (context.reversionManager && context.messageId) {
+      const taskPath = taskManager.getTaskPath(taskId);
+      await context.reversionManager.recordSnapshot(
+        context.messageId,
+        taskPath,
+        "create",
+      );
+    }
+
     return {
       success: true,
       content: `Task created with ID: ${taskId}`,
@@ -324,6 +333,15 @@ Set up task dependencies:
       };
     }
 
+    if (context.reversionManager && context.messageId) {
+      const taskPath = taskManager.getTaskPath(taskId);
+      await context.reversionManager.recordSnapshot(
+        context.messageId,
+        taskPath,
+        "modify",
+      );
+    }
+
     const updatedFields: string[] = [];
 
     const updatedTask: Task = {

package/src/tools/taskTool.ts

@@ -1,5 +1,6 @@
 import type { ToolPlugin, ToolResult, ToolContext } from "./types.js";
 import type { SubagentManager } from "../managers/subagentManager.js";
+import { EXPLORE_SUBAGENT_TYPE } from "../constants/subagents.js";
 import { TASK_TOOL_NAME } from "../constants/tools.js";
 
 /**
@@ -61,7 +62,7 @@ export function createTaskTool(subagentManager: SubagentManager): ToolPlugin {
     prompt: () => `
 - When doing file search, prefer to use the ${TASK_TOOL_NAME} tool in order to reduce context usage.
 - You should proactively use the ${TASK_TOOL_NAME} tool with specialized agents when the task at hand matches the agent's description.
-- VERY IMPORTANT: When exploring the codebase to gather context or to answer a question that is not a needle query for a specific file/class/function, it is CRITICAL that you use the ${TASK_TOOL_NAME} tool with subagent_type=Explore instead of running search commands directly.`,
+- VERY IMPORTANT: When exploring the codebase to gather context or to answer a question that is not a needle query for a specific file/class/function, it is CRITICAL that you use the ${TASK_TOOL_NAME} tool with subagent_type=${EXPLORE_SUBAGENT_TYPE} instead of running search commands directly.`,
 
     execute: async (
       args: Record<string, unknown>,
@@ -120,6 +121,36 @@ export function createTaskTool(subagentManager: SubagentManager): ToolPlugin {
               });
             }
 
+            // Set up callback to update shortResult with tool names, tool count and tokens
+            const updateShortResult = () => {
+              const messages = instance.messageManager.getMessages();
+              const tokens = instance.messageManager.getlatestTotalTokens();
+              const lastTools = instance.lastTools;
+
+              // Count tool blocks in messages
+              let toolCount = 0;
+              messages.forEach((msg) => {
+                msg.blocks.forEach((block) => {
+                  if (block.type === "tool") {
+                    toolCount++;
+                  }
+                });
+              });
+
+              let shortResult = "";
+              if (lastTools.length > 0) {
+                shortResult += `${lastTools.join(", ")} `;
+              }
+
+              shortResult += `(${toolCount} tools`;
+              if (tokens > 0) {
+                shortResult += ` | ${tokens.toLocaleString()} tokens`;
+              }
+              shortResult += ")";
+
+              context.onShortResultUpdate?.(shortResult);
+            };
+
             // Create subagent instance and execute task
             const instance = await subagentManager.createInstance(
               configuration,
@@ -129,8 +160,12 @@ export function createTaskTool(subagentManager: SubagentManager): ToolPlugin {
                 subagent_type,
               },
               run_in_background,
+              updateShortResult,
             );
 
+            // Initial update
+            updateShortResult();
+
             let isBackgrounded = false;
 
             // Register for backgrounding if not already in background
@@ -171,6 +206,9 @@ export function createTaskTool(subagentManager: SubagentManager): ToolPlugin {
                 });
               }
 
+              // Cleanup subagent instance after task completion
+              subagentManager.cleanupInstance(instance.subagentId);
+
               return resolve({
                 success: true,
                 content: result,

package/src/tools/types.ts

@@ -67,4 +67,6 @@ export interface ToolContext {
   taskManager: import("../services/taskManager.js").TaskManager;
   /** Current session ID */
   sessionId?: string;
+  /** Callback to update the short result of the current tool block */
+  onShortResultUpdate?: (shortResult: string) => void;
 }

package/src/types/messaging.ts

@@ -4,7 +4,6 @@
  */
 
 import type { Usage } from "./core.js";
-import type { SubagentConfiguration } from "../utils/subagentParser.js";
 
 export enum MessageSource {
   USER = "user",
@@ -26,7 +25,6 @@ export type MessageBlock =
   | ImageBlock
   | CommandOutputBlock
   | CompressBlock
-  | SubagentBlock
   | ReasoningBlock
   | FileHistoryBlock;
 
@@ -88,16 +86,6 @@ export interface CompressBlock {
   sessionId: string;
 }
 
-export interface SubagentBlock {
-  type: "subagent";
-  subagentId: string;
-  subagentName: string;
-  status: "active" | "completed" | "error" | "aborted";
-  sessionId: string;
-  configuration: SubagentConfiguration;
-  runInBackground?: boolean;
-}
-
 export interface ReasoningBlock {
   type: "reasoning";
   content: string;

package/src/types/processes.ts

@@ -29,6 +29,11 @@ export interface BackgroundTaskBase {
    * This allows tasks to define their own cleanup/abortion logic.
    */
   onStop?: () => void | Promise<void>;
+  /**
+   * Optional subagent ID associated with this task.
+   * Used for cleanup when the task is stopped.
+   */
+  subagentId?: string;
 }
 
 export interface BackgroundShell extends BackgroundTaskBase {

package/src/utils/builtinSubagents.ts

@@ -1,9 +1,23 @@
+import {
+  BASH_SUBAGENT_TYPE,
+  EXPLORE_SUBAGENT_TYPE,
+  PLAN_SUBAGENT_TYPE,
+  GENERAL_PURPOSE_SUBAGENT_TYPE,
+} from "../constants/subagents.js";
 import {
   BASH_SUBAGENT_SYSTEM_PROMPT,
   GENERAL_PURPOSE_SYSTEM_PROMPT,
   PLAN_SUBAGENT_SYSTEM_PROMPT,
-} from "../constants/prompts.js";
-import { BASH_TOOL_NAME } from "../constants/tools.js";
+  EXPLORE_SUBAGENT_SYSTEM_PROMPT,
+} from "../prompts/index.js";
+import {
+  BASH_TOOL_NAME,
+  GLOB_TOOL_NAME,
+  GREP_TOOL_NAME,
+  READ_TOOL_NAME,
+  LS_TOOL_NAME,
+  LSP_TOOL_NAME,
+} from "../constants/tools.js";
 import type { SubagentConfiguration } from "./subagentParser.js";
 
 /**
@@ -26,13 +40,13 @@ export function getBuiltinSubagents(): SubagentConfiguration[] {
  */
 function createBashSubagent(): SubagentConfiguration {
   return {
-    name: "Bash",
+    name: BASH_SUBAGENT_TYPE,
     description:
       "Command execution specialist for running bash commands. Use this for git operations, command execution, and other terminal tasks.",
     systemPrompt: BASH_SUBAGENT_SYSTEM_PROMPT,
     tools: [BASH_TOOL_NAME],
     model: "inherit",
-    filePath: "<builtin:Bash>",
+    filePath: `<builtin:${BASH_SUBAGENT_TYPE}>`,
     scope: "builtin",
     priority: 3,
   };
@@ -44,11 +58,11 @@ function createBashSubagent(): SubagentConfiguration {
  */
 function createGeneralPurposeSubagent(): SubagentConfiguration {
   return {
-    name: "general-purpose",
+    name: GENERAL_PURPOSE_SUBAGENT_TYPE,
     description:
       "General-purpose agent for researching complex questions, searching for code, and executing multi-step tasks. When you are searching for a keyword or file and are not confident that you will find the right match in the first few tries use this agent to perform the search for you.",
     systemPrompt: GENERAL_PURPOSE_SYSTEM_PROMPT,
-    filePath: "<builtin:general-purpose>",
+    filePath: `<builtin:${GENERAL_PURPOSE_SUBAGENT_TYPE}>`,
     scope: "builtin",
     priority: 3,
   };
@@ -59,55 +73,24 @@ function createGeneralPurposeSubagent(): SubagentConfiguration {
  * Specialized for codebase exploration and file search tasks
  */
 function createExploreSubagent(): SubagentConfiguration {
-  const systemPrompt = `You are a file search specialist. You excel at thoroughly navigating and exploring codebases.
-
-=== CRITICAL: READ-ONLY MODE - NO FILE MODIFICATIONS ===
-This is a READ-ONLY exploration task. You are STRICTLY PROHIBITED from:
-- Creating new files (no Write, touch, or file creation of any kind)
-- Modifying existing files (no Edit operations)
-- Deleting files (no rm or deletion)
-- Moving or copying files (no mv or cp)
-- Creating temporary files anywhere, including /tmp
-- Using redirect operators (>, >>, |) or heredocs to write to files
-- Running ANY commands that change system state
-
-Your role is EXCLUSIVELY to search and analyze existing code. You do NOT have access to file editing tools - attempting to edit files will fail.
-
-Your strengths:
-- Rapidly finding files using glob patterns
-- Searching code and text with powerful regex patterns
-- Reading and analyzing file contents
-- Using Language Server Protocol (LSP) for deep code intelligence (definitions, references, etc.)
-
-Guidelines:
-- Use Glob for broad file pattern matching
-- Use Grep for searching file contents with regex
-- Use Read when you know the specific file path you need to read
-- Use LSP for code intelligence features like finding definitions, references, implementations, and symbols. This is especially useful for understanding complex code relationships.
-- Use Bash ONLY for read-only operations (ls, git status, git log, git diff, find, cat, head, tail)
-- NEVER use Bash for: mkdir, touch, rm, cp, mv, git add, git commit, npm install, pip install, or any file creation/modification
-- Adapt your search approach based on the thoroughness level specified by the caller
-- Return file paths as absolute paths in your final response
-- For clear communication, avoid using emojis
-- Communicate your final report directly as a regular message - do NOT attempt to create files
-
-NOTE: You are meant to be a fast agent that returns output as quickly as possible. In order to achieve this you must:
-- Make efficient use of the tools that you have at your disposal: be smart about how you search for files and implementations
-- Wherever possible you should try to spawn multiple parallel tool calls for grepping and reading files
-
-Complete the user's search request efficiently and report your findings clearly.`;
-
   // Define allowed tools for read-only operations
-  const allowedTools = ["Glob", "Grep", "Read", "Bash", "LS", "LSP"];
+  const allowedTools = [
+    GLOB_TOOL_NAME,
+    GREP_TOOL_NAME,
+    READ_TOOL_NAME,
+    BASH_TOOL_NAME,
+    LS_TOOL_NAME,
+    LSP_TOOL_NAME,
+  ];
 
   return {
-    name: "Explore",
+    name: EXPLORE_SUBAGENT_TYPE,
     description:
       'Fast agent specialized for exploring codebases. Use this when you need to quickly find files by patterns (eg. "src/components/**/*.tsx"), search code for keywords (eg. "API endpoints"), or answer questions about the codebase (eg. "how do API endpoints work?"). When calling this agent, specify the desired thoroughness level: "quick" for basic searches, "medium" for moderate exploration, or "very thorough" for comprehensive analysis across multiple locations and naming conventions.',
-    systemPrompt,
+    systemPrompt: EXPLORE_SUBAGENT_SYSTEM_PROMPT,
     tools: allowedTools,
     model: "fastModel", // Special value that will use parent's fastModel
-    filePath: "<builtin:Explore>",
+    filePath: `<builtin:${EXPLORE_SUBAGENT_TYPE}>`,
     scope: "builtin",
     priority: 3, // Lowest priority - can be overridden by user configs
   };
@@ -119,16 +102,23 @@ Complete the user's search request efficiently and report your findings clearly.
  */
 function createPlanSubagent(): SubagentConfiguration {
   // Define allowed tools for read-only operations
-  const allowedTools = ["Glob", "Grep", "Read", "Bash", "LS", "LSP"];
+  const allowedTools = [
+    GLOB_TOOL_NAME,
+    GREP_TOOL_NAME,
+    READ_TOOL_NAME,
+    BASH_TOOL_NAME,
+    LS_TOOL_NAME,
+    LSP_TOOL_NAME,
+  ];
 
   return {
-    name: "Plan",
+    name: PLAN_SUBAGENT_TYPE,
     description:
       "Software architect agent for designing implementation plans. Use this when you need to plan the implementation strategy for a task. Returns step-by-step plans, identifies critical files, and considers architectural trade-offs.",
     systemPrompt: PLAN_SUBAGENT_SYSTEM_PROMPT,
     tools: allowedTools,
     model: "inherit", // Uses parent agent's model
-    filePath: "<builtin:Plan>",
+    filePath: `<builtin:${PLAN_SUBAGENT_TYPE}>`,
     scope: "builtin",
     priority: 3, // Lowest priority - can be overridden by user configs
   };

package/src/utils/editUtils.ts

@@ -77,12 +77,8 @@ export function analyzeEditMismatch(
     if (actualLine === expectedLine) {
       reportLines.push(`${lineNum.toString().padStart(4)} | ${actualLine}`);
     } else {
-      reportLines.push(
-        `${lineNum.toString().padStart(4)} | - ${expectedLine} (expected)`,
-      );
-      reportLines.push(
-        `${lineNum.toString().padStart(4)} | + ${actualLine} (actual)`,
-      );
+      reportLines.push(`${lineNum.toString().padStart(4)} | - ${expectedLine}`);
+      reportLines.push(`${lineNum.toString().padStart(4)} | + ${actualLine}`);
     }
   }
 

package/src/utils/gitUtils.ts

@@ -0,0 +1,24 @@
+import * as path from "node:path";
+import * as fsSync from "node:fs";
+
+/**
+ * Check if a directory is a git repository
+ * @param dirPath Directory path
+ * @returns "Yes" if it's a git repository, "No" otherwise
+ */
+export function isGitRepository(dirPath: string): string {
+  try {
+    // Check if .git directory exists in current directory or any parent directory
+    let currentPath = path.resolve(dirPath);
+    while (currentPath !== path.dirname(currentPath)) {
+      const gitPath = path.join(currentPath, ".git");
+      if (fsSync.existsSync(gitPath)) {
+        return "Yes";
+      }
+      currentPath = path.dirname(currentPath);
+    }
+    return "No";
+  } catch {
+    return "No";
+  }
+}

package/src/utils/messageOperations.ts

@@ -1,6 +1,5 @@
 import type { Message, Usage } from "../types/index.js";
 import { MessageSource } from "../types/index.js";
-import type { SubagentConfiguration } from "./subagentParser.js";
 import { readFileSync } from "fs";
 import { extname } from "path";
 import { ChatCompletionMessageFunctionToolCall } from "openai/resources.js";
@@ -22,7 +21,7 @@ export interface AddUserMessageParams extends UserMessageParams {
 export interface UpdateToolBlockParams {
   messages: Message[];
   id: string;
-  parameters: string;
+  parameters?: string;
   result?: string;
   success?: boolean;
   error?: string;
@@ -365,97 +364,6 @@ export const completeCommandInMessage = ({
   return newMessages;
 };
 
-// Subagent block message operations
-export interface AddSubagentBlockParams {
-  messages: Message[];
-  subagentId: string;
-  subagentName: string;
-  status: "active" | "completed" | "error" | "aborted";
-  sessionId: string;
-  configuration: SubagentConfiguration;
-  runInBackground?: boolean;
-}
-
-export interface UpdateSubagentBlockParams {
-  messages: Message[];
-  subagentId: string;
-  status: "active" | "completed" | "error" | "aborted";
-  sessionId?: string;
-}
-
-export const addSubagentBlockToMessage = ({
-  messages,
-  subagentId,
-  subagentName,
-  status,
-  sessionId,
-  configuration,
-  runInBackground,
-}: AddSubagentBlockParams): Message[] => {
-  const newMessages = [...messages];
-
-  // Find the last assistant message or create one
-  let lastAssistantMessage = newMessages[newMessages.length - 1];
-
-  if (!lastAssistantMessage || lastAssistantMessage.role !== "assistant") {
-    // Create new assistant message if the last message is not from assistant
-    lastAssistantMessage = {
-      id: `msg-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`,
-      role: "assistant",
-      blocks: [],
-    };
-    newMessages.push(lastAssistantMessage);
-  }
-
-  // Add subagent block
-  lastAssistantMessage.blocks.push({
-    type: "subagent",
-    subagentId,
-    subagentName,
-    status,
-    sessionId,
-    configuration,
-    runInBackground,
-  });
-
-  return newMessages;
-};
-
-export const updateSubagentBlockInMessage = (
-  messages: Message[],
-  subagentId: string,
-  updates: Partial<{
-    status: "active" | "completed" | "error" | "aborted";
-    sessionId: string;
-    runInBackground: boolean;
-  }>,
-): Message[] => {
-  const newMessages = [...messages];
-
-  // Find and update the subagent block
-  for (let i = newMessages.length - 1; i >= 0; i--) {
-    const message = newMessages[i];
-    if (message.role === "assistant") {
-      for (const block of message.blocks) {
-        if (block.type === "subagent" && block.subagentId === subagentId) {
-          if (updates.status !== undefined) {
-            block.status = updates.status;
-          }
-          if (updates.sessionId !== undefined) {
-            block.sessionId = updates.sessionId;
-          }
-          if (updates.runInBackground !== undefined) {
-            block.runInBackground = updates.runInBackground;
-          }
-          return newMessages;
-        }
-      }
-    }
-  }
-
-  return newMessages;
-};
-
 /**
  * Removes the last user message from the messages array
  * Used for hook error handling when the user prompt needs to be erased

package/dist/constants/prompts.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../src/constants/prompts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAe/C,eAAO,MAAM,kBAAkB,ksFAe8G,CAAC;AAE9I,eAAO,MAAM,sBAAsB,moBAImH,CAAC;AAEvJ,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,OAAO,GAClB,MAAM,CAWR;AAED,eAAO,MAAM,qBAAqB,ksFAAqB,CAAC;AAExD,eAAO,MAAM,2BAA2B,igBAWO,CAAC;AAEhD,eAAO,MAAM,6BAA6B,izCAeK,CAAC;AAEhD,eAAO,MAAM,2BAA2B,25EAiDyG,CAAC;AAElJ,eAAO,MAAM,WAAW,kkDAoBjB,CAAC;AAER,eAAO,MAAM,+BAA+B,20CAsBG,CAAC;AAEhD,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,KAAK,EAAE,UAAU,EAAE,EACnB,OAAO,GAAE;IACP,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE;QACT,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,OAAO,CAAC;KACrB,CAAC;CACE,GACL,MAAM,CA8CR"}