wave-agent-sdk 0.17.9 → 0.17.11

package/dist/utils/cacheControlUtils.js

@@ -130,53 +130,48 @@ export function addCacheControlToContent(content, shouldCache) {
     });
 }
 /**
- * Adds cache control to the last tool in tools array
- * @param tools - Array of tool definitions
- * @returns Tools array with cache control on last tool
+ * Counts the total number of content blocks across all messages.
+ * Each element in a message's content array counts as one block.
+ * String content counts as one block. Null/undefined content counts as zero
+ * (e.g. assistant messages with only tool_calls).
+ * @param messages - Array of chat messages
+ * @returns Total content block count
  */
-export function addCacheControlToLastTool(tools) {
-    // Handle null, undefined, or empty arrays
-    if (!tools || !Array.isArray(tools) || tools.length === 0) {
-        return [];
-    }
-    // Validate tools structure
-    const validTools = tools.filter((tool) => {
-        if (!tool || typeof tool !== "object") {
-            logger.warn("Invalid tool structure detected, skipping:", tool);
-            return false;
+export function countContentBlocks(messages) {
+    let count = 0;
+    for (const message of messages) {
+        if (!message || typeof message !== "object")
+            continue;
+        const content = message.content;
+        if (typeof content === "string") {
+            count += 1;
         }
-        if (tool.type !== "function" || !tool.function) {
-            logger.warn("Tool is not a function type or missing function property:", tool);
-            return false;
+        else if (Array.isArray(content)) {
+            count += content.length;
         }
-        return true;
-    });
-    if (validTools.length === 0) {
-        logger.warn("No valid tools found for cache control");
-        return [];
     }
-    // Create a copy of the valid tools array
-    const result = validTools.map((tool) => ({
-        ...tool,
-    }));
-    // Add cache control to the last tool only
-    const lastIndex = result.length - 1;
-    result[lastIndex] = {
-        ...result[lastIndex],
-        cache_control: { type: "ephemeral" },
-    };
-    return result;
+    return count;
 }
 /**
- * Transforms messages for Claude cache control with hardcoded strategy
+ * Transforms messages for explicit cache control.
+ *
+ * Cache breakpoints (following Claude Code's "last message marker" strategy):
+ * 1. System message — always marked (stable prefix)
+ * 2. Last message — the last user/assistant message with content is marked.
+ *    The API scans backward from this marker within 20 blocks. Since each
+ *    turn adds ~2 blocks (< 20), the previous request's marker position
+ *    always falls within the scan window, ensuring cache hits.
+ *
+ * Tools are marked separately via addCacheControlToLastTool (called by aiService).
+ *
  * @param messages - Original OpenAI message array
  * @param modelName - Model name for cache detection
  * @returns Messages with cache control markers applied
  */
-export function transformMessagesForClaudeCache(messages, modelName) {
+export function transformMessagesForExplicitCache(messages, modelName) {
     // Validate inputs
     if (!messages || !Array.isArray(messages)) {
-        logger.warn("Invalid messages array provided to transformMessagesForClaudeCache");
+        logger.warn("Invalid messages array provided to transformMessagesForExplicitCache");
         return [];
     }
     if (messages.length === 0) {
@@ -188,48 +183,56 @@ export function transformMessagesForClaudeCache(messages, modelName) {
     }
     // Find first system message index
     const firstSystemIndex = messages.findIndex((m) => m.role === "system");
-    // Find last user message index
-    let lastUserIndex = -1;
+    // Determine which message indices should receive cache_control markers
+    const cacheIndices = new Set();
+    // Marker 1: First system message (always — stable prefix)
+    if (firstSystemIndex !== -1) {
+        cacheIndices.add(firstSystemIndex);
+    }
+    // Marker 2: Last message with content (user or assistant).
+    // This marker moves each turn (~2 blocks), but since the move is < 20 blocks,
+    // the previous marker position is always within the API's 20-block scan window.
+    // This ensures the entire conversation prefix is cached.
     for (let i = messages.length - 1; i >= 0; i--) {
-        if (messages[i].role === "user") {
-            lastUserIndex = i;
+        const msg = messages[i];
+        if (!msg || typeof msg !== "object")
+            continue;
+        if (i === firstSystemIndex)
+            continue;
+        if (msg.role !== "user" && msg.role !== "assistant")
+            continue;
+        const content = msg.content;
+        const hasContent = (typeof content === "string" && content.length > 0) ||
+            (Array.isArray(content) && content.length > 0);
+        if (hasContent) {
+            cacheIndices.add(i);
             break;
         }
     }
+    // Apply cache_control markers to selected messages
     const result = messages.map((message, index) => {
         // Validate message structure
         if (!message || typeof message !== "object" || !message.role) {
             logger.warn("Invalid message structure at index", index, ":", message);
-            return message; // Return as-is to avoid breaking the flow
+            return message;
         }
-        // First system message: always cached (hardcoded)
-        if (message.role === "system" && index === firstSystemIndex) {
-            const content = message.content || "";
-            // If content is already an array, check if it already has cache control
-            if (Array.isArray(content)) {
-                const hasCacheControl = content.some((part) => part.type === "text" &&
-                    part.cache_control);
-                if (hasCacheControl) {
-                    return message;
-                }
-            }
-            const transformedContent = addCacheControlToContent(content, true);
-            return {
-                ...message,
-                content: transformedContent,
-            };
+        if (!cacheIndices.has(index)) {
+            return message;
         }
-        // Last user message: cache recent conversation history
-        if (message.role === "user" && index === lastUserIndex) {
-            const content = message.content || "";
-            const transformedContent = addCacheControlToContent(content, true);
-            return {
-                ...message,
-                content: transformedContent,
-            };
+        const content = message.content || "";
+        // Idempotency: skip if content already has cache_control (system message)
+        if (message.role === "system" && Array.isArray(content)) {
+            const hasCacheControl = content.some((part) => part.type === "text" &&
+                part.cache_control);
+            if (hasCacheControl) {
+                return message;
+            }
         }
-        // Return message unchanged
-        return message;
+        const transformedContent = addCacheControlToContent(content, true);
+        return {
+            ...message,
+            content: transformedContent,
+        };
     });
     return result;
 }

package/dist/utils/constants.d.ts

@@ -21,6 +21,6 @@ export declare const USER_MEMORY_FILE: string;
 /**
  * AI related constants
  */
-export declare const DEFAULT_WAVE_MAX_INPUT_TOKENS = 128000;
+export declare const DEFAULT_WAVE_MAX_INPUT_TOKENS = 200000;
 export declare const DEFAULT_WAVE_MAX_OUTPUT_TOKENS = 16384;
 //# sourceMappingURL=constants.d.ts.map

package/dist/utils/constants.js

@@ -23,5 +23,5 @@ export const USER_MEMORY_FILE = path.join(DATA_DIRECTORY, "AGENTS.md");
 /**
  * AI related constants
  */
-export const DEFAULT_WAVE_MAX_INPUT_TOKENS = 128000; // Default token limit
+export const DEFAULT_WAVE_MAX_INPUT_TOKENS = 200000; // Default token limit
 export const DEFAULT_WAVE_MAX_OUTPUT_TOKENS = 16384; // Default output token limit

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,CA2SX"}
+{"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,CAuSX"}

package/dist/utils/containerSetup.js

@@ -38,11 +38,6 @@ export function setupAgentContainer(setupOptions) {
     const container = new Container();
     container.register("AgentOptions", options);
     container.register("Workdir", workdir);
-    const mergedEnv = {
-        ...process.env,
-        ...(options.env || {}),
-    };
-    container.register("MergedEnv", mergedEnv);
     if (options.worktreeName) {
         container.register("WorktreeName", options.worktreeName);
         container.register("MainRepoRoot", getGitMainRepoRoot(workdir));
@@ -159,7 +154,7 @@ export function setupAgentContainer(setupOptions) {
                     toolName: context.toolName,
                     toolInput: context.toolInput,
                     planFilePath: permissionManager.getPlanFilePath(),
-                    env: mergedEnv,
+                    env: Object.fromEntries(Object.entries(process.env).filter((e) => e[1] !== undefined)),
                 });
                 if (results.length > 0) {
                     const processResult = hookManager.processHookResults("PermissionRequest", results, messageManager);

package/dist/utils/taskReminder.d.ts

@@ -0,0 +1,17 @@
+import type { Message } from "../types/messaging.js";
+import type { Task } from "../types/tasks.js";
+import type { ChatCompletionMessageParam } from "openai/resources.js";
+export declare const TASK_REMINDER_CONFIG: {
+    TURNS_SINCE_WRITE: number;
+    TURNS_BETWEEN_REMINDERS: number;
+};
+export declare function getTaskReminderTurnCounts(messages: Message[]): {
+    turnsSinceLastTaskManagement: number;
+    turnsSinceLastReminder: number;
+};
+export declare function buildTaskReminderText(tasks: Task[]): string;
+export declare function maybeInjectTaskReminder(messages: ChatCompletionMessageParam[], turnCounts: {
+    turnsSinceLastTaskManagement: number;
+    turnsSinceLastReminder: number;
+}, tasks: Task[]): void;
+//# sourceMappingURL=taskReminder.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"taskReminder.d.ts","sourceRoot":"","sources":["../../src/utils/taskReminder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AAEtE,eAAO,MAAM,oBAAoB;;;CAGhC,CAAC;AAgBF,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG;IAC9D,4BAA4B,EAAE,MAAM,CAAC;IACrC,sBAAsB,EAAE,MAAM,CAAC;CAChC,CAqCA;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,CAe3D;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,0BAA0B,EAAE,EACtC,UAAU,EAAE;IACV,4BAA4B,EAAE,MAAM,CAAC;IACrC,sBAAsB,EAAE,MAAM,CAAC;CAChC,EACD,KAAK,EAAE,IAAI,EAAE,GACZ,IAAI,CAkBN"}

package/dist/utils/taskReminder.js

@@ -0,0 +1,76 @@
+export const TASK_REMINDER_CONFIG = {
+    TURNS_SINCE_WRITE: 10,
+    TURNS_BETWEEN_REMINDERS: 10,
+};
+const TASK_MANAGEMENT_TOOLS = new Set([
+    "TaskCreate",
+    "TaskUpdate",
+    "TaskList",
+    "TaskGet",
+]);
+const TASK_REMINDER_MARKER = "<!-- task-reminder -->";
+function isQualifyingAssistantMessage(message) {
+    if (message.role !== "assistant")
+        return false;
+    if (message.isMeta)
+        return false;
+    return message.blocks.some((block) => block.type !== "reasoning");
+}
+export function getTaskReminderTurnCounts(messages) {
+    let assistantTurnCount = 0;
+    let turnsSinceLastTaskManagement;
+    let turnsSinceLastReminder;
+    for (let i = messages.length - 1; i >= 0; i--) {
+        const message = messages[i];
+        // Check blocks for task management tools and reminder markers
+        for (const block of message.blocks) {
+            if (turnsSinceLastTaskManagement === undefined &&
+                block.type === "tool" &&
+                block.name &&
+                TASK_MANAGEMENT_TOOLS.has(block.name)) {
+                turnsSinceLastTaskManagement = assistantTurnCount;
+            }
+            if (turnsSinceLastReminder === undefined &&
+                block.type === "text" &&
+                block.content.includes(TASK_REMINDER_MARKER)) {
+                turnsSinceLastReminder = assistantTurnCount;
+            }
+        }
+        if (isQualifyingAssistantMessage(message)) {
+            assistantTurnCount++;
+        }
+    }
+    return {
+        turnsSinceLastTaskManagement: turnsSinceLastTaskManagement ?? assistantTurnCount,
+        turnsSinceLastReminder: turnsSinceLastReminder ?? assistantTurnCount,
+    };
+}
+export function buildTaskReminderText(tasks) {
+    let text = `${TASK_REMINDER_MARKER}\n`;
+    text +=
+        "Here is a gentle reminder about the task list. The user may not have explicitly asked for the following to be done, but you should check the task list to see if any tasks need attention.\n";
+    if (tasks.length > 0) {
+        text += "\n";
+        for (const task of tasks) {
+            text += `#${task.id} [${task.status}] ${task.subject}\n`;
+        }
+    }
+    else {
+        text += "The task list is currently empty.\n";
+    }
+    return text;
+}
+export function maybeInjectTaskReminder(messages, turnCounts, tasks) {
+    if (turnCounts.turnsSinceLastTaskManagement <
+        TASK_REMINDER_CONFIG.TURNS_SINCE_WRITE) {
+        return;
+    }
+    if (turnCounts.turnsSinceLastReminder <
+        TASK_REMINDER_CONFIG.TURNS_BETWEEN_REMINDERS) {
+        return;
+    }
+    messages.push({
+        role: "user",
+        content: buildTaskReminderText(tasks),
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-agent-sdk",
-  "version": "0.17.9",
+  "version": "0.17.11",
   "description": "SDK for building AI-powered development tools and agents",
   "keywords": [
     "ai",