wave-agent-sdk 0.18.6 → 0.19.0

package/dist/utils/atomicWrite.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Atomically write `data` to `filePath` (async).
+ *
+ * Writes to a temp file then renames it into place. On any failure the temp
+ * file is removed and the error is re-thrown so callers can handle it.
+ */
+export declare function atomicWriteFile(filePath: string, data: string): Promise<void>;
+/**
+ * Atomically write `data` to `filePath` (sync).
+ *
+ * Sync variant for callers that cannot await. Same temp-file-then-rename
+ * strategy as {@link atomicWriteFile}.
+ */
+export declare function atomicWriteFileSync(filePath: string, data: string): void;
+//# sourceMappingURL=atomicWrite.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"atomicWrite.d.ts","sourceRoot":"","sources":["../../src/utils/atomicWrite.ts"],"names":[],"mappings":"AAiBA;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAaf;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAaxE"}

package/dist/utils/atomicWrite.js

@@ -0,0 +1,59 @@
+/**
+ * Atomic file write utilities.
+ *
+ * Writes data to a temporary file first, then renames it to the target path.
+ * This prevents readers from observing a partially-written (truncated) file,
+ * which is critical for config files that may be read concurrently.
+ *
+ * Temp file naming: `${targetPath}.tmp.${process.pid}.${randomUUID()}`
+ * — avoids collisions when multiple processes write the same file.
+ */
+import { writeFileSync, renameSync, unlinkSync, promises as fsp } from "fs";
+import { randomUUID } from "crypto";
+function tmpPathFor(targetPath) {
+    return `${targetPath}.tmp.${process.pid}.${randomUUID()}`;
+}
+/**
+ * Atomically write `data` to `filePath` (async).
+ *
+ * Writes to a temp file then renames it into place. On any failure the temp
+ * file is removed and the error is re-thrown so callers can handle it.
+ */
+export async function atomicWriteFile(filePath, data) {
+    const tmpPath = tmpPathFor(filePath);
+    try {
+        await fsp.writeFile(tmpPath, data, "utf-8");
+        await fsp.rename(tmpPath, filePath);
+    }
+    catch (error) {
+        try {
+            await fsp.unlink(tmpPath);
+        }
+        catch {
+            // Ignore cleanup errors — the original error is more important
+        }
+        throw error;
+    }
+}
+/**
+ * Atomically write `data` to `filePath` (sync).
+ *
+ * Sync variant for callers that cannot await. Same temp-file-then-rename
+ * strategy as {@link atomicWriteFile}.
+ */
+export function atomicWriteFileSync(filePath, data) {
+    const tmpPath = tmpPathFor(filePath);
+    try {
+        writeFileSync(tmpPath, data, "utf-8");
+        renameSync(tmpPath, filePath);
+    }
+    catch (error) {
+        try {
+            unlinkSync(tmpPath);
+        }
+        catch {
+            // Ignore cleanup errors — the original error is more important
+        }
+        throw error;
+    }
+}

package/dist/utils/cacheControlUtils.d.ts

@@ -6,6 +6,7 @@
  * models and preserves backward compatibility with existing message formats.
  */
 import type { ChatCompletionMessageParam, ChatCompletionContentPart, ChatCompletionContentPartText, CompletionUsage } from "openai/resources";
+import type { ModelCapabilities } from "../types/config.js";
 /**
  * Cache control directive for Claude models
  */
@@ -43,19 +44,6 @@ export interface ClaudeUsage extends CompletionUsage {
     };
     prompt_tokens_details?: ExtendedPromptTokensDetails;
 }
-/**
- * Determines if a model supports prompt caching
- * @param modelName - Model identifier
- * @returns True if model name matches the cache pattern (default: contains 'claude')
- */
-export declare function supportsPromptCaching(modelName: string): boolean;
-/**
- * Determines if a model supports cache control
- * @param modelName - Model identifier
- * @returns True if model name contains 'claude' (case-insensitive)
- * @deprecated Use supportsPromptCaching instead
- */
-export declare const isClaudeModel: typeof supportsPromptCaching;
 /**
  * Validates cache control structure
  * @param control - Object to validate
@@ -91,10 +79,10 @@ export declare function countContentBlocks(messages: ChatCompletionMessageParam[
  * Tools are marked separately via addCacheControlToLastTool (called by aiService).
  *
  * @param messages - Original OpenAI message array
- * @param modelName - Model name for cache detection
+ * @param capabilities - Declarative model capabilities for cache detection
  * @returns Messages with cache control markers applied
  */
-export declare function transformMessagesForExplicitCache(messages: ChatCompletionMessageParam[], modelName: string): ChatCompletionMessageParam[];
+export declare function transformMessagesForExplicitCache(messages: ChatCompletionMessageParam[], capabilities?: ModelCapabilities): ChatCompletionMessageParam[];
 /**
  * Extends standard usage with cache metrics
  * Extracts cache tokens from both Claude-specific top-level fields and

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

@@ -1 +1 @@
-{"version":3,"file":"cacheControlUtils.d.ts","sourceRoot":"","sources":["../../src/utils/cacheControlUtils.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EACV,0BAA0B,EAC1B,yBAAyB,EACzB,6BAA6B,EAC7B,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAO1B;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,WAAW,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,mCACf,SAAQ,6BAA6B;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,YAAY,CAAC;CAC9B;AAED;;;GAGG;AACH,MAAM,WAAW,2BACf,SAAQ,eAAe,CAAC,mBAAmB;IAC3C,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC;AAED;;;GAGG;AACH,MAAM,WAAW,WAAY,SAAQ,eAAe;IAClD,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IAGrB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,cAAc,CAAC,EAAE;QACf,yBAAyB,EAAE,MAAM,CAAC;QAClC,yBAAyB,EAAE,MAAM,CAAC;KACnC,CAAC;IAGF,qBAAqB,CAAC,EAAE,2BAA2B,CAAC;CACrD;AAUD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAoBhE;AAED;;;;;GAKG;AACH,eAAO,MAAM,aAAa,8BAAwB,CAAC;AAEnD;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,IAAI,YAAY,CAQ7E;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,MAAM,GAAG,yBAAyB,EAAE,EAC7C,WAAW,EAAE,OAAO,GACnB,mCAAmC,EAAE,CAmFvC;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,0BAA0B,EAAE,GACrC,MAAM,CAYR;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,0BAA0B,EAAE,EACtC,SAAS,EAAE,MAAM,GAChB,0BAA0B,EAAE,CAsF9B;AAED;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,eAAe,EAC9B,YAAY,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAClC,WAAW,CAiDb;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,WAAW,CAyCvE"}
+{"version":3,"file":"cacheControlUtils.d.ts","sourceRoot":"","sources":["../../src/utils/cacheControlUtils.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EACV,0BAA0B,EAC1B,yBAAyB,EACzB,6BAA6B,EAC7B,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAM5D;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,WAAW,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,mCACf,SAAQ,6BAA6B;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,YAAY,CAAC;CAC9B;AAED;;;GAGG;AACH,MAAM,WAAW,2BACf,SAAQ,eAAe,CAAC,mBAAmB;IAC3C,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC;AAED;;;GAGG;AACH,MAAM,WAAW,WAAY,SAAQ,eAAe;IAClD,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IAGrB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,cAAc,CAAC,EAAE;QACf,yBAAyB,EAAE,MAAM,CAAC;QAClC,yBAAyB,EAAE,MAAM,CAAC;KACnC,CAAC;IAGF,qBAAqB,CAAC,EAAE,2BAA2B,CAAC;CACrD;AAUD;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,IAAI,YAAY,CAQ7E;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,MAAM,GAAG,yBAAyB,EAAE,EAC7C,WAAW,EAAE,OAAO,GACnB,mCAAmC,EAAE,CAmFvC;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,0BAA0B,EAAE,GACrC,MAAM,CAYR;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,0BAA0B,EAAE,EACtC,YAAY,CAAC,EAAE,iBAAiB,GAC/B,0BAA0B,EAAE,CAsF9B;AAED;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,eAAe,EAC9B,YAAY,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAClC,WAAW,CAiDb;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,WAAW,CAyCvE"}

package/dist/utils/cacheControlUtils.js

@@ -6,44 +6,13 @@
  * models and preserves backward compatibility with existing message formats.
  */
 import { logger } from "./globalLogger.js";
+import { supportsPromptCaching } from "./modelCapabilities.js";
 // ============================================================================
 // Default Configuration
 // ============================================================================
 // ============================================================================
 // Utility Functions (Basic Structure - to be implemented)
 // ============================================================================
-/**
- * Determines if a model supports prompt caching
- * @param modelName - Model identifier
- * @returns True if model name matches the cache pattern (default: contains 'claude')
- */
-export function supportsPromptCaching(modelName) {
-    // Handle null, undefined, and non-string inputs
-    if (!modelName || typeof modelName !== "string") {
-        return false;
-    }
-    // Handle empty strings and whitespace-only strings
-    const trimmed = modelName.trim();
-    if (trimmed.length === 0) {
-        return false;
-    }
-    const cachePattern = process.env.WAVE_PROMPT_CACHE_REGEX || "claude";
-    try {
-        const regex = new RegExp(cachePattern, "i");
-        return regex.test(trimmed);
-    }
-    catch {
-        // If regex is invalid, fall back to simple includes check with default
-        return trimmed.toLowerCase().includes("claude");
-    }
-}
-/**
- * Determines if a model supports cache control
- * @param modelName - Model identifier
- * @returns True if model name contains 'claude' (case-insensitive)
- * @deprecated Use supportsPromptCaching instead
- */
-export const isClaudeModel = supportsPromptCaching;
 /**
  * Validates cache control structure
  * @param control - Object to validate
@@ -165,10 +134,10 @@ export function countContentBlocks(messages) {
  * Tools are marked separately via addCacheControlToLastTool (called by aiService).
  *
  * @param messages - Original OpenAI message array
- * @param modelName - Model name for cache detection
+ * @param capabilities - Declarative model capabilities for cache detection
  * @returns Messages with cache control markers applied
  */
-export function transformMessagesForExplicitCache(messages, modelName) {
+export function transformMessagesForExplicitCache(messages, capabilities) {
     // Validate inputs
     if (!messages || !Array.isArray(messages)) {
         logger.warn("Invalid messages array provided to transformMessagesForExplicitCache");
@@ -178,7 +147,7 @@ export function transformMessagesForExplicitCache(messages, modelName) {
         return [];
     }
     // Only apply cache control for models that support prompt caching
-    if (!supportsPromptCaching(modelName)) {
+    if (!supportsPromptCaching(capabilities)) {
         return messages;
     }
     // Find first system message index

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

@@ -1 +1 @@
-{"version":3,"file":"containerSetup.d.ts","sourceRoot":"","sources":["../../src/utils/containerSetup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AA0B3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAM3E,OAAO,KAAK,EAAE,YAAY,EAAmB,MAAM,mBAAmB,CAAC;AACvE,OAAO,KAAK,EACV,cAAc,EACd,KAAK,EACL,IAAI,EACJ,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAM3B,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,YAAY,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,OAAO,CAAC;IAGhB,uBAAuB,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,IAAI,CAAC;IAC3D,aAAa,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC;IACvC,sBAAsB,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IACvD,wBAAwB,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IACzD,iBAAiB,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IAClD,iBAAiB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC;AAED,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,0BAA0B,GACvC,SAAS,CA8SX"}
+{"version":3,"file":"containerSetup.d.ts","sourceRoot":"","sources":["../../src/utils/containerSetup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AA0B3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAM3E,OAAO,KAAK,EAAE,YAAY,EAAmB,MAAM,mBAAmB,CAAC;AACvE,OAAO,KAAK,EACV,cAAc,EACd,KAAK,EACL,IAAI,EACJ,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAM3B,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,YAAY,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,OAAO,CAAC;IAGhB,uBAAuB,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,IAAI,CAAC;IAC3D,aAAa,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC;IACvC,sBAAsB,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IACvD,wBAAwB,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IACzD,iBAAiB,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IAClD,iBAAiB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC;AAED,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,0BAA0B,GACvC,SAAS,CAkTX"}

package/dist/utils/containerSetup.js

@@ -139,7 +139,11 @@ export function setupAgentContainer(setupOptions) {
     });
     container.register("SkillManager", skillManager);
     const rootSessionId = messageManager.getRootSessionId();
-    container.register("ReversionService", new ReversionService(rootSessionId));
+    const reversionService = new ReversionService(rootSessionId);
+    container.register("ReversionService", reversionService);
+    reversionService.cleanupOldSessions(30).catch((error) => {
+        logger.error("Failed to cleanup old file history:", error);
+    });
     const reversionManager = new ReversionManager(container);
     container.register("ReversionManager", reversionManager);
     const canUseToolWithPermissionRequest = options.canUseTool

package/dist/utils/convertMessagesForAPI.d.ts

@@ -1,10 +1,18 @@
 import type { Message } from "../types/index.js";
 import { ChatCompletionMessageParam } from "openai/resources.js";
+/**
+ * Options for converting messages to API format.
+ */
+export interface ConvertMessagesOptions {
+    /** When false, images are stripped and replaced with text placeholders. */
+    supportsVision?: boolean;
+}
 /**
  * Convert message format to API call format, stopping when a compacted message is encountered.
  * Messages with no meaningful content or tool calls are filtered out.
  * @param messages Message list
+ * @param options Optional conversion options (e.g. supportsVision)
  * @returns Converted API message format list
  */
-export declare function convertMessagesForAPI(messages: Message[]): ChatCompletionMessageParam[];
+export declare function convertMessagesForAPI(messages: Message[], options?: ConvertMessagesOptions): ChatCompletionMessageParam[];
 //# sourceMappingURL=convertMessagesForAPI.d.ts.map

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;AAKjD,OAAO,EAEL,0BAA0B,EAC3B,MAAM,qBAAqB,CAAC;AAiC7B;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,OAAO,EAAE,GAClB,0BAA0B,EAAE,CAsP9B"}
+{"version":3,"file":"convertMessagesForAPI.d.ts","sourceRoot":"","sources":["../../src/utils/convertMessagesForAPI.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAKjD,OAAO,EAEL,0BAA0B,EAC3B,MAAM,qBAAqB,CAAC;AAiC7B;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,2EAA2E;IAC3E,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,CAAC,EAAE,sBAAsB,GAC/B,0BAA0B,EAAE,CA0Q9B"}

package/dist/utils/convertMessagesForAPI.js

@@ -36,9 +36,11 @@ function safeToolArguments(args) {
  * Convert message format to API call format, stopping when a compacted message is encountered.
  * Messages with no meaningful content or tool calls are filtered out.
  * @param messages Message list
+ * @param options Optional conversion options (e.g. supportsVision)
  * @returns Converted API message format list
  */
-export function convertMessagesForAPI(messages) {
+export function convertMessagesForAPI(messages, options) {
+    const supportsVision = options?.supportsVision !== false;
     const recentMessages = [];
     const startIndex = messages.length - 1;
     for (let i = startIndex; i >= 0; i--) {
@@ -66,49 +68,57 @@ export function convertMessagesForAPI(messages) {
             const toolBlocks = message.blocks.filter((block) => block.type === "tool");
             const completedToolIds = new Set(); // Record completed tool IDs
             if (toolBlocks.length > 0) {
+                // Collect image user messages to place after all tool messages
+                const imageUserMessages = [];
                 toolBlocks.forEach((toolBlock) => {
                     // Only add completed tool blocks (i.e., stage is 'end')
                     if (toolBlock.id && toolBlock.stage === "end") {
                         completedToolIds.add(toolBlock.id);
-                        // Check for image data
+                        // Always add a proper tool message to satisfy tool_call_id pairing
+                        recentMessages.unshift({
+                            tool_call_id: toolBlock.id,
+                            role: "tool",
+                            content: stripAnsiColors(toolBlock.result || ""),
+                        });
+                        // If there are images, also prepare a user message with image content
                         if (toolBlock.images && toolBlock.images.length > 0) {
-                            // If there is an image, create a user message instead of a tool message
-                            const contentParts = [];
-                            // Add tool result as text
-                            const toolResultText = `Tool result for ${toolBlock.name || "unknown tool"}:\n${stripAnsiColors(toolBlock.result || "")}`;
-                            contentParts.push({
-                                type: "text",
-                                text: toolResultText,
-                            });
-                            // Add image
-                            toolBlock.images.forEach((image) => {
-                                const imageUrl = image.data.startsWith("data:")
-                                    ? image.data
-                                    : `data:${image.mediaType || "image/png"};base64,${image.data}`;
-                                contentParts.push({
-                                    type: "image_url",
-                                    image_url: {
-                                        url: imageUrl,
-                                        detail: "auto",
-                                    },
+                            if (supportsVision) {
+                                const contentParts = [];
+                                toolBlock.images.forEach((image) => {
+                                    const imageUrl = image.data.startsWith("data:")
+                                        ? image.data
+                                        : `data:${image.mediaType || "image/png"};base64,${image.data}`;
+                                    contentParts.push({
+                                        type: "image_url",
+                                        image_url: {
+                                            url: imageUrl,
+                                            detail: "auto",
+                                        },
+                                    });
                                 });
-                            });
-                            // Add user message
-                            recentMessages.unshift({
-                                role: "user",
-                                content: contentParts,
-                            });
-                        }
-                        else {
-                            // Normal tool message
-                            recentMessages.unshift({
-                                tool_call_id: toolBlock.id,
-                                role: "tool",
-                                content: stripAnsiColors(toolBlock.result || ""),
-                            });
+                                imageUserMessages.push({
+                                    role: "user",
+                                    content: contentParts,
+                                });
+                            }
+                            else {
+                                // Non-vision model: replace images with a text placeholder
+                                imageUserMessages.push({
+                                    role: "user",
+                                    content: "[Tool returned an image, but the current model does not support image recognition]",
+                                });
+                            }
                         }
                     }
                 });
+                // Insert image user messages after all tool messages but before the
+                // assistant message (which will be unshifted next). Since tool messages
+                // were unshifted to the front, we splice images right after them.
+                if (imageUserMessages.length > 0) {
+                    // Tool messages are at indices 0..N-1, existing messages start at N
+                    const toolMsgCount = completedToolIds.size;
+                    recentMessages.splice(toolMsgCount, 0, ...imageUserMessages);
+                }
             }
             // Construct the content of the assistant message
             let content = "";
@@ -180,28 +190,37 @@ export function convertMessagesForAPI(messages) {
                 if (block.type === "image" &&
                     block.imageUrls &&
                     block.imageUrls.length > 0) {
-                    block.imageUrls.forEach((imageUrl) => {
-                        // Check if it's already base64, convert if not
-                        let finalImageUrl = imageUrl;
-                        if (!imageUrl.startsWith("data:image/")) {
-                            // If it's a file path, it needs to be converted to base64
-                            try {
-                                finalImageUrl = convertImageToBase64(imageUrl);
-                            }
-                            catch (error) {
-                                logger.error("Failed to convert image path to base64:", imageUrl, error);
-                                // Skip this image, do not add to content
-                                return;
-                            }
-                        }
+                    if (!supportsVision) {
+                        // Non-vision model: replace images with a text placeholder
                         contentParts.push({
-                            type: "image_url",
-                            image_url: {
-                                url: finalImageUrl,
-                                detail: "auto",
-                            },
+                            type: "text",
+                            text: "[User shared an image, but the current model does not support image recognition]",
                         });
-                    });
+                    }
+                    else {
+                        block.imageUrls.forEach((imageUrl) => {
+                            // Check if it's already base64, convert if not
+                            let finalImageUrl = imageUrl;
+                            if (!imageUrl.startsWith("data:image/")) {
+                                // If it's a file path, it needs to be converted to base64
+                                try {
+                                    finalImageUrl = convertImageToBase64(imageUrl);
+                                }
+                                catch (error) {
+                                    logger.error("Failed to convert image path to base64:", imageUrl, error);
+                                    // Skip this image, do not add to content
+                                    return;
+                                }
+                            }
+                            contentParts.push({
+                                type: "image_url",
+                                image_url: {
+                                    url: finalImageUrl,
+                                    detail: "auto",
+                                },
+                            });
+                        });
+                    }
                 }
                 // If there is a tool block in user message, add its result
                 if (block.type === "tool" && block.stage === "end" && block.result) {

package/dist/utils/fileUtils.d.ts

@@ -26,12 +26,6 @@ export declare function readFirstNLines(filePath: string, maxLines: number): Pro
  * @return {Promise<string>} - The last non-empty line of the file, or an empty string if no non-empty lines found.
  */
 export declare function getLastLine(filePath: string, minLength?: number): Promise<string>;
-/**
- * Ensures that a pattern is present in the global git ignore file.
- *
- * @param {string} pattern - The pattern to add to global git ignore.
- */
-export declare function ensureGlobalGitIgnore(pattern: string): Promise<void>;
 /**
  * Suggests similar paths if a file is not found.
  */

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

@@ -1 +1 @@
-{"version":3,"file":"fileUtils.d.ts","sourceRoot":"","sources":["../../src/utils/fileUtils.ts"],"names":[],"mappings":"AAOA;;;;;GAKG;AACH,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAwBrE;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,EAAE,CAAC,CA4BnB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,MAAM,EAChB,SAAS,SAAI,GACZ,OAAO,CAAC,MAAM,CAAC,CA8DjB;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAqC1E;AA2BD;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,EAAE,CAAC,CAwBnB;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAGxB"}
+{"version":3,"file":"fileUtils.d.ts","sourceRoot":"","sources":["../../src/utils/fileUtils.ts"],"names":[],"mappings":"AAKA;;;;;GAKG;AACH,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAwBrE;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,EAAE,CAAC,CA4BnB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,MAAM,EAChB,SAAS,SAAI,GACZ,OAAO,CAAC,MAAM,CAAC,CA8DjB;AA2BD;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,EAAE,CAAC,CAwBnB;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAGxB"}

package/dist/utils/fileUtils.js

@@ -1,8 +1,6 @@
 import fs from "node:fs/promises";
 import { createReadStream } from "node:fs";
 import path from "node:path";
-import { execSync } from "node:child_process";
-import { homedir } from "node:os";
 import { glob } from "glob";
 /**
  * Reads the first line of a file efficiently using Node.js readline.
@@ -138,47 +136,6 @@ export async function getLastLine(filePath, minLength = 1) {
         }
     }
 }
-/**
- * Ensures that a pattern is present in the global git ignore file.
- *
- * @param {string} pattern - The pattern to add to global git ignore.
- */
-export async function ensureGlobalGitIgnore(pattern) {
-    try {
-        let globalIgnorePath;
-        try {
-            globalIgnorePath = execSync("git config --get core.excludesfile", {
-                encoding: "utf8",
-            }).trim();
-        }
-        catch {
-            // If not set, use default paths
-            const xdgConfigHome = process.env.XDG_CONFIG_HOME || path.join(homedir(), ".config");
-            globalIgnorePath = path.join(xdgConfigHome, "git", "ignore");
-        }
-        if (!globalIgnorePath)
-            return;
-        // Ensure directory exists
-        await fs.mkdir(path.dirname(globalIgnorePath), { recursive: true });
-        let content = "";
-        try {
-            content = await fs.readFile(globalIgnorePath, "utf8");
-        }
-        catch {
-            // File doesn't exist
-        }
-        const lines = content.split("\n").map((line) => line.trim());
-        if (!lines.includes(pattern)) {
-            const newContent = content.endsWith("\n") || content === ""
-                ? `${content}${pattern}\n`
-                : `${content}\n${pattern}\n`;
-            await fs.writeFile(globalIgnorePath, newContent, "utf8");
-        }
-    }
-    catch {
-        // Ignore errors
-    }
-}
 /**
  * Simple Levenshtein distance implementation
  */

package/dist/utils/gitUtils.d.ts

@@ -45,6 +45,17 @@ export declare function resolveGitDir(cwd: string): string | null;
  * @returns Default remote branch name
  */
 export declare function getDefaultRemoteBranch(cwd: string): string;
+/**
+ * Ensure that Wave runtime files are excluded from git status by writing
+ * patterns to `.git/info/exclude` (per-repo, not global).
+ *
+ * Idempotent: if the marker `# wave-runtime` is already present in the
+ * exclude file, it skips writing. A module-level Set provides additional
+ * per-process dedup to avoid redundant file reads.
+ *
+ * @param cwd Working directory to start searching from
+ */
+export declare function ensureWaveRuntimeFilesExcluded(cwd: string): void;
 /**
  * Check if there are uncommitted changes in the working directory
  * @param cwd Working directory

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

@@ -1 +1 @@
-{"version":3,"file":"gitUtils.d.ts","sourceRoot":"","sources":["../../src/utils/gitUtils.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAevD;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAUlD;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAWnD;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAetD;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAkCxD;AAwDD;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CA4B1D;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAW1D;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAYvE"}
+{"version":3,"file":"gitUtils.d.ts","sourceRoot":"","sources":["../../src/utils/gitUtils.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAevD;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAUlD;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAWnD;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAetD;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAkCxD;AAwDD;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CA4B1D;AAQD;;;;;;;;;GASG;AACH,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAoChE;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAW1D;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAYvE"}

package/dist/utils/gitUtils.js

@@ -216,6 +216,57 @@ export function getDefaultRemoteBranch(cwd) {
     // 4. Hardcoded fallback
     return "main";
 }
+/**
+ * Module-level set tracking git dirs already processed in this process,
+ * to avoid redundant I/O.
+ */
+const excludedGitDirs = new Set();
+/**
+ * Ensure that Wave runtime files are excluded from git status by writing
+ * patterns to `.git/info/exclude` (per-repo, not global).
+ *
+ * Idempotent: if the marker `# wave-runtime` is already present in the
+ * exclude file, it skips writing. A module-level Set provides additional
+ * per-process dedup to avoid redundant file reads.
+ *
+ * @param cwd Working directory to start searching from
+ */
+export function ensureWaveRuntimeFilesExcluded(cwd) {
+    try {
+        const gitDir = resolveGitDir(cwd);
+        if (!gitDir)
+            return;
+        if (excludedGitDirs.has(gitDir))
+            return;
+        const excludePath = path.join(gitDir, "info", "exclude");
+        let content = "";
+        try {
+            content = fsSync.readFileSync(excludePath, "utf8");
+        }
+        catch {
+            // File doesn't exist yet
+        }
+        const marker = "# wave-runtime";
+        if (content.includes(marker)) {
+            excludedGitDirs.add(gitDir);
+            return;
+        }
+        const block = [
+            marker,
+            "**/.wave/scheduled_tasks.lock",
+            "**/.wave/scheduled_tasks.json",
+            "**/.wave/worktrees/",
+            "**/.wave/settings.local.json",
+            "",
+        ].join("\n");
+        fsSync.mkdirSync(path.join(gitDir, "info"), { recursive: true });
+        fsSync.appendFileSync(excludePath, block);
+        excludedGitDirs.add(gitDir);
+    }
+    catch {
+        // Best-effort: ignore all errors
+    }
+}
 /**
  * Check if there are uncommitted changes in the working directory
  * @param cwd Working directory

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

@@ -1 +1 @@
-{"version":3,"file":"groupMessagesByApiRound.d.ts","sourceRoot":"","sources":["../../src/utils/groupMessagesByApiRound.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,QAAQ,EAAE,CA8DvE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,OAAO,EAAE,EACnB,UAAU,EAAE,MAAM,GACjB,OAAO,EAAE,CAIX"}
+{"version":3,"file":"groupMessagesByApiRound.d.ts","sourceRoot":"","sources":["../../src/utils/groupMessagesByApiRound.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAGjD,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,QAAQ,EAAE,CA8DvE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,OAAO,EAAE,EACnB,UAAU,EAAE,MAAM,GACjB,OAAO,EAAE,CAIX"}

package/dist/utils/groupMessagesByApiRound.js

@@ -1,3 +1,4 @@
+import { estimateTokens as estimateStrTokens } from "./tokenEstimate.js";
 /**
  * Groups messages into "API rounds" — each round corresponds to one API
  * call-response cycle. This is critical because in agentic sessions with a
@@ -74,24 +75,24 @@ export function getLastApiRounds(messages, roundCount) {
     return lastRounds.flatMap((r) => r.messages);
 }
 /**
- * Roughly estimate token count from character count (~4 chars per token).
+ * Estimate token count from message blocks using CJK-aware estimation.
  */
 function estimateTokens(messages) {
-    let chars = 0;
+    let combined = "";
     for (const msg of messages) {
         for (const block of msg.blocks) {
             if ("content" in block && typeof block.content === "string") {
-                chars += block.content.length;
+                combined += block.content;
             }
             if (block.type === "tool" &&
                 block.parameters &&
                 typeof block.parameters === "string") {
-                chars += block.parameters.length;
+                combined += block.parameters;
             }
             if (block.type === "tool" && block.result) {
-                chars += block.result.length;
+                combined += block.result;
             }
         }
     }
-    return Math.ceil(chars / 4);
+    return estimateStrTokens(combined);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"mcpUtils.d.ts","sourceRoot":"","sources":["../../src/utils/mcpUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAgDlE;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,GACjB,0BAA0B,CAgB5B;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,CACX,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,WAAW,KAClB,OAAO,CAAC;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACtD,CAAC,GACD,UAAU,CAiCZ;AAED;;GAEG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,eAAe,EAAE,GACzB,eAAe,GAAG,SAAS,CAK7B"}
+{"version":3,"file":"mcpUtils.d.ts","sourceRoot":"","sources":["../../src/utils/mcpUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAgDlE;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,GACjB,0BAA0B,CAgB5B;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,CACX,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,WAAW,KAClB,OAAO,CAAC;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACtD,CAAC,GACD,UAAU,CAiCZ;AAED;;GAEG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,eAAe,EAAE,GACzB,eAAe,GAAG,SAAS,CAM7B"}

package/dist/utils/mcpUtils.js

@@ -84,5 +84,6 @@ export function createMcpToolPlugin(mcpTool, serverName, executeTool) {
  * Find which server a tool belongs to
  */
 export function findToolServer(toolName, servers) {
-    return servers.find((s) => s.status === "connected" && s.tools?.some((t) => t.name === toolName));
+    return servers.find((s) => (s.status === "connected" || s.status === "reconnecting") &&
+        s.tools?.some((t) => t.name === toolName));
 }