wave-agent-sdk 0.13.4 → 0.13.6

package/src/services/hook.ts

@@ -260,6 +260,21 @@ export async function executeCommands(
   return results;
 }
 
+/**
+ * Execute a CwdChanged hook
+ */
+export async function executeCwdChangedHooks(
+  oldCwd: string,
+  newCwd: string,
+  context: ExtendedHookExecutionContext,
+): Promise<HookExecutionResult[]> {
+  // CwdChanged hooks are executed through HookManager.executeCwdChangedHooks()
+  void context;
+  void oldCwd;
+  void newCwd;
+  return [];
+}
+
 /**
  * Validate command safety (basic checks)
  */

package/src/services/interactionService.ts

@@ -50,6 +50,9 @@ export class InteractionService {
 
         if (isValid && commandId !== undefined) {
           // Execute valid slash command
+          // Note: executeCommand sets isLoading early (e.g., custom commands set it
+          // before bash execution). sendAIMessage() no longer guards against isLoading,
+          // so callers can safely set it early without blocking subsequent AI calls.
           await slashCommandManager.executeCommand(commandId, args);
 
           return;

package/src/services/pluginLoader.ts

@@ -10,6 +10,7 @@ import {
 } from "../types/index.js";
 import { scanCommandsDirectory } from "../utils/customCommands.js";
 import { parseSkillFile } from "../utils/skillParser.js";
+import { resolveMcpConfig } from "../managers/mcpManager.js";
 
 export class PluginLoader {
   /**
@@ -94,6 +95,7 @@ export class PluginLoader {
               skills.push({
                 ...parsed.skillMetadata,
                 type: "project", // Plugin skills are treated as project skills
+                pluginRoot: pluginPath,
                 content: parsed.content,
                 frontmatter: parsed.frontmatter,
                 isValid: parsed.isValid,
@@ -136,7 +138,7 @@ export class PluginLoader {
     const mcpPath = path.join(pluginPath, ".mcp.json");
     try {
       const content = await fs.readFile(mcpPath, "utf-8");
-      return JSON.parse(content) as McpConfig;
+      return resolveMcpConfig(JSON.parse(content)) as McpConfig;
     } catch {
       return undefined;
     }

package/src/tools/bashTool.ts

@@ -230,7 +230,14 @@ Use the gh command via the Bash tool for GitHub-related tasks including working
 
     // Foreground execution (original behavior)
     return new Promise((resolve) => {
-      const child: ChildProcess = spawn(command, {
+      // Create a temporary file to store the CWD
+      const tempCwdFile = path.join(
+        os.tmpdir(),
+        `wave_cwd_${Date.now()}_${Math.random().toString(36).substring(2, 11)}.tmp`,
+      );
+      const wrappedCommand = `${command} && pwd -P >| ${tempCwdFile}`;
+
+      const child: ChildProcess = spawn(wrappedCommand, {
         shell: true,
         stdio: "pipe",
         cwd: context.workdir,
@@ -401,7 +408,7 @@ Use the gh command via the Bash tool for GitHub-related tasks including working
         }
       });
 
-      child.on("exit", (code) => {
+      child.on("exit", async (code) => {
         isFinished = true;
         if (context.foregroundTaskManager) {
           context.foregroundTaskManager.unregisterForegroundTask(
@@ -414,6 +421,36 @@ Use the gh command via the Bash tool for GitHub-related tasks including working
             clearTimeout(timeoutHandle);
           }
 
+          // Read the new CWD from the temporary file
+          let newCwd: string | undefined;
+          try {
+            if (fs.existsSync(tempCwdFile)) {
+              newCwd = fs.readFileSync(tempCwdFile, "utf8").trim();
+              // Validate the path exists before calling the callback
+              fs.accessSync(newCwd, fs.constants.F_OK);
+            }
+          } catch (fileError) {
+            logger.warn(
+              `Could not read or validate new CWD from temp file ${tempCwdFile}:`,
+              fileError,
+            );
+            newCwd = undefined;
+          } finally {
+            // Ensure temp file is cleaned up even if reading fails
+            try {
+              if (fs.existsSync(tempCwdFile)) {
+                fs.unlinkSync(tempCwdFile);
+              }
+            } catch (fileError) {
+              logger.error("Failed to clean up temp CWD file:", fileError);
+            }
+          }
+
+          // If CWD changed, call the onCwdChange callback
+          if (newCwd && newCwd !== context.workdir && context.onCwdChange) {
+            context.onCwdChange(newCwd);
+          }
+
           const exitCode = code ?? 0;
           const combinedOutput =
             outputBuffer + (errorBuffer ? "\n" + errorBuffer : "");

package/src/tools/types.ts

@@ -103,4 +103,6 @@ export interface ToolContext {
   };
   /** State of files read in the current session for deduplication */
   readFileState?: Map<string, { mtime: number; hash: string }>;
+  /** Callback to notify when the current working directory changes */
+  onCwdChange?: (newCwd: string) => void;
 }

package/src/types/agent.ts

@@ -1,4 +1,5 @@
 import type { ClientOptions } from "openai";
+import type { QueuedMessage } from "../managers/messageQueue.js";
 import type {
   Message,
   Logger,
@@ -96,4 +97,7 @@ export interface AgentCallbacks
   onModelChange?: (model: string) => void;
   onConfiguredModelsChange?: (models: string[]) => void;
   onLoadingChange?: (loading: boolean) => void;
+  onCommandRunningChange?: (running: boolean) => void;
+  onWorkdirChange?: (newCwd: string) => void;
+  onQueuedMessagesChange?: (messages: QueuedMessage[]) => void;
 }

package/src/types/hooks.ts

@@ -20,7 +20,8 @@ export type HookEvent =
   | "Stop"
   | "SubagentStop"
   | "PermissionRequest"
-  | "WorktreeCreate";
+  | "WorktreeCreate"
+  | "CwdChanged";
 
 // Individual hook command configuration
 export interface HookCommand {
@@ -28,6 +29,7 @@ export interface HookCommand {
   command: string;
   async?: boolean;
   timeout?: number; // seconds
+  pluginRoot?: string; // Plugin directory path for plugin-originated hooks
 }
 
 // Hook event configuration with optional pattern matching
@@ -102,6 +104,7 @@ export function isValidHookEvent(event: string): event is HookEvent {
     "SubagentStop",
     "PermissionRequest",
     "WorktreeCreate",
+    "CwdChanged",
   ].includes(event);
 }
 
@@ -128,6 +131,10 @@ export function isValidHookCommand(cmd: unknown): cmd is HookCommand {
     return false;
   }
 
+  if ("pluginRoot" in hookCmd && typeof hookCmd.pluginRoot !== "string") {
+    return false;
+  }
+
   return true;
 }
 
@@ -154,7 +161,7 @@ export interface HookJsonInput {
   session_id: string; // Format: "wave_session_{uuid}_{shortId}"
   transcript_path: string; // Format: "~/.wave/sessions/session_{shortId}.json"
   cwd: string; // Absolute path to current working directory
-  hook_event_name: HookEvent; // "PreToolUse" | "PostToolUse" | "UserPromptSubmit" | "Stop" | "SubagentStop" | "PermissionRequest" | "WorktreeCreate"
+  hook_event_name: HookEvent; // "PreToolUse" | "PostToolUse" | "UserPromptSubmit" | "Stop" | "SubagentStop" | "PermissionRequest" | "WorktreeCreate" | "CwdChanged"
 
   // Optional fields based on event type
   tool_name?: string; // Present for PreToolUse, PostToolUse, PermissionRequest
@@ -163,6 +170,8 @@ export interface HookJsonInput {
   user_prompt?: string; // Present for UserPromptSubmit only
   subagent_type?: string; // Present when hook is executed by a subagent
   name?: string; // Present for WorktreeCreate events
+  old_cwd?: string; // Present for CwdChanged events
+  new_cwd?: string; // Present for CwdChanged events
 }
 
 // Extended context interface for passing additional data to hook executor
@@ -176,6 +185,8 @@ export interface ExtendedHookExecutionContext extends HookExecutionContext {
   userPrompt?: string; // User prompt text (UserPromptSubmit only)
   subagentType?: string; // Subagent type when hook is executed by a subagent
   worktreeName?: string; // Worktree name (WorktreeCreate only)
+  oldCwd?: string; // Previous working directory (CwdChanged only)
+  newCwd?: string; // New working directory (CwdChanged only)
 }
 
 // Environment variables injected into hook processes

package/src/types/lsp.ts

@@ -15,6 +15,8 @@ export interface LspServerConfig {
   shutdownTimeout?: number;
   restartOnCrash?: boolean;
   maxRestarts?: number;
+  /** Internal: plugin directory path when the server is registered by a plugin */
+  pluginRoot?: string;
 }
 
 export interface LspConfig {

package/src/types/mcp.ts

@@ -9,6 +9,8 @@ export interface McpServerConfig {
   env?: Record<string, string>;
   url?: string;
   headers?: Record<string, string>;
+  /** Internal: plugin directory path when the server is registered by a plugin */
+  pluginRoot?: string;
 }
 
 export interface McpConfig {

package/src/types/skills.ts

@@ -15,6 +15,7 @@ export interface SkillMetadata {
   disableModelInvocation?: boolean;
   userInvocable?: boolean;
   pluginName?: string;
+  pluginRoot?: string;
 }
 
 export interface Skill extends SkillMetadata {

package/src/utils/containerSetup.ts

@@ -2,6 +2,7 @@ import { Container } from "./container.js";
 import { ForegroundTaskManager } from "../managers/foregroundTaskManager.js";
 import { BackgroundTaskManager } from "../managers/backgroundTaskManager.js";
 import { NotificationQueue } from "../managers/notificationQueue.js";
+import { MessageQueue } from "../managers/messageQueue.js";
 import { TaskManager } from "../services/taskManager.js";
 import { MessageManager } from "../managers/messageManager.js";
 import { AIManager } from "../managers/aiManager.js";
@@ -76,10 +77,14 @@ export function setupAgentContainer(
   const callbacks = options.callbacks || {};
   const container = new Container();
   container.register("AgentOptions", options);
+  container.register("Workdir", workdir);
 
   const notificationQueue = new NotificationQueue();
   container.register("NotificationQueue", notificationQueue);
 
+  const messageQueue = new MessageQueue();
+  container.register("MessageQueue", messageQueue);
+
   const foregroundTaskManager = new ForegroundTaskManager(container);
   container.register("ForegroundTaskManager", foregroundTaskManager);
   container.register("ConfigurationService", configurationService);
@@ -147,7 +152,6 @@ export function setupAgentContainer(
   container.register("LspManager", lspManager);
 
   const permissionManager = new PermissionManager(container, {
-    workdir,
     instanceAllowedRules: options.allowedTools,
     instanceDeniedRules: options.disallowedTools,
   });