wave-agent-sdk 0.0.8 → 0.0.10

package/dist/services/aiService.js

@@ -50,12 +50,19 @@ function getModelConfig(modelName, baseConfig = {}) {
     return config;
 }
 export async function callAgent(options) {
-    const { gatewayConfig, modelConfig, messages, abortSignal, memory, workdir, tools, model, systemPrompt, onContentUpdate, onToolUpdate, } = options;
+    const { gatewayConfig, modelConfig, messages, abortSignal, memory, workdir, tools, model, systemPrompt, onContentUpdate, onToolUpdate, onReasoningUpdate, } = options;
+    // Declare variables outside try block for error handling access
+    let openaiMessages;
+    let createParams;
+    let processedTools;
     try {
         // Create OpenAI client with injected configuration
         const openai = new OpenAI({
             apiKey: gatewayConfig.apiKey,
             baseURL: gatewayConfig.baseURL,
+            defaultHeaders: gatewayConfig.defaultHeaders,
+            fetchOptions: gatewayConfig.fetchOptions,
+            fetch: gatewayConfig.fetch,
         });
         // Build system prompt content
         let systemContent = systemPrompt ||
@@ -89,36 +96,34 @@ Today's date: ${new Date().toISOString().split("T")[0]}
             content: systemContent,
         };
         // ChatCompletionMessageParam[] is already in OpenAI format, add system prompt to the beginning
-        let openaiMessages = [
-            systemMessage,
-            ...messages,
-        ];
+        openaiMessages = [systemMessage, ...messages];
         // Apply cache control for Claude models
         const currentModel = model || modelConfig.agentModel;
+        processedTools = tools;
         if (isClaudeModel(currentModel)) {
             openaiMessages = transformMessagesForClaudeCache(openaiMessages, currentModel);
+            // Apply cache control to tools separately
+            if (tools && tools.length > 0) {
+                processedTools = addCacheControlToLastTool(tools);
+            }
         }
         // Get model configuration - use injected modelConfig with optional override
         const openaiModelConfig = getModelConfig(model || modelConfig.agentModel, {
             temperature: 0,
         });
         // Determine if streaming is needed
-        const isStreaming = !!(onContentUpdate || onToolUpdate);
+        const isStreaming = !!(onContentUpdate ||
+            onToolUpdate ||
+            onReasoningUpdate);
         // Prepare API call parameters
-        const createParams = {
+        createParams = {
             ...openaiModelConfig,
             messages: openaiMessages,
             stream: isStreaming,
         };
         // Only add tools if they exist
-        if (tools && tools.length > 0) {
-            // Apply cache control to tools for Claude models
-            if (isClaudeModel(currentModel)) {
-                createParams.tools = addCacheControlToLastTool(tools);
-            }
-            else {
-                createParams.tools = tools;
-            }
+        if (processedTools && processedTools.length > 0) {
+            createParams.tools = processedTools;
         }
         if (isStreaming) {
             // Handle streaming response
@@ -132,7 +137,7 @@ Today's date: ${new Date().toISOString().split("T")[0]}
             response.headers.forEach((value, key) => {
                 responseHeaders[key] = value;
             });
-            return await processStreamingResponse(stream, onContentUpdate, onToolUpdate, abortSignal, responseHeaders, currentModel);
+            return await processStreamingResponse(stream, onContentUpdate, onToolUpdate, onReasoningUpdate, abortSignal, responseHeaders, currentModel);
         }
         else {
             // Handle non-streaming response
@@ -161,22 +166,26 @@ Today's date: ${new Date().toISOString().split("T")[0]}
             }
             const result = {};
             if (finalMessage) {
-                const { content: finalContent, tool_calls: finalToolCalls, ...otherFields } = finalMessage;
+                const { content: finalContent, tool_calls: finalToolCalls, reasoning_content: finalReasoningContent, ...otherFields } = finalMessage;
                 if (typeof finalContent === "string" && finalContent.length > 0) {
                     result.content = finalContent;
                 }
+                if (typeof finalReasoningContent === "string" &&
+                    finalReasoningContent.length > 0) {
+                    result.reasoning_content = finalReasoningContent;
+                }
                 if (Array.isArray(finalToolCalls) && finalToolCalls.length > 0) {
                     result.tool_calls = finalToolCalls;
                 }
                 if (Object.keys(otherFields).length > 0) {
-                    const metadata = {};
+                    const additionalFields = {};
                     for (const [key, value] of Object.entries(otherFields)) {
-                        if (value !== undefined) {
-                            metadata[key] = value;
+                        if (value !== undefined && key !== "role") {
+                            additionalFields[key] = value;
                         }
                     }
-                    if (Object.keys(metadata).length > 0) {
-                        result.metadata = metadata;
+                    if (Object.keys(additionalFields).length > 0) {
+                        result.additionalFields = additionalFields;
                     }
                 }
             }
@@ -196,6 +205,76 @@ Today's date: ${new Date().toISOString().split("T")[0]}
         if (error.name === "AbortError") {
             throw new Error("Request was aborted");
         }
+        // Check if it's a 400 error and save messages to temp directory
+        if (error &&
+            typeof error === "object" &&
+            "status" in error &&
+            error.status === 400) {
+            try {
+                // Create temp directory for error debugging
+                const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "callAgent-400-error-"));
+                const messagesFile = path.join(tempDir, "messages.json");
+                const errorFile = path.join(tempDir, "error.json");
+                // Save complete messages to temp file
+                const debugData = {
+                    originalMessages: messages,
+                    timestamp: new Date().toISOString(),
+                    model: model || modelConfig.agentModel,
+                    workdir,
+                    sessionId: options.sessionId,
+                    gatewayConfig: {
+                        baseURL: gatewayConfig.baseURL,
+                        // Don't include apiKey for security
+                        defaultHeaders: gatewayConfig.defaultHeaders,
+                    },
+                };
+                // Add processed messages if they exist
+                if (typeof openaiMessages !== "undefined") {
+                    debugData.processedMessages = openaiMessages;
+                }
+                // Add create params if they exist
+                if (typeof createParams !== "undefined") {
+                    debugData.createParams = createParams;
+                }
+                // Add tools if they exist
+                if (processedTools) {
+                    debugData.tools = processedTools;
+                }
+                fs.writeFileSync(messagesFile, JSON.stringify(debugData, null, 2));
+                // Save error details
+                const errorData = {
+                    error: {
+                        message: error && typeof error === "object" && "message" in error
+                            ? String(error.message)
+                            : undefined,
+                        status: error && typeof error === "object" && "status" in error
+                            ? Number(error.status)
+                            : undefined,
+                        type: error && typeof error === "object" && "type" in error
+                            ? String(error.type)
+                            : undefined,
+                        code: error && typeof error === "object" && "code" in error
+                            ? String(error.code)
+                            : undefined,
+                        body: error && typeof error === "object" && "body" in error
+                            ? error.body
+                            : undefined,
+                        stack: error && typeof error === "object" && "stack" in error
+                            ? String(error.stack)
+                            : undefined,
+                    },
+                    timestamp: new Date().toISOString(),
+                };
+                fs.writeFileSync(errorFile, JSON.stringify(errorData, null, 2));
+                logger.error("callAgent 400 error occurred. Debug files saved to:", tempDir);
+                logger.error("Messages file:", messagesFile);
+                logger.error("Error file:", errorFile);
+                logger.error("Error details:", error);
+            }
+            catch (saveError) {
+                logger.error("Failed to save 400 error debug files:", saveError);
+            }
+        }
         logger.error("Failed to call OpenAI:", error);
         throw error;
     }
@@ -210,8 +289,9 @@ Today's date: ${new Date().toISOString().split("T")[0]}
  * @param modelName Model name for cache control processing
  * @returns Final result with accumulated content and tool calls
  */
-async function processStreamingResponse(stream, onContentUpdate, onToolUpdate, abortSignal, responseHeaders, modelName) {
+async function processStreamingResponse(stream, onContentUpdate, onToolUpdate, onReasoningUpdate, abortSignal, responseHeaders, modelName) {
     let accumulatedContent = "";
+    let accumulatedReasoningContent = "";
     const toolCalls = [];
     const additionalDeltaFields = {};
     let usage = undefined;
@@ -244,7 +324,7 @@ async function processStreamingResponse(stream, onContentUpdate, onToolUpdate, a
             if (!delta) {
                 continue;
             }
-            const { content, tool_calls: toolCallUpdates, ...deltaMetadata } = delta;
+            const { content, tool_calls: toolCallUpdates, reasoning_content, ...deltaMetadata } = delta;
             if (Object.keys(deltaMetadata).length > 0) {
                 Object.assign(additionalDeltaFields, deltaMetadata);
             }
@@ -256,6 +336,13 @@ async function processStreamingResponse(stream, onContentUpdate, onToolUpdate, a
                     onContentUpdate(accumulatedContent);
                 }
             }
+            if (typeof reasoning_content === "string" &&
+                reasoning_content.length > 0) {
+                accumulatedReasoningContent += reasoning_content;
+                if (onReasoningUpdate) {
+                    onReasoningUpdate(accumulatedReasoningContent);
+                }
+            }
             if (Array.isArray(toolCallUpdates)) {
                 for (const rawToolCall of toolCallUpdates) {
                     const toolCallDelta = rawToolCall;
@@ -330,7 +417,10 @@ async function processStreamingResponse(stream, onContentUpdate, onToolUpdate, a
     // Prepare final result
     const result = {};
     if (accumulatedContent) {
-        result.content = accumulatedContent;
+        result.content = accumulatedContent.trim();
+    }
+    if (accumulatedReasoningContent) {
+        result.reasoning_content = accumulatedReasoningContent.trim();
     }
     if (toolCalls.length > 0) {
         result.tool_calls = toolCalls;
@@ -345,14 +435,14 @@ async function processStreamingResponse(stream, onContentUpdate, onToolUpdate, a
         result.response_headers = responseHeaders;
     }
     if (Object.keys(additionalDeltaFields).length > 0) {
-        result.metadata = {};
+        result.additionalFields = {};
         for (const [key, value] of Object.entries(additionalDeltaFields)) {
-            if (value !== undefined) {
-                result.metadata[key] = value;
+            if (value !== undefined && key !== "role") {
+                result.additionalFields[key] = value;
             }
         }
-        if (Object.keys(result.metadata).length === 0) {
-            delete result.metadata;
+        if (Object.keys(result.additionalFields).length === 0) {
+            delete result.additionalFields;
         }
     }
     return result;
@@ -363,6 +453,9 @@ export async function compressMessages(options) {
     const openai = new OpenAI({
         apiKey: gatewayConfig.apiKey,
         baseURL: gatewayConfig.baseURL,
+        defaultHeaders: gatewayConfig.defaultHeaders,
+        fetchOptions: gatewayConfig.fetchOptions,
+        fetch: gatewayConfig.fetch,
     });
     // Get model configuration - use injected fast model
     const openaiModelConfig = getModelConfig(modelConfig.fastModel, {

package/dist/services/configurationService.d.ts

@@ -0,0 +1,116 @@
+/**
+ * Configuration Service
+ *
+ * Centralized service for loading, validating, and managing Wave configuration files.
+ * Replaces distributed configuration logic previously embedded in hook.ts.
+ */
+import type { WaveConfiguration } from "../types/hooks.js";
+import type { ConfigurationLoadResult, ValidationResult, ConfigurationPaths } from "../types/configuration.js";
+import { type EnvironmentValidationResult, type MergedEnvironmentContext, type EnvironmentMergeOptions } from "../types/environment.js";
+import { GatewayConfig, ModelConfig } from "../types/index.js";
+import { ClientOptions } from "openai";
+/**
+ * Default ConfigurationService implementation
+ *
+ * Provides centralized configuration loading, validation, and management.
+ * Extracted from distributed logic in hook.ts with improved error handling.
+ */
+export declare class ConfigurationService {
+    private currentConfiguration;
+    private env;
+    /**
+     * Load and merge configuration with comprehensive validation
+     */
+    loadMergedConfiguration(workdir: string): Promise<ConfigurationLoadResult>;
+    /**
+     * Validate configuration object structure and values
+     */
+    validateConfiguration(config: WaveConfiguration): ValidationResult;
+    /**
+     * Validate configuration file without loading
+     */
+    validateConfigurationFile(filePath: string): ValidationResult;
+    /**
+     * Get currently loaded configuration
+     */
+    getCurrentConfiguration(): WaveConfiguration | null;
+    /**
+     * Set environment variables from configuration
+     * This replaces direct process.env modification
+     */
+    setEnvironmentVars(env: Record<string, string>): void;
+    /**
+     * Get current environment variables
+     */
+    getEnvironmentVars(): Record<string, string>;
+    /**
+     * Resolves gateway configuration from constructor args and environment
+     * Resolution priority: options > env (from settings.json) > process.env > error
+     * @param apiKey - API key from constructor (optional)
+     * @param baseURL - Base URL from constructor (optional)
+     * @param defaultHeaders - HTTP headers from constructor (optional)
+     * @param fetchOptions - Fetch options from constructor (optional)
+     * @param fetch - Custom fetch implementation from constructor (optional)
+     * @returns Resolved gateway configuration
+     * @throws ConfigurationError if required configuration is missing after fallbacks
+     */
+    resolveGatewayConfig(apiKey?: string, baseURL?: string, defaultHeaders?: Record<string, string>, fetchOptions?: ClientOptions["fetchOptions"], fetch?: ClientOptions["fetch"]): GatewayConfig;
+    /**
+     * Resolves model configuration with fallbacks
+     * Resolution priority: options > env (from settings.json) > process.env > default
+     * @param agentModel - Agent model from constructor (optional)
+     * @param fastModel - Fast model from constructor (optional)
+     * @returns Resolved model configuration with defaults
+     */
+    resolveModelConfig(agentModel?: string, fastModel?: string): ModelConfig;
+    /**
+     * Resolves token limit with fallbacks
+     * Resolution priority: options > env (from settings.json) > process.env > default
+     * @param constructorLimit - Token limit from constructor (optional)
+     * @returns Resolved token limit
+     */
+    resolveTokenLimit(constructorLimit?: number): number;
+    /**
+     * Resolve all configuration file paths
+     */
+    getConfigurationPaths(workdir: string): ConfigurationPaths;
+    /**
+     * Add a permission rule to the project's settings.local.json
+     */
+    addAllowedRule(workdir: string, rule: string): Promise<void>;
+}
+/**
+ * Validate environment variable configuration
+ */
+export declare function validateEnvironmentConfig(env: unknown, configPath?: string): EnvironmentValidationResult;
+/**
+ * Merge environment configurations with project taking precedence over user
+ */
+export declare function mergeEnvironmentConfig(userEnv: Record<string, string> | undefined, projectEnv: Record<string, string> | undefined, options?: EnvironmentMergeOptions): MergedEnvironmentContext;
+/**
+ * Load Wave configuration from a JSON file
+ * Supports both hooks and environment variables with proper validation
+ */
+export declare function loadWaveConfigFromFile(filePath: string): WaveConfiguration | null;
+/**
+ * Load Wave configuration from multiple file paths in priority order
+ * Returns the first valid configuration found, or null if none exist
+ */
+export declare function loadWaveConfigFromFiles(filePaths: string[]): WaveConfiguration | null;
+/**
+ * Load user-specific Wave configuration
+ * Checks .local.json first, then falls back to .json
+ */
+export declare function loadUserWaveConfig(): WaveConfiguration | null;
+/**
+ * Load project-specific Wave configuration
+ * Checks .local.json first, then falls back to .json
+ */
+export declare function loadProjectWaveConfig(workdir: string): WaveConfiguration | null;
+/**
+ * Load and merge Wave configuration from both user and project sources
+ * Project configuration takes precedence over user configuration
+ * Checks .local.json files first, then falls back to .json files
+ */
+export declare function loadMergedWaveConfig(workdir: string): WaveConfiguration | null;
+//# sourceMappingURL=configurationService.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"configurationService.d.ts","sourceRoot":"","sources":["../../src/services/configurationService.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EACV,iBAAiB,EAElB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EACV,uBAAuB,EACvB,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,2BAA2B,CAAC;AAOnC,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,wBAAwB,EAC7B,KAAK,uBAAuB,EAE7B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,aAAa,EACb,WAAW,EAGZ,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAEvC;;;;;GAKG;AACH,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,oBAAoB,CAAkC;IAC9D,OAAO,CAAC,GAAG,CAA8B;IAIzC;;OAEG;IACG,uBAAuB,CAC3B,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,uBAAuB,CAAC;IA0EnC;;OAEG;IACH,qBAAqB,CAAC,MAAM,EAAE,iBAAiB,GAAG,gBAAgB;IA8FlE;;OAEG;IACH,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,gBAAgB;IAwC7D;;OAEG;IACH,uBAAuB,IAAI,iBAAiB,GAAG,IAAI;IAInD;;;OAGG;IACH,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAIrD;;OAEG;IACH,kBAAkB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAQ5C;;;;;;;;;;OAUG;IACH,oBAAoB,CAClB,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,EAChB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,YAAY,CAAC,EAAE,aAAa,CAAC,cAAc,CAAC,EAC5C,KAAK,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,GAC7B,aAAa;IA4DhB;;;;;;OAMG;IACH,kBAAkB,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,WAAW;IAyBxE;;;;;OAKG;IACH,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM;IAmBpD;;OAEG;IACH,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,kBAAkB;IAY1D;;OAEG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAmCnE;AAKD;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,OAAO,EACZ,UAAU,CAAC,EAAE,MAAM,GAClB,2BAA2B,CAsD7B;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,EAC3C,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,EAC9C,OAAO,GAAE,uBAA4B,GACpC,wBAAwB,CAoC1B;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,GACf,iBAAiB,GAAG,IAAI,CA8C1B;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EAAE,GAClB,iBAAiB,GAAG,IAAI,CAQ1B;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,iBAAiB,GAAG,IAAI,CAE7D;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,GACd,iBAAiB,GAAG,IAAI,CAE1B;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,GACd,iBAAiB,GAAG,IAAI,CAsE1B"}