wave-agent-sdk 0.0.7 → 0.0.10

package/dist/utils/commandPathResolver.d.ts

@@ -0,0 +1,52 @@
+/**
+ * Command path resolver utilities for nested command discovery
+ * Handles conversion between file paths and command IDs with colon syntax
+ */
+export interface CommandIdParts {
+    namespace?: string;
+    commandName: string;
+    isNested: boolean;
+    depth: number;
+    segments: string[];
+}
+/**
+ * Generate command ID from file path
+ * @param filePath - Absolute path to markdown file
+ * @param rootDir - Root commands directory path
+ * @returns Command identifier string (e.g., "openspec:apply")
+ * @throws Error on invalid path structure
+ */
+export declare function generateCommandId(filePath: string, rootDir: string): string;
+/**
+ * Parse command ID into components
+ * @param commandId - Command identifier (e.g., "openspec:apply")
+ * @returns Object with namespace and command name
+ * @throws Error on malformed command ID
+ */
+export declare function parseCommandId(commandId: string): CommandIdParts;
+/**
+ * Validate command ID format
+ * @param commandId - Command identifier to validate
+ * @returns Boolean indicating validity
+ */
+export declare function validateCommandId(commandId: string): boolean;
+/**
+ * Convert file path to command segments array
+ * @param filePath - Absolute path to markdown file
+ * @param rootDir - Root commands directory path
+ * @returns Array of path segments
+ */
+export declare function getCommandSegments(filePath: string, rootDir: string): string[];
+/**
+ * Get namespace from command segments
+ * @param segments - Command path segments
+ * @returns Namespace string or undefined for flat commands
+ */
+export declare function getNamespace(segments: string[]): string | undefined;
+/**
+ * Get command depth from segments
+ * @param segments - Command path segments
+ * @returns Depth number (0 for root, 1 for nested)
+ */
+export declare function getDepth(segments: string[]): number;
+//# sourceMappingURL=commandPathResolver.d.ts.map

package/dist/utils/commandPathResolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"commandPathResolver.d.ts","sourceRoot":"","sources":["../../src/utils/commandPathResolver.ts"],"names":[],"mappings":"AAEA;;;GAGG;AAEH,MAAM,WAAW,cAAc;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAmD3E;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc,CAyChE;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAU5D;AAaD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GACd,MAAM,EAAE,CASV;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAEnE;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAEnD"}

package/dist/utils/commandPathResolver.js

@@ -0,0 +1,145 @@
+import { relative, basename } from "path";
+/**
+ * Generate command ID from file path
+ * @param filePath - Absolute path to markdown file
+ * @param rootDir - Root commands directory path
+ * @returns Command identifier string (e.g., "openspec:apply")
+ * @throws Error on invalid path structure
+ */
+export function generateCommandId(filePath, rootDir) {
+    // Handle null/undefined inputs
+    if (filePath == null || rootDir == null) {
+        throw new Error("File path and root directory must be provided");
+    }
+    // Handle empty root directory (for root level commands)
+    const relativePath = rootDir === "" ? filePath : relative(rootDir, filePath);
+    // Handle edge cases
+    if (!relativePath || relativePath === ".") {
+        throw new Error("Command filename cannot be empty");
+    }
+    const segments = relativePath.split("/").filter((segment) => segment !== "");
+    // Remove .md extension from the last segment
+    const lastSegment = segments[segments.length - 1];
+    if (!lastSegment.endsWith(".md")) {
+        throw new Error(`Command files must have .md extension`);
+    }
+    segments[segments.length - 1] = basename(lastSegment, ".md");
+    // Handle empty filename after removing extension
+    if (segments[segments.length - 1] === "") {
+        throw new Error("Command filename cannot be empty");
+    }
+    // Validate depth (max 1 level of nesting)
+    if (segments.length > 2) {
+        throw new Error(`Command nesting too deep: ${relativePath}. Maximum depth is 1 level.`);
+    }
+    // Validate segments
+    for (const segment of segments) {
+        if (!validateSegment(segment)) {
+            throw new Error(`Invalid command path segment: "${segment}" in ${relativePath}. Must match pattern /^[a-zA-Z][a-zA-Z0-9_.-]*$/`);
+        }
+    }
+    // Generate command ID
+    if (segments.length === 1) {
+        return segments[0]; // Flat command
+    }
+    else {
+        return segments.join(":"); // Nested command with colon syntax
+    }
+}
+/**
+ * Parse command ID into components
+ * @param commandId - Command identifier (e.g., "openspec:apply")
+ * @returns Object with namespace and command name
+ * @throws Error on malformed command ID
+ */
+export function parseCommandId(commandId) {
+    // Handle null/undefined inputs
+    if (commandId == null) {
+        throw new Error("Command ID cannot be null or undefined");
+    }
+    if (commandId === "") {
+        throw new Error("Command ID cannot be empty");
+    }
+    if (!validateCommandId(commandId)) {
+        throw new Error(`Invalid command ID format: "${commandId}". Must match pattern /^[a-zA-Z0-9_-]+(?::[a-zA-Z0-9_-]+)?$/`);
+    }
+    const parts = commandId.split(":");
+    if (parts.length === 1) {
+        // Flat command
+        return {
+            namespace: undefined,
+            commandName: parts[0],
+            isNested: false,
+            depth: 0,
+            segments: [parts[0]],
+        };
+    }
+    else if (parts.length === 2) {
+        // Nested command
+        return {
+            namespace: parts[0],
+            commandName: parts[1],
+            isNested: true,
+            depth: 1,
+            segments: [parts[0], parts[1]],
+        };
+    }
+    else {
+        throw new Error(`Invalid command ID format: "${commandId}". Too many colon separators.`);
+    }
+}
+/**
+ * Validate command ID format
+ * @param commandId - Command identifier to validate
+ * @returns Boolean indicating validity
+ */
+export function validateCommandId(commandId) {
+    // Handle null/undefined inputs
+    if (commandId == null) {
+        return false;
+    }
+    // Command ID can have multiple colons (though generateCommandId enforces max 1 level)
+    // This validates the format but doesn't enforce depth limits
+    const pattern = /^[a-zA-Z][a-zA-Z0-9_-]*(?::[a-zA-Z][a-zA-Z0-9_-]*)*$/;
+    return pattern.test(commandId);
+}
+/**
+ * Validate individual path segment
+ * @param segment - Path segment to validate
+ * @returns Boolean indicating validity
+ */
+function validateSegment(segment) {
+    // Segments should start with letters and can contain letters, numbers, dashes, underscores, dots
+    const pattern = /^[a-zA-Z][a-zA-Z0-9_.-]*$/;
+    return pattern.test(segment);
+}
+/**
+ * Convert file path to command segments array
+ * @param filePath - Absolute path to markdown file
+ * @param rootDir - Root commands directory path
+ * @returns Array of path segments
+ */
+export function getCommandSegments(filePath, rootDir) {
+    const relativePath = relative(rootDir, filePath);
+    const segments = relativePath.split("/").filter((segment) => segment !== "");
+    // Remove .md extension from the last segment
+    const lastSegment = segments[segments.length - 1];
+    segments[segments.length - 1] = basename(lastSegment, ".md");
+    return segments;
+}
+/**
+ * Get namespace from command segments
+ * @param segments - Command path segments
+ * @returns Namespace string or undefined for flat commands
+ */
+export function getNamespace(segments) {
+    return segments.length > 1 ? segments[0] : undefined;
+}
+/**
+ * Get command depth from segments
+ * @param segments - Command path segments
+ * @returns Depth number (0 for root, 1 for nested)
+ */
+export function getDepth(segments) {
+    return Math.max(0, segments.length - 1);
+}

package/dist/utils/configPaths.d.ts

@@ -0,0 +1,85 @@
+/**
+ * Configuration Path Utilities
+ *
+ * Centralized utilities for resolving Wave configuration file paths.
+ * Supports both regular settings.json and settings.local.json with proper priority.
+ *
+ * Priority system:
+ * - User configs: ~/.wave/settings.local.json > ~/.wave/settings.json
+ * - Project configs: {workdir}/.wave/settings.local.json > {workdir}/.wave/settings.json
+ * - Project configs override user configs (existing behavior)
+ */
+/**
+ * Get the user-specific configuration file path (legacy function)
+ * @deprecated Use getUserConfigPaths() for better priority support
+ */
+export declare function getUserConfigPath(): string;
+/**
+ * Get the project-specific configuration file path (legacy function)
+ * @deprecated Use getProjectConfigPaths() for better priority support
+ */
+export declare function getProjectConfigPath(workdir: string): string;
+/**
+ * Get the user-specific configuration file paths in priority order
+ * Returns array with .local.json first, then .json
+ */
+export declare function getUserConfigPaths(): string[];
+/**
+ * Get the project-specific configuration file paths in priority order
+ * Returns array with .local.json first, then .json
+ */
+export declare function getProjectConfigPaths(workdir: string): string[];
+/**
+ * Get all configuration file paths (user and project) in priority order
+ * Useful for comprehensive configuration detection
+ */
+export declare function getAllConfigPaths(workdir: string): {
+    userPaths: string[];
+    projectPaths: string[];
+    allPaths: string[];
+};
+/**
+ * Get existing configuration file paths
+ * Returns only the paths that actually exist on the filesystem
+ */
+export declare function getExistingConfigPaths(workdir: string): {
+    userPaths: string[];
+    projectPaths: string[];
+    existingPaths: string[];
+};
+/**
+ * Get the first existing configuration file path with the specified priority
+ * @param paths Array of paths in priority order
+ * @returns The first path that exists, or undefined if none exist
+ */
+export declare function getFirstExistingPath(paths: string[]): string | undefined;
+/**
+ * Get effective configuration paths (the ones that would actually be used)
+ * Returns the highest priority existing path for each category
+ */
+export declare function getEffectiveConfigPaths(workdir: string): {
+    userPath?: string;
+    projectPath?: string;
+    effectivePath?: string;
+};
+/**
+ * Check if any configuration files exist
+ */
+export declare function hasAnyConfig(workdir: string): boolean;
+/**
+ * Get configuration information for debugging and monitoring
+ */
+export declare function getConfigurationInfo(workdir: string): {
+    hasUser: boolean;
+    hasProject: boolean;
+    paths: string[];
+    userPaths: string[];
+    projectPaths: string[];
+    existingPaths: string[];
+    effectivePaths: {
+        userPath?: string;
+        projectPath?: string;
+        effectivePath?: string;
+    };
+};
+//# sourceMappingURL=configPaths.d.ts.map

package/dist/utils/configPaths.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"configPaths.d.ts","sourceRoot":"","sources":["../../src/utils/configPaths.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAMH;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,EAAE,CAG7C;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAG/D;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG;IAClD,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CASA;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG;IACvD,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAYA;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAExE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG;IACxD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAeA;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAGrD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG;IACrD,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;IACpB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,cAAc,EAAE;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB,CAAC;CACH,CAcA"}

package/dist/utils/configPaths.js

@@ -0,0 +1,121 @@
+/**
+ * Configuration Path Utilities
+ *
+ * Centralized utilities for resolving Wave configuration file paths.
+ * Supports both regular settings.json and settings.local.json with proper priority.
+ *
+ * Priority system:
+ * - User configs: ~/.wave/settings.local.json > ~/.wave/settings.json
+ * - Project configs: {workdir}/.wave/settings.local.json > {workdir}/.wave/settings.json
+ * - Project configs override user configs (existing behavior)
+ */
+import { join } from "path";
+import { homedir } from "os";
+import { existsSync } from "fs";
+/**
+ * Get the user-specific configuration file path (legacy function)
+ * @deprecated Use getUserConfigPaths() for better priority support
+ */
+export function getUserConfigPath() {
+    return join(homedir(), ".wave", "settings.json");
+}
+/**
+ * Get the project-specific configuration file path (legacy function)
+ * @deprecated Use getProjectConfigPaths() for better priority support
+ */
+export function getProjectConfigPath(workdir) {
+    return join(workdir, ".wave", "settings.json");
+}
+/**
+ * Get the user-specific configuration file paths in priority order
+ * Returns array with .local.json first, then .json
+ */
+export function getUserConfigPaths() {
+    const baseDir = join(homedir(), ".wave");
+    return [join(baseDir, "settings.local.json"), join(baseDir, "settings.json")];
+}
+/**
+ * Get the project-specific configuration file paths in priority order
+ * Returns array with .local.json first, then .json
+ */
+export function getProjectConfigPaths(workdir) {
+    const baseDir = join(workdir, ".wave");
+    return [join(baseDir, "settings.local.json"), join(baseDir, "settings.json")];
+}
+/**
+ * Get all configuration file paths (user and project) in priority order
+ * Useful for comprehensive configuration detection
+ */
+export function getAllConfigPaths(workdir) {
+    const userPaths = getUserConfigPaths();
+    const projectPaths = getProjectConfigPaths(workdir);
+    return {
+        userPaths,
+        projectPaths,
+        allPaths: [...userPaths, ...projectPaths],
+    };
+}
+/**
+ * Get existing configuration file paths
+ * Returns only the paths that actually exist on the filesystem
+ */
+export function getExistingConfigPaths(workdir) {
+    const allPaths = getAllConfigPaths(workdir);
+    const existingUserPaths = allPaths.userPaths.filter(existsSync);
+    const existingProjectPaths = allPaths.projectPaths.filter(existsSync);
+    const allExistingPaths = allPaths.allPaths.filter(existsSync);
+    return {
+        userPaths: existingUserPaths,
+        projectPaths: existingProjectPaths,
+        existingPaths: allExistingPaths,
+    };
+}
+/**
+ * Get the first existing configuration file path with the specified priority
+ * @param paths Array of paths in priority order
+ * @returns The first path that exists, or undefined if none exist
+ */
+export function getFirstExistingPath(paths) {
+    return paths.find((path) => existsSync(path));
+}
+/**
+ * Get effective configuration paths (the ones that would actually be used)
+ * Returns the highest priority existing path for each category
+ */
+export function getEffectiveConfigPaths(workdir) {
+    const userPaths = getUserConfigPaths();
+    const projectPaths = getProjectConfigPaths(workdir);
+    const userPath = getFirstExistingPath(userPaths);
+    const projectPath = getFirstExistingPath(projectPaths);
+    // Project path takes precedence over user path if both exist
+    const effectivePath = projectPath || userPath;
+    return {
+        userPath,
+        projectPath,
+        effectivePath,
+    };
+}
+/**
+ * Check if any configuration files exist
+ */
+export function hasAnyConfig(workdir) {
+    const { existingPaths } = getExistingConfigPaths(workdir);
+    return existingPaths.length > 0;
+}
+/**
+ * Get configuration information for debugging and monitoring
+ */
+export function getConfigurationInfo(workdir) {
+    const allPaths = getAllConfigPaths(workdir);
+    const existingPaths = getExistingConfigPaths(workdir);
+    const effectivePaths = getEffectiveConfigPaths(workdir);
+    return {
+        hasUser: existingPaths.userPaths.length > 0,
+        hasProject: existingPaths.projectPaths.length > 0,
+        paths: allPaths.allPaths,
+        userPaths: allPaths.userPaths,
+        projectPaths: allPaths.projectPaths,
+        existingPaths: existingPaths.existingPaths,
+        effectivePaths,
+    };
+}

package/dist/utils/constants.d.ts

@@ -21,17 +21,5 @@ export declare const USER_MEMORY_FILE: string;
 /**
  * AI related constants
  */
-export declare const DEFAULT_TOKEN_LIMIT = 64000;
-/**
- * @deprecated These constants are now legacy. Use ModelConfig through Agent constructor instead.
- * They are maintained for backward compatibility with existing code that might still reference them,
- * but the actual AI services now use configuration injection.
- */
-export declare const FAST_MODEL_ID: string;
-/**
- * @deprecated These constants are now legacy. Use ModelConfig through Agent constructor instead.
- * They are maintained for backward compatibility with existing code that might still reference them,
- * but the actual AI services now use configuration injection.
- */
-export declare const AGENT_MODEL_ID: string;
+export declare const DEFAULT_TOKEN_LIMIT = 96000;
 //# sourceMappingURL=constants.d.ts.map

package/dist/utils/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH;;;GAGG;AACH,eAAO,MAAM,cAAc,QAAmC,CAAC;AAE/D;;GAEG;AACH,eAAO,MAAM,iBAAiB,QAAiD,CAAC;AAEhF;;GAEG;AACH,eAAO,MAAM,mBAAmB,QAA0C,CAAC;AAE3E;;GAEG;AACH,eAAO,MAAM,gBAAgB,QAA8C,CAAC;AAE5E;;GAEG;AACH,eAAO,MAAM,mBAAmB,QAAQ,CAAC;AAEzC;;;;GAIG;AACH,eAAO,MAAM,aAAa,QAAoD,CAAC;AAE/E;;;;GAIG;AACH,eAAO,MAAM,cAAc,QAC2B,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH;;;GAGG;AACH,eAAO,MAAM,cAAc,QAAmC,CAAC;AAE/D;;GAEG;AACH,eAAO,MAAM,iBAAiB,QAAiD,CAAC;AAEhF;;GAEG;AACH,eAAO,MAAM,mBAAmB,QAA0C,CAAC;AAE3E;;GAEG;AACH,eAAO,MAAM,gBAAgB,QAAyC,CAAC;AAEvE;;GAEG;AACH,eAAO,MAAM,mBAAmB,QAAQ,CAAC"}

package/dist/utils/constants.js

@@ -19,20 +19,8 @@ export const ERROR_LOG_DIRECTORY = path.join(DATA_DIRECTORY, "error-logs");
 /**
  * User-level memory file path
  */
-export const USER_MEMORY_FILE = path.join(DATA_DIRECTORY, "user-memory.md");
+export const USER_MEMORY_FILE = path.join(DATA_DIRECTORY, "AGENTS.md");
 /**
  * AI related constants
  */
-export const DEFAULT_TOKEN_LIMIT = 64000; // Default token limit
-/**
- * @deprecated These constants are now legacy. Use ModelConfig through Agent constructor instead.
- * They are maintained for backward compatibility with existing code that might still reference them,
- * but the actual AI services now use configuration injection.
- */
-export const FAST_MODEL_ID = process.env.AIGW_FAST_MODEL || "gemini-2.5-flash";
-/**
- * @deprecated These constants are now legacy. Use ModelConfig through Agent constructor instead.
- * They are maintained for backward compatibility with existing code that might still reference them,
- * but the actual AI services now use configuration injection.
- */
-export const AGENT_MODEL_ID = process.env.AIGW_MODEL || "claude-sonnet-4-20250514";
+export const DEFAULT_TOKEN_LIMIT = 96000; // Default token limit

package/dist/utils/convertMessagesForAPI.d.ts

@@ -1,7 +1,8 @@
 import type { Message } from "../types/index.js";
 import { ChatCompletionMessageParam } from "openai/resources.js";
 /**
- * Convert message format to API call format, stopping when a compressed message is encountered
+ * Convert message format to API call format, stopping when a compressed message is encountered.
+ * Messages with no meaningful content or tool calls are filtered out.
  * @param messages Message list
  * @returns Converted API message format list
  */

package/dist/utils/convertMessagesForAPI.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convertMessagesForAPI.d.ts","sourceRoot":"","sources":["../../src/utils/convertMessagesForAPI.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAIjD,OAAO,EAEL,0BAA0B,EAC3B,MAAM,qBAAqB,CAAC;AAuB7B;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,OAAO,EAAE,GAClB,0BAA0B,EAAE,CA8L9B"}
+{"version":3,"file":"convertMessagesForAPI.d.ts","sourceRoot":"","sources":["../../src/utils/convertMessagesForAPI.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAIjD,OAAO,EAEL,0BAA0B,EAC3B,MAAM,qBAAqB,CAAC;AAwB7B;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,OAAO,EAAE,GAClB,0BAA0B,EAAE,CAsN9B"}

package/dist/utils/convertMessagesForAPI.js

@@ -1,5 +1,6 @@
 import { convertImageToBase64 } from "./messageOperations.js";
 import { stripAnsiColors } from "./stringUtils.js";
+import { logger } from "./globalLogger.js";
 /**
  * Safely handle tool call parameters, ensuring a legal JSON string is returned
  * @param args Tool call parameters
@@ -14,14 +15,15 @@ function safeToolArguments(args) {
         JSON.parse(args);
         return args;
     }
-    catch {
-        // logger.error(`Invalid tool arguments: ${args}`);
+    catch (error) {
+        logger.error(`Invalid tool arguments: ${args}`, error);
         // If not valid JSON, return a fallback empty object
         return "{}";
     }
 }
 /**
- * Convert message format to API call format, stopping when a compressed message is encountered
+ * Convert message format to API call format, stopping when a compressed message is encountered.
+ * Messages with no meaningful content or tool calls are filtered out.
  * @param messages Message list
  * @returns Converted API message format list
  */
@@ -43,7 +45,7 @@ export function convertMessagesForAPI(messages) {
             }
             break;
         }
-        // Skip empty assistant messages
+        // Skip empty assistant messages (no blocks or all blocks are empty)
         if (message.role === "assistant" && message.blocks.length === 0) {
             continue;
         }
@@ -54,8 +56,8 @@ export function convertMessagesForAPI(messages) {
             const completedToolIds = new Set(); // Record completed tool IDs
             if (toolBlocks.length > 0) {
                 toolBlocks.forEach((toolBlock) => {
-                    // Only add completed tool blocks (i.e., not running)
-                    if (toolBlock.id && !toolBlock.isRunning) {
+                    // Only add completed tool blocks (i.e., stage is 'end')
+                    if (toolBlock.id && toolBlock.stage === "end") {
                         completedToolIds.add(toolBlock.id);
                         // Check for image data
                         if (toolBlock.images && toolBlock.images.length > 0) {
@@ -100,10 +102,14 @@ export function convertMessagesForAPI(messages) {
             // Construct the content of the assistant message
             let content = "";
             let tool_calls = undefined;
-            // Construct content from text blocks
-            const textBlocks = message.blocks.filter((block) => block.type === "text");
+            // Construct content from text blocks - filter out empty content
+            const textBlocks = message.blocks.filter((block) => block.type === "text" &&
+                block.content &&
+                block.content.trim().length > 0);
             if (textBlocks.length > 0) {
-                content = textBlocks.map((block) => block.content || "").join("\n");
+                content = textBlocks
+                    .map((block) => (block.type === "text" ? block.content : ""))
+                    .join("\n");
             }
             // Construct tool calls from tool blocks
             if (toolBlocks.length > 0) {
@@ -121,12 +127,15 @@ export function convertMessagesForAPI(messages) {
                     tool_calls = undefined;
                 }
             }
-            // Construct assistant message - only add if there is content or tool calls
-            if (content || tool_calls) {
+            // Construct assistant message - only add if there is meaningful content or tool calls
+            const hasContent = content && content.trim().length > 0;
+            const hasToolCalls = tool_calls && tool_calls.length > 0;
+            if (hasContent || hasToolCalls) {
                 const assistantMessage = {
                     role: "assistant",
-                    content,
+                    content: hasContent ? content : undefined,
                     tool_calls,
+                    ...(message.additionalFields ? { ...message.additionalFields } : {}),
                 };
                 recentMessages.unshift(assistantMessage);
             }
@@ -135,8 +144,10 @@ export function convertMessagesForAPI(messages) {
             // User messages converted to standard format
             const contentParts = [];
             message.blocks.forEach((block) => {
-                // Add text content
-                if (block.type === "text" && block.content) {
+                // Add text content - only if it has meaningful content
+                if (block.type === "text" &&
+                    block.content &&
+                    block.content.trim().length > 0) {
                     contentParts.push({
                         type: "text",
                         text: block.customCommandContent || block.content,
@@ -155,7 +166,7 @@ export function convertMessagesForAPI(messages) {
                                 finalImageUrl = convertImageToBase64(imageUrl);
                             }
                             catch (error) {
-                                console.error("Failed to convert image path to base64:", imageUrl, error);
+                                logger.error("Failed to convert image path to base64:", imageUrl, error);
                                 // Skip this image, do not add to content
                                 return;
                             }
@@ -170,11 +181,21 @@ export function convertMessagesForAPI(messages) {
                     });
                 }
             });
+            // Only add user message if there is meaningful content
             if (contentParts.length > 0) {
-                recentMessages.unshift({
-                    role: "user",
-                    content: contentParts,
+                // Filter out empty text parts
+                const meaningfulParts = contentParts.filter((part) => {
+                    if (part.type === "text") {
+                        return part.text && part.text.trim().length > 0;
+                    }
+                    return true; // Keep image parts
                 });
+                if (meaningfulParts.length > 0) {
+                    recentMessages.unshift({
+                        role: "user",
+                        content: meaningfulParts,
+                    });
+                }
             }
         }
     }

package/dist/utils/customCommands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"customCommands.d.ts","sourceRoot":"","sources":["../../src/utils/customCommands.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAG5D;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AA6CD;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,kBAAkB,EAAE,CAkB7E"}
+{"version":3,"file":"customCommands.d.ts","sourceRoot":"","sources":["../../src/utils/customCommands.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAU5D;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AA0GD;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,kBAAkB,EAAE,CAkB7E"}