wave-agent-sdk 0.14.2 → 0.14.4

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

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH;;;GAGG;AACH,eAAO,MAAM,cAAc,QAAmC,CAAC;AAE/D;;GAEG;AACH,eAAO,MAAM,mBAAmB,QAA6C,CAAC;AAE9E;;GAEG;AACH,eAAO,MAAM,mBAAmB,QAA0C,CAAC;AAE3E;;GAEG;AACH,eAAO,MAAM,gBAAgB,QAAyC,CAAC;AAEvE;;GAEG;AACH,eAAO,MAAM,6BAA6B,QAAQ,CAAC;AACnD,eAAO,MAAM,8BAA8B,OAAO,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH;;;GAGG;AACH,eAAO,MAAM,cAAc,QAAmC,CAAC;AAE/D;;GAEG;AACH,eAAO,MAAM,mBAAmB,QAA6C,CAAC;AAE9E;;GAEG;AACH,eAAO,MAAM,mBAAmB,QAA0C,CAAC;AAE3E;;GAEG;AACH,eAAO,MAAM,gBAAgB,QAAyC,CAAC;AAEvE;;GAEG;AACH,eAAO,MAAM,6BAA6B,SAAS,CAAC;AACpD,eAAO,MAAM,8BAA8B,QAAQ,CAAC"}

package/dist/utils/constants.js

@@ -23,5 +23,5 @@ export const USER_MEMORY_FILE = path.join(DATA_DIRECTORY, "AGENTS.md");
 /**
  * AI related constants
  */
-export const DEFAULT_WAVE_MAX_INPUT_TOKENS = 96000; // Default token limit
-export const DEFAULT_WAVE_MAX_OUTPUT_TOKENS = 8192; // Default output token limit
+export const DEFAULT_WAVE_MAX_INPUT_TOKENS = 128000; // Default token limit
+export const DEFAULT_WAVE_MAX_OUTPUT_TOKENS = 16384; // Default output token limit

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

@@ -1 +1 @@
-{"version":3,"file":"convertMessagesForAPI.d.ts","sourceRoot":"","sources":["../../src/utils/convertMessagesForAPI.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAKjD,OAAO,EAEL,0BAA0B,EAC3B,MAAM,qBAAqB,CAAC;AA0B7B;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,OAAO,EAAE,GAClB,0BAA0B,EAAE,CAuO9B"}
+{"version":3,"file":"convertMessagesForAPI.d.ts","sourceRoot":"","sources":["../../src/utils/convertMessagesForAPI.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAKjD,OAAO,EAEL,0BAA0B,EAC3B,MAAM,qBAAqB,CAAC;AAiC7B;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,OAAO,EAAE,GAClB,0BAA0B,EAAE,CAsP9B"}

package/dist/utils/convertMessagesForAPI.js

@@ -1,9 +1,10 @@
 import { convertImageToBase64 } from "./messageOperations.js";
 import { taskNotificationToXml } from "./notificationXml.js";
-import { stripAnsiColors } from "./stringUtils.js";
+import { recoverTruncatedJson, stripAnsiColors } from "./stringUtils.js";
 import { logger } from "./globalLogger.js";
 /**
- * Safely handle tool call parameters, ensuring a legal JSON string is returned
+ * Safely handle tool call parameters, ensuring a legal JSON string is returned.
+ * Attempts to recover truncated JSON (e.g., missing closing braces).
  * @param args Tool call parameters
  * @returns Legal JSON string
  */
@@ -16,12 +17,19 @@ function safeToolArguments(args) {
         JSON.parse(args);
         return args;
     }
-    catch (error) {
-        logger.error(`Invalid tool arguments: ${args}`, error);
-        // If not valid JSON, return a fallback empty object with the original string as a comment or property
-        return JSON.stringify({
-            invalid_arguments: args,
-        });
+    catch {
+        // Attempt to recover truncated JSON
+        const recovered = recoverTruncatedJson(args);
+        try {
+            JSON.parse(recovered);
+            return recovered;
+        }
+        catch {
+            // Truly malformed JSON — return sanitized fallback
+            return JSON.stringify({
+                invalid_arguments: args,
+            });
+        }
     }
 }
 /**
@@ -114,6 +122,16 @@ export function convertMessagesForAPI(messages) {
                     .map((block) => (block.type === "text" ? block.content : ""))
                     .join("\n");
             }
+            // Extract reasoning content from reasoning blocks
+            const reasoningBlocks = message.blocks.filter((block) => block.type === "reasoning" &&
+                block.content &&
+                block.content.trim().length > 0);
+            let reasoning_content;
+            if (reasoningBlocks.length > 0) {
+                reasoning_content = reasoningBlocks
+                    .map((block) => (block.type === "reasoning" ? block.content : ""))
+                    .join("\n");
+            }
             // Construct tool calls from tool blocks
             if (toolBlocks.length > 0) {
                 tool_calls = toolBlocks
@@ -138,6 +156,7 @@ export function convertMessagesForAPI(messages) {
                     role: "assistant",
                     content: hasContent ? content : undefined,
                     tool_calls,
+                    ...(reasoning_content ? { reasoning_content } : {}),
                     ...(message.additionalFields ? { ...message.additionalFields } : {}),
                 };
                 recentMessages.unshift(assistantMessage);

package/dist/utils/stringUtils.d.ts

@@ -23,6 +23,14 @@ export declare const stripAnsiColors: (text: string) => string;
  * @returns Formatted line number prefix
  */
 export declare function formatLineNumberPrefix(lineNumber: number): string;
+/**
+ * Attempt to recover truncated JSON (e.g., missing closing braces due to max tokens).
+ * Tracks brace depth and only recovers if there are unclosed `{` braces.
+ * Will NOT recover if there are unclosed `[` brackets (can't guess the content).
+ * @param jsonStr Potentially truncated JSON string
+ * @returns Recovered JSON string, or the original if unrecoverable
+ */
+export declare function recoverTruncatedJson(jsonStr: string): string;
 /**
  * Efficiently get the last N lines of a string without splitting the whole string.
  */

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

@@ -1 +1 @@
-{"version":3,"file":"stringUtils.d.ts","sourceRoot":"","sources":["../../src/utils/stringUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAgC/D;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,MAAM,GACpB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAwBxB;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,MAAM,MAAM,KAAG,MAK9C,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAEjE;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAehE"}
+{"version":3,"file":"stringUtils.d.ts","sourceRoot":"","sources":["../../src/utils/stringUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAgC/D;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,MAAM,GACpB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAwBxB;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,MAAM,MAAM,KAAG,MAK9C,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAEjE;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAkC5D;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAehE"}

package/dist/utils/stringUtils.js

@@ -77,6 +77,51 @@ export const stripAnsiColors = (text) => {
 export function formatLineNumberPrefix(lineNumber) {
     return `${lineNumber.toString().padStart(6)}\t`;
 }
+/**
+ * Attempt to recover truncated JSON (e.g., missing closing braces due to max tokens).
+ * Tracks brace depth and only recovers if there are unclosed `{` braces.
+ * Will NOT recover if there are unclosed `[` brackets (can't guess the content).
+ * @param jsonStr Potentially truncated JSON string
+ * @returns Recovered JSON string, or the original if unrecoverable
+ */
+export function recoverTruncatedJson(jsonStr) {
+    let braceDepth = 0;
+    let bracketDepth = 0;
+    let inString = false;
+    let escaped = false;
+    for (const ch of jsonStr) {
+        if (escaped) {
+            escaped = false;
+            continue;
+        }
+        if (ch === "\\" && inString) {
+            escaped = true;
+            continue;
+        }
+        if (ch === '"') {
+            inString = !inString;
+            continue;
+        }
+        if (!inString) {
+            if (ch === "{")
+                braceDepth++;
+            if (ch === "}")
+                braceDepth--;
+            if (ch === "[")
+                bracketDepth++;
+            if (ch === "]")
+                bracketDepth--;
+        }
+    }
+    // Build recovery suffix
+    let suffix = "";
+    if (inString)
+        suffix += '"'; // Close unclosed string
+    if (braceDepth > 0 && bracketDepth === 0) {
+        suffix += "}".repeat(braceDepth);
+    }
+    return suffix ? jsonStr + suffix : jsonStr;
+}
 /**
  * Efficiently get the last N lines of a string without splitting the whole string.
  */

package/dist/utils/subagentParser.d.ts

@@ -5,9 +5,16 @@ export interface SubagentConfiguration {
     model?: string;
     systemPrompt: string;
     filePath: string;
-    scope: "project" | "user" | "builtin";
+    scope: "project" | "user" | "builtin" | "plugin";
     priority: number;
+    /** Plugin root directory path, set when scope is "plugin" */
+    pluginRoot?: string;
 }
+/**
+ * Parse a plugin agent markdown file.
+ * Exposed as a public API for PluginLoader to use.
+ */
+export declare function parseAgentFile(filePath: string, scope: "plugin", pluginRoot: string): SubagentConfiguration;
 /**
  * Load all subagent configurations from project and user directories, plus built-in subagents
  */

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

@@ -1 +1 @@
-{"version":3,"file":"subagentParser.d.ts","sourceRoot":"","sources":["../../src/utils/subagentParser.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC;IACtC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAwLD;;GAEG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAsBlC;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAGvC"}
+{"version":3,"file":"subagentParser.d.ts","sourceRoot":"","sources":["../../src/utils/subagentParser.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS,GAAG,QAAQ,CAAC;IACjD,QAAQ,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAkKD;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,QAAQ,EACf,UAAU,EAAE,MAAM,GACjB,qBAAqB,CAEvB;AAqCD;;GAEG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAsBlC;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAGvC"}

package/dist/utils/subagentParser.js

@@ -80,9 +80,9 @@ function validateConfiguration(config, filePath) {
     }
 }
 /**
- * Parse a single subagent markdown file
+ * Parse a single subagent markdown file with optional pluginRoot support
  */
-function parseSubagentFile(filePath, scope) {
+function parseSubagentFile(filePath, scope, pluginRoot) {
     try {
         const content = readFileSync(filePath, "utf-8");
         const { frontmatter, body } = parseFrontmatter(content);
@@ -99,21 +99,36 @@ function parseSubagentFile(filePath, scope) {
             priority = 2;
         if (scope === "builtin")
             priority = 3;
+        if (scope === "plugin")
+            priority = 2; // Same priority as user-level
+        let systemPrompt = body;
+        // Substitute ${WAVE_PLUGIN_ROOT} for plugin scope at parse time
+        if (scope === "plugin" && pluginRoot) {
+            systemPrompt = systemPrompt.replace(/\$\{WAVE_PLUGIN_ROOT\}/g, pluginRoot);
+        }
         return {
             name: frontmatter.name,
             description: frontmatter.description,
             tools: frontmatter.tools,
             model: frontmatter.model,
-            systemPrompt: body,
+            systemPrompt,
             filePath,
             scope,
             priority,
+            pluginRoot: scope === "plugin" ? pluginRoot : undefined,
         };
     }
     catch (error) {
         throw new Error(`Failed to parse subagent file ${filePath}: ${error instanceof Error ? error.message : String(error)}`);
     }
 }
+/**
+ * Parse a plugin agent markdown file.
+ * Exposed as a public API for PluginLoader to use.
+ */
+export function parseAgentFile(filePath, scope, pluginRoot) {
+    return parseSubagentFile(filePath, scope, pluginRoot);
+}
 /**
  * Scan directory for subagent files
  */

package/package.json

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

package/src/managers/aiManager.ts

@@ -24,6 +24,7 @@ import type { SubagentManager } from "./subagentManager.js";
 import type { SkillManager } from "./skillManager.js";
 import { buildSystemPrompt } from "../prompts/index.js";
 import { Container } from "../utils/container.js";
+import { recoverTruncatedJson } from "../utils/stringUtils.js";
 import { ConfigurationService } from "../services/configurationService.js";
 import type { NotificationQueue } from "./notificationQueue.js";
 
@@ -44,6 +45,8 @@ export interface AIManagerOptions {
   stream?: boolean;
   /**Optional model override (e.g. for subagents) */
   modelOverride?: string;
+  /**Optional max turns limit to prevent runaway recursion (e.g. for auto-memory extraction) */
+  maxTurns?: number;
 }
 
 export class AIManager {
@@ -59,6 +62,7 @@ export class AIManager {
   private modelOverride?: string;
   private _onCwdChange?: (newCwd: string) => void; // Store callback for CWD changes
   private consecutiveCompactionFailures: number = 0;
+  private readonly maxTurns?: number;
 
   // Service overrides
   constructor(
@@ -73,6 +77,7 @@ export class AIManager {
     this.callbacks = options.callbacks ?? {};
     this.modelOverride = options.modelOverride;
     this._onCwdChange = options.callbacks?.onCwdChange; // Initialize onCwdChange
+    this.maxTurns = options.maxTurns;
   }
 
   private get toolManager(): ToolManager {
@@ -814,34 +819,45 @@ export class AIManager {
             const toolName = functionToolCall.function?.name || "";
             // Safely parse tool parameters, handle tools without parameters
             let toolArgs: Record<string, unknown> = {};
+            let jsonRecovered = false;
             const argsString = functionToolCall.function?.arguments?.trim();
 
             if (!argsString || argsString === "") {
               // Tool without parameters, use empty object
               toolArgs = {};
             } else {
+              let recoveredArgs = argsString;
               try {
                 toolArgs = JSON.parse(argsString);
-              } catch (parseError) {
-                // For non-empty but malformed JSON, still throw exception
-                let errorMessage = `Failed to parse tool arguments`;
-                if (result.finish_reason === "length") {
-                  errorMessage +=
-                    " (output truncated, please reduce your output)";
+              } catch {
+                // Attempt to recover truncated JSON (e.g., missing closing braces)
+                recoveredArgs = recoverTruncatedJson(argsString);
+                try {
+                  toolArgs = JSON.parse(recoveredArgs);
+                  jsonRecovered = true;
+                  logger.warn(
+                    `Recovered truncated JSON for tool "${toolName}"`,
+                  );
+                } catch (parseError) {
+                  let errorMessage = `Failed to parse tool arguments`;
+                  if (result.finish_reason === "length") {
+                    errorMessage +=
+                      " (output truncated, please reduce your output)";
+                  }
+                  logger?.error(errorMessage, parseError);
+                  this.messageManager.updateToolBlock({
+                    id: toolId,
+                    parameters: argsString,
+                    result: errorMessage,
+                    success: false,
+                    error: errorMessage,
+                    stage: "end",
+                    name: toolName,
+                    compactParams: "",
+                    timestamp: Date.now(),
+                  });
+                  return;
                 }
-                logger?.error(errorMessage, parseError);
-                this.messageManager.updateToolBlock({
-                  id: toolId,
-                  parameters: argsString,
-                  result: errorMessage,
-                  success: false,
-                  error: errorMessage,
-                  stage: "end",
-                  name: toolName,
-                  compactParams: "",
-                  timestamp: Date.now(),
-                });
-                return;
               }
             }
 
@@ -942,13 +958,20 @@ export class AIManager {
                 context,
               );
 
+              // Build result content, adding truncation warning if JSON was recovered
+              let toolResultContent =
+                toolResult.content ||
+                (toolResult.error ? `Error: ${toolResult.error}` : "");
+              if (jsonRecovered) {
+                toolResultContent +=
+                  "\n\n⚠️ Tool arguments were truncated (likely exceeded max output tokens). Please reduce your output or split into multiple tool calls.";
+              }
+
               // Update message state - tool execution completed
               this.messageManager.updateToolBlock({
                 id: toolId,
                 parameters: argsString,
-                result:
-                  toolResult.content ||
-                  (toolResult.error ? `Error: ${toolResult.error}` : ""),
+                result: toolResultContent,
                 success: toolResult.success,
                 error: toolResult.error,
                 stage: "end",
@@ -1001,108 +1024,116 @@ export class AIManager {
 
       // Check if there are tool operations or response was truncated, if so automatically initiate next AI service call
       if (toolCalls.length > 0 || result.finish_reason === "length") {
-        // Record committed snapshots to message history
-        if (this.reversionManager) {
-          const snapshots =
-            this.reversionManager.getAndClearCommittedSnapshots();
-          if (snapshots.length > 0) {
-            this.messageManager.addFileHistoryBlock(snapshots);
-          }
-        }
-
-        // Check interruption status
-        const isCurrentlyAborted =
-          abortController.signal.aborted || toolAbortController.signal.aborted;
-
-        // Check if all tools were manually backgrounded
-        const lastMessage =
-          this.messageManager.getMessages()[
-            this.messageManager.getMessages().length - 1
-          ];
-        const toolBlocks =
-          lastMessage?.blocks.filter(
-            (block): block is import("../types/messaging.js").ToolBlock =>
-              block.type === "tool",
-          ) || [];
-        const hasBackgrounded =
-          toolBlocks.length > 0 &&
-          toolBlocks.some((block) => block.isManuallyBackgrounded);
-
-        if (hasBackgrounded) {
-          logger?.info(
-            "Some tools were manually backgrounded, stopping recursion.",
+        // Check maxTurns limit before recursing
+        if (this.maxTurns && recursionDepth + 1 >= this.maxTurns) {
+          logger?.debug(
+            `Max turns (${this.maxTurns}) reached, stopping recursion.`,
           );
-        } else if (!isCurrentlyAborted) {
-          // If response was truncated, add a hidden continuation message
-          if (result.finish_reason === "length") {
-            this.messageManager.addUserMessage({
-              content:
-                "Output token limit hit. Resume directly — no apology, no recap of what you were doing. Pick up mid-thought if that is where the cut happened. Break remaining work into smaller pieces.",
-              isMeta: true,
-            });
+        } else {
+          // Record committed snapshots to message history
+          if (this.reversionManager) {
+            const snapshots =
+              this.reversionManager.getAndClearCommittedSnapshots();
+            if (snapshots.length > 0) {
+              this.messageManager.addFileHistoryBlock(snapshots);
+            }
           }
 
-          // Duplicate Tool Call Detection
-          if (toolCalls.length > 0) {
-            const messages = this.messageManager.getMessages();
-            // Find the most recent assistant message BEFORE the current one that has tool blocks
-            // The current assistant message is messages[messages.length - 1]
-            let previousAssistantWithTools: Message | undefined;
-            for (let i = messages.length - 2; i >= 0; i--) {
-              const msg = messages[i];
-              if (
-                msg.role === "assistant" &&
-                msg.blocks.some((b) => b.type === "tool")
-              ) {
-                previousAssistantWithTools = msg;
-                break;
-              }
+          // Check interruption status
+          const isCurrentlyAborted =
+            abortController.signal.aborted ||
+            toolAbortController.signal.aborted;
+
+          // Check if all tools were manually backgrounded
+          const lastMessage =
+            this.messageManager.getMessages()[
+              this.messageManager.getMessages().length - 1
+            ];
+          const toolBlocks =
+            lastMessage?.blocks.filter(
+              (block): block is import("../types/messaging.js").ToolBlock =>
+                block.type === "tool",
+            ) || [];
+          const hasBackgrounded =
+            toolBlocks.length > 0 &&
+            toolBlocks.some((block) => block.isManuallyBackgrounded);
+
+          if (hasBackgrounded) {
+            logger?.info(
+              "Some tools were manually backgrounded, stopping recursion.",
+            );
+          } else if (!isCurrentlyAborted) {
+            // If response was truncated, add a hidden continuation message
+            if (result.finish_reason === "length") {
+              this.messageManager.addUserMessage({
+                content:
+                  "Output token limit hit. Resume directly — no apology, no recap of what you were doing. Pick up mid-thought if that is where the cut happened. Break remaining work into smaller pieces.",
+                isMeta: true,
+              });
             }
 
-            if (previousAssistantWithTools) {
-              const previousToolBlocks =
-                previousAssistantWithTools.blocks.filter(
-                  (b): b is import("../types/messaging.js").ToolBlock =>
-                    b.type === "tool",
-                );
+            // Duplicate Tool Call Detection
+            if (toolCalls.length > 0) {
+              const messages = this.messageManager.getMessages();
+              // Find the most recent assistant message BEFORE the current one that has tool blocks
+              // The current assistant message is messages[messages.length - 1]
+              let previousAssistantWithTools: Message | undefined;
+              for (let i = messages.length - 2; i >= 0; i--) {
+                const msg = messages[i];
+                if (
+                  msg.role === "assistant" &&
+                  msg.blocks.some((b) => b.type === "tool")
+                ) {
+                  previousAssistantWithTools = msg;
+                  break;
+                }
+              }
 
-              for (const currentToolCall of toolCalls) {
-                const currentName = currentToolCall.function?.name;
-                const currentArgs = currentToolCall.function?.arguments;
+              if (previousAssistantWithTools) {
+                const previousToolBlocks =
+                  previousAssistantWithTools.blocks.filter(
+                    (b): b is import("../types/messaging.js").ToolBlock =>
+                      b.type === "tool",
+                  );
 
-                const isDuplicate = previousToolBlocks.some(
-                  (prevBlock) =>
-                    prevBlock.name === currentName &&
-                    prevBlock.parameters === currentArgs,
-                );
+                for (const currentToolCall of toolCalls) {
+                  const currentName = currentToolCall.function?.name;
+                  const currentArgs = currentToolCall.function?.arguments;
 
-                if (isDuplicate && currentName) {
-                  const toolId = currentToolCall.id;
-                  const lastMessage = messages[messages.length - 1];
-                  const toolBlock = lastMessage.blocks.find(
-                    (b): b is import("../types/messaging.js").ToolBlock =>
-                      b.type === "tool" && b.id === toolId,
+                  const isDuplicate = previousToolBlocks.some(
+                    (prevBlock) =>
+                      prevBlock.name === currentName &&
+                      prevBlock.parameters === currentArgs,
                   );
-                  if (toolBlock) {
-                    const warning = `\n\nNote: You just called this tool with the same arguments in the previous turn. Please ensure you are not in a loop and consider if you need to change your approach.`;
-                    this.messageManager.updateToolBlock({
-                      id: toolId,
-                      result: (toolBlock.result || "") + warning,
-                      stage: "end",
-                    });
+
+                  if (isDuplicate && currentName) {
+                    const toolId = currentToolCall.id;
+                    const lastMessage = messages[messages.length - 1];
+                    const toolBlock = lastMessage.blocks.find(
+                      (b): b is import("../types/messaging.js").ToolBlock =>
+                        b.type === "tool" && b.id === toolId,
+                    );
+                    if (toolBlock) {
+                      const warning = `\n\nNote: You just called this tool with the same arguments in the previous turn. Please ensure you are not in a loop and consider if you need to change your approach.`;
+                      this.messageManager.updateToolBlock({
+                        id: toolId,
+                        result: (toolBlock.result || "") + warning,
+                        stage: "end",
+                      });
+                    }
                   }
                 }
               }
             }
-          }
 
-          // Recursively call AI service, increment recursion depth, and pass same configuration
-          await this.sendAIMessage({
-            recursionDepth: recursionDepth + 1,
-            model,
-            allowedRules,
-            maxTokens,
-          });
+            // Recursively call AI service, increment recursion depth, and pass same configuration
+            await this.sendAIMessage({
+              recursionDepth: recursionDepth + 1,
+              model,
+              allowedRules,
+              maxTokens,
+            });
+          }
         }
       }
     } catch (error) {

package/src/managers/forkedAgentManager.ts

@@ -47,6 +47,7 @@ export class ForkedAgentManager {
       allowedTools?: string[];
       model?: string;
       permissionModeOverride?: PermissionMode;
+      maxTurns?: number;
     },
     prompt: string,
   ): Promise<string> {
@@ -84,6 +85,7 @@ export class ForkedAgentManager {
       allowedTools?: string[];
       model?: string;
       permissionModeOverride?: PermissionMode;
+      maxTurns?: number;
     },
     prompt: string,
   ): Promise<void> {
@@ -103,6 +105,7 @@ export class ForkedAgentManager {
           allowedTools: parameters.allowedTools,
           model: parameters.model,
           permissionModeOverride: parameters.permissionModeOverride,
+          maxTurns: parameters.maxTurns,
         },
         false,
       );

package/src/managers/pluginManager.ts

@@ -7,6 +7,7 @@ import { HookManager } from "./hookManager.js";
 import { LspManager } from "./lspManager.js";
 import { McpManager } from "./mcpManager.js";
 import { SlashCommandManager } from "./slashCommandManager.js";
+import { SubagentManager } from "./subagentManager.js";
 import { MarketplaceService } from "../services/MarketplaceService.js";
 import { ConfigurationService } from "../services/configurationService.js";
 import { Container } from "../utils/container.js";
@@ -53,6 +54,10 @@ export class PluginManager {
     return this.container.get<ConfigurationService>("ConfigurationService");
   }
 
+  private get subagentManager(): SubagentManager | undefined {
+    return this.container.get<SubagentManager>("SubagentManager");
+  }
+
   /**
    * Update enabled plugins configuration
    */
@@ -155,6 +160,7 @@ export class PluginManager {
         path: absolutePath,
         commands: PluginLoader.loadCommands(absolutePath),
         skills: await PluginLoader.loadSkills(absolutePath),
+        agents: await PluginLoader.loadAgents(absolutePath),
         lspConfig: await PluginLoader.loadLspConfig(absolutePath),
         mcpConfig: await PluginLoader.loadMcpConfig(absolutePath),
         hooksConfig: await PluginLoader.loadHooksConfig(absolutePath),
@@ -192,6 +198,10 @@ export class PluginManager {
         this.hookManager.registerPluginHooks(plugin.path, plugin.hooksConfig);
       }
 
+      if (this.subagentManager && plugin.agents.length > 0) {
+        this.subagentManager.registerPluginAgents(plugin.name, plugin.agents);
+      }
+
       this.plugins.set(manifest.name, plugin);
       logger?.info(`Loaded plugin: ${manifest.name} v${manifest.version}`);
     } catch (error) {