wave-agent-sdk 0.19.5 → 0.19.6

package/dist/prompts/index.js

@@ -1,6 +1,5 @@
 import * as os from "node:os";
 import { isGitRepository } from "../utils/gitUtils.js";
-import { getCurrentWorktreeSession } from "../utils/worktreeSession.js";
 import { buildAutoMemoryPrompt } from "./autoMemory.js";
 import { EXPLORE_SUBAGENT_TYPE, PLAN_SUBAGENT_TYPE, } from "../constants/subagents.js";
 import { ASK_USER_QUESTION_TOOL_NAME, EDIT_TOOL_NAME, WRITE_TOOL_NAME, EXIT_PLAN_MODE_TOOL_NAME, AGENT_TOOL_NAME, BASH_TOOL_NAME, READ_TOOL_NAME, GLOB_TOOL_NAME, GREP_TOOL_NAME, } from "../constants/tools.js";
@@ -230,7 +229,7 @@ export function buildSystemPrompt(basePrompt, tools, options = {}) {
             : shell.includes("bash")
                 ? "bash"
                 : shell;
-        const worktreeSession = getCurrentWorktreeSession();
+        const worktreeSession = options.worktreeSession;
         dynamicText += `
 
 Here is useful information about the environment you are running in:
@@ -255,7 +254,7 @@ Today's date: ${today}
     }
     return blocks;
 }
-export function enhanceSystemPromptWithEnvDetails(existingSystemPrompt, workdir, originalWorkdir) {
+export function enhanceSystemPromptWithEnvDetails(existingSystemPrompt, workdir, originalWorkdir, worktreeSession) {
     const isGitRepo = isGitRepository(workdir);
     const platform = os.platform();
     const osVersion = `${os.type()} ${os.release()}`;
@@ -266,7 +265,6 @@ export function enhanceSystemPromptWithEnvDetails(existingSystemPrompt, workdir,
         : shell.includes("bash")
             ? "bash"
             : shell;
-    const worktreeSession = getCurrentWorktreeSession();
     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.

package/dist/services/hook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hook.d.ts","sourceRoot":"","sources":["../../src/services/hook.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,4BAA4B,EAElC,MAAM,mBAAmB,CAAC;AA8G3B;;GAEG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,oBAAoB,GAAG,4BAA4B,EAC5D,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,mBAAmB,CAAC,CA6I9B;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,EAAE,EAClB,OAAO,EAAE,oBAAoB,GAAG,4BAA4B,EAC5D,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAchC;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAMhC;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAsBtD"}
+{"version":3,"file":"hook.d.ts","sourceRoot":"","sources":["../../src/services/hook.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,4BAA4B,EAElC,MAAM,mBAAmB,CAAC;AAuH3B;;GAEG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,oBAAoB,GAAG,4BAA4B,EAC5D,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,mBAAmB,CAAC,CA6I9B;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,EAAE,EAClB,OAAO,EAAE,oBAAoB,GAAG,4BAA4B,EAC5D,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAchC;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAMhC;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAsBtD"}

package/dist/services/hook.js

@@ -89,6 +89,12 @@ async function buildHookJsonInput(context) {
         jsonInput.background_tasks = context.backgroundTasks ?? [];
         jsonInput.session_crons = context.sessionCrons ?? [];
     }
+    // Add last_assistant_message for Stop and SubagentStop events.
+    // Omitted when undefined (no text content in last assistant message).
+    if ((context.event === "Stop" || context.event === "SubagentStop") &&
+        context.lastAssistantMessage !== undefined) {
+        jsonInput.last_assistant_message = context.lastAssistantMessage;
+    }
     return jsonInput;
 }
 /**

package/dist/tools/bashTool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bashTool.d.ts","sourceRoot":"","sources":["../../src/tools/bashTool.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,UAAU,EAA2B,MAAM,YAAY,CAAC;AA0CtE;;GAEG;AACH,eAAO,MAAM,QAAQ,EAAE,UA8iBtB,CAAC"}
+{"version":3,"file":"bashTool.d.ts","sourceRoot":"","sources":["../../src/tools/bashTool.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,UAAU,EAA2B,MAAM,YAAY,CAAC;AA0CtE;;GAEG;AACH,eAAO,MAAM,QAAQ,EAAE,UAojBtB,CAAC"}

package/dist/tools/bashTool.js

@@ -152,13 +152,15 @@ The working directory persists between commands. Try to maintain your current wo
                 error: "Command parameter is required and must be a string",
             };
         }
-        // Resolve shell path: on Windows, use Git Bash; on other platforms, use default
+        // Resolve shell path: on Windows, use Git Bash; on macOS/Linux, use bash or zsh
         const shellPath = resolveShellPath();
-        if (process.platform === "win32" && !shellPath) {
+        if (!shellPath) {
             return {
                 success: false,
                 content: "",
-                error: "Git Bash not found. Please install Git for Windows or set GIT_BASH_PATH environment variable.",
+                error: process.platform === "win32"
+                    ? "Git Bash not found. Please install Git for Windows or set WAVE_GIT_BASH_PATH environment variable."
+                    : "No suitable shell found. Please ensure bash or zsh is installed, or set WAVE_SHELL environment variable.",
             };
         }
         // Validate timeout
@@ -207,7 +209,7 @@ The working directory persists between commands. Try to maintain your current wo
                     error: "Background task manager not available",
                 };
             }
-            const { id: taskId } = backgroundTaskManager.startShell(command);
+            const { id: taskId } = backgroundTaskManager.startShell(command, undefined, context.workdir);
             const task = backgroundTaskManager.getTask(taskId);
             const outputPath = task?.outputPath;
             const backgroundMsg = [
@@ -230,7 +232,7 @@ The working directory persists between commands. Try to maintain your current wo
             const tempCwdFileForBash = toPosixPath(tempCwdFile);
             const wrappedCommand = wrapCommandForCwdTracking(command, tempCwdFileForBash);
             const child = spawn(wrappedCommand, {
-                shell: shellPath || true,
+                shell: shellPath,
                 stdio: "pipe",
                 detached: true,
                 cwd: context.workdir,

package/dist/tools/enterWorktreeTool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enterWorktreeTool.d.ts","sourceRoot":"","sources":["../../src/tools/enterWorktreeTool.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,UAAU,EAA2B,MAAM,YAAY,CAAC;AAetE,eAAO,MAAM,0BAA0B,qxCA0BtC,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,UAqI/B,CAAC"}
+{"version":3,"file":"enterWorktreeTool.d.ts","sourceRoot":"","sources":["../../src/tools/enterWorktreeTool.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,UAAU,EAA2B,MAAM,YAAY,CAAC;AAWtE,eAAO,MAAM,0BAA0B,qxCA0BtC,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,UA+H/B,CAAC"}

package/dist/tools/enterWorktreeTool.js

@@ -2,7 +2,6 @@
  * EnterWorktree tool - creates an isolated git worktree and switches the session into it.
  * Mirrors Claude Code's EnterWorktree tool behavior and prompt.
  */
-import { getCurrentWorktreeSession, setCurrentWorktreeSession, } from "../utils/worktreeSession.js";
 import { createWorktree, validateWorktreeName, generateWorktreeName, } from "../utils/worktreeUtils.js";
 import { getGitMainRepoRoot } from "../utils/gitUtils.js";
 import { ENTER_WORKTREE_TOOL_NAME } from "../constants/tools.js";
@@ -55,7 +54,7 @@ export const enterWorktreeTool = {
     prompt: () => ENTER_WORKTREE_TOOL_PROMPT,
     async execute(args, context) {
         // Validate not already in a worktree created by this session
-        if (getCurrentWorktreeSession()) {
+        if (context.aiManager?.getWorktreeSession()) {
             return {
                 success: false,
                 content: "Already in a worktree session. Use ExitWorktree to leave before creating a new one.",
@@ -95,16 +94,12 @@ export const enterWorktreeTool = {
             repoRoot: worktreeInfo.repoRoot,
             originalHeadCommit: worktreeInfo.originalHeadCommit,
         };
-        // Set module-level session state
-        setCurrentWorktreeSession(session);
-        // Update CWD via AIManager
+        // Set per-session worktree state and update CWD via AIManager
         const aiManager = context.aiManager;
         if (aiManager) {
+            aiManager.setWorktreeSession(session);
             aiManager.setWorkdir(worktreeInfo.path);
         }
-        // Also update the container's Workdir entry
-        // (Container is not directly accessible from ToolContext, but AIManager.setWorkdir
-        // handles both its internal field and process.chdir)
         // Trigger WorktreeCreate hook if worktree is new
         let hookTriggered = false;
         if (session.isNew && context.hookManager) {

package/dist/tools/exitWorktreeTool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exitWorktreeTool.d.ts","sourceRoot":"","sources":["../../src/tools/exitWorktreeTool.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,UAAU,EAA2B,MAAM,YAAY,CAAC;AAYtE,eAAO,MAAM,yBAAyB,gvDA4BrC,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,UAiM9B,CAAC"}
+{"version":3,"file":"exitWorktreeTool.d.ts","sourceRoot":"","sources":["../../src/tools/exitWorktreeTool.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,UAAU,EAA2B,MAAM,YAAY,CAAC;AAQtE,eAAO,MAAM,yBAAyB,gvDA4BrC,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,UA6L9B,CAAC"}

package/dist/tools/exitWorktreeTool.js

@@ -2,7 +2,6 @@
  * ExitWorktree tool - exits a worktree session and returns to the original directory.
  * Mirrors Claude Code's ExitWorktree tool behavior and prompt.
  */
-import { getCurrentWorktreeSession, setCurrentWorktreeSession, } from "../utils/worktreeSession.js";
 import { removeWorktree, countWorktreeChanges, } from "../utils/worktreeUtils.js";
 import { EXIT_WORKTREE_TOOL_NAME } from "../constants/tools.js";
 import { logger } from "../utils/globalLogger.js";
@@ -70,8 +69,8 @@ export const exitWorktreeTool = {
                 error: 'Missing required parameter: "action"',
             };
         }
-        // Validate: must be in an active worktree session
-        const session = getCurrentWorktreeSession();
+        // Validate: must be in an active worktree session (for this session)
+        const session = context.aiManager?.getWorktreeSession();
         if (!session) {
             return {
                 success: false,
@@ -109,10 +108,9 @@ export const exitWorktreeTool = {
         const { originalCwd, worktreePath, worktreeBranch } = session;
         if (action === "keep") {
             // Clear session state
-            setCurrentWorktreeSession(null);
-            // Restore CWD
             const aiManager = context.aiManager;
             if (aiManager) {
+                aiManager.setWorktreeSession(null);
                 aiManager.setWorkdir(originalCwd);
             }
             return {
@@ -131,11 +129,10 @@ export const exitWorktreeTool = {
         // Count changes BEFORE removing the worktree (directory will be gone after)
         const summary = countWorktreeChanges(worktreePath, session.originalHeadCommit) ?? { changedFiles: 0, commits: 0 };
         removeWorktree(worktreeInfo);
-        // Clear session state
-        setCurrentWorktreeSession(null);
-        // Restore CWD
+        // Clear session state and restore CWD
         const aiManager = context.aiManager;
         if (aiManager) {
+            aiManager.setWorktreeSession(null);
             aiManager.setWorkdir(originalCwd);
         }
         // Trigger WorktreeRemove hook (non-blocking)

package/dist/types/hooks.d.ts

@@ -81,6 +81,7 @@ export interface HookJsonInput {
     compact_summary?: string;
     background_tasks?: BackgroundTaskInfo[];
     session_crons?: SessionCronInfo[];
+    last_assistant_message?: string;
 }
 export interface BackgroundTaskInfo {
     id: string;
@@ -116,6 +117,7 @@ export interface ExtendedHookExecutionContext extends HookExecutionContext {
     compactSummary?: string;
     backgroundTasks?: BackgroundTaskInfo[];
     sessionCrons?: SessionCronInfo[];
+    lastAssistantMessage?: string;
 }
 export interface HookEnvironment {
     WAVE_PROJECT_DIR: string;

package/dist/types/hooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../src/types/hooks.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../src/types/hooks.ts"],"names":[],"mappings":"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"}

package/dist/types/messaging.d.ts

@@ -74,6 +74,8 @@ export interface ReasoningBlock {
     type: "reasoning";
     content: string;
     stage?: "streaming" | "end";
+    startTime?: number;
+    endTime?: number;
 }
 export interface FileHistoryBlock {
     type: "file_history";

package/dist/types/messaging.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messaging.d.ts","sourceRoot":"","sources":["../../src/types/messaging.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAEvC,oBAAY,aAAa;IACvB,IAAI,SAAS;IACb,IAAI,SAAS;CACd;AAED,MAAM,WAAW,OAAO;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,MAAM,YAAY,GACpB,SAAS,GACT,UAAU,GACV,SAAS,GACT,UAAU,GACV,SAAS,GACT,YAAY,GACZ,cAAc,GACd,gBAAgB,GAChB,qBAAqB,CAAC;AAE1B,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,KAAK,CAAC,EAAE,WAAW,GAAG,KAAK,CAAC;CAC7B;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,KAAK,CAAC;QAEb,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC,CAAC;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,KAAK,EAAE,OAAO,GAAG,WAAW,GAAG,SAAS,GAAG,KAAK,CAAC;IACjD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,SAAS,GAAG,KAAK,CAAC;IACzB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,WAAW,GAAG,KAAK,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,cAAc,CAAC;IACrB,SAAS,EAAE,OAAO,gBAAgB,EAAE,YAAY,EAAE,CAAC;CACpD;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,mBAAmB,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,GAAG,OAAO,GAAG,UAAU,CAAC;IACzC,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;IACtD,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB"}
+{"version":3,"file":"messaging.d.ts","sourceRoot":"","sources":["../../src/types/messaging.ts"],"names":[],"mappings":"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"}

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,CAkTX"}
+{"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,CAsTX"}

package/dist/utils/containerSetup.js

@@ -42,6 +42,9 @@ export function setupAgentContainer(setupOptions) {
         container.register("WorktreeName", options.worktreeName);
         container.register("MainRepoRoot", getGitMainRepoRoot(workdir));
     }
+    // Per-agent worktree session state (EnterWorktree/ExitWorktree). Stored in the
+    // container so it is isolated per session, not shared process-wide.
+    container.register("WorktreeSession", null);
     const notificationQueue = new NotificationQueue();
     container.register("NotificationQueue", notificationQueue);
     const messageQueue = new MessageQueue();

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

@@ -1 +1 @@
-{"version":3,"file":"shellResolver.d.ts","sourceRoot":"","sources":["../../src/utils/shellResolver.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,sBAAsB,UAGlC,CAAC;AAEF,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,SAAS,CAuBrD"}
+{"version":3,"file":"shellResolver.d.ts","sourceRoot":"","sources":["../../src/utils/shellResolver.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,sBAAsB,UAGlC,CAAC;AAgLF,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,SAAS,CAMrD"}

package/dist/utils/shellResolver.js

@@ -1,25 +1,174 @@
 import fs from "fs";
+import path from "path";
+import { execFileSync } from "child_process";
 export const WINDOWS_GIT_BASH_PATHS = [
     "C:\\Program Files\\Git\\bin\\bash.exe",
     "C:\\Program Files (x86)\\Git\\bin\\bash.exe",
 ];
-export function resolveShellPath() {
-    if (process.platform !== "win32") {
+// Common git.exe locations (checked before falling back to `where.exe`).
+const WINDOWS_GIT_EXE_PATHS = [
+    "C:\\Program Files\\Git\\cmd\\git.exe",
+    "C:\\Program Files (x86)\\Git\\cmd\\git.exe",
+];
+// Common directories where bash/zsh may live, used as fallback after PATH lookup.
+const FIXED_SHELL_DIRS = [
+    "/bin",
+    "/usr/bin",
+    "/usr/local/bin",
+    "/opt/homebrew/bin",
+];
+function isExecutable(shellPath) {
+    try {
+        fs.accessSync(shellPath, fs.constants.X_OK);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/** Resolve a command name (e.g. "bash") to an absolute path by searching $PATH. */
+function which(command) {
+    const pathEnv = process.env.PATH;
+    if (!pathEnv)
+        return undefined;
+    for (const dir of pathEnv.split(":")) {
+        if (!dir)
+            continue;
+        const candidate = path.join(dir, command);
+        if (isExecutable(candidate)) {
+            return candidate;
+        }
+    }
+    return undefined;
+}
+function isSupportedShell(shellPath) {
+    return shellPath.includes("bash") || shellPath.includes("zsh");
+}
+/**
+ * Locate the `git` executable on Windows, then infer bash.exe from it.
+ * Checks common Git for Windows install locations first, then falls back
+ * to `where.exe git` (aligned with Claude Code's findExecutable('git')).
+ * Returns the inferred bash.exe path, or undefined if not found.
+ */
+function inferGitBashFromGit() {
+    // 1. Common git.exe locations
+    let gitExe;
+    for (const candidate of WINDOWS_GIT_EXE_PATHS) {
+        if (fs.existsSync(candidate)) {
+            gitExe = candidate;
+            break;
+        }
+    }
+    // 2. Fallback: where.exe git
+    if (!gitExe) {
+        try {
+            const result = execFileSync("where", ["git"], {
+                stdio: "pipe",
+                encoding: "utf8",
+                timeout: 3000,
+            }).trim();
+            // where.exe may return multiple lines; take the first non-empty one.
+            gitExe = result.split(/\r?\n/).find((line) => line.trim()) || undefined;
+        }
+        catch {
+            gitExe = undefined;
+        }
+    }
+    if (!gitExe)
         return undefined;
+    // git.exe is at <install>/cmd/git.exe → bash.exe is at <install>/bin/bash.exe
+    // join treats git.exe as a segment, so ".." cancels it (→ cmd dir),
+    // the second ".." cancels cmd (→ <install>), then bin/bash.exe.
+    const bashPath = path.win32.join(gitExe, "..", "..", "bin", "bash.exe");
+    if (fs.existsSync(bashPath)) {
+        return bashPath;
+    }
+    return undefined;
+}
+/**
+ * Resolve a bash or zsh binary on macOS/Linux.
+ *
+ * Priority (aligned with Claude Code's findSuitableShell):
+ *   1. WAVE_SHELL env var (only if it points to an executable bash/zsh)
+ *   2. $SHELL (only if it is bash/zsh)
+ *   3. `which bash` / `which zsh` discovered on $PATH
+ *   4. Common fixed locations (/bin, /usr/bin, /usr/local/bin, /opt/homebrew/bin)
+ *
+ * When $SHELL is bash, bash is preferred; otherwise zsh is preferred. This
+ * matters because /bin/sh may be dash (Debian/Ubuntu) or POSIX-mode bash
+ * (macOS), neither of which supports bashisms like process substitution
+ * `<()`, causing `eval '<()...'` to fail at parse time.
+ */
+function resolveUnixShell() {
+    // 1. WAVE_SHELL env override
+    const waveShell = process.env.WAVE_SHELL;
+    if (waveShell && isSupportedShell(waveShell) && isExecutable(waveShell)) {
+        return waveShell;
+    }
+    // 2. $SHELL (only bash/zsh)
+    const envShell = process.env.SHELL;
+    const isEnvShellSupported = !!envShell && isSupportedShell(envShell);
+    const preferBash = envShell?.includes("bash") ?? false;
+    // 3. Locate via PATH
+    const bashPath = which("bash");
+    const zshPath = which("zsh");
+    // 4. Fixed common locations, ordered by user preference
+    const shellOrder = preferBash ? ["bash", "zsh"] : ["zsh", "bash"];
+    const candidates = shellOrder.flatMap((shell) => FIXED_SHELL_DIRS.map((dir) => `${dir}/${shell}`));
+    // Discovered PATH paths: preferred type first, the other as fallback
+    if (preferBash) {
+        if (bashPath)
+            candidates.unshift(bashPath);
+        if (zshPath)
+            candidates.push(zshPath);
     }
-    if (process.env.GIT_BASH_PATH) {
-        return process.env.GIT_BASH_PATH;
+    else {
+        if (zshPath)
+            candidates.unshift(zshPath);
+        if (bashPath)
+            candidates.push(bashPath);
     }
+    // Always prioritize $SHELL if it is a supported, executable shell
+    if (isEnvShellSupported && envShell && isExecutable(envShell)) {
+        candidates.unshift(envShell);
+    }
+    return candidates.find((candidate) => isExecutable(candidate));
+}
+/**
+ * Resolve the Git Bash path on Windows.
+ *
+ * Priority (aligned with Claude Code's findGitBashPath):
+ *   1. WAVE_GIT_BASH_PATH env var
+ *   2. Infer from `git` executable location (<git dir>/../../bin/bash.exe)
+ *   3. Common install paths (C:\Program Files\Git\bin\bash.exe, etc.)
+ */
+function resolveWindowsShell() {
+    // 1. Env var override
+    if (process.env.WAVE_GIT_BASH_PATH) {
+        return process.env.WAVE_GIT_BASH_PATH;
+    }
+    // 2. Infer from git executable location
+    const inferred = inferGitBashFromGit();
+    if (inferred) {
+        return inferred;
+    }
+    // 4. Common install paths
     const paths = [
         ...WINDOWS_GIT_BASH_PATHS,
         process.env.LOCALAPPDATA
             ? `${process.env.LOCALAPPDATA}\\Programs\\Git\\bin\\bash.exe`
             : null,
     ].filter(Boolean);
-    for (const path of paths) {
-        if (fs.existsSync(path)) {
-            return path;
+    for (const p of paths) {
+        if (fs.existsSync(p)) {
+            return p;
         }
     }
     return undefined;
 }
+export function resolveShellPath() {
+    if (process.platform === "win32") {
+        return resolveWindowsShell();
+    }
+    return resolveUnixShell();
+}

package/dist/utils/worktreeSession.d.ts

@@ -1,9 +1,11 @@
 /**
- * Module-level worktree session state tracking.
- * Analogous to Claude Code's currentWorktreeSession in worktree.ts.
+ * Worktree session state tracking.
  *
- * Tracks whether the current session entered a worktree via EnterWorktree tool,
- * so ExitWorktree can validate scope and restore the original CWD.
+ * The session state is stored per-agent in each session's DI container (see the
+ * "WorktreeSession" container slot registered in containerSetup.ts and accessed via
+ * AIManager.getWorktreeSession()/setWorktreeSession()). This keeps worktree state
+ * isolated per session in stdio multi-agent mode — a process-level singleton would
+ * leak state across concurrent sessions (see specs/047-worktree.md FR-042).
  */
 export interface WorktreeSession {
     /** The working directory the session was in before EnterWorktree */
@@ -21,6 +23,4 @@ export interface WorktreeSession {
     /** The HEAD commit of the original branch at worktree creation time */
     originalHeadCommit?: string;
 }
-export declare function getCurrentWorktreeSession(): WorktreeSession | null;
-export declare function setCurrentWorktreeSession(session: WorktreeSession | null): void;
 //# sourceMappingURL=worktreeSession.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"worktreeSession.d.ts","sourceRoot":"","sources":["../../src/utils/worktreeSession.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,WAAW,eAAe;IAC9B,oEAAoE;IACpE,WAAW,EAAE,MAAM,CAAC;IACpB,qCAAqC;IACrC,YAAY,EAAE,MAAM,CAAC;IACrB,uCAAuC;IACvC,cAAc,EAAE,MAAM,CAAC;IACvB,oDAAoD;IACpD,YAAY,EAAE,MAAM,CAAC;IACrB,oEAAoE;IACpE,KAAK,EAAE,OAAO,CAAC;IACf,kCAAkC;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,uEAAuE;IACvE,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAID,wBAAgB,yBAAyB,IAAI,eAAe,GAAG,IAAI,CAElE;AAED,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,eAAe,GAAG,IAAI,GAC9B,IAAI,CAEN"}
+{"version":3,"file":"worktreeSession.d.ts","sourceRoot":"","sources":["../../src/utils/worktreeSession.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,MAAM,WAAW,eAAe;IAC9B,oEAAoE;IACpE,WAAW,EAAE,MAAM,CAAC;IACpB,qCAAqC;IACrC,YAAY,EAAE,MAAM,CAAC;IACrB,uCAAuC;IACvC,cAAc,EAAE,MAAM,CAAC;IACvB,oDAAoD;IACpD,YAAY,EAAE,MAAM,CAAC;IACrB,oEAAoE;IACpE,KAAK,EAAE,OAAO,CAAC;IACf,kCAAkC;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,uEAAuE;IACvE,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B"}

package/dist/utils/worktreeSession.js

@@ -1,14 +1,10 @@
 /**
- * Module-level worktree session state tracking.
- * Analogous to Claude Code's currentWorktreeSession in worktree.ts.
+ * Worktree session state tracking.
  *
- * Tracks whether the current session entered a worktree via EnterWorktree tool,
- * so ExitWorktree can validate scope and restore the original CWD.
+ * The session state is stored per-agent in each session's DI container (see the
+ * "WorktreeSession" container slot registered in containerSetup.ts and accessed via
+ * AIManager.getWorktreeSession()/setWorktreeSession()). This keeps worktree state
+ * isolated per session in stdio multi-agent mode — a process-level singleton would
+ * leak state across concurrent sessions (see specs/047-worktree.md FR-042).
  */
-let currentWorktreeSession = null;
-export function getCurrentWorktreeSession() {
-    return currentWorktreeSession;
-}
-export function setCurrentWorktreeSession(session) {
-    currentWorktreeSession = session;
-}
+export {};

package/package.json

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

package/src/agent.ts

@@ -42,6 +42,7 @@ import { TaskManager } from "./services/taskManager.js";
 import { btw } from "./services/aiService.js";
 import { convertMessagesForAPI } from "./utils/convertMessagesForAPI.js";
 import { supportsVision } from "./utils/modelCapabilities.js";
+import type { WorktreeSession } from "./utils/worktreeSession.js";
 import { parseTaskNotificationXml } from "./utils/notificationXml.js";
 import { InitializationService } from "./services/initializationService.js";
 import { InteractionService } from "./services/interactionService.js";
@@ -298,6 +299,15 @@ export class Agent {
     this.options.callbacks?.onWorkdirChange?.(newCwd);
   }
 
+  /**
+   * Set this session's worktree session state (used by CLI -w startup to inject the
+   * session created before the agent existed). Delegates to AIManager so the state is
+   * stored in this agent's own DI container.
+   */
+  public setWorktreeSession(session: WorktreeSession | null): void {
+    this.aiManager.setWorktreeSession(session);
+  }
+
   /** Get project memory content */
   public get projectMemory(): string {
     const memoryService =
@@ -389,6 +399,27 @@ export class Agent {
     return removed;
   }
 
+  /**
+   * Update a queued message's content by its ID (does not change queue order)
+   * @param id - The ID of the message to update
+   * @param patch - The fields to update
+   * @returns true if the message was updated, false if not found
+   */
+  public updateQueuedMessageById(
+    id: string,
+    patch: {
+      content?: string;
+      images?: Array<{ path: string; mimeType: string }>;
+      type?: "message" | "bang";
+    },
+  ): boolean {
+    const updated = this.messageQueue.updateById(id, patch);
+    if (updated) {
+      this.options.callbacks?.onQueuedMessagesChange?.(this.queuedMessages);
+    }
+    return updated;
+  }
+
   /**
    * Unified dequeue trigger — checks state machine before processing.
    * Called from onMessageEnqueued, onLoadingChange(false), and