wave-agent-sdk 0.5.0 → 0.6.1

package/src/managers/subagentManager.ts

@@ -51,6 +51,11 @@ export interface SubagentManagerCallbacks {
   ) => void;
   /** Triggered when subagent messages change */
   onSubagentMessagesChange?: (subagentId: string, messages: Message[]) => void;
+  /** Triggered when subagent latest total tokens change */
+  onSubagentLatestTotalTokensChange?: (
+    subagentId: string,
+    tokens: number,
+  ) => void;
 }
 
 export interface SubagentInstance {
@@ -69,6 +74,7 @@ export interface SubagentManagerOptions {
   workdir: string;
   parentToolManager: ToolManager;
   parentMessageManager: MessageManager;
+  taskManager: import("../services/taskManager.js").TaskManager;
   callbacks?: SubagentManagerCallbacks; // Use SubagentManagerCallbacks instead of parentCallbacks
   logger?: Logger;
   getGatewayConfig: () => GatewayConfig;
@@ -88,6 +94,7 @@ export class SubagentManager {
   private workdir: string;
   private parentToolManager: ToolManager;
   private parentMessageManager: MessageManager;
+  private taskManager: import("../services/taskManager.js").TaskManager;
   private callbacks?: SubagentManagerCallbacks; // Use SubagentManagerCallbacks instead of parentCallbacks
   private logger?: Logger;
   private getGatewayConfig: () => GatewayConfig;
@@ -103,6 +110,7 @@ export class SubagentManager {
     this.workdir = options.workdir;
     this.parentToolManager = options.parentToolManager;
     this.parentMessageManager = options.parentMessageManager;
+    this.taskManager = options.taskManager;
     this.callbacks = options.callbacks; // Store SubagentManagerCallbacks
     this.logger = options.logger;
     this.getGatewayConfig = options.getGatewayConfig;
@@ -196,6 +204,7 @@ export class SubagentManager {
     const aiManager = new AIManager({
       messageManager,
       toolManager,
+      taskManager: this.taskManager,
       logger: this.logger,
       workdir: this.workdir,
       systemPrompt: configuration.systemPrompt,
@@ -294,6 +303,7 @@ export class SubagentManager {
           description: instance.configuration.description,
           stdout: "",
           stderr: "",
+          onStop: () => instance.aiManager.abortAIMessage(),
         });
 
         instance.backgroundTaskId = taskId;
@@ -359,6 +369,7 @@ export class SubagentManager {
       description: instance.configuration.description,
       stdout: "",
       stderr: "",
+      onStop: () => instance.aiManager.abortAIMessage(),
     });
 
     instance.backgroundTaskId = taskId;
@@ -378,24 +389,19 @@ export class SubagentManager {
   ): Promise<string> {
     // Set up consolidated abort handler to prevent listener accumulation
     let abortCleanup: (() => void) | undefined;
-    if (abortSignal) {
+    // Only link to parent abort signal if NOT running in background
+    if (abortSignal && !instance.backgroundTaskId) {
       abortCleanup = addConsolidatedAbortListener(abortSignal, [
         () => {
           // Update status to aborted
-          // Only update status if it's NOT a background task
-          if (!instance.backgroundTaskId) {
-            this.updateInstanceStatus(instance.subagentId, "aborted");
-            this.parentMessageManager.updateSubagentBlock(instance.subagentId, {
-              status: "aborted",
-            });
-          }
+          this.updateInstanceStatus(instance.subagentId, "aborted");
+          this.parentMessageManager.updateSubagentBlock(instance.subagentId, {
+            status: "aborted",
+          });
         },
         () => {
           // Abort the AI execution
-          // Only abort if it's NOT a background task
-          if (!instance.backgroundTaskId) {
-            instance.aiManager.abortAIMessage();
-          }
+          instance.aiManager.abortAIMessage();
         },
       ]);
     }
@@ -441,8 +447,6 @@ export class SubagentManager {
       });
 
       // If we have an abort signal, race against it using utilities to prevent listener accumulation
-      // BUT: If this is a background task, we DON'T want to race against the abort signal
-      // because the abort signal (Esc) should only stop the tool watching the task, not the task itself.
       if (abortSignal && !instance.backgroundTaskId) {
         await Promise.race([
           executeAI,
@@ -623,6 +627,7 @@ export class SubagentManager {
         const aiManager = new AIManager({
           messageManager,
           toolManager,
+          taskManager: this.taskManager,
           logger: this.logger,
           workdir: this.workdir,
           systemPrompt: configuration.systemPrompt,
@@ -734,6 +739,20 @@ export class SubagentManager {
           sessionId: newSessionId,
         });
       },
+
+      onLatestTotalTokensChange: (tokens: number) => {
+        // Forward latest total tokens to parent via SubagentManager callbacks
+        if (this.callbacks?.onSubagentLatestTotalTokensChange) {
+          this.callbacks.onSubagentLatestTotalTokensChange(subagentId, tokens);
+        }
+      },
+
+      onFileHistoryBlockAdded: (
+        snapshots: import("../types/reversion.js").FileSnapshot[],
+      ) => {
+        // Forward file history blocks to parent MessageManager
+        this.parentMessageManager.addFileHistoryBlock(snapshots);
+      },
     };
   }
 }

package/src/managers/toolManager.ts

@@ -13,10 +13,15 @@ import { globTool } from "../tools/globTool.js";
 import { grepTool } from "../tools/grepTool.js";
 import { lsTool } from "../tools/lsTool.js";
 import { readTool } from "../tools/readTool.js";
-import { todoWriteTool } from "../tools/todoWriteTool.js";
 import { lspTool } from "../tools/lspTool.js";
 import { createTaskTool } from "../tools/taskTool.js";
 import { createSkillTool } from "../tools/skillTool.js";
+import {
+  taskCreateTool,
+  taskGetTool,
+  taskUpdateTool,
+  taskListTool,
+} from "../tools/taskManagementTools.js";
 import { McpManager } from "./mcpManager.js";
 import { PermissionManager } from "./permissionManager.js";
 import { ChatCompletionFunctionTool } from "openai/resources.js";
@@ -39,6 +44,8 @@ export interface ToolManagerOptions {
   permissionManager?: PermissionManager;
   /** Foreground task manager for backgrounding tasks */
   foregroundTaskManager?: import("../types/processes.js").IForegroundTaskManager;
+  /** Task manager for task management */
+  taskManager?: import("../services/taskManager.js").TaskManager;
   /** Reversion manager for file snapshots */
   reversionManager?: ReversionManager;
   /** Background task manager for background execution */
@@ -63,6 +70,7 @@ class ToolManager {
   private permissionManager?: PermissionManager;
   private foregroundTaskManager?: import("../types/processes.js").IForegroundTaskManager;
   private reversionManager?: ReversionManager;
+  private taskManager?: import("../services/taskManager.js").TaskManager;
   private backgroundTaskManager?: import("./backgroundTaskManager.js").BackgroundTaskManager;
   private permissionMode?: PermissionMode;
   private canUseToolCallback?: PermissionCallback;
@@ -72,6 +80,7 @@ class ToolManager {
     this.lspManager = options.lspManager;
     this.logger = options.logger;
     this.permissionManager = options.permissionManager;
+    this.taskManager = options.taskManager;
     this.foregroundTaskManager = options.foregroundTaskManager;
     this.reversionManager = options.reversionManager;
     this.backgroundTaskManager = options.backgroundTaskManager;
@@ -128,8 +137,11 @@ class ToolManager {
       grepTool,
       lsTool,
       readTool,
-      todoWriteTool,
       lspTool,
+      taskCreateTool,
+      taskGetTool,
+      taskUpdateTool,
+      taskListTool,
     ];
 
     for (const tool of builtInTools) {
@@ -177,11 +189,13 @@ class ToolManager {
       permissionMode: effectivePermissionMode,
       canUseToolCallback: this.canUseToolCallback,
       permissionManager: this.permissionManager,
+      taskManager: this.taskManager!,
       reversionManager: this.reversionManager,
       backgroundTaskManager: this.backgroundTaskManager,
       foregroundTaskManager: this.foregroundTaskManager,
       mcpManager: this.mcpManager,
       lspManager: this.lspManager,
+      sessionId: context.sessionId,
     };
 
     this.logger?.debug("Executing tool with enhanced context", {
@@ -252,6 +266,13 @@ class ToolManager {
     return [...builtInToolsConfig, ...mcpToolsConfig];
   }
 
+  /**
+   * Get the list of registered tool plugins
+   */
+  public getTools(): ToolPlugin[] {
+    return Array.from(this.tools.values());
+  }
+
   /**
    * Get the current permission mode
    */
@@ -278,6 +299,15 @@ class ToolManager {
   public getPermissionManager(): PermissionManager | undefined {
     return this.permissionManager;
   }
+
+  /**
+   * Get the task manager
+   */
+  public getTaskManager():
+    | import("../services/taskManager.js").TaskManager
+    | undefined {
+    return this.taskManager;
+  }
 }
 
 // Export tool registry class and types

package/src/services/aiService.ts

@@ -21,10 +21,7 @@ import * as os from "os";
 import * as fs from "fs";
 import * as path from "path";
 
-import {
-  DEFAULT_SYSTEM_PROMPT,
-  buildSystemPrompt,
-} from "../constants/prompts.js";
+import { COMPRESS_MESSAGES_SYSTEM_PROMPT } from "../constants/prompts.js";
 
 /**
  * Interface for debug data saved during 400 errors
@@ -66,28 +63,6 @@ interface ErrorData {
  * Instead of parsing JSON, we use the raw chunk for efficient streaming
  */
 
-/**
- * Check if a directory is a git repository
- * @param dirPath Directory path to check
- * @returns "Yes" if it's a git repo, "No" otherwise
- */
-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 (fs.existsSync(gitPath)) {
-        return "Yes";
-      }
-      currentPath = path.dirname(currentPath);
-    }
-    return "No";
-  } catch {
-    return "No";
-  }
-}
-
 /**
  * OpenAI model configuration type, based on OpenAI parameters but excluding messages
  */
@@ -144,7 +119,6 @@ export interface CallAgentOptions {
   messages: ChatCompletionMessageParam[];
   sessionId?: string;
   abortSignal?: AbortSignal;
-  memory?: string; // Memory content parameter, content read from AGENTS.md
   workdir: string; // Current working directory
   tools?: ChatCompletionFunctionTool[]; // Tool configuration
   model?: string; // Custom model
@@ -187,7 +161,6 @@ export async function callAgent(
     modelConfig,
     messages,
     abortSignal,
-    memory,
     workdir,
     tools,
     model,
@@ -216,28 +189,7 @@ export async function callAgent(
     });
 
     // Build system prompt content
-    let systemContent = buildSystemPrompt(
-      systemPrompt || DEFAULT_SYSTEM_PROMPT,
-      tools || [],
-    );
-
-    // Always add environment information
-    systemContent += `
-
-Here is useful information about the environment you are running in:
-<env>
-Working directory: ${workdir}
-Is directory a git repo: ${isGitRepository(workdir)}
-Platform: ${os.platform()}
-OS Version: ${os.type()} ${os.release()}
-Today's date: ${new Date().toISOString().split("T")[0]}
-</env>
-`;
-
-    // If there is memory content, add it to the system prompt
-    if (memory && memory.trim()) {
-      systemContent += `\n## Memory Context\n\nThe following is important context and memory from previous interactions:\n\n${memory}`;
-    }
+    const systemContent = systemPrompt || "";
 
     // Add system prompt
     const systemMessage: ChatCompletionMessageParam = {
@@ -792,101 +744,7 @@ export async function compressMessages(
         messages: [
           {
             role: "system",
-            content: `Your task is to create a detailed summary of the conversation so far, paying close attention to the user's explicit requests and your previous actions.
-This summary should be thorough in capturing technical details, code patterns, and architectural decisions that would be essential for continuing development work without losing context.
-
-Before providing your final summary, wrap your analysis in <analysis> tags to organize your thoughts and ensure you've covered all necessary points. In your analysis process:
-
-1. Chronologically analyze each message and section of the conversation. For each section thoroughly identify:
-   - The user's explicit requests and intents
-   - Your approach to addressing the user's requests
-   - Key decisions, technical concepts and code patterns
-   - Specific details like:
-     - file names
-     - full code snippets
-     - function signatures
-     - file edits
-  - Errors that you ran into and how you fixed them
-  - Pay special attention to specific user feedback that you received, especially if the user told you to do something differently.
-2. Double-check for technical accuracy and completeness, addressing each required element thoroughly.
-
-Your summary should include the following sections:
-
-1. Primary Request and Intent: Capture all of the user's explicit requests and intents in detail
-2. Key Technical Concepts: List all important technical concepts, technologies, and frameworks discussed.
-3. Files and Code Sections: Enumerate specific files and code sections examined, modified, or created. Pay special attention to the most recent messages and include full code snippets where applicable and include a summary of why this file read or edit is important.
-4. Errors and fixes: List all errors that you ran into, and how you fixed them. Pay special attention to specific user feedback that you received, especially if the user told you to do something differently.
-5. Problem Solving: Document problems solved and any ongoing troubleshooting efforts.
-6. All user messages: List ALL user messages that are not tool results. These are critical for understanding the users' feedback and changing intent.
-6. Pending Tasks: Outline any pending tasks that you have explicitly been asked to work on.
-7. Current Work: Describe in detail precisely what was being worked on immediately before this summary request, paying special attention to the most recent messages from both user and assistant. Include file names and code snippets where applicable.
-8. Optional Next Step: List the next step that you will take that is related to the most recent work you were doing. IMPORTANT: ensure that this step is DIRECTLY in line with the user's most recent explicit requests, and the task you were working on immediately before this summary request. If your last task was concluded, then only list next steps if they are explicitly in line with the users request. Do not start on tangential requests or really old requests that were already completed without confirming with the user first.
-                       If there is a next step, include direct quotes from the most recent conversation showing exactly what task you were working on and where you left off. This should be verbatim to ensure there's no drift in task interpretation.
-
-Here's an example of how your output should be structured:
-
-<example>
-<analysis>
-[Your thought process, ensuring all points are covered thoroughly and accurately]
-</analysis>
-
-<summary>
-1. Primary Request and Intent:
-   [Detailed description]
-
-2. Key Technical Concepts:
-   - [Concept 1]
-   - [Concept 2]
-   - [...]
-
-3. Files and Code Sections:
-   - [File Name 1]
-      - [Summary of why this file is important]
-      - [Summary of the changes made to this file, if any]
-      - [Important Code Snippet]
-   - [File Name 2]
-      - [Important Code Snippet]
-   - [...]
-
-4. Errors and fixes:
-    - [Detailed description of error 1]:
-      - [How you fixed the error]
-      - [User feedback on the error if any]
-    - [...]
-
-5. Problem Solving:
-   [Description of solved problems and ongoing troubleshooting]
-
-6. All user messages: 
-    - [Detailed non tool use user message]
-    - [...]
-
-7. Pending Tasks:
-   - [Task 1]
-   - [Task 2]
-   - [...]
-
-8. Current Work:
-   [Precise description of current work]
-
-9. Optional Next Step:
-   [Optional Next step to take]
-
-</summary>
-</example>
-
-Please provide your summary based on the conversation so far, following this structure and ensuring precision and thoroughness in your response. 
-
-There may be additional summarization instructions provided in the included context. If so, remember to follow these instructions when creating the above summary. Examples of instructions include:
-<example>
-## Compact Instructions
-When summarizing the conversation focus on typescript code changes and also remember the mistakes you made and how you fixed them.
-</example>
-
-<example>
-# Summary instructions
-When you are using compact - please focus on test output and code changes. Include file reads verbatim.
-</example>`,
+            content: COMPRESS_MESSAGES_SYSTEM_PROMPT,
           },
           ...messages,
           {

package/src/services/memory.ts

@@ -4,54 +4,6 @@ import { USER_MEMORY_FILE, DATA_DIRECTORY } from "../utils/constants.js";
 import { logger } from "../utils/globalLogger.js";
 
 // Project memory related methods
-export const isMemoryMessage = (message: string): boolean => {
-  return message.trim().startsWith("#");
-};
-
-export const addMemory = async (
-  message: string,
-  workdir: string,
-): Promise<void> => {
-  if (!isMemoryMessage(message)) {
-    return;
-  }
-
-  try {
-    const memoryFilePath = path.join(workdir, "AGENTS.md");
-
-    // Format memory entry, starting with -, no timestamp
-    const memoryEntry = `- ${message.substring(1).trim()}\n`;
-
-    // Check if file exists
-    let existingContent = "";
-    try {
-      existingContent = await fs.readFile(memoryFilePath, "utf-8");
-    } catch (error) {
-      // File does not exist, create new file
-      if ((error as NodeJS.ErrnoException).code === "ENOENT") {
-        logger.info("Memory file does not exist, will create new one", {
-          memoryFilePath,
-        });
-        existingContent =
-          "# Memory\n\nThis is the AI assistant's memory file, recording important information and context.\n\n";
-      } else {
-        throw error;
-      }
-    }
-
-    // Append new memory entry to the end of the file
-    const updatedContent = existingContent + memoryEntry;
-
-    // Write file
-    await fs.writeFile(memoryFilePath, updatedContent, "utf-8");
-
-    logger.debug(`Memory added to ${memoryFilePath}:`, message);
-  } catch (error) {
-    logger.error("Failed to add memory:", error);
-    throw new Error(`Failed to add memory: ${(error as Error).message}`);
-  }
-};
-
 // User memory related methods
 export const ensureUserMemoryFile = async (): Promise<void> => {
   try {
@@ -83,30 +35,6 @@ export const ensureUserMemoryFile = async (): Promise<void> => {
   }
 };
 
-export const addUserMemory = async (message: string): Promise<void> => {
-  try {
-    // Ensure user memory file exists
-    await ensureUserMemoryFile();
-
-    // Format memory entry, starting with -
-    const memoryEntry = `- ${message.substring(1).trim()}\n`;
-
-    // Read existing content
-    const existingContent = await fs.readFile(USER_MEMORY_FILE, "utf-8");
-
-    // Append new memory entry to the end of the file
-    const updatedContent = existingContent + memoryEntry;
-
-    // Write file
-    await fs.writeFile(USER_MEMORY_FILE, updatedContent, "utf-8");
-
-    logger.debug(`User memory added to ${USER_MEMORY_FILE}:`, message);
-  } catch (error) {
-    logger.error("Failed to add user memory:", error);
-    throw new Error(`Failed to add user memory: ${(error as Error).message}`);
-  }
-};
-
 export const getUserMemoryContent = async (): Promise<string> => {
   try {
     await ensureUserMemoryFile();

package/src/services/session.ts

@@ -28,6 +28,8 @@ import { logger } from "../utils/globalLogger.js";
 
 export interface SessionData {
   id: string;
+  rootSessionId?: string;
+  parentSessionId?: string;
   messages: Message[];
   metadata: {
     workdir: string;
@@ -38,6 +40,8 @@ export interface SessionData {
 
 export interface SessionMetadata {
   id: string;
+  rootSessionId?: string;
+  parentSessionId?: string;
   sessionType: "main" | "subagent";
   subagentType?: string;
   workdir: string;
@@ -101,6 +105,7 @@ async function updateSessionIndex(
     ...rest,
     lastActiveAt: metadata.lastActiveAt.toISOString(),
     firstMessage: metadata.firstMessage || index.sessions[id]?.firstMessage,
+    parentSessionId: metadata.parentSessionId,
   };
   index.lastUpdated = new Date().toISOString();
 
@@ -191,6 +196,8 @@ export async function appendMessages(
   newMessages: Message[],
   workdir: string,
   sessionType: "main" | "subagent" = "main",
+  rootSessionId?: string,
+  parentSessionId?: string,
 ): Promise<void> {
   // Do not save session files in test environment
   if (process.env.NODE_ENV === "test") {
@@ -252,6 +259,8 @@ export async function appendMessages(
 
   await updateSessionIndex(projectDir.encodedPath, {
     id: sessionId,
+    rootSessionId,
+    parentSessionId,
     sessionType,
     workdir,
     lastActiveAt: new Date(lastMessage.timestamp),
@@ -294,8 +303,28 @@ export async function loadSessionFromJsonl(
     // Extract metadata from messages
     const lastMessage = messages[messages.length - 1];
 
+    // Try to get rootSessionId and parentSessionId from index
+    let rootSessionId: string | undefined;
+    let parentSessionId: string | undefined;
+    try {
+      const encoder = new PathEncoder();
+      const projectDir = await encoder.getProjectDirectory(
+        workdir,
+        SESSION_DIR,
+      );
+      const indexPath = join(projectDir.encodedPath, SESSION_INDEX_FILENAME);
+      const indexContent = await fs.readFile(indexPath, "utf8");
+      const index = JSON.parse(indexContent) as SessionIndex;
+      rootSessionId = index.sessions[sessionId]?.rootSessionId;
+      parentSessionId = index.sessions[sessionId]?.parentSessionId;
+    } catch {
+      // Ignore index errors
+    }
+
     const sessionData: SessionData = {
       id: sessionId,
+      rootSessionId: rootSessionId || sessionId,
+      parentSessionId,
       messages: messages.map((msg) => {
         // Remove timestamp property for backward compatibility
         const { timestamp: _ignored, ...messageWithoutTimestamp } = msg;
@@ -841,3 +870,47 @@ export async function handleSessionRestoration(
     process.exit(1);
   }
 }
+
+/**
+ * Load the full message thread by following parentSessionId links
+ * @param currentSessionId - The ID of the current session
+ * @param workdir - Working directory for the session
+ * @returns Promise that resolves to an array of all messages in the thread
+ */
+export async function loadFullMessageThread(
+  currentSessionId: string,
+  workdir: string,
+): Promise<{ messages: Message[]; sessionIds: string[] }> {
+  const sessionIds: string[] = [];
+  let currentId: string | undefined = currentSessionId;
+  const allMessages: Message[] = [];
+
+  while (currentId) {
+    const sessionData = await loadSessionFromJsonl(currentId, workdir);
+    if (!sessionData) break;
+
+    sessionIds.unshift(currentId);
+    // Add messages from this session to the beginning of the list
+    // But skip the "compress" block if it's not the first session in our traversal (which is the latest)
+    // Actually, we should probably keep all messages and let the UI/logic handle it.
+    // But wait, if we are concatenating, the "compress" block in session N summarizes session N-1.
+    // So if we have session N-1 and session N, we should probably skip the compress block in session N.
+
+    const messages = sessionData.messages;
+    if (allMessages.length > 0) {
+      // If we already have messages (from "later" sessions),
+      // we are now adding messages from an "earlier" session.
+      // The later session's first message might be a "compress" block.
+      if (allMessages[0].blocks.some((b) => b.type === "compress")) {
+        // Remove the compress block from the later session's messages
+        // because we are now providing the actual messages it summarized.
+        allMessages.shift();
+      }
+    }
+
+    allMessages.unshift(...messages);
+    currentId = sessionData.parentSessionId;
+  }
+
+  return { messages: allMessages, sessionIds };
+}