wave-agent-sdk 0.0.7 → 0.0.8

package/dist/managers/subagentManager.js

@@ -1,6 +1,6 @@
 import { randomUUID } from "crypto";
 import { AIManager } from "./aiManager.js";
-import { MessageManager, } from "./messageManager.js";
+import { MessageManager } from "./messageManager.js";
 export class SubagentManager {
     constructor(options) {
         this.instances = new Map();
@@ -8,10 +8,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.hookManager = options.hookManager;
         this.onUsageAdded = options.onUsageAdded;
     }
     /**
@@ -58,23 +60,14 @@ export class SubagentManager {
         }
         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",
+            parentSessionId: this.parentMessageManager.getSessionId(),
+            subagentType: parameters.subagent_type,
         });
         // Use the parent tool manager directly - tool restrictions will be handled by allowedTools parameter
         const toolManager = this.parentToolManager;
@@ -89,6 +82,8 @@ export class SubagentManager {
             logger: this.logger,
             workdir: this.workdir,
             systemPrompt: configuration.systemPrompt,
+            subagentType: parameters.subagent_type, // Pass subagent type for hook context
+            hookManager: this.hookManager,
             gatewayConfig: this.gatewayConfig,
             modelConfig: {
                 ...this.modelConfig,
@@ -107,10 +102,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;
     }
     /**
@@ -136,7 +132,6 @@ export class SubagentManager {
                     this.updateInstanceStatus(instance.subagentId, "aborted");
                     this.parentMessageManager.updateSubagentBlock(instance.subagentId, {
                         status: "aborted",
-                        messages: instance.messages,
                     });
                 });
             }
@@ -192,11 +187,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 +250,181 @@ 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",
+                    parentSessionId: this.parentMessageManager.getSessionId(),
+                    subagentType: configuration.name, // Use configuration name for restored sessions
+                });
+                // Use the parent tool manager
+                const toolManager = this.parentToolManager;
+                // Determine model to use
+                const modelToUse = configuration.model && configuration.model !== "inherit"
+                    ? configuration.model
+                    : this.modelConfig.agentModel;
+                // 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,
+                    gatewayConfig: this.gatewayConfig,
+                    modelConfig: {
+                        ...this.modelConfig,
+                        agentModel: modelToUse,
+                    },
+                    tokenLimit: this.tokenLimit,
+                    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);
+                // Now restore the session data including sessionId, which will trigger the callback chain
+                const sessionDataObj = {
+                    id: sessionData.id,
+                    messages: sessionData.messages,
+                    version: "1.0.0",
+                    metadata: {
+                        workdir: this.workdir,
+                        startedAt: new Date().toISOString(),
+                        lastActiveAt: new Date().toISOString(),
+                        latestTotalTokens: 0,
+                    },
+                };
+                messageManager.initializeFromSession(sessionDataObj);
+            }
+            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);
+                }
+            },
+            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,
+                });
+            },
+        };
+    }
+    /**
+     * Update configuration for SubagentManager and all active subagents
+     * This method updates configuration for live config reload support
+     * @param newGatewayConfig - New gateway configuration
+     * @param newModelConfig - New model configuration
+     * @param newTokenLimit - New token limit
+     */
+    updateConfiguration(newGatewayConfig, newModelConfig, newTokenLimit) {
+        this.logger?.info("Live Config: Updating SubagentManager configuration");
+        // Update stored configuration
+        this.gatewayConfig = newGatewayConfig;
+        this.modelConfig = newModelConfig;
+        this.tokenLimit = newTokenLimit;
+        // Update all active subagent AIManager instances
+        let updatedCount = 0;
+        for (const [subagentId, instance] of this.instances.entries()) {
+            if (instance.status === "active" || instance.status === "initializing") {
+                try {
+                    // For subagents, we need to preserve their model if it was explicitly set
+                    const subagentModelConfig = {
+                        ...newModelConfig,
+                        // If subagent has its own model configured, preserve it
+                        agentModel: instance.configuration.model &&
+                            instance.configuration.model !== "inherit"
+                            ? instance.configuration.model
+                            : newModelConfig.agentModel,
+                    };
+                    instance.aiManager.updateConfiguration(newGatewayConfig, subagentModelConfig, newTokenLimit);
+                    updatedCount++;
+                    this.logger?.debug(`Live Config: Updated configuration for subagent ${subagentId}`);
+                }
+                catch (error) {
+                    this.logger?.error(`Live Config: Failed to update configuration for subagent ${subagentId}: ${error.message}`);
+                }
+            }
+        }
+        this.logger?.info(`Live Config: SubagentManager configuration updated - ${updatedCount} active subagents updated`);
+    }
+    /**
+     * Get current configuration for debugging
+     */
+    getCurrentConfiguration() {
+        const activeSubagents = Array.from(this.instances.values()).filter((instance) => instance.status === "active" || instance.status === "initializing").length;
+        return {
+            gatewayConfig: { ...this.gatewayConfig },
+            modelConfig: { ...this.modelConfig },
+            tokenLimit: this.tokenLimit,
+            activeSubagents,
+        };
+    }
 }

package/dist/services/aiService.d.ts

@@ -1,6 +1,7 @@
 import { ChatCompletionMessageToolCall } from "openai/resources";
 import { ChatCompletionMessageParam, ChatCompletionFunctionTool } from "openai/resources.js";
 import type { GatewayConfig, ModelConfig } from "../types/index.js";
+import { type ClaudeUsage } from "../utils/cacheControlUtils.js";
 export interface CallAgentOptions {
     gatewayConfig: GatewayConfig;
     modelConfig: ModelConfig;
@@ -12,15 +13,22 @@ export interface CallAgentOptions {
     tools?: ChatCompletionFunctionTool[];
     model?: string;
     systemPrompt?: string;
+    onContentUpdate?: (content: string) => void;
+    onToolUpdate?: (toolCall: {
+        id: string;
+        name: string;
+        parameters: string;
+        parametersChunk?: string;
+        stage?: "start" | "streaming" | "running" | "end";
+    }) => void;
 }
 export interface CallAgentResult {
     content?: string;
     tool_calls?: ChatCompletionMessageToolCall[];
-    usage?: {
-        prompt_tokens: number;
-        completion_tokens: number;
-        total_tokens: number;
-    };
+    usage?: ClaudeUsage;
+    finish_reason?: "stop" | "length" | "tool_calls" | "content_filter" | "function_call" | null;
+    response_headers?: Record<string, string>;
+    metadata?: Record<string, unknown>;
 }
 export declare function callAgent(options: CallAgentOptions): Promise<CallAgentResult>;
 export interface CompressMessagesOptions {

package/dist/services/aiService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aiService.d.ts","sourceRoot":"","sources":["../../src/services/aiService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAEL,0BAA0B,EAC1B,0BAA0B,EAC3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AA4DpE,MAAM,WAAW,gBAAgB;IAE/B,aAAa,EAAE,aAAa,CAAC;IAC7B,WAAW,EAAE,WAAW,CAAC;IAGzB,QAAQ,EAAE,0BAA0B,EAAE,CAAC;IACvC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,0BAA0B,EAAE,CAAC;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,6BAA6B,EAAE,CAAC;IAC7C,KAAK,CAAC,EAAE;QACN,aAAa,EAAE,MAAM,CAAC;QACtB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;CACH;AAED,wBAAsB,SAAS,CAC7B,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,eAAe,CAAC,CAoH1B;AAED,MAAM,WAAW,uBAAuB;IAEtC,aAAa,EAAE,aAAa,CAAC;IAC7B,WAAW,EAAE,WAAW,CAAC;IAGzB,QAAQ,EAAE,0BAA0B,EAAE,CAAC;IACvC,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE;QACN,aAAa,EAAE,MAAM,CAAC;QACtB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;CACH;AAED,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,sBAAsB,CAAC,CAuGjC"}
+{"version":3,"file":"aiService.d.ts","sourceRoot":"","sources":["../../src/services/aiService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAGL,0BAA0B,EAC1B,0BAA0B,EAE3B,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAKL,KAAK,WAAW,EACjB,MAAM,+BAA+B,CAAC;AAkEvC,MAAM,WAAW,gBAAgB;IAE/B,aAAa,EAAE,aAAa,CAAC;IAC7B,WAAW,EAAE,WAAW,CAAC;IAGzB,QAAQ,EAAE,0BAA0B,EAAE,CAAC;IACvC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,0BAA0B,EAAE,CAAC;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IAGtB,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE;QACxB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,EAAE,MAAM,CAAC;QACnB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,KAAK,CAAC,EAAE,OAAO,GAAG,WAAW,GAAG,SAAS,GAAG,KAAK,CAAC;KACnD,KAAK,IAAI,CAAC;CACZ;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,6BAA6B,EAAE,CAAC;IAC7C,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,aAAa,CAAC,EACV,MAAM,GACN,QAAQ,GACR,YAAY,GACZ,gBAAgB,GAChB,eAAe,GACf,IAAI,CAAC;IACT,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,wBAAsB,SAAS,CAC7B,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,eAAe,CAAC,CAgN1B;AA0ND,MAAM,WAAW,uBAAuB;IAEtC,aAAa,EAAE,aAAa,CAAC;IAC7B,WAAW,EAAE,WAAW,CAAC;IAGzB,QAAQ,EAAE,0BAA0B,EAAE,CAAC;IACvC,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE;QACN,aAAa,EAAE,MAAM,CAAC;QACtB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;CACH;AAED,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,sBAAsB,CAAC,CA2JjC"}