wave-agent-sdk 0.6.1 → 0.6.3

package/src/managers/subagentManager.ts

@@ -8,20 +8,19 @@ import type {
   ModelConfig,
   Usage,
 } from "../types/index.js";
-import type { SessionData } from "../services/session.js";
 import { AIManager } from "./aiManager.js";
 import { MessageManager } from "./messageManager.js";
 import { ToolManager } from "./toolManager.js";
 import { HookManager } from "./hookManager.js";
-import {
-  UserMessageParams,
-  type AgentToolBlockUpdateParams,
-} from "../utils/messageOperations.js";
 import {
   addConsolidatedAbortListener,
   createAbortPromise,
 } from "../utils/abortUtils.js";
 import { BackgroundTaskManager } from "./backgroundTaskManager.js";
+import {
+  UserMessageParams,
+  type AgentToolBlockUpdateParams,
+} from "../utils/messageOperations.js";
 
 export interface SubagentManagerCallbacks {
   // Granular subagent message callbacks (015-subagent-message-callbacks)
@@ -66,14 +65,15 @@ export interface SubagentInstance {
   toolManager: ToolManager;
   status: "initializing" | "active" | "completed" | "error" | "aborted";
   messages: Message[];
+  lastTools: string[]; // Track last two tool names
   subagentType: string; // Store the subagent type for hook context
   backgroundTaskId?: string; // ID of the background task if transitioned
+  onUpdate?: () => void; // Optional callback for real-time updates
 }
 
 export interface SubagentManagerOptions {
   workdir: string;
   parentToolManager: ToolManager;
-  parentMessageManager: MessageManager;
   taskManager: import("../services/taskManager.js").TaskManager;
   callbacks?: SubagentManagerCallbacks; // Use SubagentManagerCallbacks instead of parentCallbacks
   logger?: Logger;
@@ -93,7 +93,6 @@ 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;
@@ -109,7 +108,6 @@ export class SubagentManager {
   constructor(options: SubagentManagerOptions) {
     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;
@@ -176,6 +174,7 @@ export class SubagentManager {
       subagent_type: string;
     },
     runInBackground?: boolean,
+    onUpdate?: () => void,
   ): Promise<SubagentInstance> {
     if (!this.parentToolManager) {
       throw new Error(
@@ -248,22 +247,13 @@ export class SubagentManager {
       toolManager,
       status: "initializing",
       messages: [],
+      lastTools: [], // Initialize lastTools
       subagentType: parameters.subagent_type, // Store the subagent type
+      onUpdate,
     };
 
     this.instances.set(subagentId, instance);
 
-    // Create subagent block in parent message manager
-    this.parentMessageManager.addSubagentBlock(
-      subagentId,
-      configuration.name,
-      messageManager.getSessionId(),
-      configuration,
-      "active",
-      parameters,
-      runInBackground,
-    );
-
     return instance;
   }
 
@@ -287,9 +277,6 @@ export class SubagentManager {
 
       // Set status to active and update parent
       this.updateInstanceStatus(instance.subagentId, "active");
-      this.parentMessageManager.updateSubagentBlock(instance.subagentId, {
-        status: "active",
-      });
 
       if (runInBackground && this.backgroundTaskManager) {
         const taskId = this.backgroundTaskManager.generateId();
@@ -303,7 +290,11 @@ export class SubagentManager {
           description: instance.configuration.description,
           stdout: "",
           stderr: "",
-          onStop: () => instance.aiManager.abortAIMessage(),
+          subagentId: instance.subagentId,
+          onStop: () => {
+            instance.aiManager.abortAIMessage();
+            this.cleanupInstance(instance.subagentId);
+          },
         });
 
         instance.backgroundTaskId = taskId;
@@ -341,9 +332,6 @@ export class SubagentManager {
       return await this.internalExecute(instance, prompt, abortSignal);
     } catch (error) {
       this.updateInstanceStatus(instance.subagentId, "error");
-      this.parentMessageManager.updateSubagentBlock(instance.subagentId, {
-        status: "error",
-      });
       throw error;
     }
   }
@@ -369,16 +357,15 @@ export class SubagentManager {
       description: instance.configuration.description,
       stdout: "",
       stderr: "",
-      onStop: () => instance.aiManager.abortAIMessage(),
+      subagentId: instance.subagentId,
+      onStop: () => {
+        instance.aiManager.abortAIMessage();
+        this.cleanupInstance(instance.subagentId);
+      },
     });
 
     instance.backgroundTaskId = taskId;
 
-    // Update parent message manager to reflect background status
-    this.parentMessageManager.updateSubagentBlock(subagentId, {
-      runInBackground: true,
-    });
-
     return taskId;
   }
 
@@ -395,9 +382,8 @@ export class SubagentManager {
         () => {
           // Update status to aborted
           this.updateInstanceStatus(instance.subagentId, "aborted");
-          this.parentMessageManager.updateSubagentBlock(instance.subagentId, {
-            status: "aborted",
-          });
+          // Cleanup instance immediately on abort
+          this.cleanupInstance(instance.subagentId);
         },
         () => {
           // Abort the AI execution
@@ -474,9 +460,6 @@ export class SubagentManager {
 
       // Update status to completed and update parent
       this.updateInstanceStatus(instance.subagentId, "completed");
-      this.parentMessageManager.updateSubagentBlock(instance.subagentId, {
-        status: "completed",
-      });
 
       // If this was transitioned to background, update the background task
       if (instance.backgroundTaskId && this.backgroundTaskManager) {
@@ -580,99 +563,6 @@ export class SubagentManager {
     this.instances.clear();
   }
 
-  /**
-   * Restore subagent instances from saved session data
-   * This method is called during agent initialization to restore previous subagent states
-   */
-  async restoreSubagentSessions(
-    subagentSessions: Array<{
-      sessionData: SessionData;
-      subagentId: string;
-      configuration: SubagentConfiguration;
-    }>,
-  ): Promise<void> {
-    for (const { sessionData, subagentId, configuration } of subagentSessions) {
-      try {
-        // Use the configuration from the SubagentBlock
-
-        // Create the subagent instance without executing - just restore the state
-
-        // Create MessageManager for the restored subagent
-        const subagentCallbacks = this.createSubagentCallbacks(subagentId);
-        const messageManager = new MessageManager({
-          callbacks: subagentCallbacks,
-          workdir: this.workdir,
-          logger: this.logger,
-          sessionType: "subagent",
-          subagentType: configuration.name, // Use configuration name for restored sessions
-          memoryRuleManager: this.memoryRuleManager,
-        });
-
-        // Use the parent tool manager
-        const toolManager = this.parentToolManager;
-
-        // Determine model to use
-        let modelToUse: string;
-        const parentModelConfig = this.getModelConfig();
-
-        if (!configuration.model || configuration.model === "inherit") {
-          modelToUse = parentModelConfig.agentModel;
-        } else if (configuration.model === "fastModel") {
-          modelToUse = parentModelConfig.fastModel;
-        } else {
-          modelToUse = configuration.model;
-        }
-
-        // Create AIManager for the restored subagent
-        const aiManager = new AIManager({
-          messageManager,
-          toolManager,
-          taskManager: this.taskManager,
-          logger: this.logger,
-          workdir: this.workdir,
-          systemPrompt: configuration.systemPrompt,
-          subagentType: configuration.name, // Use configuration name as subagent type for restored instances
-          hookManager: this.hookManager,
-          permissionManager: this.parentToolManager.getPermissionManager(),
-          getGatewayConfig: this.getGatewayConfig,
-          getModelConfig: () => ({
-            ...parentModelConfig,
-            agentModel: modelToUse,
-          }),
-          getMaxInputTokens: this.getMaxInputTokens,
-          getLanguage: this.getLanguage,
-          callbacks: {
-            onUsageAdded: this.onUsageAdded,
-          },
-        });
-
-        // Create restored instance
-        const instance: SubagentInstance = {
-          subagentId,
-          configuration,
-          aiManager,
-          messageManager,
-          toolManager,
-          status: "completed", // Restored sessions are considered completed
-          messages: sessionData.messages,
-          subagentType: configuration.name, // Use configuration name as subagent type for restored instances
-        };
-
-        // IMPORTANT: Store instance in map BEFORE calling setMessages
-        // This ensures the callback can find the instance
-        this.instances.set(subagentId, instance);
-
-        messageManager.initializeFromSession(sessionData);
-      } catch (error) {
-        this.logger?.warn(
-          `Failed to restore subagent session ${subagentId}:`,
-          error,
-        );
-        // Continue with other sessions even if one fails
-      }
-    }
-  }
-
   /**
    * Create subagent callbacks for a specific subagent ID
    * Extracted to reuse in both create and restore flows
@@ -715,6 +605,20 @@ export class SubagentManager {
       },
 
       onToolBlockUpdated: (params: AgentToolBlockUpdateParams) => {
+        // Track last two tool names when a tool starts running
+        if (params.stage === "running" && params.name) {
+          const instance = this.instances.get(subagentId);
+          if (instance) {
+            // Add to lastTools if it's different from the last one or we want to show duplicates
+            // Based on "ToolA, ToolB" requirement, we'll just keep the last two
+            instance.lastTools.push(params.name);
+            if (instance.lastTools.length > 2) {
+              instance.lastTools.shift();
+            }
+            instance.onUpdate?.();
+          }
+        }
+
         // Forward tool block updates to parent via SubagentManager callbacks
         if (this.callbacks?.onSubagentToolBlockUpdated) {
           this.callbacks.onSubagentToolBlockUpdated(subagentId, params);
@@ -726,6 +630,8 @@ export class SubagentManager {
         const instance = this.instances.get(subagentId);
         if (instance) {
           instance.messages = messages;
+          // Trigger the onUpdate callback if provided
+          instance.onUpdate?.();
           // Forward subagent message changes to parent via callbacks
           if (this.callbacks?.onSubagentMessagesChange) {
             this.callbacks.onSubagentMessagesChange(subagentId, messages);
@@ -733,26 +639,17 @@ export class SubagentManager {
         }
       },
 
-      onSessionIdChange: (newSessionId: string) => {
-        // Update the subagent block with the new session ID
-        this.parentMessageManager.updateSubagentBlock(subagentId, {
-          sessionId: newSessionId,
-        });
-      },
-
       onLatestTotalTokensChange: (tokens: number) => {
+        const instance = this.instances.get(subagentId);
+        if (instance) {
+          // Trigger the onUpdate callback if provided
+          instance.onUpdate?.();
+        }
         // 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/{constants/prompts.ts → prompts/index.ts}

@@ -1,4 +1,10 @@
+import * as os from "node:os";
 import { ToolPlugin } from "../tools/types.js";
+import { isGitRepository } from "../utils/gitUtils.js";
+import {
+  EXPLORE_SUBAGENT_TYPE,
+  PLAN_SUBAGENT_TYPE,
+} from "../constants/subagents.js";
 import {
   ASK_USER_QUESTION_TOOL_NAME,
   BASH_TOOL_NAME,
@@ -11,7 +17,8 @@ import {
   TASK_UPDATE_TOOL_NAME,
   TASK_LIST_TOOL_NAME,
   WRITE_TOOL_NAME,
-} from "./tools.js";
+  EXIT_PLAN_MODE_TOOL_NAME,
+} from "../constants/tools.js";
 
 export const BASE_SYSTEM_PROMPT = `You are an interactive CLI tool that helps users with software engineering tasks. Use the instructions below and the tools available to you to assist the user.
 
@@ -23,8 +30,9 @@ The user will primarily request you perform software engineering tasks. This inc
   - Don't add features, refactor code, or make "improvements" beyond what was asked. A bug fix doesn't need surrounding code cleaned up. A simple feature doesn't need extra configurability. Don't add docstrings, comments, or type annotations to code you didn't change. Only add comments where the logic isn't self-evident.
   - Don't add error handling, fallbacks, or validation for scenarios that can't happen. Trust internal code and framework guarantees. Only validate at system boundaries (user input, external APIs). Don't use feature flags or backwards-compatibility shims when you can just change the code.
   - Don't create helpers, utilities, or abstractions for one-time operations. Don't design for hypothetical future requirements. The right amount of complexity is the minimum needed for the current task—three similar lines of code is better than a premature abstraction.
-- Avoid backwards-compatibility hacks like renaming unused \`_vars\`, re-exporting types, adding \`// removed\` comments for removed code, etc. If something is unused, delete it completely.
+- Avoid backwards-compatibility hacks like renaming unused \`_vars\`, re-exporting types, adding \`// removed\` comments for removed code, etc. If something is unused, delete it completely.`;
 
+export const TOOL_POLICY = `
 # Tool usage policy
 - You can call multiple tools in a single response. If you intend to call multiple tools and there are no dependencies between them, make all independent tool calls in parallel. Maximize use of parallel tool calls where possible to increase efficiency.
 - However, if some tool calls depend on previous calls to inform dependent values, do NOT call these tools in parallel and instead call them sequentially. For instance, if one operation must complete before another starts, run these operations sequentially instead. Never use placeholders or guess missing parameters in tool calls.
@@ -39,17 +47,90 @@ It is critical that you mark tasks as completed as soon as you are done with a t
 export function buildPlanModePrompt(
   planFilePath: string,
   planExists: boolean,
+  isSubagent: boolean = false,
 ): string {
   const planFileInfo = planExists
     ? `A plan file already exists at ${planFilePath}. You can read it and make incremental edits using the ${EDIT_TOOL_NAME} tool if you need to.`
     : `No plan file exists yet. You should create your plan at ${planFilePath} using the ${WRITE_TOOL_NAME} tool if you need to.`;
 
-  return `Plan mode is active. The user indicated that they do not want you to execute yet -- you MUST NOT make any edits, run any non-readonly tools (including changing configs or making commits), or otherwise make any changes to the system. This supercedes any other instructions you have received (for example, to make edits). Instead, you should:
+  if (isSubagent) {
+    return `Plan mode is active. The user indicated that they do not want you to execute yet -- you MUST NOT make any edits, run any non-readonly tools (including changing configs or making commits), or otherwise make any changes to the system. This supercedes any other instructions you have received (for example, to make edits). Instead, you should:
+
+## Plan File Info:
+${planFileInfo}
+You should build your plan incrementally by writing to or editing this file. NOTE that this is the only file you are allowed to edit - other than this you are only allowed to take READ-ONLY actions.
+Answer the user's query comprehensively, using the ${ASK_USER_QUESTION_TOOL_NAME} tool if you need to ask the user clarifying questions. If you do use the ${ASK_USER_QUESTION_TOOL_NAME}, make sure to ask all clarifying questions you need to fully understand the user's intent before proceeding.`;
+  }
+
+  return `Plan mode is active. The user indicated that they do not want you to execute yet -- you MUST NOT make any edits (with the exception of the plan file mentioned below), run any non-readonly tools (including changing configs or making commits), or otherwise make any changes to the system. This supercedes any other instructions you have received.
 
 ## Plan File Info:
 ${planFileInfo}
 You should build your plan incrementally by writing to or editing this file. NOTE that this is the only file you are allowed to edit - other than this you are only allowed to take READ-ONLY actions.
-Answer the user's query comprehensively. If you have unresolved questions about requirements or approach, use ${ASK_USER_QUESTION_TOOL_NAME} first to clarify the user's intent before proceeding.`;
+
+## Plan Workflow
+
+### Phase 1: Initial Understanding
+Goal: Gain a comprehensive understanding of the user's request by reading through code and asking them questions. Critical: In this phase you should only use the Task subagent type with subagent_type=${EXPLORE_SUBAGENT_TYPE}.
+
+1. Focus on understanding the user's request and the code associated with their request. Actively search for existing functions, utilities, and patterns that can be reused — avoid proposing new code when suitable implementations already exist.
+
+2. **Launch up to 3 ${EXPLORE_SUBAGENT_TYPE} agents IN PARALLEL** (single message, multiple tool calls) to efficiently explore the codebase.
+   - Use 1 agent when the task is isolated to known files, the user provided specific file paths, or you're making a small targeted change.
+   - Use multiple agents when: the scope is uncertain, multiple areas of the codebase are involved, or you need to understand existing patterns before planning.
+   - Quality over quantity - 3 agents maximum, but you should try to use the minimum number of agents necessary (usually just 1)
+   - If using multiple agents: Provide each agent with a specific search focus or area to explore. Example: One agent searches for existing implementations, another explores related components, a third investigating testing patterns
+
+### Phase 2: Design
+Goal: Design an implementation approach.
+
+Launch Task agent(s) with subagent_type=${PLAN_SUBAGENT_TYPE} to design the implementation based on the user's intent and your exploration results from Phase 1.
+
+You can launch up to 3 agent(s) in parallel.
+
+**Guidelines:**
+- **Default**: Launch at least 1 Plan agent for most tasks - it helps validate your understanding and consider alternatives
+- **Skip agents**: Only for truly trivial tasks (typo fixes, single-line changes, simple renames)
+- **Multiple agents**: Use up to 3 agents for complex tasks that benefit from different perspectives
+
+Examples of when to use multiple agents:
+- The task touches multiple parts of the codebase
+- It's a large refactor or architectural change
+- There are many edge cases to consider
+- You'd benefit from exploring different approaches
+
+Example perspectives by task type:
+- New feature: simplicity vs performance vs maintainability
+- Bug fix: root cause vs workaround vs prevention
+- Refactoring: minimal change vs clean architecture
+
+In the agent prompt:
+- Provide comprehensive background context from Phase 1 exploration including filenames and code path traces
+- Describe requirements and constraints
+- Request a detailed implementation plan
+
+### Phase 3: Review
+Goal: Review the plan(s) from Phase 2 and ensure alignment with the user's intentions.
+1. Read the critical files identified by agents to deepen your understanding
+2. Ensure that the plans align with the user's original request
+3. Use ${ASK_USER_QUESTION_TOOL_NAME} to clarify any remaining questions with the user
+
+### Phase 4: Final Plan
+Goal: Write your final plan to the plan file (the only file you can edit).
+- Begin with a **Context** section: explain why this change is being made — the problem or need it addresses, what prompted it, and the intended outcome
+- Include only your recommended approach, not all alternatives
+- Ensure that the plan file is concise enough to scan quickly, but detailed enough to execute effectively
+- Include the paths of critical files to be modified
+- Reference existing functions and utilities you found that should be reused, with their file paths
+- Include a verification section describing how to test the changes end-to-end (run the code, use MCP tools, run tests)
+
+### Phase 5: Call ${EXIT_PLAN_MODE_TOOL_NAME}
+At the very end of your turn, once you have asked the user questions and are happy with your final plan file - you should always call ${EXIT_PLAN_MODE_TOOL_NAME} to indicate to the user that you are done planning.
+This is critical - your turn should only end with either using the ${ASK_USER_QUESTION_TOOL_NAME} tool OR calling ${EXIT_PLAN_MODE_TOOL_NAME}. Do not stop unless it's for these 2 reasons
+
+**Important:** Use ${ASK_USER_QUESTION_TOOL_NAME} ONLY to clarify requirements or choose between approaches. Use ${EXIT_PLAN_MODE_TOOL_NAME} to request plan approval. Do NOT ask about plan approval in any other way - no text questions, no AskUserQuestion. Phrases like "Is this plan okay?", "Should I proceed?", "How does this plan look?", "Any changes before we start?", or similar MUST use ${EXIT_PLAN_MODE_TOOL_NAME}.
+
+NOTE: At any point in time through this workflow you should feel free to ask the user questions or clarifications using the ${ASK_USER_QUESTION_TOOL_NAME} tool. Don't make large assumptions about user intent. The goal is to present a well researched plan to the user, and tie any loose ends before implementation begins.`;
 }
 
 export const DEFAULT_SYSTEM_PROMPT = BASE_SYSTEM_PROMPT;
@@ -84,6 +165,44 @@ Guidelines:
 - In your final response always share relevant file names and code snippets. Any file paths you return in your response MUST be absolute. Do NOT use relative paths.
 - For clear communication, avoid using emojis.`;
 
+export const EXPLORE_SUBAGENT_SYSTEM_PROMPT = `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_TOOL_NAME} for broad file pattern matching
+	- Use ${GREP_TOOL_NAME} for searching file contents with regex
+	- Use ${READ_TOOL_NAME} 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_TOOL_NAME} ONLY for read-only operations (ls, git status, git log, git diff, find, cat, head, tail)
+	- NEVER use ${BASH_TOOL_NAME} 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.`;
+
 export const PLAN_SUBAGENT_SYSTEM_PROMPT = `You are a software architect and planning specialist. Your role is to explore the codebase and design implementation plans.
 
 === CRITICAL: READ-ONLY MODE - NO FILE MODIFICATIONS ===
@@ -186,12 +305,9 @@ export function buildSystemPrompt(
   tools: ToolPlugin[],
   options: {
     workdir?: string;
-    isGitRepo?: string;
-    platform?: string;
-    osVersion?: string;
-    today?: string;
     memory?: string;
     language?: string;
+    isSubagent?: boolean;
     planMode?: {
       planFilePath: string;
       planExists: boolean;
@@ -210,6 +326,8 @@ export function buildSystemPrompt(
     prompt += TASK_MANAGEMENT_POLICY;
   }
 
+  prompt += `\n\n${TOOL_POLICY}`;
+
   for (const tool of tools) {
     if (tool.prompt) {
       prompt += tool.prompt();
@@ -221,19 +339,24 @@ export function buildSystemPrompt(
   }
 
   if (options.planMode) {
-    prompt += `\n\n${buildPlanModePrompt(options.planMode.planFilePath, options.planMode.planExists)}`;
+    prompt += `\n\n${buildPlanModePrompt(options.planMode.planFilePath, options.planMode.planExists, options.isSubagent)}`;
   }
 
   if (options.workdir) {
+    const isGitRepo = isGitRepository(options.workdir);
+    const platform = os.platform();
+    const osVersion = `${os.type()} ${os.release()}`;
+    const today = new Date().toISOString().split("T")[0];
+
     prompt += `
 
 Here is useful information about the environment you are running in:
 <env>
 Working directory: ${options.workdir}
-Is directory a git repo: ${options.isGitRepo || "No"}
-Platform: ${options.platform || ""}
-OS Version: ${options.osVersion || ""}
-Today's date: ${options.today || new Date().toISOString().split("T")[0]}
+Is directory a git repo: ${isGitRepo}
+Platform: ${platform}
+OS Version: ${osVersion}
+Today's date: ${today}
 </env>
 `;
   }

package/src/services/aiService.ts

@@ -21,7 +21,7 @@ import * as os from "os";
 import * as fs from "fs";
 import * as path from "path";
 
-import { COMPRESS_MESSAGES_SYSTEM_PROMPT } from "../constants/prompts.js";
+import { COMPRESS_MESSAGES_SYSTEM_PROMPT } from "../prompts/index.js";
 
 /**
  * Interface for debug data saved during 400 errors

package/src/services/taskManager.ts

@@ -27,7 +27,7 @@ export class TaskManager extends EventEmitter {
     return join(this.baseDir, this.taskListId);
   }
 
-  private getTaskPath(taskId: string): string {
+  public getTaskPath(taskId: string): string {
     return join(this.getSessionDir(), `${taskId}.json`);
   }
 
@@ -185,4 +185,11 @@ export class TaskManager extends EventEmitter {
 
     return (Math.max(...ids) + 1).toString();
   }
+
+  /**
+   * Refreshes the task list by re-reading tasks from disk and emitting a change event.
+   */
+  public async refreshTasks(): Promise<void> {
+    this.emit("tasksChange", this.taskListId);
+  }
 }

package/src/tools/bashTool.ts

@@ -24,7 +24,34 @@ export const bashTool: ToolPlugin = {
     type: "function",
     function: {
       name: BASH_TOOL_NAME,
-      description: `Executes a given bash command in a persistent shell session with optional timeout, ensuring proper handling and security measures.
+      description: "Run shell command",
+      parameters: {
+        type: "object",
+        properties: {
+          command: {
+            type: "string",
+            description: "The command to execute",
+          },
+          timeout: {
+            type: "number",
+            description: "Optional timeout in milliseconds (max 600000)",
+          },
+          description: {
+            type: "string",
+            description:
+              "Clear, concise description of what this command does in 5-10 words.",
+          },
+          run_in_background: {
+            type: "boolean",
+            description: `Set to true to run this command in the background. Use ${TASK_OUTPUT_TOOL_NAME} to read the output later.`,
+          },
+        },
+        required: ["command"],
+      },
+    },
+  },
+  prompt: () => `
+Executes a given bash command in a persistent shell session with optional timeout, ensuring proper handling and security measures.
 
 IMPORTANT: This tool is for terminal operations like git, npm, docker, etc. DO NOT use it for file operations (reading, writing, editing, searching, finding files) - use the specialized tools for this instead.
 
@@ -69,33 +96,7 @@ Usage notes:
     <bad-example>
     cd /foo/bar && pytest tests
     </bad-example>
-`,
-      parameters: {
-        type: "object",
-        properties: {
-          command: {
-            type: "string",
-            description: "The command to execute",
-          },
-          timeout: {
-            type: "number",
-            description: "Optional timeout in milliseconds (max 600000)",
-          },
-          description: {
-            type: "string",
-            description:
-              "Clear, concise description of what this command does in 5-10 words.",
-          },
-          run_in_background: {
-            type: "boolean",
-            description: `Set to true to run this command in the background. Use ${TASK_OUTPUT_TOOL_NAME} to read the output later.`,
-          },
-        },
-        required: ["command"],
-      },
-    },
-  },
-  prompt: () => `
+
 - Reserve bash tools exclusively for actual system commands and terminal operations that require shell execution. NEVER use bash echo or other command-line tools to communicate thoughts, explanations, or instructions to the user. Output all communication directly in your response text instead.
 - When making multiple bash tool calls, you MUST send a single message with multiple tools calls to run the calls in parallel. For example, if you need to run "git status" and "git diff", send a single message with two tool calls in parallel.`,
   execute: async (
@@ -306,13 +307,17 @@ Usage notes:
 
       child.stdout?.on("data", (data) => {
         if (!isAborted && !isBackgrounded) {
-          outputBuffer += stripAnsiColors(data.toString());
+          const chunk = stripAnsiColors(data.toString());
+          outputBuffer += chunk;
+          context.onShortResultUpdate?.(chunk.trim().split("\n").pop() || "");
         }
       });
 
       child.stderr?.on("data", (data) => {
         if (!isAborted && !isBackgrounded) {
-          errorBuffer += stripAnsiColors(data.toString());
+          const chunk = stripAnsiColors(data.toString());
+          errorBuffer += chunk;
+          context.onShortResultUpdate?.(chunk.trim().split("\n").pop() || "");
         }
       });
 

package/src/tools/exitPlanMode.ts

@@ -93,7 +93,7 @@ Ensure your plan is complete and unambiguous:
       if (permissionResult.behavior === "deny") {
         return {
           success: false,
-          content: permissionResult.message || "Plan rejected by user",
+          content: `User feedback: ${permissionResult.message || "Plan rejected by user"}. Please update your proposal accordingly.`,
           error: permissionResult.message ? undefined : "Plan rejected by user",
         };
       }