wave-agent-sdk 0.0.8 → 0.0.11

package/dist/index.d.ts

@@ -3,10 +3,13 @@ export * from "./services/memory.js";
 export * from "./services/session.js";
 export * from "./services/hook.js";
 export * from "./services/jsonlHandler.js";
+export * from "./services/configurationService.js";
 export * from "./agent.js";
 export * from "./utils/bashHistory.js";
+export * from "./utils/bashParser.js";
 export * from "./utils/convertMessagesForAPI.js";
 export * from "./utils/fileFilter.js";
+export * from "./utils/fileSearch.js";
 export * from "./utils/globalLogger.js";
 export * from "./utils/mcpUtils.js";
 export * from "./utils/messageOperations.js";

package/dist/index.d.ts.map

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

package/dist/index.js

@@ -4,12 +4,15 @@ export * from "./services/memory.js";
 export * from "./services/session.js";
 export * from "./services/hook.js";
 export * from "./services/jsonlHandler.js";
+export * from "./services/configurationService.js"; // New configuration management service
 // Export main agent
 export * from "./agent.js";
 // Export all utilities
 export * from "./utils/bashHistory.js";
+export * from "./utils/bashParser.js";
 export * from "./utils/convertMessagesForAPI.js";
 export * from "./utils/fileFilter.js";
+export * from "./utils/fileSearch.js";
 export * from "./utils/globalLogger.js";
 export * from "./utils/mcpUtils.js";
 export * from "./utils/messageOperations.js";

package/dist/managers/aiManager.d.ts

@@ -17,9 +17,12 @@ export interface AIManagerOptions {
     workdir: string;
     systemPrompt?: string;
     subagentType?: string;
-    gatewayConfig: GatewayConfig;
-    modelConfig: ModelConfig;
-    tokenLimit: number;
+    /**Whether to use streaming mode for AI responses - defaults to true */
+    stream?: boolean;
+    getGatewayConfig: () => GatewayConfig;
+    getModelConfig: () => ModelConfig;
+    getTokenLimit: () => number;
+    getEnvironmentVars?: () => Record<string, string>;
 }
 export declare class AIManager {
     isLoading: boolean;
@@ -33,42 +36,17 @@ export declare class AIManager {
     private workdir;
     private systemPrompt?;
     private subagentType?;
-    private gatewayConfig;
-    private modelConfig;
-    private tokenLimit;
+    private stream;
+    private getGatewayConfigFn;
+    private getModelConfigFn;
+    private getTokenLimitFn;
+    private getEnvironmentVarsFn?;
     constructor(options: AIManagerOptions);
+    getGatewayConfig(): GatewayConfig;
+    getModelConfig(): ModelConfig;
+    getTokenLimit(): number;
     private isCompressing;
     private callbacks;
-    /**
-     * Update gateway configuration at runtime for live config reload
-     * @param newConfig - New gateway configuration
-     */
-    updateGatewayConfig(newConfig: GatewayConfig): void;
-    /**
-     * Update model configuration at runtime for live config reload
-     * @param newConfig - New model configuration
-     */
-    updateModelConfig(newConfig: ModelConfig): void;
-    /**
-     * Update token limit at runtime for live config reload
-     * @param newLimit - New token limit
-     */
-    updateTokenLimit(newLimit: number): void;
-    /**
-     * Update all configurations at once for live config reload
-     * @param newGatewayConfig - New gateway configuration
-     * @param newModelConfig - New model configuration
-     * @param newTokenLimit - New token limit
-     */
-    updateConfiguration(newGatewayConfig: GatewayConfig, newModelConfig: ModelConfig, newTokenLimit: number): void;
-    /**
-     * Get current configuration for debugging
-     */
-    getCurrentConfiguration(): {
-        gatewayConfig: GatewayConfig;
-        modelConfig: ModelConfig;
-        tokenLimit: number;
-    };
     /**
      * Get filtered tool configuration
      */

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

@@ -1 +1 @@
-{"version":3,"file":"aiManager.d.ts","sourceRoot":"","sources":["../../src/managers/aiManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"aiManager.d.ts","sourceRoot":"","sources":["../../src/managers/aiManager.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EACV,MAAM,EACN,aAAa,EACb,WAAW,EACX,KAAK,EACN,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAExE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGpD,MAAM,WAAW,kBAAkB;IACjC,wBAAwB,CAAC,EAAE,CAAC,aAAa,EAAE,OAAO,KAAK,IAAI,CAAC;IAC5D,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CACvC;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,cAAc,CAAC;IAC/B,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;IAC9C,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,uEAAuE;IACvE,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,gBAAgB,EAAE,MAAM,aAAa,CAAC;IACtC,cAAc,EAAE,MAAM,WAAW,CAAC;IAClC,aAAa,EAAE,MAAM,MAAM,CAAC;IAC5B,kBAAkB,CAAC,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnD;AAED,qBAAa,SAAS;IACb,SAAS,EAAE,OAAO,CAAS;IAClC,OAAO,CAAC,eAAe,CAAgC;IACvD,OAAO,CAAC,mBAAmB,CAAgC;IAC3D,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,qBAAqB,CAAC,CAAwB;IACtD,OAAO,CAAC,WAAW,CAAC,CAAc;IAClC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,YAAY,CAAC,CAAS;IAC9B,OAAO,CAAC,YAAY,CAAC,CAAS;IAC9B,OAAO,CAAC,MAAM,CAAU;IAGxB,OAAO,CAAC,kBAAkB,CAAsB;IAChD,OAAO,CAAC,gBAAgB,CAAoB;IAC5C,OAAO,CAAC,eAAe,CAAe;IACtC,OAAO,CAAC,oBAAoB,CAAC,CAA+B;gBAEhD,OAAO,EAAE,gBAAgB;IAoB9B,gBAAgB,IAAI,aAAa;IAIjC,cAAc,IAAI,WAAW;IAI7B,aAAa,IAAI,MAAM;IAI9B,OAAO,CAAC,aAAa,CAAkB;IACvC,OAAO,CAAC,SAAS,CAAqB;IAEtC;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAYvB,YAAY,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI;IAItC,cAAc,IAAI,IAAI;IAuB7B,OAAO,CAAC,qBAAqB;YAqBf,8BAA8B;IA+ErC,gBAAgB,IAAI,OAAO;IAI3B,gBAAgB,CAAC,aAAa,EAAE,OAAO,GAAG,IAAI;IAOxC,aAAa,CACxB,OAAO,GAAE;QACP,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;KACpB,GACL,OAAO,CAAC,IAAI,CAAC;IA2YhB;;;;OAIG;YACW,gBAAgB;IAiE9B;;;OAGG;YACW,sBAAsB;IA6DpC;;OAEG;YACW,uBAAuB;CAwDtC"}

package/dist/managers/aiManager.js

@@ -1,4 +1,4 @@
-import { callAgent, compressMessages } from "../services/aiService.js";
+import { callAgent, compressMessages, } from "../services/aiService.js";
 import { getMessagesToCompress } from "../utils/messageOperations.js";
 import { convertMessagesForAPI } from "../utils/convertMessagesForAPI.js";
 import { calculateComprehensiveTotalTokens } from "../utils/tokenCalculation.js";
@@ -17,58 +17,23 @@ export class AIManager {
         this.workdir = options.workdir;
         this.systemPrompt = options.systemPrompt;
         this.subagentType = options.subagentType; // Store subagent type
+        this.stream = options.stream ?? true; // Default to true if not specified
         this.callbacks = options.callbacks ?? {};
-        // Store resolved configuration
-        this.gatewayConfig = options.gatewayConfig;
-        this.modelConfig = options.modelConfig;
-        this.tokenLimit = options.tokenLimit;
+        // Store configuration getter functions for dynamic resolution
+        this.getGatewayConfigFn = options.getGatewayConfig;
+        this.getModelConfigFn = options.getModelConfig;
+        this.getTokenLimitFn = options.getTokenLimit;
+        this.getEnvironmentVarsFn = options.getEnvironmentVars;
     }
-    /**
-     * Update gateway configuration at runtime for live config reload
-     * @param newConfig - New gateway configuration
-     */
-    updateGatewayConfig(newConfig) {
-        this.logger?.info(`Live Config: Updating AIManager gateway config - baseURL: ${newConfig.baseURL}`);
-        this.gatewayConfig = newConfig;
-    }
-    /**
-     * Update model configuration at runtime for live config reload
-     * @param newConfig - New model configuration
-     */
-    updateModelConfig(newConfig) {
-        this.logger?.info(`Live Config: Updating AIManager model config - agent: ${newConfig.agentModel}, fast: ${newConfig.fastModel}`);
-        this.modelConfig = newConfig;
-    }
-    /**
-     * Update token limit at runtime for live config reload
-     * @param newLimit - New token limit
-     */
-    updateTokenLimit(newLimit) {
-        this.logger?.info(`Live Config: Updating AIManager token limit: ${newLimit}`);
-        this.tokenLimit = newLimit;
+    // Getter methods for accessing dynamic configuration
+    getGatewayConfig() {
+        return this.getGatewayConfigFn();
     }
-    /**
-     * Update all configurations at once for live config reload
-     * @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 all AIManager configuration");
-        this.gatewayConfig = newGatewayConfig;
-        this.modelConfig = newModelConfig;
-        this.tokenLimit = newTokenLimit;
-        this.logger?.info(`Live Config: Configuration updated - model: ${newModelConfig.agentModel}, tokenLimit: ${newTokenLimit}`);
+    getModelConfig() {
+        return this.getModelConfigFn();
     }
-    /**
-     * Get current configuration for debugging
-     */
-    getCurrentConfiguration() {
-        return {
-            gatewayConfig: { ...this.gatewayConfig },
-            modelConfig: { ...this.modelConfig },
-            tokenLimit: this.tokenLimit,
-        };
+    getTokenLimit() {
+        return this.getTokenLimitFn();
     }
     /**
      * Get filtered tool configuration
@@ -135,8 +100,8 @@ export class AIManager {
         if (usage.total_tokens +
             (usage.cache_read_input_tokens || 0) +
             (usage.cache_creation_input_tokens || 0) >
-            this.tokenLimit) {
-            this.logger?.debug(`Token usage exceeded ${this.tokenLimit}, compressing messages...`);
+            this.getTokenLimit()) {
+            this.logger?.debug(`Token usage exceeded ${this.getTokenLimit()}, compressing messages...`);
             // Check if messages need compression
             const { messagesToCompress, insertIndex } = getMessagesToCompress(this.messageManager.getMessages(), 7);
             // If there are messages to compress, perform compression
@@ -147,8 +112,8 @@ export class AIManager {
                 this.setIsCompressing(true);
                 try {
                     const compressionResult = await compressMessages({
-                        gatewayConfig: this.gatewayConfig,
-                        modelConfig: this.modelConfig,
+                        gatewayConfig: this.getGatewayConfig(),
+                        modelConfig: this.getModelConfig(),
                         messages: recentChatMessages,
                         abortSignal: abortController.signal,
                     });
@@ -159,7 +124,7 @@ export class AIManager {
                             prompt_tokens: compressionResult.usage.prompt_tokens,
                             completion_tokens: compressionResult.usage.completion_tokens,
                             total_tokens: compressionResult.usage.total_tokens,
-                            model: this.modelConfig.fastModel,
+                            model: this.getModelConfig().fastModel,
                             operation_type: "compress",
                         };
                     }
@@ -222,12 +187,13 @@ export class AIManager {
         try {
             // Get combined memory content
             const combinedMemory = await memory.getCombinedMemoryContent(this.workdir);
-            // Add assistant message first (for streaming updates)
-            this.messageManager.addAssistantMessage();
-            // Call AI service with streaming callbacks
-            const result = await callAgent({
-                gatewayConfig: this.gatewayConfig,
-                modelConfig: this.modelConfig,
+            // Track if assistant message has been created
+            let assistantMessageCreated = false;
+            this.logger?.debug("modelConfig in sendAIMessage", this.getModelConfig());
+            // Call AI service with streaming callbacks if enabled
+            const callAgentOptions = {
+                gatewayConfig: this.getGatewayConfig(),
+                modelConfig: this.getModelConfig(),
                 messages: recentMessages,
                 sessionId: this.messageManager.getSessionId(),
                 abortSignal: abortController.signal,
@@ -236,14 +202,25 @@ export class AIManager {
                 tools: this.getFilteredToolsConfig(allowedTools), // Pass filtered tool configuration
                 model: model, // Use passed model
                 systemPrompt: this.systemPrompt, // Pass custom system prompt
-                // Streaming callbacks
-                onContentUpdate: (content) => {
+            };
+            // Add streaming callbacks only if streaming is enabled
+            if (this.stream) {
+                callAgentOptions.onContentUpdate = (content) => {
+                    // Create assistant message on first chunk if not already created
+                    if (!assistantMessageCreated) {
+                        this.messageManager.addAssistantMessage();
+                        assistantMessageCreated = true;
+                    }
                     this.messageManager.updateCurrentMessageContent(content);
-                },
-                onToolUpdate: (toolCall) => {
+                };
+                callAgentOptions.onToolUpdate = (toolCall) => {
+                    // Create assistant message on first tool update if not already created
+                    if (!assistantMessageCreated) {
+                        this.messageManager.addAssistantMessage();
+                        assistantMessageCreated = true;
+                    }
                     // Use parametersChunk as compact param for better performance
                     // No need to extract params or generate compact params during streaming
-                    this.logger?.debug("Tool streaming update:", toolCall);
                     // Update tool block with streaming parameters using parametersChunk as compact param
                     this.messageManager.updateToolBlock({
                         id: toolCall.id,
@@ -253,8 +230,26 @@ export class AIManager {
                         compactParams: toolCall.parameters?.split("\n").pop()?.slice(-30),
                         stage: toolCall.stage || "streaming", // Default to streaming if stage not provided
                     });
-                },
-            });
+                };
+                callAgentOptions.onReasoningUpdate = (reasoning) => {
+                    // Create assistant message on first reasoning update if not already created
+                    if (!assistantMessageCreated) {
+                        this.messageManager.addAssistantMessage();
+                        assistantMessageCreated = true;
+                    }
+                    this.messageManager.updateCurrentMessageReasoning(reasoning);
+                };
+            }
+            const result = await callAgent(callAgentOptions);
+            const createdByStreaming = assistantMessageCreated;
+            // For non-streaming mode, create assistant message after callAgent returns
+            // Also create if streaming mode but no streaming callbacks were called (e.g., when content comes directly in result)
+            if (!this.stream ||
+                (!assistantMessageCreated &&
+                    (result.content || result.tool_calls || result.reasoning_content))) {
+                this.messageManager.addAssistantMessage();
+                assistantMessageCreated = true;
+            }
             // Log finish reason and response headers if available
             if (result.finish_reason) {
                 this.logger?.debug(`AI response finished with reason: ${result.finish_reason}`);
@@ -263,11 +258,16 @@ export class AIManager {
                 Object.keys(result.response_headers).length > 0) {
                 this.logger?.debug("AI response headers:", result.response_headers);
             }
-            if (result.metadata && Object.keys(result.metadata).length > 0) {
-                this.messageManager.mergeAssistantMetadata(result.metadata);
+            if (result.additionalFields &&
+                Object.keys(result.additionalFields).length > 0) {
+                this.messageManager.mergeAssistantAdditionalFields(result.additionalFields);
+            }
+            // Handle result reasoning content from non-streaming mode
+            if (result.reasoning_content && !createdByStreaming) {
+                this.messageManager.updateCurrentMessageReasoning(result.reasoning_content);
             }
             // Handle result content from non-streaming mode
-            if (result.content) {
+            if (result.content && !createdByStreaming) {
                 this.messageManager.updateCurrentMessageContent(result.content);
             }
             // Handle usage tracking for agent operations
@@ -277,7 +277,7 @@ export class AIManager {
                     prompt_tokens: result.usage.prompt_tokens,
                     completion_tokens: result.usage.completion_tokens,
                     total_tokens: result.usage.total_tokens,
-                    model: model || this.modelConfig.agentModel,
+                    model: model || this.getModelConfig().agentModel,
                     operation_type: "agent",
                     // Preserve cache fields if present
                     ...(result.usage.cache_read_input_tokens !== undefined && {
@@ -390,12 +390,6 @@ export class AIManager {
                             name: toolName,
                             shortResult: toolResult.shortResult,
                         });
-                        // If tool returns diff information, add diff block
-                        if (toolResult.success &&
-                            toolResult.diffResult &&
-                            toolResult.filePath) {
-                            this.messageManager.addDiffBlock(toolResult.filePath, toolResult.diffResult);
-                        }
                         // Execute PostToolUse hooks after successful tool completion
                         await this.executePostToolUseHooks(toolId, toolName, toolArgs, toolResult);
                     }
@@ -487,6 +481,7 @@ export class AIManager {
                 cwd: this.workdir,
                 subagentType: this.subagentType, // Include subagent type in hook context
                 // Stop hooks don't need toolName, toolInput, toolResponse, or userPrompt
+                env: this.getEnvironmentVarsFn?.() || {}, // Include configuration environment variables
             };
             const results = await this.hookManager.executeHooks(hookName, context);
             // Process hook results to handle exit codes and appropriate responses
@@ -535,6 +530,7 @@ export class AIManager {
                 cwd: this.workdir,
                 toolInput,
                 subagentType: this.subagentType, // Include subagent type in hook context
+                env: this.getEnvironmentVarsFn?.() || {}, // Include configuration environment variables
             };
             const results = await this.hookManager.executeHooks("PreToolUse", context);
             // Process hook results to handle exit codes and determine if tool should be blocked
@@ -580,6 +576,7 @@ export class AIManager {
                 toolInput,
                 toolResponse,
                 subagentType: this.subagentType, // Include subagent type in hook context
+                env: this.getEnvironmentVarsFn?.() || {}, // Include configuration environment variables
             };
             const results = await this.hookManager.executeHooks("PostToolUse", context);
             // Process hook results to handle exit codes and update tool results

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

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

package/dist/managers/backgroundBashManager.js

@@ -1,5 +1,6 @@
 import { spawn } from "child_process";
 import { logger } from "../utils/globalLogger.js";
+import { stripAnsiColors } from "../utils/stringUtils.js";
 export class BackgroundBashManager {
     constructor(options) {
         this.shells = new Map();
@@ -42,11 +43,11 @@ export class BackgroundBashManager {
             }, timeout);
         }
         child.stdout?.on("data", (data) => {
-            shell.stdout += data.toString();
+            shell.stdout += stripAnsiColors(data.toString());
             this.notifyShellsChange();
         });
         child.stderr?.on("data", (data) => {
-            shell.stderr += data.toString();
+            shell.stderr += stripAnsiColors(data.toString());
             this.notifyShellsChange();
         });
         child.on("exit", (code) => {
@@ -63,7 +64,7 @@ export class BackgroundBashManager {
                 clearTimeout(timeoutHandle);
             }
             shell.status = "completed";
-            shell.stderr += `\nProcess error: ${error.message}`;
+            shell.stderr += `\nProcess error: ${stripAnsiColors(error.message)}`;
             shell.exitCode = 1;
             shell.runtime = Date.now() - startTime;
             this.notifyShellsChange();

package/dist/managers/hookManager.d.ts

@@ -10,7 +10,6 @@ import type { Logger } from "../types/index.js";
 import type { MessageManager } from "./messageManager.js";
 export declare class HookManager {
     private configuration;
-    private environmentVars;
     private readonly matcher;
     private readonly logger?;
     private readonly workdir;
@@ -21,10 +20,10 @@ export declare class HookManager {
      */
     loadConfiguration(userHooks?: PartialHookConfiguration, projectHooks?: PartialHookConfiguration): void;
     /**
-     * Load configuration from filesystem settings
-     * Automatically loads and merges user and project Wave configuration (hooks + environment)
+     * Load hooks configuration from a pre-loaded WaveConfiguration
+     * Configuration loading is now handled by ConfigurationService
      */
-    loadConfigurationFromSettings(): void;
+    loadConfigurationFromWaveConfig(waveConfig: WaveConfiguration | null): void;
     /**
      * Execute hooks for a specific event
      */
@@ -65,10 +64,6 @@ export declare class HookManager {
      * Get current configuration
      */
     getConfiguration(): PartialHookConfiguration | undefined;
-    /**
-     * Get current environment variables
-     */
-    getEnvironmentVars(): Record<string, string> | undefined;
     /**
      * Clear current configuration
      */

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

@@ -1 +1 @@
-{"version":3,"file":"hookManager.d.ts","sourceRoot":"","sources":["../../src/managers/hookManager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,KAAK,SAAS,EAEd,KAAK,iBAAiB,EACtB,KAAK,wBAAwB,EAC7B,KAAK,oBAAoB,EACzB,KAAK,4BAA4B,EACjC,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EAItB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAMtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,qBAAa,WAAW;IACtB,OAAO,CAAC,aAAa,CAAuC;IAC5D,OAAO,CAAC,eAAe,CAAqC;IAC5D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAG/B,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,WAA+B,EACxC,MAAM,CAAC,EAAE,MAAM;IAOjB;;;OAGG;IACH,iBAAiB,CACf,SAAS,CAAC,EAAE,wBAAwB,EACpC,YAAY,CAAC,EAAE,wBAAwB,GACtC,IAAI;IAyBP;;;OAGG;IACH,6BAA6B,IAAI,IAAI;IA6CrC;;OAEG;IACG,YAAY,CAChB,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,oBAAoB,GAAG,4BAA4B,GAC3D,OAAO,CAAC,mBAAmB,EAAE,CAAC;IA0HjC;;;OAGG;IACH,kBAAkB,CAChB,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,mBAAmB,EAAE,EAC9B,cAAc,CAAC,EAAE,cAAc,EAC/B,MAAM,CAAC,EAAE,MAAM,EACf,cAAc,CAAC,EAAE,MAAM,GACtB;QACD,WAAW,EAAE,OAAO,CAAC;QACrB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB;IAuCD;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAezB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAyD3B;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAQ9B;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO;IAWtD;;OAEG;IACH,qBAAqB,CAAC,MAAM,EAAE,iBAAiB,GAAG,gBAAgB;IA8DlE;;OAEG;IACH,OAAO,CAAC,4BAA4B;IAyCpC;;OAEG;IACH,gBAAgB,IAAI,wBAAwB,GAAG,SAAS;IAOxD;;OAEG;IACH,kBAAkB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS;IAOxD;;OAEG;IACH,kBAAkB,IAAI,IAAI;IAI1B;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAmDhC;;OAEG;IACH,OAAO,CAAC,wBAAwB;IA8BhC;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAa/B;;OAEG;IACH,OAAO,CAAC,aAAa;IA4BrB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAqC3B;;OAEG;IACH,qBAAqB,IAAI;QACvB,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,aAAa,EAAE,MAAM,CAAC;QACtB,cAAc,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;KAC3C;CA6CF"}
+{"version":3,"file":"hookManager.d.ts","sourceRoot":"","sources":["../../src/managers/hookManager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,KAAK,SAAS,EAEd,KAAK,iBAAiB,EACtB,KAAK,wBAAwB,EAC7B,KAAK,oBAAoB,EACzB,KAAK,4BAA4B,EACjC,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EAItB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,qBAAa,WAAW;IACtB,OAAO,CAAC,aAAa,CAAuC;IAC5D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAG/B,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,WAA+B,EACxC,MAAM,CAAC,EAAE,MAAM;IAOjB;;;OAGG;IACH,iBAAiB,CACf,SAAS,CAAC,EAAE,wBAAwB,EACpC,YAAY,CAAC,EAAE,wBAAwB,GACtC,IAAI;IAyBP;;;OAGG;IACH,+BAA+B,CAAC,UAAU,EAAE,iBAAiB,GAAG,IAAI,GAAG,IAAI;IAqC3E;;OAEG;IACG,YAAY,CAChB,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,oBAAoB,GAAG,4BAA4B,GAC3D,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAyHjC;;;OAGG;IACH,kBAAkB,CAChB,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,mBAAmB,EAAE,EAC9B,cAAc,CAAC,EAAE,cAAc,EAC/B,MAAM,CAAC,EAAE,MAAM,EACf,cAAc,CAAC,EAAE,MAAM,GACtB;QACD,WAAW,EAAE,OAAO,CAAC;QACrB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB;IAuCD;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAezB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAsE3B;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAQ9B;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO;IAWtD;;OAEG;IACH,qBAAqB,CAAC,MAAM,EAAE,iBAAiB,GAAG,gBAAgB;IA8DlE;;OAEG;IACH,OAAO,CAAC,4BAA4B;IAyCpC;;OAEG;IACH,gBAAgB,IAAI,wBAAwB,GAAG,SAAS;IAOxD;;OAEG;IACH,kBAAkB,IAAI,IAAI;IAI1B;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAsDhC;;OAEG;IACH,OAAO,CAAC,wBAAwB;IA8BhC;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAa/B;;OAEG;IACH,OAAO,CAAC,aAAa;IAiCrB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IA2C3B;;OAEG;IACH,qBAAqB,IAAI;QACvB,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,aAAa,EAAE,MAAM,CAAC;QACtB,cAAc,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;KAC3C;CA+CF"}

package/dist/managers/hookManager.js

@@ -6,7 +6,7 @@
  */
 import { HookConfigurationError, isValidHookEvent, isValidHookEventConfig, } from "../types/hooks.js";
 import { HookMatcher } from "../utils/hookMatcher.js";
-import { executeCommand, isCommandSafe, loadMergedWaveConfig, } from "../services/hook.js";
+import { executeCommand, isCommandSafe } from "../services/hook.js";
 import { MessageSource } from "../types/index.js";
 export class HookManager {
     constructor(workdir, matcher = new HookMatcher(), logger) {
@@ -36,35 +36,31 @@ export class HookManager {
         this.configuration = merged;
     }
     /**
-     * Load configuration from filesystem settings
-     * Automatically loads and merges user and project Wave configuration (hooks + environment)
+     * Load hooks configuration from a pre-loaded WaveConfiguration
+     * Configuration loading is now handled by ConfigurationService
      */
-    loadConfigurationFromSettings() {
+    loadConfigurationFromWaveConfig(waveConfig) {
         try {
-            this.logger?.debug(`[HookManager] Loading configuration...`);
-            const mergedWaveConfig = loadMergedWaveConfig(this.workdir);
-            this.logger?.debug(`[HookManager] Merged config result:`, mergedWaveConfig);
-            this.configuration = mergedWaveConfig?.hooks || undefined;
-            this.environmentVars = mergedWaveConfig?.env || undefined;
+            this.logger?.debug(`[HookManager] Loading hooks configuration from pre-loaded config...`);
+            this.configuration = waveConfig?.hooks || undefined;
             // Validate the loaded configuration if it exists
-            if (mergedWaveConfig?.hooks) {
-                const validation = this.validatePartialConfiguration(mergedWaveConfig.hooks);
+            if (waveConfig?.hooks) {
+                const validation = this.validatePartialConfiguration(waveConfig.hooks);
                 if (!validation.valid) {
-                    throw new HookConfigurationError("filesystem settings", validation.errors);
+                    throw new HookConfigurationError("provided configuration", validation.errors);
                 }
             }
-            this.logger?.debug(`[HookManager] Configuration loaded successfully with ${Object.keys(mergedWaveConfig?.hooks || {}).length} event types and ${Object.keys(this.environmentVars || {}).length} environment variables`);
+            this.logger?.debug(`[HookManager] Hooks configuration loaded successfully with ${Object.keys(waveConfig?.hooks || {}).length} event types`);
         }
         catch (error) {
             // If loading fails, start with undefined configuration (no hooks)
             this.configuration = undefined;
-            this.environmentVars = undefined;
-            // Re-throw configuration errors, but handle file system errors gracefully
+            // Re-throw configuration errors, but handle other errors gracefully
             if (error instanceof HookConfigurationError) {
                 throw error;
             }
             else {
-                this.logger?.warn("Failed to load hooks configuration from settings:", error);
+                this.logger?.warn(`[HookManager] Failed to load configuration, continuing with no hooks: ${error.message}`);
             }
         }
     }
@@ -110,7 +106,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 executeCommand(hookCommand.command, context, undefined, this.environmentVars);
+                    const result = await executeCommand(hookCommand.command, context, undefined);
                     results.push(result);
                     // Report individual command result
                     if (result.success) {
@@ -228,6 +224,17 @@ export class HookManager {
                     source: MessageSource.HOOK,
                 });
                 return { shouldBlock: true, errorMessage };
+            case "Notification":
+                // For notification hooks with exit code 2, only show stderr in error block
+                messageManager.addErrorBlock(errorMessage);
+                return { shouldBlock: false };
+            case "SubagentStop":
+                // Similar to Stop, show error and allow blocking
+                messageManager.addUserMessage({
+                    content: errorMessage,
+                    source: MessageSource.HOOK,
+                });
+                return { shouldBlock: true, errorMessage };
             default:
                 return { shouldBlock: false };
         }
@@ -343,15 +350,6 @@ export class HookManager {
         // Deep clone to prevent external modification
         return JSON.parse(JSON.stringify(this.configuration));
     }
-    /**
-     * Get current environment variables
-     */
-    getEnvironmentVars() {
-        if (!this.environmentVars)
-            return undefined;
-        // Deep clone to prevent external modification
-        return JSON.parse(JSON.stringify(this.environmentVars));
-    }
     /**
      * Clear current configuration
      */
@@ -386,7 +384,10 @@ export class HookManager {
             }
         }
         // Validate non-tool events don't have unexpected tool names
-        if ((event === "UserPromptSubmit" || event === "Stop") &&
+        if ((event === "UserPromptSubmit" ||
+            event === "Stop" ||
+            event === "Notification" ||
+            event === "SubagentStop") &&
             context.toolName !== undefined) {
             this.logger?.warn(`[HookManager] ${event} event has unexpected toolName in context: ${context.toolName}`);
         }
@@ -433,7 +434,10 @@ export class HookManager {
      */
     configApplies(config, event, toolName) {
         // For events that don't use matchers, config always applies
-        if (event === "UserPromptSubmit" || event === "Stop") {
+        if (event === "UserPromptSubmit" ||
+            event === "Stop" ||
+            event === "Notification" ||
+            event === "SubagentStop") {
             return true;
         }
         // For tool-based events, check matcher if present
@@ -467,7 +471,11 @@ export class HookManager {
             }
         }
         // Validate that non-tool events don't have matchers
-        if ((event === "UserPromptSubmit" || event === "Stop") && config.matcher) {
+        if ((event === "UserPromptSubmit" ||
+            event === "Stop" ||
+            event === "Notification" ||
+            event === "SubagentStop") &&
+            config.matcher) {
             errors.push(`${prefix}: Event ${event} should not have a matcher`);
         }
         // Validate commands
@@ -493,6 +501,7 @@ export class HookManager {
                     UserPromptSubmit: 0,
                     Stop: 0,
                     SubagentStop: 0,
+                    Notification: 0,
                 },
             };
         }
@@ -502,6 +511,7 @@ export class HookManager {
             UserPromptSubmit: 0,
             Stop: 0,
             SubagentStop: 0,
+            Notification: 0,
         };
         let totalConfigs = 0;
         let totalCommands = 0;