wave-agent-sdk 0.0.5 → 0.0.7

package/dist/utils/skillParser.d.ts

@@ -1,4 +1,4 @@
-import type { ParsedSkillFile, SkillParseOptions, SkillMetadata } from "../types.js";
+import type { ParsedSkillFile, SkillParseOptions, SkillMetadata } from "../types/index.js";
 /**
  * Parse a SKILL.md file and validate its contents
  */

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

@@ -1 +1 @@
-{"version":3,"file":"skillParser.d.ts","sourceRoot":"","sources":["../../src/utils/skillParser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,eAAe,EACf,iBAAiB,EAEjB,aAAa,EACd,MAAM,aAAa,CAAC;AAErB;;GAEG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,iBAAsB,GAC9B,eAAe,CAiEjB;AAkCD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,aAAa,GAAG,MAAM,EAAE,CAwCvE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAOtD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAa5E"}
+{"version":3,"file":"skillParser.d.ts","sourceRoot":"","sources":["../../src/utils/skillParser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,eAAe,EACf,iBAAiB,EAEjB,aAAa,EACd,MAAM,mBAAmB,CAAC;AAE3B;;GAEG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,iBAAsB,GAC9B,eAAe,CAiEjB;AAkCD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,aAAa,GAAG,MAAM,EAAE,CAwCvE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAOtD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAa5E"}

package/package.json

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

package/src/agent.ts

@@ -13,7 +13,7 @@ import {
   type BackgroundBashManagerCallbacks,
 } from "./managers/backgroundBashManager.js";
 import { SlashCommandManager } from "./managers/slashCommandManager.js";
-import type { SlashCommand, CustomSlashCommand } from "./types.js";
+import type { SlashCommand, CustomSlashCommand } from "./types/index.js";
 import type {
   Message,
   Logger,
@@ -21,8 +21,8 @@ import type {
   GatewayConfig,
   ModelConfig,
   Usage,
-} from "./types.js";
-import { HookManager } from "./hooks/index.js";
+} from "./types/index.js";
+import { HookManager } from "./managers/hookManager.js";
 import { configResolver } from "./utils/configResolver.js";
 import { configValidator } from "./utils/configValidator.js";
 import { SkillManager } from "./managers/skillManager.js";
@@ -145,12 +145,7 @@ export class Agent {
       logger: this.logger,
     }); // Initialize tool registry, pass MCP manager
 
-    this.hookManager = new HookManager(
-      this.workdir,
-      undefined,
-      undefined,
-      this.logger,
-    ); // Initialize hooks manager
+    this.hookManager = new HookManager(this.workdir, undefined, this.logger); // Initialize hooks manager
 
     // Initialize MessageManager
     this.messageManager = new MessageManager({
@@ -221,6 +216,10 @@ export class Agent {
     return [...this._usages]; // Return copy to prevent external modification
   }
 
+  public get sessionFilePath(): string {
+    return this.messageManager.getTranscriptPath();
+  }
+
   /**
    * Rebuild usage array from messages containing usage metadata
    * Called during session restoration to reconstruct usage tracking
@@ -422,10 +421,9 @@ export class Agent {
 
   /** Unified interrupt method, interrupts both AI messages and command execution */
   public abortMessage(): void {
-    this.abortAIMessage();
+    this.abortAIMessage(); // This will abort tools including Task tool (subagents)
     this.abortBashCommand();
     this.abortSlashCommand();
-    this.abortSubagents();
   }
 
   /** Add to input history */
@@ -443,23 +441,12 @@ export class Agent {
     this.slashCommandManager.abortCurrentCommand();
   }
 
-  /** Interrupt all subagent execution */
-  public abortSubagents(): void {
-    this.subagentManager.abortAllInstances();
-  }
-
-  /** Interrupt specific subagent execution */
-  public abortSubagent(subagentId: string): boolean {
-    return this.subagentManager.abortInstance(subagentId);
-  }
-
   /** Destroy managers, clean up resources */
   public async destroy(): Promise<void> {
     await this.messageManager.saveSession();
-    this.abortAIMessage();
+    this.abortAIMessage(); // This will abort tools including Task tool (subagents)
     this.abortBashCommand();
     this.abortSlashCommand();
-    this.abortSubagents();
     // Cleanup background bash manager
     this.backgroundBashManager.cleanup();
     // Cleanup MCP connections
@@ -499,34 +486,53 @@ export class Agent {
       // Add user message to history
       this.addToInputHistory(content);
 
-      // Execute UserPromptSubmit hooks before processing the prompt
+      // Add user message first, will automatically sync to UI
+      this.messageManager.addUserMessage({
+        content,
+        images: images?.map((img) => ({
+          path: img.path,
+          mimeType: img.mimeType,
+        })),
+      });
+
+      // Execute UserPromptSubmit hooks after adding the user message
       if (this.hookManager) {
         try {
-          await this.hookManager.executeHooks("UserPromptSubmit", {
-            event: "UserPromptSubmit",
-            projectDir: this.workdir,
-            timestamp: new Date(),
-            // UserPromptSubmit doesn't need toolName
-            sessionId: this.sessionId,
-            transcriptPath: this.messageManager.getTranscriptPath(),
-            cwd: this.workdir,
-            userPrompt: content,
-          });
+          const hookResults = await this.hookManager.executeHooks(
+            "UserPromptSubmit",
+            {
+              event: "UserPromptSubmit",
+              projectDir: this.workdir,
+              timestamp: new Date(),
+              // UserPromptSubmit doesn't need toolName
+              sessionId: this.sessionId,
+              transcriptPath: this.messageManager.getTranscriptPath(),
+              cwd: this.workdir,
+              userPrompt: content,
+            },
+          );
+
+          // Process hook results and determine if we should continue
+          const processResult = this.hookManager.processHookResults(
+            "UserPromptSubmit",
+            hookResults,
+            this.messageManager,
+          );
+
+          // If hook processing indicates we should block (exit code 2), stop here
+          if (processResult.shouldBlock) {
+            this.logger?.info(
+              "UserPromptSubmit hook blocked prompt processing with error:",
+              processResult.errorMessage,
+            );
+            return; // Don't send to AI
+          }
         } catch (error) {
           this.logger?.warn("UserPromptSubmit hooks execution failed:", error);
           // Continue processing even if hooks fail
         }
       }
 
-      // Add user message, will automatically sync to UI
-      this.messageManager.addUserMessage(
-        content,
-        images?.map((img) => ({
-          path: img.path,
-          mimeType: img.mimeType,
-        })),
-      );
-
       // Send AI message
       await this.aiManager.sendAIMessage();
     } catch (error) {

package/src/index.ts

@@ -2,6 +2,7 @@
 export * from "./services/aiService.js";
 export * from "./services/memory.js";
 export * from "./services/session.js";
+export * from "./services/hook.js";
 
 // Export main agent
 export * from "./agent.js";
@@ -15,9 +16,7 @@ export * from "./utils/messageOperations.js";
 export * from "./utils/path.js";
 export * from "./utils/stringUtils.js";
 export * from "./utils/customCommands.js";
-
-// Export hooks system
-export * from "./hooks/index.js";
+export * from "./utils/hookMatcher.js";
 
 // Export types
-export * from "./types.js";
+export * from "./types/index.js";