wave-agent-sdk 0.12.8 → 0.12.10

package/src/types/messaging.ts

@@ -25,7 +25,6 @@ export type MessageBlock =
   | ToolBlock
   | ImageBlock
   | BangBlock
-  | SlashBlock
   | CompressBlock
   | ReasoningBlock
   | FileHistoryBlock;
@@ -36,17 +35,6 @@ export interface TextBlock {
   source?: MessageSource;
 }
 
-export interface SlashBlock {
-  type: "slash";
-  command: string;
-  args?: string;
-  content?: string; // The expanded prompt (template + args + bash output)
-  result?: string; // The final output (e.g., from a forked skill)
-  stage: "running" | "success" | "error" | "aborted";
-  error?: string;
-  shortResult?: string; // Progress summary (e.g., "3 tools | 1,234 tokens")
-}
-
 export interface ErrorBlock {
   type: "error";
   content: string;

package/src/utils/cacheControlUtils.ts

@@ -73,11 +73,11 @@ export interface ClaudeUsage extends CompletionUsage {
 // ============================================================================
 
 /**
- * Determines if a model supports cache control
+ * Determines if a model supports prompt caching
  * @param modelName - Model identifier
- * @returns True if model name contains 'claude' (case-insensitive)
+ * @returns True if model name matches the cache pattern (default: contains 'claude')
  */
-export function isClaudeModel(modelName: string): boolean {
+export function supportsPromptCaching(modelName: string): boolean {
   // Handle null, undefined, and non-string inputs
   if (!modelName || typeof modelName !== "string") {
     return false;
@@ -89,9 +89,24 @@ export function isClaudeModel(modelName: string): boolean {
     return false;
   }
 
-  return trimmed.toLowerCase().includes("claude");
+  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
@@ -308,8 +323,8 @@ export function transformMessagesForClaudeCache(
     return [];
   }
 
-  // Only apply cache control for Claude models
-  if (!isClaudeModel(modelName)) {
+  // Only apply cache control for models that support prompt caching
+  if (!supportsPromptCaching(modelName)) {
     return messages;
   }
 
@@ -352,11 +367,15 @@ export function transformMessagesForClaudeCache(
 
     // Interval-based message caching: cache message at latest interval position (sliding window)
     if (index === intervalMessageIndex) {
-      // If the message is a tool role, add cache control directly to the message
+      // If the message is a tool role, add cache control to the content block
       if (message.role === "tool") {
+        const content =
+          typeof message.content === "string" ? message.content : "";
+        const transformedContent = addCacheControlToContent(content, true);
+
         return {
           ...message,
-          cache_control: { type: "ephemeral" },
+          content: transformedContent,
         } as ChatCompletionMessageParam;
       }
       // If the message has tool calls, cache the last tool call instead of content

package/src/utils/containerSetup.ts

@@ -24,6 +24,7 @@ import { ReversionService } from "../services/reversionService.js";
 import { MemoryService } from "../services/memory.js";
 import { AutoMemoryService } from "../services/autoMemoryService.js";
 import { getGitMainRepoRoot } from "./gitUtils.js";
+import { USER_MEMORY_FILE } from "./constants.js";
 import type { AgentOptions } from "../types/index.js";
 import type {
   PermissionMode,
@@ -150,6 +151,7 @@ export function setupAgentContainer(
   if (configurationService.resolveAutoMemoryEnabled()) {
     const autoMemoryDir = memoryService.getAutoMemoryDirectory(workdir);
     permissionManager.addSystemAdditionalDirectory(autoMemoryDir);
+    permissionManager.addSystemAdditionalDirectory(USER_MEMORY_FILE);
   }
   container.register("PermissionManager", permissionManager);
   permissionManager.setOnConfiguredPermissionModeChange((mode) => {

package/src/utils/convertMessagesForAPI.ts

@@ -197,22 +197,6 @@ export function convertMessagesForAPI(
           });
         }
 
-        // Handle SlashBlock
-        if (block.type === "slash") {
-          if (block.content && block.content.trim().length > 0) {
-            contentParts.push({
-              type: "text",
-              text: block.content,
-            });
-          }
-          if (block.result && block.result.trim().length > 0) {
-            contentParts.push({
-              type: "text",
-              text: `<local-command-stdout>\n${stripAnsiColors(block.result)}\n</local-command-stdout>`,
-            });
-          }
-        }
-
         // If there is an image, add image content
         if (
           block.type === "image" &&

package/src/utils/messageOperations.ts

@@ -20,26 +20,6 @@ export interface AddUserMessageParams extends UserMessageParams {
   id?: string;
 }
 
-export interface AddSlashParams {
-  messages: Message[];
-  command: string;
-  args?: string;
-  content?: string;
-  id?: string;
-}
-
-export interface UpdateSlashParams {
-  messages: Message[];
-  command: string;
-  messageId?: string;
-  args?: string;
-  content?: string;
-  result?: string;
-  stage?: "running" | "success" | "error" | "aborted";
-  error?: string;
-  shortResult?: string;
-}
-
 export interface UpdateToolBlockParams {
   messages: Message[];
   id: string;
@@ -175,95 +155,6 @@ export const addUserMessageToMessages = ({
   return [...messages, userMessage];
 };
 
-/**
- * Add a slash command message to the conversation.
- */
-export const addSlashMessageToMessages = ({
-  messages,
-  command,
-  args,
-  content,
-  id,
-}: AddSlashParams): Message[] => {
-  const slashMessage: Message = {
-    id: id || generateMessageId(),
-    role: "user",
-    blocks: [
-      {
-        type: "slash",
-        command,
-        args,
-        content,
-        stage: "running",
-      },
-    ],
-  };
-  return [...messages, slashMessage];
-};
-
-/**
- * Update a slash block in a message.
- */
-export const updateSlashBlockInMessage = ({
-  messages,
-  command,
-  messageId,
-  args,
-  content,
-  result,
-  stage,
-  error,
-  shortResult,
-}: UpdateSlashParams): Message[] => {
-  const newMessages = [...messages];
-
-  // If messageId is provided, target that specific message
-  if (messageId) {
-    const messageIndex = newMessages.findIndex((msg) => msg.id === messageId);
-    if (messageIndex !== -1) {
-      const slashBlockIndex = newMessages[messageIndex].blocks.findIndex(
-        (block) => block.type === "slash" && block.command === command,
-      );
-
-      if (slashBlockIndex !== -1) {
-        const slashBlock = newMessages[messageIndex].blocks[slashBlockIndex];
-        if (slashBlock.type === "slash") {
-          if (args !== undefined) slashBlock.args = args;
-          if (content !== undefined) slashBlock.content = content;
-          if (result !== undefined) slashBlock.result = result;
-          if (stage !== undefined) slashBlock.stage = stage;
-          if (error !== undefined) slashBlock.error = error;
-          if (shortResult !== undefined) slashBlock.shortResult = shortResult;
-        }
-      }
-    }
-    return newMessages;
-  }
-
-  // Find the last user message with a slash block for this command
-  for (let i = newMessages.length - 1; i >= 0; i--) {
-    const msg = newMessages[i];
-    if (msg.role === "user") {
-      const slashBlockIndex = msg.blocks.findIndex(
-        (block) => block.type === "slash" && block.command === command,
-      );
-      if (slashBlockIndex !== -1) {
-        const slashBlock = msg.blocks[slashBlockIndex];
-        if (slashBlock.type === "slash") {
-          if (args !== undefined) slashBlock.args = args;
-          if (content !== undefined) slashBlock.content = content;
-          if (result !== undefined) slashBlock.result = result;
-          if (stage !== undefined) slashBlock.stage = stage;
-          if (error !== undefined) slashBlock.error = error;
-          if (shortResult !== undefined) slashBlock.shortResult = shortResult;
-        }
-        break;
-      }
-    }
-  }
-  return newMessages;
-};
-
 /**
  * Update a user message's content by its ID.
  */
@@ -669,11 +560,6 @@ export function getMessageContent(message: Message): string {
     return textBlock.content;
   }
 
-  const slashBlock = message.blocks.find((block) => block.type === "slash");
-  if (slashBlock && "command" in slashBlock) {
-    return `/${slashBlock.command}${slashBlock.args ? ` ${slashBlock.args}` : ""}`;
-  }
-
   const bangBlock = message.blocks.find((block) => block.type === "bang");
   if (bangBlock && "command" in bangBlock) {
     return `!${bangBlock.command}`;