wave-agent-sdk 0.18.5 → 0.18.6

package/dist/managers/aiManager.js

@@ -894,7 +894,86 @@ export class AIManager {
                 await this.messageManager.saveSession();
                 // Set loading to false first
                 this.setIsLoading(false);
-                // Inject pending notifications from background tasks
+                // Clear temporary rules
+                this.permissionManager?.clearTemporaryRules();
+                // Clear abort controllers
+                this.abortController = null;
+                this.toolAbortController = null;
+                // Execute Stop/SubagentStop hooks only if the operation was not aborted
+                const isCurrentlyAborted = abortController.signal.aborted || toolAbortController.signal.aborted;
+                if (!isCurrentlyAborted) {
+                    // Record committed snapshots to message history for the final turn
+                    if (this.reversionManager) {
+                        const snapshots = this.reversionManager.getAndClearCommittedSnapshots();
+                        if (snapshots.length > 0) {
+                            this.messageManager.addFileHistoryBlock(snapshots);
+                        }
+                    }
+                    // Goal evaluation — supersedes Stop hooks when active
+                    const goalManager = this.container.has("GoalManager")
+                        ? this.container.get("GoalManager")
+                        : undefined;
+                    let goalContinuing = false;
+                    if (goalManager?.isGoalActive() && !this.subagentType) {
+                        // 1. Increment turn count and check circuit breakers
+                        goalManager.incrementTurnCount();
+                        const circuitBreaker = goalManager.checkCircuitBreakers();
+                        if (circuitBreaker) {
+                            goalManager.clearGoal();
+                            logger?.info(`[Goal] ${circuitBreaker}`);
+                            this.messageManager.addUserMessage({
+                                content: `<system-reminder>${circuitBreaker}</system-reminder>`,
+                                isMeta: true,
+                            });
+                            // Fall through to normal Stop hooks on the final turn
+                        }
+                        else {
+                            // 2. Evaluate goal
+                            const evaluation = await goalManager.evaluateGoal(abortController.signal);
+                            if (evaluation.isMet) {
+                                goalManager.clearGoal();
+                                logger?.info(`[Goal] Goal achieved: ${evaluation.reason}`);
+                                this.messageManager.addUserMessage({
+                                    content: `<system-reminder>Goal achieved: ${evaluation.reason}</system-reminder>`,
+                                    isMeta: true,
+                                });
+                                // Fall through to normal Stop hooks on the final turn
+                            }
+                            else {
+                                const goal = goalManager.getGoal();
+                                goal.lastReason = evaluation.reason;
+                                logger?.info(`[Goal] Not yet met: ${evaluation.reason}`);
+                                this.messageManager.addUserMessage({
+                                    content: `<system-reminder>Goal not yet met: ${evaluation.reason}. Continue working toward: ${goal.condition}</system-reminder>`,
+                                    isMeta: true,
+                                });
+                                // Keep loading state active to prevent UI flicker
+                                this.setIsLoading(true);
+                                goalContinuing = true;
+                                // Restart outer loop to continue goal pursuit
+                                shouldRestart = true;
+                                turnOffset = 0;
+                            }
+                        }
+                    }
+                    // Skip Stop hooks when goal evaluator is continuing the conversation
+                    if (goalContinuing) {
+                        // Goal evaluator supersedes Stop hooks
+                    }
+                    else {
+                        const shouldContinue = await this.executeStopHooks();
+                        // If Stop/SubagentStop hooks indicate we should continue (due to blocking errors),
+                        // restart the AI conversation cycle
+                        if (shouldContinue) {
+                            logger?.info(`${this.subagentType ? "SubagentStop" : "Stop"} hooks indicate issues need fixing, continuing conversation...`);
+                            // Restart the conversation to let AI fix the issues
+                            shouldRestart = true;
+                            turnOffset = 0;
+                        }
+                    }
+                }
+                // Inject pending notifications from background tasks (after Stop hooks,
+                // aligned with Claude Code which fires Stop hooks unconditionally)
                 const notificationQueue = this.container.has("NotificationQueue")
                     ? this.container.get("NotificationQueue")
                     : undefined;
@@ -916,87 +995,6 @@ export class AIManager {
                     shouldRestart = true;
                     turnOffset = 0;
                 }
-                else {
-                    // Clear temporary rules
-                    this.permissionManager?.clearTemporaryRules();
-                    // Clear abort controllers
-                    this.abortController = null;
-                    this.toolAbortController = null;
-                    // Execute Stop/SubagentStop hooks only if the operation was not aborted
-                    const isCurrentlyAborted = abortController.signal.aborted ||
-                        toolAbortController.signal.aborted;
-                    if (!isCurrentlyAborted) {
-                        // Record committed snapshots to message history for the final turn
-                        if (this.reversionManager) {
-                            const snapshots = this.reversionManager.getAndClearCommittedSnapshots();
-                            if (snapshots.length > 0) {
-                                this.messageManager.addFileHistoryBlock(snapshots);
-                            }
-                        }
-                        // Goal evaluation — supersedes Stop hooks when active
-                        const goalManager = this.container.has("GoalManager")
-                            ? this.container.get("GoalManager")
-                            : undefined;
-                        let goalContinuing = false;
-                        if (goalManager?.isGoalActive() && !this.subagentType) {
-                            // 1. Increment turn count and check circuit breakers
-                            goalManager.incrementTurnCount();
-                            const circuitBreaker = goalManager.checkCircuitBreakers();
-                            if (circuitBreaker) {
-                                goalManager.clearGoal();
-                                logger?.info(`[Goal] ${circuitBreaker}`);
-                                this.messageManager.addUserMessage({
-                                    content: `<system-reminder>${circuitBreaker}</system-reminder>`,
-                                    isMeta: true,
-                                });
-                                // Fall through to normal Stop hooks on the final turn
-                            }
-                            else {
-                                // 2. Evaluate goal
-                                const evaluation = await goalManager.evaluateGoal(abortController.signal);
-                                if (evaluation.isMet) {
-                                    goalManager.clearGoal();
-                                    logger?.info(`[Goal] Goal achieved: ${evaluation.reason}`);
-                                    this.messageManager.addUserMessage({
-                                        content: `<system-reminder>Goal achieved: ${evaluation.reason}</system-reminder>`,
-                                        isMeta: true,
-                                    });
-                                    // Fall through to normal Stop hooks on the final turn
-                                }
-                                else {
-                                    const goal = goalManager.getGoal();
-                                    goal.lastReason = evaluation.reason;
-                                    logger?.info(`[Goal] Not yet met: ${evaluation.reason}`);
-                                    this.messageManager.addUserMessage({
-                                        content: `<system-reminder>Goal not yet met: ${evaluation.reason}. Continue working toward: ${goal.condition}</system-reminder>`,
-                                        isMeta: true,
-                                    });
-                                    // Keep loading state active to prevent UI flicker
-                                    this.setIsLoading(true);
-                                    goalContinuing = true;
-                                    // Restart outer loop to continue goal pursuit
-                                    shouldRestart = true;
-                                    turnOffset = 0;
-                                }
-                            }
-                        }
-                        // Skip Stop hooks when goal evaluator is continuing the conversation
-                        if (goalContinuing) {
-                            // Goal evaluator supersedes Stop hooks
-                        }
-                        else {
-                            const shouldContinue = await this.executeStopHooks();
-                            // If Stop/SubagentStop hooks indicate we should continue (due to blocking errors),
-                            // restart the AI conversation cycle
-                            if (shouldContinue) {
-                                logger?.info(`${this.subagentType ? "SubagentStop" : "Stop"} hooks indicate issues need fixing, continuing conversation...`);
-                                // Restart the conversation to let AI fix the issues
-                                shouldRestart = true;
-                                turnOffset = 0;
-                            }
-                        }
-                    }
-                }
             }
             if (!shouldRestart)
                 break outer;

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

@@ -1 +1 @@
-{"version":3,"file":"openaiClient.d.ts","sourceRoot":"","sources":["../../src/utils/openaiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sCAAsC,EACtC,mCAAmC,EACnC,mBAAmB,EACnB,cAAc,EACf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAyBnD,KAAK,YAAY,GACb,sCAAsC,GACtC,mCAAmC,CAAC;AAExC,UAAU,WAAW,CAAC,CAAC;IACrB,IAAI,EAAE,CAAC,CAAC;IACR,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,UAAU,UAAU,CAAC,CAAC,CAAE,SAAQ,OAAO,CAAC,CAAC,CAAC;IACxC,YAAY,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;CACzC;AAED,qBAAa,YAAY;IACX,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,aAAa;IAEzC,IAAI,IAAI;;qBAGO,CAAC,SAAS,YAAY,UACrB,CAAC,YACC;gBAAE,MAAM,CAAC,EAAE,WAAW,CAAA;aAAE,KACjC,UAAU,CACX,CAAC,SAAS,mCAAmC,GACzC,aAAa,CAAC,mBAAmB,CAAC,GAClC,cAAc,CACnB;;MA2BN;YAEa,OAAO;YAuHN,oBAAoB;CAyCpC"}
+{"version":3,"file":"openaiClient.d.ts","sourceRoot":"","sources":["../../src/utils/openaiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sCAAsC,EACtC,mCAAmC,EACnC,mBAAmB,EACnB,cAAc,EACf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAyBnD,KAAK,YAAY,GACb,sCAAsC,GACtC,mCAAmC,CAAC;AAExC,UAAU,WAAW,CAAC,CAAC;IACrB,IAAI,EAAE,CAAC,CAAC;IACR,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,UAAU,UAAU,CAAC,CAAC,CAAE,SAAQ,OAAO,CAAC,CAAC,CAAC;IACxC,YAAY,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;CACzC;AAED,qBAAa,YAAY;IACX,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,aAAa;IAEzC,IAAI,IAAI;;qBAGO,CAAC,SAAS,YAAY,UACrB,CAAC,YACC;gBAAE,MAAM,CAAC,EAAE,WAAW,CAAA;aAAE,KACjC,UAAU,CACX,CAAC,SAAS,mCAAmC,GACzC,aAAa,CAAC,mBAAmB,CAAC,GAClC,cAAc,CACnB;;MA2BN;YAEa,OAAO;YAyHN,oBAAoB;CAyCpC"}

package/dist/utils/openaiClient.js

@@ -67,6 +67,7 @@ export class OpenAIClient {
                 }
                 if (attempt < MAX_RETRIES) {
                     logger.warn("OpenAI API network error, retrying...", {
+                        model: params.model,
                         attempt: attempt + 1,
                         error: e,
                     });
@@ -106,6 +107,7 @@ export class OpenAIClient {
             if (retryableStatus && attempt < MAX_RETRIES) {
                 lastRetryAfter = response.headers.get("retry-after");
                 logger.warn("OpenAI API error, retrying...", {
+                    model: params.model,
                     attempt: attempt + 1,
                     status: response.status,
                     retryAfter: lastRetryAfter,

package/package.json

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

package/scripts/install_ripgrep.js

@@ -9,18 +9,6 @@ const __dirname = path.dirname(__filename);
 const MANIFEST_PATH = path.resolve(__dirname, "../bin/rg");
 const VENDOR_DIR = path.resolve(__dirname, "../vendor/ripgrep");
 
-function getCurrentPlatform() {
-  const platform = process.platform;
-  const arch = process.arch;
-  if (platform === "darwin")
-    return `macos-${arch === "arm64" ? "aarch64" : "x86_64"}`;
-  if (platform === "linux")
-    return `linux-${arch === "arm64" ? "aarch64" : "x86_64"}`;
-  if (platform === "win32")
-    return `windows-${arch === "arm64" ? "aarch64" : "x86_64"}`;
-  return null;
-}
-
 async function main() {
   if (!fs.existsSync(MANIFEST_PATH)) {
     console.error(`Manifest not found: ${MANIFEST_PATH}`);
@@ -30,15 +18,7 @@ async function main() {
   const manifestContent = fs.readFileSync(MANIFEST_PATH, "utf-8");
   const jsonContent = manifestContent.replace(/^#!.*\n/, "");
   const manifest = JSON.parse(jsonContent);
-  const allPlatforms = manifest.platforms;
-
-  // In CI, only download for the current platform
-  const isCI = process.env.CI === "true";
-  const currentPlatform = isCI ? getCurrentPlatform() : null;
-  const platforms =
-    currentPlatform && currentPlatform in allPlatforms
-      ? { [currentPlatform]: allPlatforms[currentPlatform] }
-      : allPlatforms;
+  const platforms = manifest.platforms;
 
   if (!fs.existsSync(VENDOR_DIR)) {
     fs.mkdirSync(VENDOR_DIR, { recursive: true });

package/src/managers/aiManager.ts

@@ -1271,7 +1271,103 @@ export class AIManager {
         // Set loading to false first
         this.setIsLoading(false);
 
-        // Inject pending notifications from background tasks
+        // Clear temporary rules
+        this.permissionManager?.clearTemporaryRules();
+
+        // Clear abort controllers
+        this.abortController = null;
+        this.toolAbortController = null;
+
+        // Execute Stop/SubagentStop hooks only if the operation was not aborted
+        const isCurrentlyAborted =
+          abortController.signal.aborted || toolAbortController.signal.aborted;
+
+        if (!isCurrentlyAborted) {
+          // Record committed snapshots to message history for the final turn
+          if (this.reversionManager) {
+            const snapshots =
+              this.reversionManager.getAndClearCommittedSnapshots();
+            if (snapshots.length > 0) {
+              this.messageManager.addFileHistoryBlock(snapshots);
+            }
+          }
+
+          // Goal evaluation — supersedes Stop hooks when active
+          const goalManager = this.container.has("GoalManager")
+            ? this.container.get<import("./goalManager.js").GoalManager>(
+                "GoalManager",
+              )
+            : undefined;
+
+          let goalContinuing = false;
+
+          if (goalManager?.isGoalActive() && !this.subagentType) {
+            // 1. Increment turn count and check circuit breakers
+            goalManager.incrementTurnCount();
+            const circuitBreaker = goalManager.checkCircuitBreakers();
+
+            if (circuitBreaker) {
+              goalManager.clearGoal();
+              logger?.info(`[Goal] ${circuitBreaker}`);
+              this.messageManager.addUserMessage({
+                content: `<system-reminder>${circuitBreaker}</system-reminder>`,
+                isMeta: true,
+              });
+              // Fall through to normal Stop hooks on the final turn
+            } else {
+              // 2. Evaluate goal
+              const evaluation = await goalManager.evaluateGoal(
+                abortController.signal,
+              );
+
+              if (evaluation.isMet) {
+                goalManager.clearGoal();
+                logger?.info(`[Goal] Goal achieved: ${evaluation.reason}`);
+                this.messageManager.addUserMessage({
+                  content: `<system-reminder>Goal achieved: ${evaluation.reason}</system-reminder>`,
+                  isMeta: true,
+                });
+                // Fall through to normal Stop hooks on the final turn
+              } else {
+                const goal = goalManager.getGoal()!;
+                goal.lastReason = evaluation.reason;
+                logger?.info(`[Goal] Not yet met: ${evaluation.reason}`);
+                this.messageManager.addUserMessage({
+                  content: `<system-reminder>Goal not yet met: ${evaluation.reason}. Continue working toward: ${goal.condition}</system-reminder>`,
+                  isMeta: true,
+                });
+                // Keep loading state active to prevent UI flicker
+                this.setIsLoading(true);
+                goalContinuing = true;
+                // Restart outer loop to continue goal pursuit
+                shouldRestart = true;
+                turnOffset = 0;
+              }
+            }
+          }
+
+          // Skip Stop hooks when goal evaluator is continuing the conversation
+          if (goalContinuing) {
+            // Goal evaluator supersedes Stop hooks
+          } else {
+            const shouldContinue = await this.executeStopHooks();
+
+            // If Stop/SubagentStop hooks indicate we should continue (due to blocking errors),
+            // restart the AI conversation cycle
+            if (shouldContinue) {
+              logger?.info(
+                `${this.subagentType ? "SubagentStop" : "Stop"} hooks indicate issues need fixing, continuing conversation...`,
+              );
+
+              // Restart the conversation to let AI fix the issues
+              shouldRestart = true;
+              turnOffset = 0;
+            }
+          }
+        }
+
+        // Inject pending notifications from background tasks (after Stop hooks,
+        // aligned with Claude Code which fires Stop hooks unconditionally)
         const notificationQueue = this.container.has("NotificationQueue")
           ? this.container.get<NotificationQueue>("NotificationQueue")
           : undefined;
@@ -1292,102 +1388,6 @@ export class AIManager {
           // Restart outer loop to process the notifications
           shouldRestart = true;
           turnOffset = 0;
-        } else {
-          // Clear temporary rules
-          this.permissionManager?.clearTemporaryRules();
-
-          // Clear abort controllers
-          this.abortController = null;
-          this.toolAbortController = null;
-
-          // Execute Stop/SubagentStop hooks only if the operation was not aborted
-          const isCurrentlyAborted =
-            abortController.signal.aborted ||
-            toolAbortController.signal.aborted;
-
-          if (!isCurrentlyAborted) {
-            // Record committed snapshots to message history for the final turn
-            if (this.reversionManager) {
-              const snapshots =
-                this.reversionManager.getAndClearCommittedSnapshots();
-              if (snapshots.length > 0) {
-                this.messageManager.addFileHistoryBlock(snapshots);
-              }
-            }
-
-            // Goal evaluation — supersedes Stop hooks when active
-            const goalManager = this.container.has("GoalManager")
-              ? this.container.get<import("./goalManager.js").GoalManager>(
-                  "GoalManager",
-                )
-              : undefined;
-
-            let goalContinuing = false;
-
-            if (goalManager?.isGoalActive() && !this.subagentType) {
-              // 1. Increment turn count and check circuit breakers
-              goalManager.incrementTurnCount();
-              const circuitBreaker = goalManager.checkCircuitBreakers();
-
-              if (circuitBreaker) {
-                goalManager.clearGoal();
-                logger?.info(`[Goal] ${circuitBreaker}`);
-                this.messageManager.addUserMessage({
-                  content: `<system-reminder>${circuitBreaker}</system-reminder>`,
-                  isMeta: true,
-                });
-                // Fall through to normal Stop hooks on the final turn
-              } else {
-                // 2. Evaluate goal
-                const evaluation = await goalManager.evaluateGoal(
-                  abortController.signal,
-                );
-
-                if (evaluation.isMet) {
-                  goalManager.clearGoal();
-                  logger?.info(`[Goal] Goal achieved: ${evaluation.reason}`);
-                  this.messageManager.addUserMessage({
-                    content: `<system-reminder>Goal achieved: ${evaluation.reason}</system-reminder>`,
-                    isMeta: true,
-                  });
-                  // Fall through to normal Stop hooks on the final turn
-                } else {
-                  const goal = goalManager.getGoal()!;
-                  goal.lastReason = evaluation.reason;
-                  logger?.info(`[Goal] Not yet met: ${evaluation.reason}`);
-                  this.messageManager.addUserMessage({
-                    content: `<system-reminder>Goal not yet met: ${evaluation.reason}. Continue working toward: ${goal.condition}</system-reminder>`,
-                    isMeta: true,
-                  });
-                  // Keep loading state active to prevent UI flicker
-                  this.setIsLoading(true);
-                  goalContinuing = true;
-                  // Restart outer loop to continue goal pursuit
-                  shouldRestart = true;
-                  turnOffset = 0;
-                }
-              }
-            }
-
-            // Skip Stop hooks when goal evaluator is continuing the conversation
-            if (goalContinuing) {
-              // Goal evaluator supersedes Stop hooks
-            } else {
-              const shouldContinue = await this.executeStopHooks();
-
-              // If Stop/SubagentStop hooks indicate we should continue (due to blocking errors),
-              // restart the AI conversation cycle
-              if (shouldContinue) {
-                logger?.info(
-                  `${this.subagentType ? "SubagentStop" : "Stop"} hooks indicate issues need fixing, continuing conversation...`,
-                );
-
-                // Restart the conversation to let AI fix the issues
-                shouldRestart = true;
-                turnOffset = 0;
-              }
-            }
-          }
         }
       }
 

package/src/utils/openaiClient.ts

@@ -133,6 +133,7 @@ export class OpenAIClient {
         }
         if (attempt < MAX_RETRIES) {
           logger.warn("OpenAI API network error, retrying...", {
+            model: params.model,
             attempt: attempt + 1,
             error: e,
           });
@@ -185,6 +186,7 @@ export class OpenAIClient {
       if (retryableStatus && attempt < MAX_RETRIES) {
         lastRetryAfter = response.headers.get("retry-after");
         logger.warn("OpenAI API error, retrying...", {
+          model: params.model,
           attempt: attempt + 1,
           status: response.status,
           retryAfter: lastRetryAfter,