wave-agent-sdk 0.0.5 → 0.0.7

package/dist/{hooks/manager.js → managers/hookManager.js}

@@ -4,18 +4,14 @@
  * Central orchestrator for the hooks system. Handles configuration loading,
  * validation, and hook execution across all supported events.
  */
-import { HookConfigurationError, isValidHookEvent, isValidHookEventConfig, } from "./types.js";
-import { HookMatcher } from "./matcher.js";
-import { HookExecutor } from "./executor.js";
-import { loadMergedHooksConfig } from "./settings.js";
+import { HookConfigurationError, isValidHookEvent, isValidHookEventConfig, } from "../types/hooks.js";
+import { HookMatcher } from "../utils/hookMatcher.js";
+import { executeCommand, isCommandSafe, loadMergedHooksConfig, } from "../services/hook.js";
+import { MessageSource } from "../types/index.js";
 export class HookManager {
-    constructor(workdir, matcher = new HookMatcher(), executor, logger) {
+    constructor(workdir, matcher = new HookMatcher(), logger) {
         this.workdir = workdir;
         this.matcher = matcher;
-        // Create executor with logger if provided, or use passed executor, or create default
-        this.executor = logger
-            ? new HookExecutor(logger)
-            : executor || new HookExecutor();
         this.logger = logger;
     }
     /**
@@ -48,13 +44,15 @@ export class HookManager {
             this.logger?.debug(`[HookManager] Loading configuration...`);
             const mergedConfig = loadMergedHooksConfig(this.workdir);
             this.logger?.debug(`[HookManager] Merged config result:`, mergedConfig);
-            this.configuration = mergedConfig;
-            // Validate the loaded configuration
-            const validation = this.validatePartialConfiguration(mergedConfig);
-            if (!validation.valid) {
-                throw new HookConfigurationError("filesystem settings", validation.errors);
+            this.configuration = mergedConfig || undefined;
+            // Validate the loaded configuration if it exists
+            if (mergedConfig) {
+                const validation = this.validatePartialConfiguration(mergedConfig);
+                if (!validation.valid) {
+                    throw new HookConfigurationError("filesystem settings", validation.errors);
+                }
             }
-            this.logger?.debug(`[HookManager] Configuration loaded successfully with ${Object.keys(mergedConfig).length} event types`);
+            this.logger?.debug(`[HookManager] Configuration loaded successfully with ${Object.keys(mergedConfig || {}).length} event types`);
         }
         catch (error) {
             // If loading fails, start with undefined configuration (no hooks)
@@ -110,7 +108,7 @@ export class HookManager {
                 const hookCommand = config.hooks[commandIndex];
                 try {
                     this.logger?.debug(`[HookManager] Executing command ${commandIndex + 1}/${config.hooks.length} in configuration ${configIndex + 1}`);
-                    const result = await this.executor.executeCommand(hookCommand.command, context);
+                    const result = await executeCommand(hookCommand.command, context);
                     results.push(result);
                     // Report individual command result
                     if (result.success) {
@@ -141,6 +139,103 @@ export class HookManager {
         this.logger?.debug(`[HookManager] ${event} execution summary: ${summary}`);
         return results;
     }
+    /**
+     * Process hook execution results and determine appropriate actions
+     * based on exit codes and hook event type
+     */
+    processHookResults(event, results, messageManager, toolId, toolParameters) {
+        if (!messageManager || results.length === 0) {
+            return { shouldBlock: false };
+        }
+        // First pass: Check for any blocking errors (exit code 2)
+        // Blocking errors take precedence and stop all processing
+        for (const result of results) {
+            if (result.exitCode === 2) {
+                // Handle blocking error immediately and return
+                return this.handleBlockingError(event, result, messageManager, toolId, toolParameters);
+            }
+        }
+        // Second pass: Process all non-blocking results
+        for (const result of results) {
+            if (result.exitCode === undefined) {
+                continue; // Skip results without exit codes
+            }
+            // Handle exit code interpretation
+            if (result.exitCode === 0) {
+                // Success case - handle stdout based on hook type
+                this.handleHookSuccess(event, result, messageManager);
+            }
+            else {
+                // Non-blocking error case (any exit code except 0 and 2)
+                this.handleNonBlockingError(result, messageManager);
+            }
+        }
+        return { shouldBlock: false };
+    }
+    /**
+     * Handle successful hook execution (exit code 0)
+     */
+    handleHookSuccess(event, result, messageManager) {
+        if (event === "UserPromptSubmit" && result.stdout?.trim()) {
+            // Inject stdout as user message context for UserPromptSubmit
+            messageManager.addUserMessage({
+                content: result.stdout.trim(),
+                source: MessageSource.HOOK,
+            });
+        }
+        // For other hook types (PreToolUse, PostToolUse, Stop), ignore stdout
+    }
+    /**
+     * Handle blocking error (exit code 2) - behavior varies by hook type
+     */
+    handleBlockingError(event, result, messageManager, toolId, toolParameters) {
+        const errorMessage = result.stderr?.trim() || "Hook execution failed";
+        switch (event) {
+            case "UserPromptSubmit":
+                // Block prompt processing, show error to user, erase prompt
+                messageManager.addErrorBlock(errorMessage);
+                messageManager.removeLastUserMessage();
+                return {
+                    shouldBlock: true,
+                    errorMessage,
+                };
+            case "PreToolUse":
+                // Block tool execution and show error to Wave Agent via tool block
+                if (toolId) {
+                    messageManager.updateToolBlock({
+                        id: toolId,
+                        parameters: toolParameters || "",
+                        result: errorMessage,
+                        success: false,
+                        error: "Hook blocked tool execution",
+                    });
+                }
+                return { shouldBlock: true };
+            case "PostToolUse":
+                // Show error to Wave Agent via user message and allow AI to continue
+                messageManager.addUserMessage({
+                    content: errorMessage,
+                    source: MessageSource.HOOK,
+                });
+                return { shouldBlock: false };
+            case "Stop":
+                // Show error to Wave Agent via user message and block stopping to continue conversation
+                messageManager.addUserMessage({
+                    content: errorMessage,
+                    source: MessageSource.HOOK,
+                });
+                return { shouldBlock: true, errorMessage };
+            default:
+                return { shouldBlock: false };
+        }
+    }
+    /**
+     * Handle non-blocking error (other exit codes)
+     */
+    handleNonBlockingError(result, messageManager) {
+        const errorMessage = result.stderr?.trim() || "Hook execution failed";
+        messageManager.addErrorBlock(errorMessage);
+    }
     /**
      * Check if hooks are configured for an event/tool combination
      */
@@ -347,7 +442,7 @@ export class HookManager {
         }
         // Validate commands
         config.hooks.forEach((hookCommand, cmdIndex) => {
-            if (!this.executor.isCommandSafe(hookCommand.command)) {
+            if (!isCommandSafe(hookCommand.command)) {
                 errors.push(`${prefix}.hooks[${cmdIndex}]: Command may be unsafe: ${hookCommand.command}`);
             }
         });

package/dist/managers/mcpManager.d.ts

@@ -1,6 +1,6 @@
 import { ChatCompletionFunctionTool } from "openai/resources.js";
 import type { ToolPlugin, ToolResult, ToolContext } from "../tools/types.js";
-import type { Logger, McpServerConfig, McpConfig, McpTool, McpServerStatus } from "../types.js";
+import type { Logger, McpServerConfig, McpConfig, McpTool, McpServerStatus } from "../types/index.js";
 export interface McpManagerCallbacks {
     onServersChange?: (servers: McpServerStatus[]) => void;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"mcpManager.d.ts","sourceRoot":"","sources":["../../src/managers/mcpManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AAEjE,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,KAAK,EACV,MAAM,EACN,eAAe,EACf,SAAS,EACT,OAAO,EACP,eAAe,EAChB,MAAM,aAAa,CAAC;AAQrB,MAAM,WAAW,mBAAmB;IAClC,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,IAAI,CAAC;CACxD;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAA0B;IACxC,OAAO,CAAC,OAAO,CAA2C;IAC1D,OAAO,CAAC,WAAW,CAAyC;IAC5D,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,OAAO,CAAc;IAC7B,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,MAAM,CAAC,CAAS;gBAEZ,OAAO,GAAE,iBAAsB;IAK3C;;OAEG;IACG,UAAU,CACd,OAAO,EAAE,MAAM,EACf,WAAW,GAAE,OAAe,GAC3B,OAAO,CAAC,IAAI,CAAC;IA4CV,kBAAkB,IAAI,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IAO/C,UAAU,IAAI,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IA0CvC,UAAU,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAWrD,SAAS,IAAI,SAAS,GAAG,IAAI;IAI7B,aAAa,IAAI,eAAe,EAAE;IAIlC,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;IAIpD,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,IAAI;IASzE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO;IAyBzD,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAgB7B,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA4F7C,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA2BtD,oBAAoB,IAAI,OAAO,EAAE;IAW3B,cAAc,CAClB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,OAAO,CAAC;QACT,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,MAAM,CAAC,EAAE,KAAK,CAAC;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,SAAS,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;KACtD,CAAC;IAoEI,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9B;;OAEG;IACH,iBAAiB,IAAI,UAAU,EAAE;IAuBjC;;OAEG;IACH,iBAAiB,IAAI,0BAA0B,EAAE;IAIjD;;OAEG;IACG,wBAAwB,CAC5B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,UAAU,CAAC;IActB;;OAEG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;CAIjC"}
+{"version":3,"file":"mcpManager.d.ts","sourceRoot":"","sources":["../../src/managers/mcpManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AAEjE,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,KAAK,EACV,MAAM,EACN,eAAe,EACf,SAAS,EACT,OAAO,EACP,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAQ3B,MAAM,WAAW,mBAAmB;IAClC,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,IAAI,CAAC;CACxD;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAA0B;IACxC,OAAO,CAAC,OAAO,CAA2C;IAC1D,OAAO,CAAC,WAAW,CAAyC;IAC5D,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,OAAO,CAAc;IAC7B,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,MAAM,CAAC,CAAS;gBAEZ,OAAO,GAAE,iBAAsB;IAK3C;;OAEG;IACG,UAAU,CACd,OAAO,EAAE,MAAM,EACf,WAAW,GAAE,OAAe,GAC3B,OAAO,CAAC,IAAI,CAAC;IA4CV,kBAAkB,IAAI,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IAO/C,UAAU,IAAI,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IA0CvC,UAAU,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAWrD,SAAS,IAAI,SAAS,GAAG,IAAI;IAI7B,aAAa,IAAI,eAAe,EAAE;IAIlC,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;IAIpD,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,IAAI;IASzE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO;IAyBzD,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAgB7B,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA4F7C,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA2BtD,oBAAoB,IAAI,OAAO,EAAE;IAW3B,cAAc,CAClB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,OAAO,CAAC;QACT,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,MAAM,CAAC,EAAE,KAAK,CAAC;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,SAAS,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;KACtD,CAAC;IAoEI,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9B;;OAEG;IACH,iBAAiB,IAAI,UAAU,EAAE;IAuBjC;;OAEG;IACH,iBAAiB,IAAI,0BAA0B,EAAE;IAIjD;;OAEG;IACG,wBAAwB,CAC5B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,UAAU,CAAC;IActB;;OAEG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;CAIjC"}

package/dist/managers/messageManager.d.ts

@@ -1,5 +1,5 @@
-import { type AgentToolBlockUpdateParams } from "../utils/messageOperations.js";
-import type { Logger, Message, Usage } from "../types.js";
+import { UserMessageParams, type AgentToolBlockUpdateParams } from "../utils/messageOperations.js";
+import type { Logger, Message, Usage } from "../types/index.js";
 import { ChatCompletionMessageFunctionToolCall } from "openai/resources.js";
 export interface MessageManagerCallbacks {
     onMessagesChange?: (messages: Message[]) => void;
@@ -7,10 +7,7 @@ export interface MessageManagerCallbacks {
     onLatestTotalTokensChange?: (latestTotalTokens: number) => void;
     onUserInputHistoryChange?: (history: string[]) => void;
     onUsagesChange?: (usages: Usage[]) => void;
-    onUserMessageAdded?: (content: string, images?: Array<{
-        path: string;
-        mimeType: string;
-    }>) => void;
+    onUserMessageAdded?: (params: UserMessageParams) => void;
     onAssistantMessageAdded?: (content?: string, toolCalls?: ChatCompletionMessageFunctionToolCall[]) => void;
     onToolBlockUpdated?: (params: AgentToolBlockUpdateParams) => void;
     onDiffBlockAdded?: (filePath: string, diffResult: string) => void;
@@ -18,12 +15,15 @@ export interface MessageManagerCallbacks {
     onCompressBlockAdded?: (insertIndex: number, content: string) => void;
     onCompressionStateChange?: (isCompressing: boolean) => void;
     onMemoryBlockAdded?: (content: string, success: boolean, type: "project" | "user", storagePath: string) => void;
-    onCustomCommandAdded?: (commandName: string, content: string, originalInput?: string) => void;
     onAddCommandOutputMessage?: (command: string) => void;
     onUpdateCommandOutputMessage?: (command: string, output: string) => void;
     onCompleteCommandMessage?: (command: string, exitCode: number) => void;
-    onSubAgentBlockAdded?: (subagentId: string) => void;
-    onSubAgentBlockUpdated?: (subagentId: string, messages: Message[]) => void;
+    onSubAgentBlockAdded?: (subagentId: string, parameters: {
+        description: string;
+        prompt: string;
+        subagent_type: string;
+    }) => void;
+    onSubAgentBlockUpdated?: (subagentId: string, messages: Message[], status: "active" | "completed" | "error" | "aborted") => void;
 }
 export interface MessageManagerOptions {
     callbacks: MessageManagerCallbacks;
@@ -70,11 +70,7 @@ export declare class MessageManager {
     initializeFromSession(sessionId: string, messages: Message[], latestTotalTokens: number): void;
     addToInputHistory(input: string): void;
     clearInputHistory(): void;
-    addUserMessage(content: string, images?: Array<{
-        path: string;
-        mimeType: string;
-    }>): void;
-    addCustomCommandMessage(commandName: string, content: string, originalInput?: string): void;
+    addUserMessage(params: UserMessageParams): void;
     addAssistantMessage(content?: string, toolCalls?: ChatCompletionMessageFunctionToolCall[], usage?: Usage): void;
     updateToolBlock(params: AgentToolBlockUpdateParams): void;
     addDiffBlock(filePath: string, diffResult: Array<{
@@ -91,7 +87,11 @@ export declare class MessageManager {
     addCommandOutputMessage(command: string): void;
     updateCommandOutputMessage(command: string, output: string): void;
     completeCommandMessage(command: string, exitCode: number): void;
-    addSubagentBlock(subagentId: string, subagentName: string, status?: "active" | "completed" | "error", subagentMessages?: Message[]): void;
+    addSubagentBlock(subagentId: string, subagentName: string, status: "active" | "completed" | "error" | undefined, subagentMessages: Message[] | undefined, parameters: {
+        description: string;
+        prompt: string;
+        subagent_type: string;
+    }): void;
     updateSubagentBlock(subagentId: string, updates: Partial<{
         status: "active" | "completed" | "error" | "aborted";
         messages: Message[];
@@ -100,5 +100,10 @@ export declare class MessageManager {
      * Trigger usage change callback with all usage data from assistant messages
      */
     triggerUsageChange(): void;
+    /**
+     * Remove the last user message from the conversation
+     * Used for hook error handling when the user prompt needs to be erased
+     */
+    removeLastUserMessage(): void;
 }
 //# sourceMappingURL=messageManager.d.ts.map

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

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

package/dist/managers/messageManager.js

@@ -1,5 +1,5 @@
 import { randomUUID } from "crypto";
-import { addAssistantMessageToMessages, updateToolBlockInMessage, addErrorBlockToMessage, addDiffBlockToMessage, addUserMessageToMessages, extractUserInputHistory, addMemoryBlockToMessage, addCommandOutputMessage, updateCommandOutputInMessage, completeCommandInMessage, addSubagentBlockToMessage, updateSubagentBlockInMessage, } from "../utils/messageOperations.js";
+import { addAssistantMessageToMessages, updateToolBlockInMessage, addErrorBlockToMessage, addDiffBlockToMessage, addUserMessageToMessages, extractUserInputHistory, addMemoryBlockToMessage, addCommandOutputMessage, updateCommandOutputInMessage, completeCommandInMessage, addSubagentBlockToMessage, updateSubagentBlockInMessage, removeLastUserMessage, } from "../utils/messageOperations.js";
 import { cleanupExpiredSessions, getLatestSession, loadSession, saveSession, getSessionFilePath, } from "../services/session.js";
 export class MessageManager {
     constructor(options) {
@@ -60,7 +60,7 @@ export class MessageManager {
             await cleanupExpiredSessions(this.workdir, this.sessionDir);
         }
         catch (error) {
-            console.warn("Failed to cleanup expired sessions:", error);
+            this.logger?.warn("Failed to cleanup expired sessions:", error);
         }
         if (!restoreSessionId && !continueLastSession) {
             return;
@@ -135,28 +135,13 @@ export class MessageManager {
         this.setUserInputHistory([]);
     }
     // Encapsulated message operation functions
-    addUserMessage(content, images) {
+    addUserMessage(params) {
         const newMessages = addUserMessageToMessages({
             messages: this.messages,
-            content,
-            images,
-        });
-        this.setMessages(newMessages);
-        this.callbacks.onUserMessageAdded?.(content, images);
-    }
-    addCustomCommandMessage(commandName, content, originalInput) {
-        const newMessages = addUserMessageToMessages({
-            messages: this.messages,
-            content: "", // Empty content, as we will use CustomCommandBlock
-            customCommandBlock: {
-                type: "custom_command",
-                commandName,
-                content,
-                originalInput,
-            },
+            ...params,
         });
         this.setMessages(newMessages);
-        this.callbacks.onCustomCommandAdded?.(commandName, content, originalInput);
+        this.callbacks.onUserMessageAdded?.(params);
     }
     addAssistantMessage(content, toolCalls, usage) {
         const newMessages = addAssistantMessageToMessages(this.messages, content, toolCalls, usage);
@@ -166,14 +151,15 @@ export class MessageManager {
     updateToolBlock(params) {
         const newMessages = updateToolBlockInMessage({
             messages: this.messages,
-            id: params.toolId,
-            parameters: params.args || "",
+            id: params.id,
+            parameters: params.parameters,
             result: params.result,
             success: params.success,
             error: params.error,
             isRunning: params.isRunning,
             name: params.name,
             shortResult: params.shortResult,
+            images: params.images,
             compactParams: params.compactParams,
         });
         this.setMessages(newMessages);
@@ -264,7 +250,7 @@ export class MessageManager {
         this.callbacks.onCompleteCommandMessage?.(command, exitCode);
     }
     // Subagent block methods
-    addSubagentBlock(subagentId, subagentName, status = "active", subagentMessages = []) {
+    addSubagentBlock(subagentId, subagentName, status = "active", subagentMessages = [], parameters) {
         const params = {
             messages: this.messages,
             subagentId,
@@ -274,7 +260,7 @@ export class MessageManager {
         };
         const updatedMessages = addSubagentBlockToMessage(params);
         this.setMessages(updatedMessages);
-        this.callbacks.onSubAgentBlockAdded?.(params.subagentId);
+        this.callbacks.onSubAgentBlockAdded?.(params.subagentId, parameters);
     }
     updateSubagentBlock(subagentId, updates) {
         const updatedMessages = updateSubagentBlockInMessage(this.messages, subagentId, updates);
@@ -285,7 +271,7 @@ export class MessageManager {
             status: updates.status || "active",
             subagentMessages: updates.messages || [],
         };
-        this.callbacks.onSubAgentBlockUpdated?.(params.subagentId, params.messages);
+        this.callbacks.onSubAgentBlockUpdated?.(params.subagentId, params.messages, params.status);
     }
     /**
      * Trigger usage change callback with all usage data from assistant messages
@@ -299,4 +285,12 @@ export class MessageManager {
         }
         this.callbacks.onUsagesChange?.(usages);
     }
+    /**
+     * Remove the last user message from the conversation
+     * Used for hook error handling when the user prompt needs to be erased
+     */
+    removeLastUserMessage() {
+        const newMessages = removeLastUserMessage(this.messages);
+        this.setMessages(newMessages);
+    }
 }

package/dist/managers/skillManager.d.ts

@@ -1,4 +1,4 @@
-import type { SkillManagerOptions, SkillMetadata, Skill, SkillToolArgs, SkillInvocationContext } from "../types.js";
+import type { SkillManagerOptions, SkillMetadata, Skill, SkillToolArgs, SkillInvocationContext } from "../types/index.js";
 /**
  * Manages skill discovery and loading
  */

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

@@ -1 +1 @@
-{"version":3,"file":"skillManager.d.ts","sourceRoot":"","sources":["../../src/managers/skillManager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,mBAAmB,EACnB,aAAa,EACb,KAAK,EAGL,aAAa,EACb,sBAAsB,EAEvB,MAAM,aAAa,CAAC;AAGrB;;GAEG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,kBAAkB,CAAS;IACnC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,MAAM,CAAC,CAAS;IAExB,OAAO,CAAC,aAAa,CAAoC;IACzD,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,WAAW,CAAS;gBAEhB,OAAO,GAAE,mBAAwB;IAO7C;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAwCjC;;OAEG;IACH,aAAa,IAAI,OAAO;IAIxB;;OAEG;IACH,kBAAkB,IAAI,aAAa,EAAE;IAQrC;;;OAGG;IACG,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IAgBzD;;OAEG;YACW,cAAc;IAkB5B;;OAEG;YACW,uBAAuB;IAiFrC;;OAEG;YACW,oBAAoB;IAkBlC;;OAEG;IACG,YAAY,CAChB,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,sBAAsB,CAAA;KAAE,CAAC;IAqCjE;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAY1B;;OAEG;IACH,OAAO,CAAC,qBAAqB;CAa9B"}
+{"version":3,"file":"skillManager.d.ts","sourceRoot":"","sources":["../../src/managers/skillManager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,mBAAmB,EACnB,aAAa,EACb,KAAK,EAGL,aAAa,EACb,sBAAsB,EAEvB,MAAM,mBAAmB,CAAC;AAG3B;;GAEG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,kBAAkB,CAAS;IACnC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,MAAM,CAAC,CAAS;IAExB,OAAO,CAAC,aAAa,CAAoC;IACzD,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,WAAW,CAAS;gBAEhB,OAAO,GAAE,mBAAwB;IAO7C;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAwCjC;;OAEG;IACH,aAAa,IAAI,OAAO;IAIxB;;OAEG;IACH,kBAAkB,IAAI,aAAa,EAAE;IAQrC;;;OAGG;IACG,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IAgBzD;;OAEG;YACW,cAAc;IAkB5B;;OAEG;YACW,uBAAuB;IAiFrC;;OAEG;YACW,oBAAoB;IAkBlC;;OAEG;IACG,YAAY,CAChB,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,sBAAsB,CAAA;KAAE,CAAC;IAqCjE;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAY1B;;OAEG;IACH,OAAO,CAAC,qBAAqB;CAa9B"}

package/dist/managers/slashCommandManager.d.ts

@@ -1,6 +1,6 @@
 import type { MessageManager } from "./messageManager.js";
 import type { AIManager } from "./aiManager.js";
-import type { SlashCommand, CustomSlashCommand, Logger } from "../types.js";
+import type { SlashCommand, CustomSlashCommand, Logger } from "../types/index.js";
 export interface SlashCommandManagerOptions {
     messageManager: MessageManager;
     aiManager: AIManager;

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

@@ -1 +1 @@
-{"version":3,"file":"slashCommandManager.d.ts","sourceRoot":"","sources":["../../src/managers/slashCommandManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAkB5E,MAAM,WAAW,0BAA0B;IACzC,cAAc,EAAE,cAAc,CAAC;IAC/B,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAmC;IACnD,OAAO,CAAC,cAAc,CAAyC;IAC/D,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,MAAM,CAAC,CAAS;gBAEZ,OAAO,EAAE,0BAA0B;IAU/C,OAAO,CAAC,yBAAyB;IAYjC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAwC1B;;OAEG;IACI,oBAAoB,IAAI,IAAI;IAWnC;;OAEG;IACH,OAAO,CAAC,eAAe;IAIvB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;OAEG;IACI,WAAW,IAAI,YAAY,EAAE;IAIpC;;OAEG;IACI,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAI9D;;OAEG;IACU,cAAc,CACzB,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC;IAenB;;;OAGG;IACI,4BAA4B,CAAC,KAAK,EAAE,MAAM,GAAG;QAClD,OAAO,EAAE,OAAO,CAAC;QACjB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,IAAI,CAAC,EAAE,MAAM,CAAC;KACf;IAeD;;OAEG;IACI,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAI7C;;OAEG;IACI,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAI1E;;OAEG;IACI,iBAAiB,IAAI,kBAAkB,EAAE;IAIhD;;OAEG;YACW,+BAA+B;IA2E7C;;OAEG;IACI,mBAAmB,IAAI,IAAI;CAInC"}
+{"version":3,"file":"slashCommandManager.d.ts","sourceRoot":"","sources":["../../src/managers/slashCommandManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EACV,YAAY,EACZ,kBAAkB,EAClB,MAAM,EACP,MAAM,mBAAmB,CAAC;AAkB3B,MAAM,WAAW,0BAA0B;IACzC,cAAc,EAAE,cAAc,CAAC;IAC/B,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAmC;IACnD,OAAO,CAAC,cAAc,CAAyC;IAC/D,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,MAAM,CAAC,CAAS;gBAEZ,OAAO,EAAE,0BAA0B;IAU/C,OAAO,CAAC,yBAAyB;IAYjC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAwC1B;;OAEG;IACI,oBAAoB,IAAI,IAAI;IAWnC;;OAEG;IACH,OAAO,CAAC,eAAe;IAIvB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;OAEG;IACI,WAAW,IAAI,YAAY,EAAE;IAIpC;;OAEG;IACI,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAI9D;;OAEG;IACU,cAAc,CACzB,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC;IAenB;;;OAGG;IACI,4BAA4B,CAAC,KAAK,EAAE,MAAM,GAAG;QAClD,OAAO,EAAE,OAAO,CAAC;QACjB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,IAAI,CAAC,EAAE,MAAM,CAAC;KACf;IAeD;;OAEG;IACI,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAI7C;;OAEG;IACI,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAI1E;;OAEG;IACI,iBAAiB,IAAI,kBAAkB,EAAE;IAIhD;;OAEG;YACW,+BAA+B;IA0E7C;;OAEG;IACI,mBAAmB,IAAI,IAAI;CAInC"}

package/dist/managers/slashCommandManager.js

@@ -181,11 +181,14 @@ export class SlashCommandManager {
             const finalContent = bashResults.length > 0
                 ? replaceBashCommandsWithOutput(processedContent, bashResults)
                 : processedContent;
-            // Add custom command block to show the command being executed
+            // Add custom command message to show the command being executed
             const originalInput = args
                 ? `/${commandName} ${args}`
                 : `/${commandName}`;
-            this.messageManager.addCustomCommandMessage(commandName, finalContent, originalInput);
+            this.messageManager.addUserMessage({
+                content: originalInput,
+                customCommandContent: finalContent,
+            });
             // Execute the AI conversation with custom configuration
             await this.aiManager.sendAIMessage({
                 model: config?.model,

package/dist/managers/subagentManager.d.ts

@@ -1,5 +1,5 @@
 import type { SubagentConfiguration } from "../utils/subagentParser.js";
-import type { Message, Logger, GatewayConfig, ModelConfig, Usage } from "../types.js";
+import type { Message, Logger, GatewayConfig, ModelConfig, Usage } from "../types/index.js";
 import { AIManager } from "./aiManager.js";
 import { MessageManager } from "./messageManager.js";
 import { ToolManager } from "./toolManager.js";
@@ -10,7 +10,6 @@ export interface SubagentInstance {
     messageManager: MessageManager;
     toolManager: ToolManager;
     status: "initializing" | "active" | "completed" | "error" | "aborted";
-    taskDescription: string;
     messages: Message[];
 }
 export interface SubagentManagerOptions {
@@ -54,14 +53,18 @@ export declare class SubagentManager {
     /**
      * Create a new subagent instance with isolated managers
      */
-    createInstance(configuration: SubagentConfiguration, taskDescription: string): Promise<SubagentInstance>;
+    createInstance(configuration: SubagentConfiguration, parameters: {
+        description: string;
+        prompt: string;
+        subagent_type: string;
+    }): Promise<SubagentInstance>;
     /**
      * Execute task using subagent instance
      *
      * IMPORTANT: This method automatically filters out the Task tool from allowedTools
      * to prevent subagents from spawning other subagents (infinite recursion protection)
      */
-    executeTask(instance: SubagentInstance, prompt: string): Promise<string>;
+    executeTask(instance: SubagentInstance, prompt: string, abortSignal?: AbortSignal): Promise<string>;
     /**
      * Get instance by subagent ID
      */
@@ -74,14 +77,6 @@ export declare class SubagentManager {
      * Add message to instance
      */
     addMessageToInstance(subagentId: string, message: Message): void;
-    /**
-     * Abort a running subagent instance
-     */
-    abortInstance(subagentId: string): boolean;
-    /**
-     * Abort all active subagent instances
-     */
-    abortAllInstances(): void;
     /**
      * Clean up completed, errored, or aborted instances
      */

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

@@ -1 +1 @@
-{"version":3,"file":"subagentManager.d.ts","sourceRoot":"","sources":["../../src/managers/subagentManager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,KAAK,EACV,OAAO,EACP,MAAM,EACN,aAAa,EACb,WAAW,EACX,KAAK,EACN,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EACL,cAAc,EAEf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,qBAAqB,CAAC;IACrC,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,cAAc,CAAC;IAC/B,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,cAAc,GAAG,QAAQ,GAAG,WAAW,GAAG,OAAO,GAAG,SAAS,CAAC;IACtE,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,OAAO,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,WAAW,CAAC;IAC/B,oBAAoB,EAAE,cAAc,CAAC;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,aAAa,CAAC;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CACvC;AAED,qBAAa,eAAe;IAC1B,OAAO,CAAC,SAAS,CAAuC;IACxD,OAAO,CAAC,oBAAoB,CAAwC;IAEpE,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,iBAAiB,CAAc;IACvC,OAAO,CAAC,oBAAoB,CAAiB;IAC7C,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,YAAY,CAAC,CAAyB;gBAElC,OAAO,EAAE,sBAAsB;IAW3C;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIjC;;OAEG;IACG,kBAAkB,IAAI,OAAO,CAAC,qBAAqB,EAAE,CAAC;IAY5D;;OAEG;IACH,iBAAiB,IAAI,qBAAqB,EAAE;IAS5C;;OAEG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM;IAK/B;;OAEG;IACG,cAAc,CAClB,aAAa,EAAE,qBAAqB,EACpC,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,gBAAgB,CAAC;IAsF5B;;;;;OAKG;IACG,WAAW,CACf,QAAQ,EAAE,gBAAgB,EAC1B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC;IAiElB;;OAEG;IACH,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IAIxD;;OAEG;IACH,oBAAoB,CAClB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC,GACjC,IAAI;IAOP;;OAEG;IACH,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAOhE;;OAEG;IACH,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAiC1C;;OAEG;IACH,iBAAiB,IAAI,IAAI;IAOzB;;OAEG;IACH,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAYzC;;OAEG;IACH,kBAAkB,IAAI,gBAAgB,EAAE;IAOxC;;OAEG;IACH,OAAO,IAAI,IAAI;CAKhB"}
+{"version":3,"file":"subagentManager.d.ts","sourceRoot":"","sources":["../../src/managers/subagentManager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,KAAK,EACV,OAAO,EACP,MAAM,EACN,aAAa,EACb,WAAW,EACX,KAAK,EACN,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EACL,cAAc,EAEf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,qBAAqB,CAAC;IACrC,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,cAAc,CAAC;IAC/B,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,cAAc,GAAG,QAAQ,GAAG,WAAW,GAAG,OAAO,GAAG,SAAS,CAAC;IACtE,QAAQ,EAAE,OAAO,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,WAAW,CAAC;IAC/B,oBAAoB,EAAE,cAAc,CAAC;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,aAAa,CAAC;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CACvC;AAED,qBAAa,eAAe;IAC1B,OAAO,CAAC,SAAS,CAAuC;IACxD,OAAO,CAAC,oBAAoB,CAAwC;IAEpE,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,iBAAiB,CAAc;IACvC,OAAO,CAAC,oBAAoB,CAAiB;IAC7C,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,YAAY,CAAC,CAAyB;gBAElC,OAAO,EAAE,sBAAsB;IAW3C;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIjC;;OAEG;IACG,kBAAkB,IAAI,OAAO,CAAC,qBAAqB,EAAE,CAAC;IAY5D;;OAEG;IACH,iBAAiB,IAAI,qBAAqB,EAAE;IAS5C;;OAEG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM;IAK/B;;OAEG;IACG,cAAc,CAClB,aAAa,EAAE,qBAAqB,EACpC,UAAU,EAAE;QACV,WAAW,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;QACf,aAAa,EAAE,MAAM,CAAC;KACvB,GACA,OAAO,CAAC,gBAAgB,CAAC;IAsF5B;;;;;OAKG;IACG,WAAW,CACf,QAAQ,EAAE,gBAAgB,EAC1B,MAAM,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,MAAM,CAAC;IAsGlB;;OAEG;IACH,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IAIxD;;OAEG;IACH,oBAAoB,CAClB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC,GACjC,IAAI;IAOP;;OAEG;IACH,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAOhE;;OAEG;IACH,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAYzC;;OAEG;IACH,kBAAkB,IAAI,gBAAgB,EAAE;IAOxC;;OAEG;IACH,OAAO,IAAI,IAAI;CAGhB"}

package/dist/managers/subagentManager.js

@@ -49,7 +49,7 @@ export class SubagentManager {
     /**
      * Create a new subagent instance with isolated managers
      */
-    async createInstance(configuration, taskDescription) {
+    async createInstance(configuration, parameters) {
         if (!this.parentToolManager ||
             !this.gatewayConfig ||
             !this.modelConfig ||
@@ -106,12 +106,11 @@ export class SubagentManager {
             messageManager,
             toolManager,
             status: "initializing",
-            taskDescription,
             messages: [],
         };
         this.instances.set(subagentId, instance);
         // Create subagent block in parent message manager
-        this.parentMessageManager.addSubagentBlock(subagentId, configuration.name, "active", []);
+        this.parentMessageManager.addSubagentBlock(subagentId, configuration.name, "active", [], parameters);
         return instance;
     }
     /**
@@ -120,15 +119,29 @@ export class SubagentManager {
      * IMPORTANT: This method automatically filters out the Task tool from allowedTools
      * to prevent subagents from spawning other subagents (infinite recursion protection)
      */
-    async executeTask(instance, prompt) {
+    async executeTask(instance, prompt, abortSignal) {
         try {
+            // Check if already aborted before starting
+            if (abortSignal?.aborted) {
+                throw new Error("Task was aborted before execution started");
+            }
             // Set status to active and update parent
             this.updateInstanceStatus(instance.subagentId, "active");
             this.parentMessageManager.updateSubagentBlock(instance.subagentId, {
                 status: "active",
             });
+            // Set up abort handler
+            if (abortSignal) {
+                abortSignal.addEventListener("abort", () => {
+                    this.updateInstanceStatus(instance.subagentId, "aborted");
+                    this.parentMessageManager.updateSubagentBlock(instance.subagentId, {
+                        status: "aborted",
+                        messages: instance.messages,
+                    });
+                });
+            }
             // Add the user's prompt as a message
-            instance.messageManager.addUserMessage(prompt);
+            instance.messageManager.addUserMessage({ content: prompt });
             // Create allowed tools list - always exclude Task tool to prevent subagent recursion
             let allowedTools = instance.configuration.tools;
             // Always filter out the Task tool to prevent subagents from creating sub-subagents
@@ -141,12 +154,33 @@ export class SubagentManager {
                 allowedTools = allTools.filter((tool) => tool !== "Task");
             }
             // Execute the AI request with tool restrictions
-            await instance.aiManager.sendAIMessage({
+            // The AIManager will handle abort signals through its own abort controllers
+            // We need to abort the AI execution if the external abort signal is triggered
+            const executeAI = instance.aiManager.sendAIMessage({
                 allowedTools,
                 model: instance.configuration.model !== "inherit"
                     ? instance.configuration.model
                     : undefined,
             });
+            // If we have an abort signal, race against it
+            if (abortSignal) {
+                await Promise.race([
+                    executeAI,
+                    new Promise((_, reject) => {
+                        if (abortSignal.aborted) {
+                            reject(new Error("Task was aborted"));
+                        }
+                        abortSignal.addEventListener("abort", () => {
+                            // Abort the AI execution
+                            instance.aiManager.abortAIMessage();
+                            reject(new Error("Task was aborted"));
+                        });
+                    }),
+                ]);
+            }
+            else {
+                await executeAI;
+            }
             // Get the latest messages to extract the response
             const messages = instance.messageManager.getMessages();
             const lastAssistantMessage = messages
@@ -198,44 +232,6 @@ export class SubagentManager {
             instance.messages.push(message);
         }
     }
-    /**
-     * Abort a running subagent instance
-     */
-    abortInstance(subagentId) {
-        const instance = this.instances.get(subagentId);
-        if (!instance) {
-            return false;
-        }
-        // Only abort active or initializing instances
-        if (instance.status !== "active" && instance.status !== "initializing") {
-            return false;
-        }
-        try {
-            // Abort the AI manager operations
-            instance.aiManager.abortAIMessage();
-            // Update status
-            this.updateInstanceStatus(subagentId, "aborted");
-            this.parentMessageManager.updateSubagentBlock(subagentId, {
-                status: "aborted",
-                messages: instance.messages,
-            });
-            this.logger?.debug(`Aborted subagent instance: ${subagentId}`);
-            return true;
-        }
-        catch (error) {
-            this.logger?.error(`Failed to abort subagent instance ${subagentId}:`, error);
-            return false;
-        }
-    }
-    /**
-     * Abort all active subagent instances
-     */
-    abortAllInstances() {
-        const activeInstances = this.getActiveInstances();
-        for (const instance of activeInstances) {
-            this.abortInstance(instance.subagentId);
-        }
-    }
     /**
      * Clean up completed, errored, or aborted instances
      */
@@ -258,8 +254,6 @@ export class SubagentManager {
      * Clean up all instances (for session end)
      */
     cleanup() {
-        // Abort all active instances before cleanup
-        this.abortAllInstances();
         this.instances.clear();
     }
 }