wave-agent-sdk 0.0.7 → 0.0.10

package/dist/managers/skillManager.js

@@ -14,6 +14,7 @@ export class SkillManager {
             options.personalSkillsPath || join(homedir(), ".wave", "skills");
         this.scanTimeout = options.scanTimeout || 5000;
         this.logger = options.logger;
+        this.workdir = options.workdir || process.cwd();
     }
     /**
      * Initialize the skill manager by discovering available skills
@@ -84,7 +85,7 @@ export class SkillManager {
      */
     async discoverSkills() {
         const personalCollection = await this.discoverSkillCollection(this.personalSkillsPath, "personal");
-        const projectCollection = await this.discoverSkillCollection(process.cwd(), "project");
+        const projectCollection = await this.discoverSkillCollection(this.workdir, "project");
         return {
             personalSkills: personalCollection.skills,
             projectSkills: projectCollection.skills,

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,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"}
+{"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;IAejC;;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;IAyE7C;;OAEG;IACI,mBAAmB,IAAI,IAAI;CAInC"}

package/dist/managers/slashCommandManager.js

@@ -20,9 +20,12 @@ export class SlashCommandManager {
         this.registerCommand({
             id: "clear",
             name: "clear",
-            description: "Clear the chat session",
+            description: "Clear the chat session and terminal",
             handler: () => {
+                // Clear chat messages
                 this.messageManager.clearMessages();
+                // Clear terminal screen
+                process.stdout.write("\x1Bc");
             },
         });
     }
@@ -192,7 +195,6 @@ export class SlashCommandManager {
             // Execute the AI conversation with custom configuration
             await this.aiManager.sendAIMessage({
                 model: config?.model,
-                allowedTools: config?.allowedTools,
             });
         }
         catch (error) {

package/dist/managers/subagentManager.d.ts

@@ -1,8 +1,25 @@
 import type { SubagentConfiguration } from "../utils/subagentParser.js";
 import type { Message, Logger, GatewayConfig, 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";
+export interface SubagentManagerCallbacks {
+    /** Triggered when subagent adds user message */
+    onSubagentUserMessageAdded?: (subagentId: string, params: UserMessageParams) => void;
+    /** Triggered when subagent creates assistant message */
+    onSubagentAssistantMessageAdded?: (subagentId: string) => void;
+    /** Triggered during subagent content streaming updates */
+    onSubagentAssistantContentUpdated?: (subagentId: string, chunk: string, accumulated: string) => void;
+    /** Triggered during subagent reasoning streaming updates */
+    onSubagentAssistantReasoningUpdated?: (subagentId: string, chunk: string, accumulated: string) => void;
+    /** Triggered when subagent tool block is updated */
+    onSubagentToolBlockUpdated?: (subagentId: string, params: AgentToolBlockUpdateParams) => void;
+    /** Triggered when subagent messages change */
+    onSubagentMessagesChange?: (subagentId: string, messages: Message[]) => void;
+}
 export interface SubagentInstance {
     subagentId: string;
     configuration: SubagentConfiguration;
@@ -11,15 +28,18 @@ export interface SubagentInstance {
     toolManager: ToolManager;
     status: "initializing" | "active" | "completed" | "error" | "aborted";
     messages: Message[];
+    subagentType: string;
 }
 export interface SubagentManagerOptions {
     workdir: string;
     parentToolManager: ToolManager;
     parentMessageManager: MessageManager;
+    callbacks?: SubagentManagerCallbacks;
     logger?: Logger;
-    gatewayConfig: GatewayConfig;
-    modelConfig: ModelConfig;
-    tokenLimit: number;
+    getGatewayConfig: () => GatewayConfig;
+    getModelConfig: () => ModelConfig;
+    getTokenLimit: () => number;
+    hookManager?: HookManager;
     onUsageAdded?: (usage: Usage) => void;
 }
 export declare class SubagentManager {
@@ -28,10 +48,12 @@ export declare class SubagentManager {
     private workdir;
     private parentToolManager;
     private parentMessageManager;
+    private callbacks?;
     private logger?;
-    private gatewayConfig;
-    private modelConfig;
-    private tokenLimit;
+    private getGatewayConfig;
+    private getModelConfig;
+    private getTokenLimit;
+    private hookManager?;
     private onUsageAdded?;
     constructor(options: SubagentManagerOptions);
     /**
@@ -89,5 +111,19 @@ export declare class SubagentManager {
      * Clean up all instances (for session end)
      */
     cleanup(): void;
+    /**
+     * Restore subagent instances from saved session data
+     * This method is called during agent initialization to restore previous subagent states
+     */
+    restoreSubagentSessions(subagentSessions: Array<{
+        sessionData: SessionData;
+        subagentId: string;
+        configuration: SubagentConfiguration;
+    }>): Promise<void>;
+    /**
+     * Create subagent callbacks for a specific subagent ID
+     * Extracted to reuse in both create and restore flows
+     */
+    private createSubagentCallbacks;
 }
 //# sourceMappingURL=subagentManager.d.ts.map

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

package/dist/managers/subagentManager.js

@@ -1,6 +1,7 @@
 import { randomUUID } from "crypto";
 import { AIManager } from "./aiManager.js";
-import { MessageManager, } from "./messageManager.js";
+import { MessageManager } from "./messageManager.js";
+import { addConsolidatedAbortListener, createAbortPromise, } from "../utils/abortUtils.js";
 export class SubagentManager {
     constructor(options) {
         this.instances = new Map();
@@ -8,10 +9,12 @@ export class SubagentManager {
         this.workdir = options.workdir;
         this.parentToolManager = options.parentToolManager;
         this.parentMessageManager = options.parentMessageManager;
+        this.callbacks = options.callbacks; // Store SubagentManagerCallbacks
         this.logger = options.logger;
-        this.gatewayConfig = options.gatewayConfig;
-        this.modelConfig = options.modelConfig;
-        this.tokenLimit = options.tokenLimit;
+        this.getGatewayConfig = options.getGatewayConfig;
+        this.getModelConfig = options.getModelConfig;
+        this.getTokenLimit = options.getTokenLimit;
+        this.hookManager = options.hookManager;
         this.onUsageAdded = options.onUsageAdded;
     }
     /**
@@ -50,38 +53,21 @@ export class SubagentManager {
      * Create a new subagent instance with isolated managers
      */
     async createInstance(configuration, parameters) {
-        if (!this.parentToolManager ||
-            !this.gatewayConfig ||
-            !this.modelConfig ||
-            !this.tokenLimit) {
+        if (!this.parentToolManager) {
             throw new Error("SubagentManager not properly initialized - call initialize() first");
         }
         const subagentId = randomUUID();
         // Create isolated MessageManager for the subagent
-        const subagentCallbacks = {
-            // These callbacks will be handled by the parent agent
-            onMessagesChange: (messages) => {
-                const instance = this.instances.get(subagentId);
-                if (instance) {
-                    instance.messages = messages;
-                    // Update parent's subagent block with latest messages
-                    this.parentMessageManager.updateSubagentBlock(subagentId, {
-                        messages: messages,
-                    });
-                }
-            },
-        };
+        const subagentCallbacks = this.createSubagentCallbacks(subagentId);
         const messageManager = new MessageManager({
             callbacks: subagentCallbacks,
             workdir: this.workdir,
             logger: this.logger,
+            sessionType: "subagent",
+            subagentType: parameters.subagent_type,
         });
         // Use the parent tool manager directly - tool restrictions will be handled by allowedTools parameter
         const toolManager = this.parentToolManager;
-        // Determine model to use
-        const modelToUse = configuration.model && configuration.model !== "inherit"
-            ? configuration.model
-            : this.modelConfig.agentModel;
         // Create isolated AIManager for the subagent
         const aiManager = new AIManager({
             messageManager,
@@ -89,12 +75,31 @@ export class SubagentManager {
             logger: this.logger,
             workdir: this.workdir,
             systemPrompt: configuration.systemPrompt,
-            gatewayConfig: this.gatewayConfig,
-            modelConfig: {
-                ...this.modelConfig,
-                agentModel: modelToUse,
+            subagentType: parameters.subagent_type, // Pass subagent type for hook context
+            hookManager: this.hookManager,
+            getGatewayConfig: this.getGatewayConfig,
+            getModelConfig: () => {
+                // Determine model dynamically each time
+                const parentModelConfig = this.getModelConfig();
+                let modelToUse;
+                if (!configuration.model || configuration.model === "inherit") {
+                    // Use parent's agentModel for "inherit" or undefined
+                    modelToUse = parentModelConfig.agentModel;
+                }
+                else if (configuration.model === "fastModel") {
+                    // Use parent's fastModel for special "fastModel" value
+                    modelToUse = parentModelConfig.fastModel;
+                }
+                else {
+                    // Use specific model name
+                    modelToUse = configuration.model;
+                }
+                return {
+                    ...parentModelConfig,
+                    agentModel: modelToUse,
+                };
             },
-            tokenLimit: this.tokenLimit,
+            getTokenLimit: this.getTokenLimit,
             callbacks: {
                 onUsageAdded: this.onUsageAdded,
             },
@@ -107,10 +112,11 @@ export class SubagentManager {
             toolManager,
             status: "initializing",
             messages: [],
+            subagentType: parameters.subagent_type, // Store the subagent type
         };
         this.instances.set(subagentId, instance);
         // Create subagent block in parent message manager
-        this.parentMessageManager.addSubagentBlock(subagentId, configuration.name, "active", [], parameters);
+        this.parentMessageManager.addSubagentBlock(subagentId, configuration.name, messageManager.getSessionId(), configuration, "active", parameters);
         return instance;
     }
     /**
@@ -130,15 +136,22 @@ export class SubagentManager {
             this.parentMessageManager.updateSubagentBlock(instance.subagentId, {
                 status: "active",
             });
-            // Set up abort handler
+            // Set up consolidated abort handler to prevent listener accumulation
+            let abortCleanup;
             if (abortSignal) {
-                abortSignal.addEventListener("abort", () => {
-                    this.updateInstanceStatus(instance.subagentId, "aborted");
-                    this.parentMessageManager.updateSubagentBlock(instance.subagentId, {
-                        status: "aborted",
-                        messages: instance.messages,
-                    });
-                });
+                abortCleanup = addConsolidatedAbortListener(abortSignal, [
+                    () => {
+                        // Update status to aborted
+                        this.updateInstanceStatus(instance.subagentId, "aborted");
+                        this.parentMessageManager.updateSubagentBlock(instance.subagentId, {
+                            status: "aborted",
+                        });
+                    },
+                    () => {
+                        // Abort the AI execution
+                        instance.aiManager.abortAIMessage();
+                    },
+                ]);
             }
             // Add the user's prompt as a message
             instance.messageManager.addUserMessage({ content: prompt });
@@ -155,31 +168,42 @@ export class SubagentManager {
             }
             // Execute the AI request with tool restrictions
             // 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
+            // Resolve model name for sendAIMessage
+            let resolvedModel;
+            if (instance.configuration.model &&
+                instance.configuration.model !== "inherit") {
+                if (instance.configuration.model === "fastModel") {
+                    // Use parent's fastModel for special "fastModel" value
+                    const parentModelConfig = this.getModelConfig();
+                    resolvedModel = parentModelConfig.fastModel;
+                }
+                else {
+                    // Use specific model name
+                    resolvedModel = instance.configuration.model;
+                }
+            }
+            // For "inherit" or undefined, resolvedModel remains undefined (uses AIManager default)
             const executeAI = instance.aiManager.sendAIMessage({
                 allowedTools,
-                model: instance.configuration.model !== "inherit"
-                    ? instance.configuration.model
-                    : undefined,
+                model: resolvedModel,
             });
-            // 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"));
-                        });
-                    }),
-                ]);
+            try {
+                // If we have an abort signal, race against it using utilities to prevent listener accumulation
+                if (abortSignal) {
+                    await Promise.race([
+                        executeAI,
+                        createAbortPromise(abortSignal, "Task was aborted"),
+                    ]);
+                }
+                else {
+                    await executeAI;
+                }
             }
-            else {
-                await executeAI;
+            finally {
+                // Clean up abort listeners to prevent memory leaks
+                if (abortCleanup) {
+                    abortCleanup();
+                }
             }
             // Get the latest messages to extract the response
             const messages = instance.messageManager.getMessages();
@@ -192,11 +216,10 @@ export class SubagentManager {
             // Extract text content from the last assistant message
             const textBlocks = lastAssistantMessage.blocks.filter((block) => block.type === "text");
             const response = textBlocks.map((block) => block.content).join("\n");
-            // Update status to completed and update parent with final messages
+            // Update status to completed and update parent
             this.updateInstanceStatus(instance.subagentId, "completed");
             this.parentMessageManager.updateSubagentBlock(instance.subagentId, {
                 status: "completed",
-                messages: messages,
             });
             return response || "Task completed with no text response";
         }
@@ -256,4 +279,132 @@ export class SubagentManager {
     cleanup() {
         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) {
+        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
+                });
+                // Use the parent tool manager
+                const toolManager = this.parentToolManager;
+                // Determine model to use
+                let modelToUse;
+                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,
+                    logger: this.logger,
+                    workdir: this.workdir,
+                    systemPrompt: configuration.systemPrompt,
+                    subagentType: configuration.name, // Use configuration name as subagent type for restored instances
+                    hookManager: this.hookManager,
+                    getGatewayConfig: this.getGatewayConfig,
+                    getModelConfig: () => ({
+                        ...parentModelConfig,
+                        agentModel: modelToUse,
+                    }),
+                    getTokenLimit: this.getTokenLimit,
+                    callbacks: {
+                        onUsageAdded: this.onUsageAdded,
+                    },
+                });
+                // Create restored instance
+                const instance = {
+                    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
+     */
+    createSubagentCallbacks(subagentId) {
+        return {
+            onUserMessageAdded: (params) => {
+                // Forward user message events to parent via SubagentManager callbacks
+                if (this.callbacks?.onSubagentUserMessageAdded) {
+                    this.callbacks.onSubagentUserMessageAdded(subagentId, params);
+                }
+            },
+            onAssistantMessageAdded: () => {
+                // Forward assistant message events to parent via SubagentManager callbacks
+                if (this.callbacks?.onSubagentAssistantMessageAdded) {
+                    this.callbacks.onSubagentAssistantMessageAdded(subagentId);
+                }
+            },
+            onAssistantContentUpdated: (chunk, accumulated) => {
+                // Forward assistant content updates to parent via SubagentManager callbacks
+                if (this.callbacks?.onSubagentAssistantContentUpdated) {
+                    this.callbacks.onSubagentAssistantContentUpdated(subagentId, chunk, accumulated);
+                }
+            },
+            onAssistantReasoningUpdated: (chunk, accumulated) => {
+                // Forward assistant reasoning updates to parent via SubagentManager callbacks
+                if (this.callbacks?.onSubagentAssistantReasoningUpdated) {
+                    this.callbacks.onSubagentAssistantReasoningUpdated(subagentId, chunk, accumulated);
+                }
+            },
+            onToolBlockUpdated: (params) => {
+                // Forward tool block updates to parent via SubagentManager callbacks
+                if (this.callbacks?.onSubagentToolBlockUpdated) {
+                    this.callbacks.onSubagentToolBlockUpdated(subagentId, params);
+                }
+            },
+            // These callbacks will be handled by the parent agent
+            onMessagesChange: (messages) => {
+                const instance = this.instances.get(subagentId);
+                if (instance) {
+                    instance.messages = messages;
+                    // Forward subagent message changes to parent via callbacks
+                    if (this.callbacks?.onSubagentMessagesChange) {
+                        this.callbacks.onSubagentMessagesChange(subagentId, messages);
+                    }
+                }
+            },
+            onSessionIdChange: (newSessionId) => {
+                // Update the subagent block with the new session ID
+                this.parentMessageManager.updateSubagentBlock(subagentId, {
+                    sessionId: newSessionId,
+                });
+            },
+        };
+    }
 }

package/dist/managers/toolManager.d.ts

@@ -1,20 +1,35 @@
 import type { ToolContext, ToolPlugin, ToolResult } from "../tools/types.js";
 import { McpManager } from "./mcpManager.js";
+import { PermissionManager } from "./permissionManager.js";
 import { ChatCompletionFunctionTool } from "openai/resources.js";
-import type { Logger } from "../types/index.js";
+import type { Logger, PermissionMode, PermissionCallback, ILspManager } from "../types/index.js";
 import type { SubagentManager } from "./subagentManager.js";
 import type { SkillManager } from "./skillManager.js";
 export interface ToolManagerOptions {
     mcpManager: McpManager;
+    lspManager?: ILspManager;
     logger?: Logger;
+    /** Optional permission manager for handling tool permission checks */
+    permissionManager?: PermissionManager;
+    /** Permission mode for tool execution (defaults to "default") */
+    permissionMode?: PermissionMode;
+    /** Custom permission callback for tool usage */
+    canUseToolCallback?: PermissionCallback;
 }
 /**
  * Tool Manager
+ *
+ * Manages tool registration and execution with optional permission system integration.
+ * Supports both built-in tools and MCP (Model Context Protocol) tools.
  */
 declare class ToolManager {
     private tools;
     private mcpManager;
+    private lspManager?;
     private logger?;
+    private permissionManager?;
+    private permissionMode?;
+    private canUseToolCallback?;
     constructor(options: ToolManagerOptions);
     /**
      * Register a new tool
@@ -47,9 +62,31 @@ declare class ToolManager {
         subagentManager?: SubagentManager;
         skillManager?: SkillManager;
     }): void;
+    /**
+     * Execute a tool by name with the provided arguments and context
+     *
+     * Enhances the context with permission-related fields before execution:
+     * - permissionMode: The current permission mode (default or bypassPermissions)
+     * - canUseToolCallback: Custom permission callback if provided
+     * - permissionManager: The PermissionManager instance for permission checks
+     *
+     * @param name - Name of the tool to execute
+     * @param args - Arguments to pass to the tool
+     * @param context - Execution context for the tool
+     * @returns Promise resolving to the tool execution result
+     */
     execute(name: string, args: Record<string, unknown>, context: ToolContext): Promise<ToolResult>;
     list(): ToolPlugin[];
     getToolsConfig(): ChatCompletionFunctionTool[];
+    /**
+     * Get the current permission mode
+     */
+    getPermissionMode(): PermissionMode;
+    /**
+     * Set the permission mode
+     * @param mode - The new permission mode
+     */
+    setPermissionMode(mode: PermissionMode): void;
 }
 export { ToolManager };
 //# sourceMappingURL=toolManager.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"toolManager.d.ts","sourceRoot":"","sources":["../../src/managers/toolManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAc7E,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,cAAM,WAAW;IACf,OAAO,CAAC,KAAK,CAAiC;IAC9C,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,MAAM,CAAC,CAAS;gBAEZ,OAAO,EAAE,kBAAkB;IAKvC;;OAEG;IACI,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAIvC;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACI,sBAAsB,CAAC,IAAI,CAAC,EAAE;QACnC,eAAe,CAAC,EAAE,eAAe,CAAC;QAClC,YAAY,CAAC,EAAE,YAAY,CAAC;KAC7B,GAAG,IAAI;IAgCF,OAAO,CACX,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,UAAU,CAAC;IA2BtB,IAAI,IAAI,UAAU,EAAE;IAMpB,cAAc,IAAI,0BAA0B,EAAE;CAO/C;AAGD,OAAO,EAAE,WAAW,EAAE,CAAC"}
+{"version":3,"file":"toolManager.d.ts","sourceRoot":"","sources":["../../src/managers/toolManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAe7E,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,KAAK,EACV,MAAM,EACN,cAAc,EACd,kBAAkB,EAClB,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,CAAC,EAAE,WAAW,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,sEAAsE;IACtE,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,iEAAiE;IACjE,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,gDAAgD;IAChD,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;CACzC;AAED;;;;;GAKG;AACH,cAAM,WAAW;IACf,OAAO,CAAC,KAAK,CAAiC;IAC9C,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,UAAU,CAAC,CAAc;IACjC,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,iBAAiB,CAAC,CAAoB;IAC9C,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,kBAAkB,CAAC,CAAqB;gBAEpC,OAAO,EAAE,kBAAkB;IAUvC;;OAEG;IACI,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAIvC;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACI,sBAAsB,CAAC,IAAI,CAAC,EAAE;QACnC,eAAe,CAAC,EAAE,eAAe,CAAC;QAClC,YAAY,CAAC,EAAE,YAAY,CAAC;KAC7B,GAAG,IAAI;IAiCR;;;;;;;;;;;;OAYG;IACG,OAAO,CACX,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,UAAU,CAAC;IA2DtB,IAAI,IAAI,UAAU,EAAE;IAMpB,cAAc,IAAI,0BAA0B,EAAE;IAQ9C;;OAEG;IACI,iBAAiB,IAAI,cAAc;IAS1C;;;OAGG;IACI,iBAAiB,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI;CAGrD;AAGD,OAAO,EAAE,WAAW,EAAE,CAAC"}