wave-agent-sdk 1.0.1 → 1.0.3

package/dist/agent.js

@@ -503,6 +503,13 @@ export class Agent {
         await this.messageManager.saveSession();
     }
     async clearMessages() {
+        // Aligned with webview (ChatApp handleClearChat): /clear is ignored
+        // while the agent is running, instead of aborting the AI mid-turn
+        // (which used to inject a late "Request was aborted" error into the
+        // newly cleared session).
+        if (this.aiManager.isLoading) {
+            return;
+        }
         this.aiManager.abortAIMessage();
         // Capture old session info before clearing
         const oldSessionId = this.messageManager.getSessionId();
@@ -546,6 +553,11 @@ export class Agent {
      * @param customInstructions - Optional custom instructions for compaction
      */
     async compact(customInstructions) {
+        // Aligned with webview: /compact is ignored while the agent is running,
+        // instead of aborting the AI mid-turn before compacting.
+        if (this.aiManager.isLoading) {
+            return;
+        }
         this.aiManager.abortAIMessage();
         await this.aiManager.compactConversation({
             customInstructions,

package/dist/managers/aiManager.js

@@ -1606,6 +1606,8 @@ ${question}`;
                         id: toolId,
                         shortResult,
                         stage: "running",
+                        compactParams,
+                        name: toolName,
                     });
                 },
                 onResultUpdate: (result) => {
@@ -1613,6 +1615,8 @@ ${question}`;
                         id: toolId,
                         result,
                         stage: "running",
+                        compactParams,
+                        name: toolName,
                     });
                 },
                 onCwdChange: async (newCwd) => {

package/dist/managers/permissionManager.js

@@ -310,16 +310,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");
@@ -371,7 +363,17 @@ 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/dist/prompts/index.d.ts

@@ -45,4 +45,3 @@ export declare function buildSystemPrompt(basePrompt: string | undefined, tools:
         content: string;
     };
 }): SystemPromptBlock[];
-export declare function enhanceSystemPromptWithEnvDetails(existingSystemPrompt: string, workdir: string, originalWorkdir?: string, worktreeSession?: WorktreeSession | null): string;

package/dist/prompts/index.js

@@ -285,6 +285,43 @@ export function formatCompactSummary(summary) {
     return formattedSummary.trim();
 }
 export const WEB_CONTENT_SYSTEM_PROMPT = `You are a helpful assistant that extracts information from web content. The content is provided in Markdown format.`;
+/**
+ * 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() {
+    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() {
+    if (os.platform() === "win32") {
+        return `${os.version()} ${os.release()}`;
+    }
+    return `${os.type()} ${os.release()}`;
+}
 export function buildSystemPrompt(basePrompt, tools, options = {}) {
     // --- Static block (cacheable) ---
     let staticText = basePrompt || DEFAULT_SYSTEM_PROMPT;
@@ -305,27 +342,49 @@ export function buildSystemPrompt(basePrompt, tools, options = {}) {
     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 !== 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) {
         dynamicText += `\n\n${buildAutoMemoryPrompt(options.autoMemory.directory)}`;
@@ -338,34 +397,3 @@ Today's date: ${today}
     }
     return blocks;
 }
-export function enhanceSystemPromptWithEnvDetails(existingSystemPrompt, workdir, originalWorkdir, worktreeSession) {
-    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>
-`;
-}

package/package.json

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

package/src/agent.ts

@@ -681,6 +681,14 @@ export class Agent {
   }
 
   public async clearMessages(): Promise<void> {
+    // Aligned with webview (ChatApp handleClearChat): /clear is ignored
+    // while the agent is running, instead of aborting the AI mid-turn
+    // (which used to inject a late "Request was aborted" error into the
+    // newly cleared session).
+    if (this.aiManager.isLoading) {
+      return;
+    }
+
     this.aiManager.abortAIMessage();
 
     // Capture old session info before clearing
@@ -743,6 +751,12 @@ export class Agent {
    * @param customInstructions - Optional custom instructions for compaction
    */
   public async compact(customInstructions?: string): Promise<void> {
+    // Aligned with webview: /compact is ignored while the agent is running,
+    // instead of aborting the AI mid-turn before compacting.
+    if (this.aiManager.isLoading) {
+      return;
+    }
+
     this.aiManager.abortAIMessage();
 
     await this.aiManager.compactConversation({

package/src/managers/aiManager.ts

@@ -2195,6 +2195,8 @@ ${question}`;
             id: toolId,
             shortResult,
             stage: "running",
+            compactParams,
+            name: toolName,
           });
         },
         onResultUpdate: (result: string) => {
@@ -2202,6 +2204,8 @@ ${question}`;
             id: toolId,
             result,
             stage: "running",
+            compactParams,
+            name: toolName,
           });
         },
         onCwdChange: async (newCwd: string) => {

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/prompts/index.ts

@@ -347,6 +347,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.`;
 
+/**
+ * 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,
   tools: ToolPlugin[],
@@ -387,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) {
@@ -425,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>
-`;
-}