wave-agent-sdk 1.0.0 → 1.0.2

package/src/managers/messageManager.ts

@@ -37,7 +37,6 @@ import { READ_TOOL_NAME } from "../constants/tools.js";
 import { Container } from "../utils/container.js";
 
 export interface MessageManagerCallbacks {
-  onMessagesChange?: (messages: Message[]) => void;
   onSessionIdChange?: (sessionId: string) => void;
   onLatestTotalTokensChange?: (latestTotalTokens: number) => void;
   onUsagesChange?: (usages: Usage[]) => void;
@@ -64,9 +63,17 @@ export interface MessageManagerCallbacks {
   onCompactBlockAdded?: (content: string) => void;
   onCompactionStateChange?: (isCompacting: boolean) => void;
   // Bang callback
-  onAddBangMessage?: (command: string) => void;
-  onUpdateBangMessage?: (command: string, output: string) => void;
-  onCompleteBangMessage?: (command: string, exitCode: number) => void;
+  onAddBangMessage?: (command: string, messageId: string) => void;
+  onUpdateBangMessage?: (
+    command: string,
+    output: string,
+    messageId: string,
+  ) => void;
+  onCompleteBangMessage?: (
+    command: string,
+    exitCode: number,
+    messageId: string,
+  ) => void;
   onInfoBlockAdded?: (content: string) => void;
   // Rewind callbacks
   onShowRewind?: () => void;
@@ -322,8 +329,6 @@ export class MessageManager {
       this.extractFileReadsFromMessage(messages[messages.length - 1]);
       this.extractSkillInvocationsFromMessage(messages[messages.length - 1]);
     }
-
-    this.callbacks.onMessagesChange?.([...messages]);
   }
 
   /**
@@ -339,6 +344,20 @@ export class MessageManager {
         return;
       }
 
+      // CC-aligned lazy materialization: when the session file has not been
+      // materialized yet (no saved messages) and every unsaved message is a
+      // meta message (isMeta: true, e.g. SessionStart hook context), skip
+      // persistence. Persisting meta-only sessions would create "0 tokens /
+      // No content" ghost entries in the resume list. The meta messages stay
+      // in memory and are flushed together with the first real user/assistant
+      // message (matches CC's pendingEntries buffering).
+      if (
+        this.savedMessageCount === 0 &&
+        unsavedMessages.every((m) => m.isMeta)
+      ) {
+        return;
+      }
+
       // Create session if needed (only when we have messages to save)
       if (this.savedMessageCount === 0) {
         // This is the first time saving messages, so create the session
@@ -622,7 +641,9 @@ export class MessageManager {
       command,
     });
     this.setMessages(updatedMessages);
-    this.callbacks.onAddBangMessage?.(command);
+    // The bang message is appended as the last message
+    const messageId = this.messages[this.messages.length - 1]?.id ?? "";
+    this.callbacks.onAddBangMessage?.(command, messageId);
   }
 
   public updateBangMessage(command: string, output: string): void {
@@ -632,7 +653,8 @@ export class MessageManager {
       output,
     });
     this.setMessages(updatedMessages);
-    this.callbacks.onUpdateBangMessage?.(command, output);
+    const messageId = this.findBangMessageId(command) ?? "";
+    this.callbacks.onUpdateBangMessage?.(command, output, messageId);
   }
 
   public completeBangMessage(
@@ -647,7 +669,25 @@ export class MessageManager {
       output,
     });
     this.setMessages(updatedMessages);
-    this.callbacks.onCompleteBangMessage?.(command, exitCode);
+    const messageId = this.findBangMessageId(command) ?? "";
+    this.callbacks.onCompleteBangMessage?.(command, exitCode, messageId);
+  }
+
+  /**
+   * Find the message ID of the most recent message containing a bang block
+   * for the given command. Bang callbacks do not carry a block ID, so the
+   * message is located by matching the command against bang blocks.
+   */
+  private findBangMessageId(command: string): string | undefined {
+    for (let i = this.messages.length - 1; i >= 0; i--) {
+      const message = this.messages[i];
+      if (message.role !== "user") continue;
+      const hasBangBlock = message.blocks?.some(
+        (block) => block.type === "bang" && block.command === command,
+      );
+      if (hasBangBlock) return message.id;
+    }
+    return undefined;
   }
 
   public addNotificationMessage(
@@ -700,7 +740,6 @@ export class MessageManager {
   /**
    * Finalize a streaming block of the given type by setting its stage to "end".
    * Fires the corresponding incremental callback with chunk="" to signal finalization.
-   * Does NOT call onMessagesChange — the caller is responsible for that.
    * Returns true if a block was finalized.
    */
   private finalizeStreamingBlock(
@@ -807,8 +846,6 @@ export class MessageManager {
     });
 
     // Note: Subagent-specific callbacks are now handled by SubagentManager
-
-    this.callbacks.onMessagesChange?.([...this.messages]); // Still need to notify of changes
   }
 
   /**
@@ -871,8 +908,6 @@ export class MessageManager {
       accumulated: newAccumulatedReasoning,
       stage: "streaming",
     });
-
-    this.callbacks.onMessagesChange?.([...this.messages]); // Still need to notify of changes
   }
 
   /**
@@ -885,15 +920,8 @@ export class MessageManager {
     const lastMessage = this.messages[this.messages.length - 1];
     if (lastMessage.role !== "assistant") return;
 
-    const textFinalized = this.finalizeStreamingBlock(lastMessage, "text");
-    const reasoningFinalized = this.finalizeStreamingBlock(
-      lastMessage,
-      "reasoning",
-    );
-
-    if (textFinalized || reasoningFinalized) {
-      this.callbacks.onMessagesChange?.([...this.messages]);
-    }
+    this.finalizeStreamingBlock(lastMessage, "text");
+    this.finalizeStreamingBlock(lastMessage, "reasoning");
   }
 
   /**

package/src/managers/permissionManager.ts

@@ -427,18 +427,8 @@ export class PermissionManager {
       }
     }
 
-    // 1. If bypassPermissions mode, always allow
-    // Exception: tools that require user interaction (e.g. AskUserQuestion)
-    // must still prompt the user, matching Claude Code's requiresUserInteraction behavior.
-    if (context.permissionMode === "bypassPermissions") {
-      const requiresUserInteraction =
-        context.toolName === ASK_USER_QUESTION_TOOL_NAME;
-      if (!requiresUserInteraction) {
-        return { behavior: "allow" };
-      }
-    }
-
-    // 1.0 Check worktree safety for Write and Edit tools
+    // Check worktree safety for Write and Edit tools — unconditional safety
+    // check, applied regardless of permission mode (same as read-before-edit).
     // Support both CLI -w sessions (container-registered) and EnterWorktree mid-session
     // (per-agent WorktreeSession stored in this session's container)
     const worktreeSession = this.container.get<WorktreeSession | null>(
@@ -503,7 +493,19 @@ export class PermissionManager {
       }
     }
 
-    // 1.1 If acceptEdits mode, allow Edit, Write, and mkdir in safe zone
+    // If bypassPermissions mode, always allow
+    // Exception: tools that require user interaction (e.g. AskUserQuestion)
+    // must still prompt the user, matching Claude Code's requiresUserInteraction behavior.
+    // Worktree safety check above runs unconditionally, so bypass never skips it.
+    if (context.permissionMode === "bypassPermissions") {
+      const requiresUserInteraction =
+        context.toolName === ASK_USER_QUESTION_TOOL_NAME;
+      if (!requiresUserInteraction) {
+        return { behavior: "allow" };
+      }
+    }
+
+    // If acceptEdits mode, allow Edit, Write, and mkdir in safe zone
     if (context.permissionMode === "acceptEdits") {
       const autoAcceptedTools = [EDIT_TOOL_NAME, WRITE_TOOL_NAME];
       if (autoAcceptedTools.includes(context.toolName)) {

package/src/managers/subagentManager.ts

@@ -790,6 +790,7 @@ export class SubagentManager {
   private createSubagentCallbacks(subagentId: string) {
     return {
       onUserMessageAdded: (params: UserMessageParams) => {
+        this.refreshSubagentState(subagentId);
         // Forward user message events to parent via SubagentManager callbacks
         if (this.callbacks?.onSubagentUserMessageAdded) {
           this.callbacks.onSubagentUserMessageAdded(subagentId, params);
@@ -797,6 +798,7 @@ export class SubagentManager {
       },
 
       onAssistantMessageAdded: (messageId: string) => {
+        this.refreshSubagentState(subagentId);
         // Forward assistant message events to parent via SubagentManager callbacks
         if (this.callbacks?.onSubagentAssistantMessageAdded) {
           this.callbacks.onSubagentAssistantMessageAdded(subagentId, messageId);
@@ -809,6 +811,7 @@ export class SubagentManager {
         accumulated: string;
         stage: "streaming" | "end";
       }) => {
+        this.refreshSubagentState(subagentId);
         // Forward assistant content updates to parent via SubagentManager callbacks
         if (this.callbacks?.onSubagentAssistantContentUpdated) {
           this.callbacks.onSubagentAssistantContentUpdated({
@@ -823,6 +826,7 @@ export class SubagentManager {
         accumulated: string;
         stage: "streaming" | "end";
       }) => {
+        this.refreshSubagentState(subagentId);
         // Forward assistant reasoning updates to parent via SubagentManager callbacks
         if (this.callbacks?.onSubagentAssistantReasoningUpdated) {
           this.callbacks.onSubagentAssistantReasoningUpdated({
@@ -833,6 +837,7 @@ export class SubagentManager {
       },
 
       onToolBlockUpdated: (params: ToolBlockUpdateCallbackParams) => {
+        this.refreshSubagentState(subagentId);
         const instance = this.instances.get(subagentId);
         if (instance) {
           // Log tool execution to file only when finalized
@@ -852,31 +857,6 @@ export class SubagentManager {
         }
       },
 
-      // These callbacks will be handled by the parent agent
-      onMessagesChange: (messages: Message[]) => {
-        const instance = this.instances.get(subagentId);
-        if (instance) {
-          instance.messages = messages;
-          // Compute usedTools from messages (last 2 tool blocks)
-          const toolBlocks = messages.flatMap(
-            (m) => m.blocks?.filter((b) => b.type === "tool") ?? [],
-          );
-          const last2 = toolBlocks.slice(-2);
-          instance.usedTools = last2.map((tb) => ({
-            name: tb.name ?? "",
-            parameters: tb.parameters ?? "",
-            compactParams: tb.compactParams,
-            stage: tb.stage,
-          }));
-          // Trigger the onUpdate callback if provided
-          instance.onUpdate?.();
-          // Forward subagent message changes to parent via callbacks
-          if (this.callbacks?.onSubagentMessagesChange) {
-            this.callbacks.onSubagentMessagesChange(subagentId, messages);
-          }
-        }
-      },
-
       onLatestTotalTokensChange: (tokens: number) => {
         const instance = this.instances.get(subagentId);
         if (instance) {
@@ -890,6 +870,7 @@ export class SubagentManager {
       },
 
       onErrorBlockAdded: (error: string) => {
+        this.refreshSubagentState(subagentId);
         const instance = this.instances.get(subagentId);
         if (instance?.logStream) {
           instance.logStream.write(
@@ -899,4 +880,34 @@ export class SubagentManager {
       },
     };
   }
+
+  /**
+   * Pull the latest messages from the subagent instance's MessageManager and
+   * refresh the instance's cached messages, usedTools, onUpdate and the
+   * onSubagentMessagesChange forwarding. Triggered by incremental callbacks.
+   */
+  private refreshSubagentState(subagentId: string): void {
+    const instance = this.instances.get(subagentId);
+    if (!instance) return;
+
+    const messages = instance.messageManager.getMessages();
+    instance.messages = messages;
+    // Compute usedTools from messages (last 2 tool blocks)
+    const toolBlocks = messages.flatMap(
+      (m) => m.blocks?.filter((b) => b.type === "tool") ?? [],
+    );
+    const last2 = toolBlocks.slice(-2);
+    instance.usedTools = last2.map((tb) => ({
+      name: tb.name ?? "",
+      parameters: tb.parameters ?? "",
+      compactParams: tb.compactParams,
+      stage: tb.stage,
+    }));
+    // Trigger the onUpdate callback if provided
+    instance.onUpdate?.();
+    // Forward subagent message changes to parent via callbacks
+    if (this.callbacks?.onSubagentMessagesChange) {
+      this.callbacks.onSubagentMessagesChange(subagentId, messages);
+    }
+  }
 }

package/src/prompts/index.ts

@@ -346,10 +346,46 @@ export function formatCompactSummary(summary: string): string {
 }
 
 export const WEB_CONTENT_SYSTEM_PROMPT = `You are a helpful assistant that extracts information from web content. The content is provided in Markdown format.`;
-export const BTW_SYSTEM_PROMPT = `You are a helpful assistant. Answer the user's side question based on the conversation history. 
-Do NOT say things like "Let me try...", "I'll now...", "Let me check...", or promise to take any action. 
-If you don't know the answer, say so - do not offer to look it up or investigate. 
-Simply answer the question with the information you have.`;
+
+/**
+ * Notes block prepended to the subagent env section, aligned with Claude
+ * Code's enhanceSystemPromptWithEnvDetails().
+ */
+const SUBAGENT_ENV_NOTES = `Notes:
+- Agent threads always have their cwd reset between bash calls, as a result please only use absolute file paths.
+- In your final response, share file paths (always absolute, never relative) that are relevant to the task. Include code snippets only when the exact text is load-bearing (e.g., a bug you found, a function signature the caller asked for) — do not recap code you merely read.
+- For clear communication with the user the assistant MUST avoid using emojis.
+- Do not use a colon before tool calls. Text like "Let me read the file:" followed by a read tool call should just be "Let me read the file." with a period.`;
+
+/**
+ * Shell info line, aligned with Claude Code's getShellInfoLine(). On win32 an
+ * extra Unix-syntax hint is appended.
+ */
+function getShellInfoLine(): string {
+  const shell = process.env.SHELL || "unknown";
+  const shellName = shell.includes("zsh")
+    ? "zsh"
+    : shell.includes("bash")
+      ? "bash"
+      : shell;
+  if (os.platform() === "win32") {
+    return `Shell: ${shellName} (use Unix shell syntax, not Windows — e.g., /dev/null not NUL, forward slashes in paths)`;
+  }
+  return `Shell: ${shellName}`;
+}
+
+/**
+ * OS Version value, aligned with Claude Code's getUnameSR(). os.type() and
+ * os.release() wrap uname(3) on POSIX, producing output byte-identical to
+ * `uname -sr`. Windows has no uname(3); os.type() returns "Windows_NT" there,
+ * but os.version() gives the friendlier "Windows 11 Pro", so use that instead.
+ */
+function getUnameSR(): string {
+  if (os.platform() === "win32") {
+    return `${os.version()} ${os.release()}`;
+  }
+  return `${os.type()} ${os.release()}`;
+}
 
 export function buildSystemPrompt(
   basePrompt: string | undefined,
@@ -391,29 +427,51 @@ export function buildSystemPrompt(
   if (options.workdir) {
     const isGitRepo = isGitRepository(options.workdir);
     const platform = os.platform();
-    const osVersion = `${os.type()} ${os.release()}`;
-    const today = new Date().toISOString().split("T")[0];
-    const shell = process.env.SHELL || "unknown";
-    const shellName = shell.includes("zsh")
-      ? "zsh"
-      : shell.includes("bash")
-        ? "bash"
-        : shell;
-
+    const shellInfo = getShellInfoLine();
+    const osVersion = getUnameSR();
+    const primaryWorkdir = options.originalWorkdir ?? options.workdir;
     const worktreeSession = options.worktreeSession;
 
-    dynamicText += `
+    if (options.isSubagent) {
+      // Subagent env section, aligned with Claude Code's computeEnvInfo() +
+      // enhanceSystemPromptWithEnvDetails() (without the model description and
+      // knowledge cutoff lines, which Wave does not use).
+      dynamicText += `
+
+${SUBAGENT_ENV_NOTES}
 
 Here is useful information about the environment you are running in:
 <env>
-Primary working directory: ${options.originalWorkdir ?? options.workdir}${worktreeSession ? `\nThis is a git worktree — an isolated copy of the repository. Run all commands from this directory. Do NOT \`cd\` to the original repository root at ${worktreeSession.originalCwd}.` : ""}
+Working directory: ${primaryWorkdir}
 Is directory a git repo: ${isGitRepo}
 Platform: ${platform}
-Shell: ${shellName}
+${shellInfo}
 OS Version: ${osVersion}
-Today's date: ${today}
 </env>
 `;
+    } else {
+      // Main agent env section, aligned with Claude Code's
+      // computeSimpleEnvInfo() (without the model description, knowledge
+      // cutoff, and marketing lines, which Wave does not use).
+      const envItems = [
+        `Primary working directory: ${primaryWorkdir}`,
+        worktreeSession
+          ? `This is a git worktree — an isolated copy of the repository. Run all commands from this directory. Do NOT \`cd\` to the original repository root.`
+          : null,
+        `Is a git repository: ${isGitRepo}`,
+        `Platform: ${platform}`,
+        shellInfo,
+        `OS Version: ${osVersion}`,
+      ].filter((item): item is string => item !== null);
+
+      const envBlock = [
+        `# Environment`,
+        `You have been invoked in the following environment: `,
+        ...envItems.map((item) => ` - ${item}`),
+      ].join("\n");
+
+      dynamicText += `\n\n${envBlock}`;
+    }
   }
 
   if (options.autoMemory) {
@@ -429,42 +487,3 @@ Today's date: ${today}
 
   return blocks;
 }
-
-export function enhanceSystemPromptWithEnvDetails(
-  existingSystemPrompt: string,
-  workdir: string,
-  originalWorkdir?: string,
-  worktreeSession?: WorktreeSession | null,
-): string {
-  const isGitRepo = isGitRepository(workdir);
-  const platform = os.platform();
-  const osVersion = `${os.type()} ${os.release()}`;
-  const today = new Date().toISOString().split("T")[0];
-  const shell = process.env.SHELL || "unknown";
-  const shellName = shell.includes("zsh")
-    ? "zsh"
-    : shell.includes("bash")
-      ? "bash"
-      : shell;
-
-  const notes = `Notes:
-- Agent threads always have their cwd reset between bash calls, as a result please only use absolute file paths.${worktreeSession ? `\n- You are in a git worktree at ${worktreeSession.worktreePath} (branch: ${worktreeSession.worktreeBranch}). Absolute paths from prior context may refer to the original repo at ${worktreeSession.originalCwd}; translate them to your worktree. Do NOT edit files outside this worktree.` : ""}
-- In your final response, share file paths (always absolute, never relative) that are relevant to the task. Include code snippets only when the exact text is load-bearing (e.g., a bug you found, a function signature the caller asked for) — do not recap code you merely read.
-- For clear communication with the user the assistant MUST avoid using emojis.
-- Do not use a colon before tool calls. Text like "Let me read the file:" followed by a read tool call should just be "Let me read the file." with a period.`;
-
-  return `${existingSystemPrompt}
-
-${notes}
-
-Here is useful information about the environment you are running in:
-<env>
-Primary working directory: ${originalWorkdir ?? workdir}${worktreeSession ? `\nThis is a git worktree — an isolated copy of the repository. Run all commands from this directory. Do NOT \`cd\` to the original repository root at ${worktreeSession.originalCwd}.` : ""}
-Is directory a git repo: ${isGitRepo}
-Platform: ${platform}
-Shell: ${shellName}
-OS Version: ${osVersion}
-Today's date: ${today}
-</env>
-`;
-}