wave-agent-sdk 0.2.1 → 0.5.0

package/dist/constants/prompts.js

@@ -27,13 +27,32 @@ export const SUBAGENT_POLICY = `
 - 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.`;
-export const FILE_TOOL_POLICY = `
-- Use specialized tools instead of bash commands when possible, as this provides a better user experience. For file operations, use dedicated tools: ${READ_TOOL_NAME} for reading files instead of cat/head/tail, ${EDIT_TOOL_NAME}/${MULTI_EDIT_TOOL_NAME} for editing instead of sed/awk, ${WRITE_TOOL_NAME} for creating files instead of cat with heredoc or echo redirection, and ${LS_TOOL_NAME}/${GLOB_TOOL_NAME}/${GREP_TOOL_NAME} for searching and listing files instead of find/ls/grep.`;
+export const FILE_TOOL_POLICY_PREFIX = `\n- Use specialized tools instead of bash commands when possible, as this provides a better user experience. For file operations, use dedicated tools:`;
+export const READ_FILE_POLICY = ` ${READ_TOOL_NAME} for reading files instead of cat/head/tail`;
+export const EDIT_FILE_POLICY = ` ${EDIT_TOOL_NAME}/${MULTI_EDIT_TOOL_NAME} for editing instead of sed/awk`;
+export const WRITE_FILE_POLICY = ` ${WRITE_TOOL_NAME} for creating files instead of cat with heredoc or echo redirection`;
+export const SEARCH_FILE_POLICY = ` ${LS_TOOL_NAME}/${GLOB_TOOL_NAME}/${GREP_TOOL_NAME} for searching and listing files instead of find/ls/grep`;
 export const BASH_POLICY = `
 - 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 to run the calls in parallel.`;
 export const DEFAULT_SYSTEM_PROMPT = BASE_SYSTEM_PROMPT;
-export const INIT_PROMPT = `Please analyze this codebase and create a AGENTS.md file, which will be given to future instances of Wave Code to operate in this repository.
+export const GENERAL_PURPOSE_SYSTEM_PROMPT = `You are an agent. Given the user's message, you should use the tools available to complete the task. Do what has been asked; nothing more, nothing less. When you complete the task simply respond with a detailed writeup.
+
+Your strengths:
+- Searching for code, configurations, and patterns across large codebases
+- Analyzing multiple files to understand system architecture
+- Investigating complex questions that require exploring many files
+- Performing multi-step research tasks
+
+Guidelines:
+- For file searches: Use Grep or Glob when you need to search broadly. Use Read when you know the specific file path.
+- For analysis: Start broad and narrow down. Use multiple search strategies if the first doesn't yield results.
+- Be thorough: Check multiple locations, consider different naming conventions, look for related files.
+- NEVER create files unless they're absolutely necessary for achieving your goal. ALWAYS prefer editing an existing file to creating a new one.
+- NEVER proactively create documentation files (*.md) or README files. Only create documentation files if explicitly requested.
+- 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 INIT_PROMPT = `Please analyze this codebase and create a AGENTS.md file, which will be given to future instances of Agent to operate in this repository.
 
 What to add:
 1. Commands that will be commonly used, such as how to build, lint, and run tests. Include the necessary commands to develop in this codebase, such as how to run a single test.
@@ -52,7 +71,7 @@ Usage notes:
 \`\`\`
 # AGENTS.md
 
-This file provides guidance to Wave Code when working with code in this repository.
+This file provides guidance to Agent when working with code in this repository.
 \`\`\``;
 export function buildSystemPrompt(basePrompt, tools) {
     let prompt = basePrompt;
@@ -73,7 +92,24 @@ export function buildSystemPrompt(basePrompt, tools) {
         toolNames.has(LS_TOOL_NAME) ||
         toolNames.has(GLOB_TOOL_NAME) ||
         toolNames.has(GREP_TOOL_NAME)) {
-        prompt += FILE_TOOL_POLICY;
+        const parts = [];
+        if (toolNames.has(READ_TOOL_NAME)) {
+            parts.push(READ_FILE_POLICY);
+        }
+        if (toolNames.has(EDIT_TOOL_NAME) || toolNames.has(MULTI_EDIT_TOOL_NAME)) {
+            parts.push(EDIT_FILE_POLICY);
+        }
+        if (toolNames.has(WRITE_TOOL_NAME)) {
+            parts.push(WRITE_FILE_POLICY);
+        }
+        if (toolNames.has(LS_TOOL_NAME) ||
+            toolNames.has(GLOB_TOOL_NAME) ||
+            toolNames.has(GREP_TOOL_NAME)) {
+            parts.push(SEARCH_FILE_POLICY);
+        }
+        if (parts.length > 0) {
+            prompt += FILE_TOOL_POLICY_PREFIX + parts.join(",") + ".";
+        }
     }
     if (toolNames.has(BASH_TOOL_NAME)) {
         prompt += BASH_POLICY;

package/dist/constants/tools.d.ts

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

package/dist/constants/tools.js

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

package/dist/index.d.ts

@@ -9,7 +9,6 @@ export * from "./constants/tools.js";
 export * from "./managers/pluginManager.js";
 export * from "./managers/pluginScopeManager.js";
 export * from "./agent.js";
-export * from "./utils/bashHistory.js";
 export * from "./utils/bashParser.js";
 export * from "./utils/convertMessagesForAPI.js";
 export * from "./utils/fileFilter.js";
@@ -18,6 +17,7 @@ export * from "./utils/globalLogger.js";
 export * from "./utils/mcpUtils.js";
 export * from "./utils/messageOperations.js";
 export * from "./utils/path.js";
+export * from "./utils/promptHistory.js";
 export * from "./utils/stringUtils.js";
 export * from "./utils/customCommands.js";
 export * from "./utils/hookMatcher.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oCAAoC,CAAC;AACnD,cAAc,kCAAkC,CAAC;AAGjD,cAAc,sBAAsB,CAAC;AAGrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kCAAkC,CAAC;AAGjD,cAAc,YAAY,CAAC;AAG3B,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,kCAAkC,CAAC;AACjD,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AAGvC,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oCAAoC,CAAC;AACnD,cAAc,kCAAkC,CAAC;AAGjD,cAAc,sBAAsB,CAAC;AAGrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kCAAkC,CAAC;AAGjD,cAAc,YAAY,CAAC;AAG3B,cAAc,uBAAuB,CAAC;AACtC,cAAc,kCAAkC,CAAC;AACjD,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AAGvC,cAAc,kBAAkB,CAAC"}

package/dist/index.js

@@ -14,7 +14,6 @@ export * from "./managers/pluginScopeManager.js";
 // Export main agent
 export * from "./agent.js";
 // Export all utilities
-export * from "./utils/bashHistory.js";
 export * from "./utils/bashParser.js";
 export * from "./utils/convertMessagesForAPI.js";
 export * from "./utils/fileFilter.js";
@@ -23,6 +22,7 @@ export * from "./utils/globalLogger.js";
 export * from "./utils/mcpUtils.js";
 export * from "./utils/messageOperations.js";
 export * from "./utils/path.js";
+export * from "./utils/promptHistory.js";
 export * from "./utils/stringUtils.js";
 export * from "./utils/customCommands.js";
 export * from "./utils/hookMatcher.js";

package/dist/managers/MemoryRuleManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MemoryRuleManager.d.ts","sourceRoot":"","sources":["../../src/managers/MemoryRuleManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAOzD,MAAM,WAAW,uBAAuB;IACtC,0CAA0C;IAC1C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAClC,0DAA0D;IAC1D,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC5B;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,KAAK,CAGX;IAEF,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,OAAO,CAAoB;gBAEvB,OAAO,EAAE,wBAAwB;IAK7C;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;YAetB,aAAa;YAyDb,YAAY;IAqB1B;;OAEG;IACH,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE;IAUtD;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAG9B"}
+{"version":3,"file":"MemoryRuleManager.d.ts","sourceRoot":"","sources":["../../src/managers/MemoryRuleManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAOzD,MAAM,WAAW,uBAAuB;IACtC,0CAA0C;IAC1C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAClC,0DAA0D;IAC1D,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC5B;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,KAAK,CAGX;IAEF,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,OAAO,CAAoB;gBAEvB,OAAO,EAAE,wBAAwB;IAK7C;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;YA8BtB,aAAa;YAyDb,YAAY;IAsB1B;;OAEG;IACH,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE;IAUtD;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAG9B"}

package/dist/managers/MemoryRuleManager.js

@@ -18,13 +18,26 @@ export class MemoryRuleManager {
     async discoverRules() {
         const projectRulesDir = path.join(this.workdir, ".wave", "rules");
         const userRulesDir = path.join(os.homedir(), ".wave", "rules");
+        logger.debug(`Scanning for modular memory rules...`);
+        logger.debug(`  User rules directory: ${userRulesDir}`);
+        logger.debug(`  Project rules directory: ${projectRulesDir}`);
         const newRules = {};
         // Discover user rules first, then project rules so project rules can override if needed
         // (though IDs are based on file path, so they shouldn't collide unless same path)
         await this.scanDirectory(userRulesDir, "user", newRules);
         await this.scanDirectory(projectRulesDir, "project", newRules);
         this.state.rules = newRules;
-        logger.debug(`Discovered ${Object.keys(newRules).length} memory rules`);
+        const ruleCount = Object.keys(newRules).length;
+        logger.debug(`Discovered ${ruleCount} modular memory rules`);
+        if (ruleCount > 0) {
+            logger.debug("Loaded memory rules:");
+            for (const [id, rule] of Object.entries(newRules)) {
+                const pathInfo = rule.metadata.paths
+                    ? `paths: ${JSON.stringify(rule.metadata.paths)}`
+                    : "global (no path restriction)";
+                logger.debug(`  - ${id} (${rule.source}): ${pathInfo}`);
+            }
+        }
     }
     async scanDirectory(dir, source, registry, visited = new Set()) {
         const realDir = await fs.realpath(dir).catch(() => dir);
@@ -84,6 +97,7 @@ export class MemoryRuleManager {
             const relativeId = path.relative(rulesRoot, filePath);
             rule.id = relativeId;
             registry[rule.id] = rule;
+            logger.debug(`Loaded memory rule: ${relativeId} from ${filePath}`);
         }
         catch (error) {
             logger.error(`Failed to parse memory rule at ${filePath}:`, error);
@@ -95,7 +109,7 @@ export class MemoryRuleManager {
     getActiveRules(filesInContext) {
         const activeRules = [];
         for (const rule of Object.values(this.state.rules)) {
-            if (this.service.isRuleActive(rule, filesInContext)) {
+            if (this.service.isRuleActive(rule, filesInContext, this.workdir)) {
                 activeRules.push(rule);
             }
         }

package/dist/managers/aiManager.d.ts

@@ -1,7 +1,7 @@
 import type { Logger, GatewayConfig, ModelConfig, Usage } from "../types/index.js";
 import type { ToolManager } from "./toolManager.js";
 import type { MessageManager } from "./messageManager.js";
-import type { BackgroundBashManager } from "./backgroundBashManager.js";
+import type { BackgroundTaskManager } from "./backgroundTaskManager.js";
 import type { HookManager } from "./hookManager.js";
 import type { PermissionManager } from "./permissionManager.js";
 export interface AIManagerCallbacks {
@@ -12,18 +12,20 @@ export interface AIManagerOptions {
     messageManager: MessageManager;
     toolManager: ToolManager;
     logger?: Logger;
-    backgroundBashManager?: BackgroundBashManager;
+    backgroundTaskManager?: BackgroundTaskManager;
     hookManager?: HookManager;
     permissionManager?: PermissionManager;
     callbacks?: AIManagerCallbacks;
     workdir: string;
     systemPrompt?: string;
     subagentType?: string;
+    reversionManager?: import("./reversionManager.js").ReversionManager;
     /**Whether to use streaming mode for AI responses - defaults to true */
     stream?: boolean;
     getGatewayConfig: () => GatewayConfig;
     getModelConfig: () => ModelConfig;
     getMaxInputTokens: () => number;
+    getLanguage: () => string | undefined;
     getEnvironmentVars?: () => Record<string, string>;
 }
 export declare class AIManager {
@@ -33,8 +35,9 @@ export declare class AIManager {
     private logger?;
     private toolManager;
     private messageManager;
-    private backgroundBashManager?;
+    private backgroundTaskManager?;
     private hookManager?;
+    private reversionManager?;
     private permissionManager?;
     private workdir;
     private systemPrompt?;
@@ -43,11 +46,13 @@ export declare class AIManager {
     private getGatewayConfigFn;
     private getModelConfigFn;
     private getMaxInputTokensFn;
+    private getLanguageFn;
     private getEnvironmentVarsFn?;
     constructor(options: AIManagerOptions);
     getGatewayConfig(): GatewayConfig;
     getModelConfig(): ModelConfig;
     getMaxInputTokens(): number;
+    getLanguage(): string | undefined;
     private isCompressing;
     private callbacks;
     /**
@@ -56,6 +61,11 @@ export declare class AIManager {
     private getFilteredToolsConfig;
     setIsLoading(isLoading: boolean): void;
     abortAIMessage(): void;
+    /**
+     * Abort the AI recursion loop immediately.
+     * This is used when a tool is backgrounded via Ctrl-B, even if no foreground task was active.
+     */
+    abortRecursion(): void;
     private generateCompactParams;
     private handleTokenUsageAndCompression;
     getIsCompressing(): boolean;
@@ -63,7 +73,7 @@ export declare class AIManager {
     sendAIMessage(options?: {
         recursionDepth?: number;
         model?: string;
-        /** Rules for automatic tool approval (e.g., "Bash(git status:*)") */
+        /** Rules for automatic tool approval (e.g., "Bash(git status*)") */
         allowedRules?: string[];
         /** List of tools available to the AI (e.g., ["Bash", "Read"]) */
         tools?: string[];

package/dist/managers/aiManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aiManager.d.ts","sourceRoot":"","sources":["../../src/managers/aiManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"aiManager.d.ts","sourceRoot":"","sources":["../../src/managers/aiManager.ts"],"names":[],"mappings":"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"}

package/dist/managers/aiManager.js

@@ -2,7 +2,6 @@ import { callAgent, compressMessages, } from "../services/aiService.js";
 import { getMessagesToCompress } from "../utils/messageOperations.js";
 import { convertMessagesForAPI } from "../utils/convertMessagesForAPI.js";
 import { calculateComprehensiveTotalTokens } from "../utils/tokenCalculation.js";
-import * as memory from "../services/memory.js";
 import * as fs from "node:fs/promises";
 import { DEFAULT_SYSTEM_PROMPT, buildSystemPrompt, } from "../constants/prompts.js";
 export class AIManager {
@@ -13,8 +12,9 @@ export class AIManager {
         this.isCompressing = false;
         this.messageManager = options.messageManager;
         this.toolManager = options.toolManager;
-        this.backgroundBashManager = options.backgroundBashManager;
+        this.backgroundTaskManager = options.backgroundTaskManager;
         this.hookManager = options.hookManager;
+        this.reversionManager = options.reversionManager;
         this.permissionManager = options.permissionManager;
         this.logger = options.logger;
         this.workdir = options.workdir;
@@ -26,6 +26,7 @@ export class AIManager {
         this.getGatewayConfigFn = options.getGatewayConfig;
         this.getModelConfigFn = options.getModelConfig;
         this.getMaxInputTokensFn = options.getMaxInputTokens;
+        this.getLanguageFn = options.getLanguage;
         this.getEnvironmentVarsFn = options.getEnvironmentVars;
     }
     // Getter methods for accessing dynamic configuration
@@ -38,6 +39,9 @@ export class AIManager {
     getMaxInputTokens() {
         return this.getMaxInputTokensFn();
     }
+    getLanguage() {
+        return this.getLanguageFn();
+    }
     /**
      * Get filtered tool configuration based on tools list
      */
@@ -74,6 +78,14 @@ export class AIManager {
         }
         this.setIsLoading(false);
     }
+    /**
+     * Abort the AI recursion loop immediately.
+     * This is used when a tool is backgrounded via Ctrl-B, even if no foreground task was active.
+     */
+    abortRecursion() {
+        this.logger?.info("Aborting AI recursion loop");
+        this.abortAIMessage();
+    }
     // Helper method to generate compactParams
     generateCompactParams(toolName, toolArgs) {
         try {
@@ -164,8 +176,6 @@ export class AIManager {
         if (recursionDepth === 0 && this.isLoading) {
             return;
         }
-        // Save session in each recursion to ensure message persistence
-        await this.messageManager.saveSession();
         // Only create new AbortControllers for the initial call (recursionDepth === 0)
         // For recursive calls, reuse existing controllers to maintain abort signal
         let abortController;
@@ -179,9 +189,12 @@ export class AIManager {
         }
         else {
             // Reuse existing controllers for recursive calls
-            abortController = this.abortController;
-            toolAbortController = this.toolAbortController;
+            // Fallback to new controllers if they were cleared (should not happen in normal flow but good for tests)
+            abortController = this.abortController || new AbortController();
+            toolAbortController = this.toolAbortController || new AbortController();
         }
+        // Save session in each recursion to ensure message persistence
+        await this.messageManager.saveSession();
         // Only set loading state for the initial call
         if (recursionDepth === 0) {
             this.setIsLoading(true);
@@ -193,7 +206,7 @@ export class AIManager {
         const recentMessages = convertMessagesForAPI(this.messageManager.getMessages());
         try {
             // Get combined memory content
-            const combinedMemory = await memory.getCombinedMemoryContent(this.workdir);
+            const combinedMemory = await this.messageManager.getCombinedMemory();
             // Track if assistant message has been created
             let assistantMessageCreated = false;
             this.logger?.debug("modelConfig in sendAIMessage", this.getModelConfig());
@@ -201,6 +214,12 @@ export class AIManager {
             const currentMode = this.permissionManager?.getCurrentEffectiveMode(this.getModelConfig().permissionMode);
             const toolsConfig = this.getFilteredToolsConfig(tools);
             let effectiveSystemPrompt = buildSystemPrompt(this.systemPrompt || DEFAULT_SYSTEM_PROMPT, toolsConfig);
+            // Inject language prompt if configured
+            const language = this.getLanguage();
+            if (language) {
+                const languagePrompt = `\n\n# Language\nAlways respond in ${language}. Technical terms (e.g., code, tool names, file paths) should remain in their original language or English where appropriate.`;
+                effectiveSystemPrompt = (effectiveSystemPrompt || "") + languagePrompt;
+            }
             if (currentMode === "plan") {
                 const planFilePath = this.permissionManager?.getPlanFilePath();
                 if (planFilePath) {
@@ -409,11 +428,22 @@ export class AIManager {
                         // Create tool execution context
                         const context = {
                             abortSignal: toolAbortController.signal,
-                            backgroundBashManager: this.backgroundBashManager,
+                            backgroundTaskManager: this.backgroundTaskManager,
                             workdir: this.workdir,
+                            messageId: this.messageManager.getMessages().slice(-1)[0]?.id,
                         };
                         // Execute tool
                         const toolResult = await this.toolManager.execute(functionToolCall.function?.name || "", toolArgs, context);
+                        // Check if the tool was backgrounded via Ctrl-B
+                        // If it was backgrounded, we should abort the AI recursion
+                        if (toolResult.success &&
+                            toolResult.content.includes("Command was manually backgrounded by user")) {
+                            this.logger?.info(`Tool ${toolName} was backgrounded via Ctrl-B, aborting AI recursion`);
+                            // Use abortAIMessage directly instead of abortRecursion to avoid double logging
+                            // and ensure we don't trigger the "Request was aborted" error block
+                            this.abortAIMessage();
+                            return;
+                        }
                         // Update message state - tool execution completed
                         this.messageManager.updateToolBlock({
                             id: toolId,
@@ -452,6 +482,13 @@ export class AIManager {
             await this.handleTokenUsageAndCompression(result.usage, abortController, model);
             // Check if there are tool operations, if so automatically initiate next AI service call
             if (toolCalls.length > 0) {
+                // Record committed snapshots to message history
+                if (this.reversionManager) {
+                    const snapshots = this.reversionManager.getAndClearCommittedSnapshots();
+                    if (snapshots.length > 0) {
+                        this.messageManager.addFileHistoryBlock(snapshots);
+                    }
+                }
                 // Check interruption status
                 const isCurrentlyAborted = abortController.signal.aborted || toolAbortController.signal.aborted;
                 if (!isCurrentlyAborted) {
@@ -467,7 +504,15 @@ export class AIManager {
             }
         }
         catch (error) {
-            this.messageManager.addErrorBlock(error instanceof Error ? error.message : "Unknown error occurred");
+            // Check if the error is an abort error
+            // Use the local variables to avoid null reference if this.abortController was cleared
+            const isCurrentlyAborted = abortController.signal.aborted || toolAbortController.signal.aborted;
+            if (isCurrentlyAborted) {
+                this.logger?.info("AI message processing was aborted");
+            }
+            else {
+                this.messageManager.addErrorBlock(error instanceof Error ? error.message : "Unknown error occurred");
+            }
         }
         finally {
             // Only execute cleanup and hooks for the initial call
@@ -484,6 +529,13 @@ export class AIManager {
                 // Execute Stop/SubagentStop hooks only if the operation was not aborted
                 const isCurrentlyAborted = abortController.signal.aborted || toolAbortController.signal.aborted;
                 if (!isCurrentlyAborted) {
+                    // Record committed snapshots to message history for the final turn
+                    if (this.reversionManager) {
+                        const snapshots = this.reversionManager.getAndClearCommittedSnapshots();
+                        if (snapshots.length > 0) {
+                            this.messageManager.addFileHistoryBlock(snapshots);
+                        }
+                    }
                     const shouldContinue = await this.executeStopHooks();
                     // If Stop/SubagentStop hooks indicate we should continue (due to blocking errors),
                     // restart the AI conversation cycle

package/dist/managers/backgroundBashManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backgroundBashManager.d.ts","sourceRoot":"","sources":["../../src/managers/backgroundBashManager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD,MAAM,WAAW,8BAA8B;IAC7C,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,KAAK,IAAI,CAAC;CACtD;AAED,MAAM,WAAW,4BAA4B;IAC3C,SAAS,CAAC,EAAE,8BAA8B,CAAC;IAC3C,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,qBAAqB;IAChC,OAAO,CAAC,MAAM,CAAsC;IACpD,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,SAAS,CAAiC;IAClD,OAAO,CAAC,OAAO,CAAS;gBAEZ,OAAO,EAAE,4BAA4B;IAKjD,OAAO,CAAC,kBAAkB;IAInB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM;IAsErD,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;IAIjD,YAAY,IAAI,eAAe,EAAE;IAIjC,SAAS,CACd,EAAE,EAAE,MAAM,EACV,MAAM,CAAC,EAAE,MAAM,GACd;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAiCrD,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAmD9B,OAAO,IAAI,IAAI;CAUvB"}
+{"version":3,"file":"backgroundBashManager.d.ts","sourceRoot":"","sources":["../../src/managers/backgroundBashManager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD,MAAM,WAAW,8BAA8B;IAC7C,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,KAAK,IAAI,CAAC;CACtD;AAED,MAAM,WAAW,4BAA4B;IAC3C,SAAS,CAAC,EAAE,8BAA8B,CAAC;IAC3C,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,qBAAqB;IAChC,OAAO,CAAC,MAAM,CAAsC;IACpD,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,SAAS,CAAiC;IAClD,OAAO,CAAC,OAAO,CAAS;gBAEZ,OAAO,EAAE,4BAA4B;IAKjD,OAAO,CAAC,kBAAkB;IAInB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM;IAuErD,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;IAIjD,YAAY,IAAI,eAAe,EAAE;IAIjC,SAAS,CACd,EAAE,EAAE,MAAM,EACV,MAAM,CAAC,EAAE,MAAM,GACd;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAiCrD,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAmD9B,OAAO,IAAI,IAAI;CAUvB"}

package/dist/managers/backgroundBashManager.js

@@ -24,6 +24,7 @@ export class BackgroundBashManager {
         });
         const shell = {
             id,
+            type: "shell",
             process: child,
             command,
             startTime,

package/dist/managers/backgroundTaskManager.d.ts

@@ -0,0 +1,35 @@
+import { type ChildProcess } from "child_process";
+import { BackgroundTask } from "../types/processes.js";
+export interface BackgroundTaskManagerCallbacks {
+    onTasksChange?: (tasks: BackgroundTask[]) => void;
+}
+export interface BackgroundTaskManagerOptions {
+    callbacks?: BackgroundTaskManagerCallbacks;
+    workdir: string;
+}
+export declare class BackgroundTaskManager {
+    private tasks;
+    private nextId;
+    private callbacks;
+    private workdir;
+    constructor(options: BackgroundTaskManagerOptions);
+    private notifyTasksChange;
+    generateId(): string;
+    addTask(task: BackgroundTask): void;
+    getTask(id: string): BackgroundTask | undefined;
+    getAllTasks(): BackgroundTask[];
+    startShell(command: string, timeout?: number): {
+        id: string;
+        child: ChildProcess;
+        detach: () => void;
+    };
+    adoptProcess(child: ChildProcess, command: string, initialStdout?: string, initialStderr?: string): string;
+    getOutput(id: string, filter?: string): {
+        stdout: string;
+        stderr: string;
+        status: string;
+    } | null;
+    stopTask(id: string): boolean;
+    cleanup(): void;
+}
+//# sourceMappingURL=backgroundTaskManager.d.ts.map

package/dist/managers/backgroundTaskManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"backgroundTaskManager.d.ts","sourceRoot":"","sources":["../../src/managers/backgroundTaskManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,cAAc,EAAmB,MAAM,uBAAuB,CAAC;AAIxE,MAAM,WAAW,8BAA8B;IAC7C,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,IAAI,CAAC;CACnD;AAED,MAAM,WAAW,4BAA4B;IAC3C,SAAS,CAAC,EAAE,8BAA8B,CAAC;IAC3C,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,qBAAqB;IAChC,OAAO,CAAC,KAAK,CAAqC;IAClD,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,SAAS,CAAiC;IAClD,OAAO,CAAC,OAAO,CAAS;gBAEZ,OAAO,EAAE,4BAA4B;IAKjD,OAAO,CAAC,iBAAiB;IAIlB,UAAU,IAAI,MAAM;IAIpB,OAAO,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI;IAKnC,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAI/C,WAAW,IAAI,cAAc,EAAE;IAI/B,UAAU,CACf,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,GACf;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,YAAY,CAAC;QAAC,MAAM,EAAE,MAAM,IAAI,CAAA;KAAE;IA0FnD,YAAY,CACjB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,MAAM,EACf,aAAa,GAAE,MAAW,EAC1B,aAAa,GAAE,MAAW,GACzB,MAAM;IAgDF,SAAS,CACd,EAAE,EAAE,MAAM,EACV,MAAM,CAAC,EAAE,MAAM,GACd;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAiCrD,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAmE7B,OAAO,IAAI,IAAI;CAUvB"}