wave-agent-sdk 0.7.1 → 0.8.0

package/dist/tools/lspTool.js

@@ -2,6 +2,8 @@ import { relative } from "path";
 import { logger } from "../utils/globalLogger.js";
 import { getDisplayPath } from "../utils/path.js";
 import { LSP_TOOL_NAME } from "../constants/tools.js";
+export const MAX_RESULTS = 1000;
+export const MAX_FILES = 100;
 /**
  * Formats an LSP URI into a readable file path
  */
@@ -94,10 +96,15 @@ function formatGoToDefinitionResult(result, workdir) {
         if (validLocations.length === 1) {
             return `Defined in ${formatLocation(validLocations[0], workdir)}`;
         }
-        const formatted = validLocations
+        const shownLocations = validLocations.slice(0, MAX_RESULTS);
+        const formatted = shownLocations
             .map((loc) => `  ${formatLocation(loc, workdir)}`)
             .join("\n");
-        return `Found ${validLocations.length} definitions:\n${formatted}`;
+        let header = `Found ${validLocations.length} definitions:`;
+        if (validLocations.length > MAX_RESULTS) {
+            header += ` (showing first ${MAX_RESULTS})`;
+        }
+        return `${header}\n${formatted}`;
     }
     const loc = isLocationLink(result) ? locationLinkToLocation(result) : result;
     return `Defined in ${formatLocation(loc, workdir)}`;
@@ -117,17 +124,34 @@ function formatFindReferencesResult(result, workdir) {
         return `Found 1 reference:\n  ${formatLocation(validLocations[0], workdir)}`;
     }
     const grouped = groupItemsByUri(validLocations, workdir);
-    const lines = [
-        `Found ${validLocations.length} references across ${grouped.size} files:`,
-    ];
+    const totalResults = validLocations.length;
+    const totalFiles = grouped.size;
+    let resultsShown = 0;
+    let filesShown = 0;
+    const lines = [];
     for (const [path, locs] of grouped) {
+        if (resultsShown >= MAX_RESULTS || filesShown >= MAX_FILES)
+            break;
+        filesShown++;
+        const remainingResults = MAX_RESULTS - resultsShown;
+        const locsToShow = locs.slice(0, remainingResults);
+        const isTruncated = locsToShow.length < locs.length;
         lines.push(`\n${path}:`);
-        for (const loc of locs) {
+        for (const loc of locsToShow) {
             const line = loc.range.start.line + 1;
             const character = loc.range.start.character + 1;
             lines.push(`  Line ${line}:${character}`);
         }
+        if (isTruncated) {
+            lines.push(`  ... and ${locs.length - locsToShow.length} more in this file`);
+        }
+        resultsShown += locsToShow.length;
     }
+    let header = `Found ${totalResults} references across ${totalFiles} files:`;
+    if (totalResults > resultsShown || totalFiles > filesShown) {
+        header += ` (showing first ${resultsShown} results and ${filesShown} files)`;
+    }
+    lines.unshift(header);
     return lines.join("\n");
 }
 /**
@@ -196,20 +220,24 @@ function getSymbolKindName(kind) {
 /**
  * Formats a single document symbol recursively
  */
-function formatDocumentSymbol(symbol, depth = 0) {
+function formatDocumentSymbol(symbol, state, depth = 0) {
+    state.total++;
     const results = [];
-    const indent = "  ".repeat(depth);
-    const kindName = getSymbolKindName(symbol.kind);
-    let line = `${indent}${symbol.name} (${kindName})`;
-    if (symbol.detail) {
-        line += ` ${symbol.detail}`;
-    }
-    const startLine = symbol.range.start.line + 1;
-    line += ` - Line ${startLine}`;
-    results.push(line);
+    if (state.count < MAX_RESULTS) {
+        const indent = "  ".repeat(depth);
+        const kindName = getSymbolKindName(symbol.kind);
+        let line = `${indent}${symbol.name} (${kindName})`;
+        if (symbol.detail) {
+            line += ` ${symbol.detail}`;
+        }
+        const startLine = symbol.range.start.line + 1;
+        line += ` - Line ${startLine}`;
+        results.push(line);
+        state.count++;
+    }
     if (symbol.children && symbol.children.length > 0) {
         for (const child of symbol.children) {
-            results.push(...formatDocumentSymbol(child, depth + 1));
+            results.push(...formatDocumentSymbol(child, state, depth + 1));
         }
     }
     return results;
@@ -225,10 +253,16 @@ function formatDocumentSymbolResult(result, workdir) {
     if (first && "location" in first) {
         return formatWorkspaceSymbolResult(result, workdir);
     }
-    const lines = ["Document symbols:"];
+    const state = { count: 0, total: 0 };
+    const lines = [];
     for (const symbol of result) {
-        lines.push(...formatDocumentSymbol(symbol));
+        lines.push(...formatDocumentSymbol(symbol, state));
+    }
+    let header = "Document symbols:";
+    if (state.total > MAX_RESULTS) {
+        header += ` (showing first ${MAX_RESULTS} of ${state.total})`;
     }
+    lines.unshift(header);
     return lines.join("\n");
 }
 /**
@@ -242,13 +276,21 @@ function formatWorkspaceSymbolResult(result, workdir) {
     if (validSymbols.length === 0) {
         return "No symbols found in workspace. This may occur if the workspace is empty, or if the LSP server has not finished indexing the project.";
     }
-    const lines = [
-        `Found ${validSymbols.length} symbol${validSymbols.length === 1 ? "" : "s"} in workspace:`,
-    ];
     const grouped = groupItemsByUri(validSymbols, workdir);
+    const totalResults = validSymbols.length;
+    const totalFiles = grouped.size;
+    let resultsShown = 0;
+    let filesShown = 0;
+    const lines = [];
     for (const [path, symbols] of grouped) {
+        if (resultsShown >= MAX_RESULTS || filesShown >= MAX_FILES)
+            break;
+        filesShown++;
+        const remainingResults = MAX_RESULTS - resultsShown;
+        const symbolsToShow = symbols.slice(0, remainingResults);
+        const isTruncated = symbolsToShow.length < symbols.length;
         lines.push(`\n${path}:`);
-        for (const s of symbols) {
+        for (const s of symbolsToShow) {
             const kindName = getSymbolKindName(s.kind);
             const startLine = s.location.range.start.line + 1;
             let line = `  ${s.name} (${kindName}) - Line ${startLine}`;
@@ -257,7 +299,16 @@ function formatWorkspaceSymbolResult(result, workdir) {
             }
             lines.push(line);
         }
+        if (isTruncated) {
+            lines.push(`  ... and ${symbols.length - symbolsToShow.length} more in this file`);
+        }
+        resultsShown += symbolsToShow.length;
     }
+    let header = `Found ${totalResults} symbol${totalResults === 1 ? "" : "s"} in workspace:`;
+    if (totalResults > resultsShown || totalFiles > filesShown) {
+        header += ` (showing first ${resultsShown} results and ${filesShown} files)`;
+    }
+    lines.unshift(header);
     return lines.join("\n");
 }
 /**
@@ -287,10 +338,16 @@ function formatPrepareCallHierarchyResult(result, workdir) {
     if (result.length === 1) {
         return `Call hierarchy item: ${formatCallHierarchyItem(result[0], workdir)}`;
     }
-    const lines = [`Found ${result.length} call hierarchy items:`];
-    for (const item of result) {
+    const shownItems = result.slice(0, MAX_RESULTS);
+    const lines = [];
+    for (const item of shownItems) {
         lines.push(`  ${formatCallHierarchyItem(item, workdir)}`);
     }
+    let header = `Found ${result.length} call hierarchy items:`;
+    if (result.length > MAX_RESULTS) {
+        header += ` (showing first ${MAX_RESULTS})`;
+    }
+    lines.unshift(header);
     return lines.join("\n");
 }
 /**
@@ -300,10 +357,8 @@ function formatIncomingCallsResult(result, workdir) {
     if (!result || result.length === 0) {
         return "No incoming calls found (nothing calls this function)";
     }
-    const lines = [
-        `Found ${result.length} incoming call${result.length === 1 ? "" : "s"}:`,
-    ];
     const grouped = new Map();
+    const totalResults = result.length;
     for (const call of result) {
         if (!call.from) {
             logger.warn("formatIncomingCallsResult: CallHierarchyIncomingCall has undefined from field");
@@ -318,9 +373,19 @@ function formatIncomingCallsResult(result, workdir) {
             grouped.set(path, [call]);
         }
     }
+    const totalFiles = grouped.size;
+    let resultsShown = 0;
+    let filesShown = 0;
+    const lines = [];
     for (const [path, calls] of grouped) {
+        if (resultsShown >= MAX_RESULTS || filesShown >= MAX_FILES)
+            break;
+        filesShown++;
+        const remainingResults = MAX_RESULTS - resultsShown;
+        const callsToShow = calls.slice(0, remainingResults);
+        const isTruncated = callsToShow.length < calls.length;
         lines.push(`\n${path}:`);
-        for (const call of calls) {
+        for (const call of callsToShow) {
             if (!call.from)
                 continue;
             const kindName = getSymbolKindName(call.from.kind);
@@ -334,7 +399,16 @@ function formatIncomingCallsResult(result, workdir) {
             }
             lines.push(line);
         }
+        if (isTruncated) {
+            lines.push(`  ... and ${calls.length - callsToShow.length} more in this file`);
+        }
+        resultsShown += callsToShow.length;
     }
+    let header = `Found ${totalResults} incoming call${totalResults === 1 ? "" : "s"}:`;
+    if (totalResults > resultsShown || totalFiles > filesShown) {
+        header += ` (showing first ${resultsShown} results and ${filesShown} files)`;
+    }
+    lines.unshift(header);
     return lines.join("\n");
 }
 /**
@@ -344,10 +418,8 @@ function formatOutgoingCallsResult(result, workdir) {
     if (!result || result.length === 0) {
         return "No outgoing calls found (this function calls nothing)";
     }
-    const lines = [
-        `Found ${result.length} outgoing call${result.length === 1 ? "" : "s"}:`,
-    ];
     const grouped = new Map();
+    const totalResults = result.length;
     for (const call of result) {
         if (!call.to) {
             logger.warn("formatOutgoingCallsResult: CallHierarchyOutgoingCall has undefined to field");
@@ -362,9 +434,19 @@ function formatOutgoingCallsResult(result, workdir) {
             grouped.set(path, [call]);
         }
     }
+    const totalFiles = grouped.size;
+    let resultsShown = 0;
+    let filesShown = 0;
+    const lines = [];
     for (const [path, calls] of grouped) {
+        if (resultsShown >= MAX_RESULTS || filesShown >= MAX_FILES)
+            break;
+        filesShown++;
+        const remainingResults = MAX_RESULTS - resultsShown;
+        const callsToShow = calls.slice(0, remainingResults);
+        const isTruncated = callsToShow.length < calls.length;
         lines.push(`\n${path}:`);
-        for (const call of calls) {
+        for (const call of callsToShow) {
             if (!call.to)
                 continue;
             const kindName = getSymbolKindName(call.to.kind);
@@ -378,7 +460,16 @@ function formatOutgoingCallsResult(result, workdir) {
             }
             lines.push(line);
         }
+        if (isTruncated) {
+            lines.push(`  ... and ${calls.length - callsToShow.length} more in this file`);
+        }
+        resultsShown += callsToShow.length;
+    }
+    let header = `Found ${totalResults} outgoing call${totalResults === 1 ? "" : "s"}:`;
+    if (totalResults > resultsShown || totalFiles > filesShown) {
+        header += ` (showing first ${resultsShown} results and ${filesShown} files)`;
     }
+    lines.unshift(header);
     return lines.join("\n");
 }
 /**
@@ -390,25 +481,7 @@ export const lspTool = {
         type: "function",
         function: {
             name: LSP_TOOL_NAME,
-            description: `Interact with Language Server Protocol (LSP) servers to get code intelligence features.
-
-Supported operations:
-- goToDefinition: Find where a symbol is defined
-- findReferences: Find all references to a symbol
-- hover: Get hover information (documentation, type info) for a symbol
-- documentSymbol: Get all symbols (functions, classes, variables) in a document
-- workspaceSymbol: Search for symbols across the entire workspace
-- goToImplementation: Find implementations of an interface or abstract method
-- prepareCallHierarchy: Get call hierarchy item at a position (functions/methods)
-- incomingCalls: Find all functions/methods that call the function at a position
-- outgoingCalls: Find all functions/methods called by the function at a position
-
-All operations require:
-- filePath: The file to operate on
-- line: The line number (1-based, as shown in editors)
-- character: The character offset (1-based, as shown in editors)
-
-Note: LSP servers must be configured for the file type. If no server is available, an error will be returned.`,
+            description: `Interact with Language Server Protocol (LSP) servers to get code intelligence features.`,
             parameters: {
                 type: "object",
                 properties: {
@@ -444,6 +517,25 @@ Note: LSP servers must be configured for the file type. If no server is availabl
             },
         },
     },
+    prompt: () => `Interact with Language Server Protocol (LSP) servers to get code intelligence features.
+
+Supported operations:
+- goToDefinition: Find where a symbol is defined
+- findReferences: Find all references to a symbol
+- hover: Get hover information (documentation, type info) for a symbol
+- documentSymbol: Get all symbols (functions, classes, variables) in a document
+- workspaceSymbol: Search for symbols across the entire workspace
+- goToImplementation: Find implementations of an interface or abstract method
+- prepareCallHierarchy: Get call hierarchy item at a position (functions/methods)
+- incomingCalls: Find all functions/methods that call the function at a position
+- outgoingCalls: Find all functions/methods called by the function at a position
+
+All operations require:
+- filePath: The file to operate on
+- line: The line number (1-based, as shown in editors)
+- character: The character offset (1-based, as shown in editors)
+
+Note: LSP servers must be configured for the file type. If no server is available, an error will be returned.`,
     execute: async (args, context) => {
         const { operation, filePath, line, character } = args;
         if (!context.lspManager) {

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

@@ -1 +1 @@
-{"version":3,"file":"skillTool.d.ts","sourceRoot":"","sources":["../../src/tools/skillTool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAA2B,MAAM,YAAY,CAAC;AAItE;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,UAmFvB,CAAC"}
+{"version":3,"file":"skillTool.d.ts","sourceRoot":"","sources":["../../src/tools/skillTool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAA2B,MAAM,YAAY,CAAC;AAUtE;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,UA0MvB,CAAC"}

package/dist/tools/skillTool.js

@@ -1,4 +1,7 @@
 import { SKILL_TOOL_NAME } from "../constants/tools.js";
+import { GENERAL_PURPOSE_SUBAGENT_TYPE } from "../constants/subagents.js";
+import { logger } from "../utils/globalLogger.js";
+import { countToolBlocks, formatToolTokenSummary, } from "../utils/messageOperations.js";
 /**
  * Skill tool plugin for invoking Wave skills
  */
@@ -16,13 +19,17 @@ export const skillTool = {
                         type: "string",
                         description: "Name of the skill to invoke",
                     },
+                    args: {
+                        type: "string",
+                        description: "Optional arguments to pass to the skill",
+                    },
                 },
                 required: ["skill_name"],
             },
         },
     },
     prompt: (args) => {
-        const availableSkills = args?.availableSkills;
+        const availableSkills = args?.availableSkills?.filter((skill) => !skill.disableModelInvocation);
         if (!availableSkills || availableSkills.length === 0) {
             return "Invoke a Wave skill by name. Skills are user-defined automation templates that can be personal or project-specific. No skills are currently available.";
         }
@@ -43,6 +50,7 @@ export const skillTool = {
             }
             // Validate arguments
             const skillName = args.skill_name;
+            const skillArgs = args.args;
             if (!skillName || typeof skillName !== "string") {
                 return {
                     success: false,
@@ -50,10 +58,97 @@ export const skillTool = {
                     error: "skill_name parameter is required and must be a string",
                 };
             }
-            // Execute the skill
+            const skillMetadata = skillManager.getSkillMetadata(skillName);
+            if (skillMetadata?.disableModelInvocation) {
+                return {
+                    success: false,
+                    content: "",
+                    error: `Skill "${skillName}" is not available for model invocation.`,
+                };
+            }
+            // Handle fork context
+            if (skillMetadata?.context === "fork") {
+                const subagentManager = context.subagentManager;
+                if (!subagentManager) {
+                    return {
+                        success: false,
+                        content: "",
+                        error: "Subagent manager not available in tool context",
+                    };
+                }
+                const agentType = skillMetadata.agent || GENERAL_PURPOSE_SUBAGENT_TYPE;
+                const configuration = await subagentManager.findSubagent(agentType);
+                if (!configuration) {
+                    return {
+                        success: false,
+                        content: "",
+                        error: `No subagent found matching "${agentType}" for skill "${skillName}"`,
+                    };
+                }
+                // Execute the skill to get the content
+                const skillResult = await skillManager.executeSkill({
+                    skill_name: skillName,
+                    args: skillArgs,
+                });
+                logger.debug(`Skill ${skillName} executed, allowedTools:`, {
+                    allowedTools: skillResult.allowedTools,
+                });
+                // Create subagent instance
+                const instance = await subagentManager.createInstance(configuration, {
+                    description: `Skill: ${skillName}`,
+                    prompt: skillResult.content,
+                    subagent_type: agentType,
+                    allowedTools: skillResult.allowedTools,
+                    model: skillMetadata.model,
+                }, false, // run_in_background
+                () => {
+                    // Update shortResult
+                    const messages = instance.messageManager.getMessages();
+                    const tokens = instance.messageManager.getlatestTotalTokens();
+                    const lastTools = instance.lastTools;
+                    const toolCount = countToolBlocks(messages);
+                    const summary = formatToolTokenSummary(toolCount, tokens);
+                    let shortResult = "";
+                    if (toolCount > 2) {
+                        shortResult += "... ";
+                    }
+                    if (lastTools.length > 0) {
+                        shortResult += `${lastTools.join(", ")} `;
+                    }
+                    shortResult += summary;
+                    context.onShortResultUpdate?.(shortResult);
+                });
+                try {
+                    const result = await subagentManager.executeTask(instance, skillResult.content, context.abortSignal, false);
+                    // Cleanup subagent instance after task completion
+                    subagentManager.cleanupInstance(instance.subagentId);
+                    const messages = instance.messageManager.getMessages();
+                    const tokens = instance.messageManager.getlatestTotalTokens();
+                    const toolCount = countToolBlocks(messages);
+                    const summary = formatToolTokenSummary(toolCount, tokens);
+                    return {
+                        success: true,
+                        content: result,
+                        shortResult: `Invoked skill: ${skillName}${summary ? ` ${summary}` : ""}`,
+                    };
+                }
+                catch (error) {
+                    return {
+                        success: false,
+                        content: "",
+                        error: `Skill fork failed: ${error instanceof Error ? error.message : String(error)}`,
+                    };
+                }
+            }
+            // Standard execution
             const result = await skillManager.executeSkill({
                 skill_name: skillName,
+                args: skillArgs,
             });
+            // Add temporary rules if allowedTools are present
+            if (result.allowedTools && result.allowedTools.length > 0) {
+                context.permissionManager?.addTemporaryRules(result.allowedTools);
+            }
             return {
                 success: true,
                 content: result.content,

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

@@ -1 +1 @@
-{"version":3,"file":"taskManagementTools.d.ts","sourceRoot":"","sources":["../../src/tools/taskManagementTools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA2B,MAAM,YAAY,CAAC;AASjE,eAAO,MAAM,cAAc,EAAE,UA0H5B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,UAyDzB,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,UA+P5B,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,UAkE1B,CAAC"}
+{"version":3,"file":"taskManagementTools.d.ts","sourceRoot":"","sources":["../../src/tools/taskManagementTools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA2B,MAAM,YAAY,CAAC;AASjE,eAAO,MAAM,cAAc,EAAE,UA2H5B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,UAyDzB,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,UA4R5B,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,UAkE1B,CAAC"}

package/dist/tools/taskManagementTools.js

@@ -104,7 +104,8 @@ NOTE that you should not use this tool if there is only one trivial task to do.
         const taskId = await taskManager.createTask(task);
         if (context.reversionManager && context.messageId) {
             const taskPath = taskManager.getTaskPath(taskId);
-            await context.reversionManager.recordSnapshot(context.messageId, taskPath, "create");
+            const snapshotId = await context.reversionManager.recordSnapshot(context.messageId, taskPath, "create");
+            await context.reversionManager.commitSnapshot(snapshotId);
         }
         return {
             success: true,
@@ -308,9 +309,10 @@ Set up task dependencies:
                 content: `Task with ID ${taskId} not found.`,
             };
         }
+        let snapshotId;
         if (context.reversionManager && context.messageId) {
             const taskPath = taskManager.getTaskPath(taskId);
-            await context.reversionManager.recordSnapshot(context.messageId, taskPath, "modify");
+            snapshotId = await context.reversionManager.recordSnapshot(context.messageId, taskPath, "modify");
         }
         const updatedFields = [];
         const updatedTask = {
@@ -360,10 +362,18 @@ Set up task dependencies:
                 for (const targetId of blocksToAdd) {
                     const targetTask = await taskManager.getTask(targetId);
                     if (targetTask && !targetTask.blockedBy.includes(taskId)) {
+                        let targetSnapshotId;
+                        if (context.reversionManager && context.messageId) {
+                            const targetPath = taskManager.getTaskPath(targetId);
+                            targetSnapshotId = await context.reversionManager.recordSnapshot(context.messageId, targetPath, "modify");
+                        }
                         await taskManager.updateTask({
                             ...targetTask,
                             blockedBy: [...targetTask.blockedBy, taskId],
                         });
+                        if (context.reversionManager && targetSnapshotId) {
+                            await context.reversionManager.commitSnapshot(targetSnapshotId);
+                        }
                     }
                 }
             }
@@ -377,15 +387,26 @@ Set up task dependencies:
                 for (const targetId of blockedByToAdd) {
                     const targetTask = await taskManager.getTask(targetId);
                     if (targetTask && !targetTask.blocks.includes(taskId)) {
+                        let targetSnapshotId;
+                        if (context.reversionManager && context.messageId) {
+                            const targetPath = taskManager.getTaskPath(targetId);
+                            targetSnapshotId = await context.reversionManager.recordSnapshot(context.messageId, targetPath, "modify");
+                        }
                         await taskManager.updateTask({
                             ...targetTask,
                             blocks: [...targetTask.blocks, taskId],
                         });
+                        if (context.reversionManager && targetSnapshotId) {
+                            await context.reversionManager.commitSnapshot(targetSnapshotId);
+                        }
                     }
                 }
             }
         }
         await taskManager.updateTask(updatedTask);
+        if (context.reversionManager && snapshotId) {
+            await context.reversionManager.commitSnapshot(snapshotId);
+        }
         let content = `Updated task #${taskId} ${updatedFields.join(", ")}`;
         if (updatedTask.status === "completed") {
             content += `\n\nTask completed. Call TaskList now to find your next available task or see if your work unblocked others.`;

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

@@ -1 +1 @@
-{"version":3,"file":"taskTool.d.ts","sourceRoot":"","sources":["../../src/tools/taskTool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAA2B,MAAM,YAAY,CAAC;AAKtE;;GAEG;AACH,eAAO,MAAM,QAAQ,EAAE,UA2OtB,CAAC"}
+{"version":3,"file":"taskTool.d.ts","sourceRoot":"","sources":["../../src/tools/taskTool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAA2B,MAAM,YAAY,CAAC;AAStE;;GAEG;AACH,eAAO,MAAM,QAAQ,EAAE,UAqOtB,CAAC"}

package/dist/tools/taskTool.js

@@ -1,5 +1,6 @@
 import { EXPLORE_SUBAGENT_TYPE } from "../constants/subagents.js";
 import { TASK_TOOL_NAME } from "../constants/tools.js";
+import { countToolBlocks, formatToolTokenSummary, } from "../utils/messageOperations.js";
 /**
  * Task tool plugin for delegating tasks to specialized subagents
  */
@@ -116,15 +117,8 @@ ${subagentList || "No subagents configured"}
                 const messages = instance.messageManager.getMessages();
                 const tokens = instance.messageManager.getlatestTotalTokens();
                 const lastTools = instance.lastTools;
-                // Count tool blocks in messages
-                let toolCount = 0;
-                messages.forEach((msg) => {
-                    msg.blocks.forEach((block) => {
-                        if (block.type === "tool") {
-                            toolCount++;
-                        }
-                    });
-                });
+                const toolCount = countToolBlocks(messages);
+                const summary = formatToolTokenSummary(toolCount, tokens);
                 let shortResult = "";
                 if (toolCount > 2) {
                     shortResult += "... ";
@@ -132,11 +126,7 @@ ${subagentList || "No subagents configured"}
                 if (lastTools.length > 0) {
                     shortResult += `${lastTools.join(", ")} `;
                 }
-                shortResult += `(${toolCount} tools`;
-                if (tokens > 0) {
-                    shortResult += ` | ${tokens.toLocaleString()} tokens`;
-                }
-                shortResult += ")";
+                shortResult += summary;
                 context.onShortResultUpdate?.(shortResult);
             });
             // Register for backgrounding if not already in background
@@ -174,10 +164,14 @@ ${subagentList || "No subagents configured"}
                 }
                 // Cleanup subagent instance after task completion
                 subagentManager.cleanupInstance(instance.subagentId);
+                const messages = instance.messageManager.getMessages();
+                const tokens = instance.messageManager.getlatestTotalTokens();
+                const toolCount = countToolBlocks(messages);
+                const summary = formatToolTokenSummary(toolCount, tokens);
                 return {
                     success: true,
                     content: result,
-                    shortResult: `Task completed by ${configuration.name}`,
+                    shortResult: `Task completed${summary ? ` ${summary}` : ""}`,
                 };
             }
             finally {

package/dist/tools/types.d.ts

@@ -11,7 +11,7 @@ export interface ToolPlugin {
     execute: (args: Record<string, unknown>, context: ToolContext) => Promise<ToolResult>;
     formatCompactParams?: (params: Record<string, unknown>, context: ToolContext) => string;
     /**
-     * Optional function to provide a prompt to be added to the system prompt
+     * Function to provide a prompt to be added to the tool description
      */
     prompt?: (args?: {
         availableSubagents?: SubagentConfiguration[];
@@ -34,7 +34,6 @@ export interface ToolResult {
 }
 export interface ToolContext {
     abortSignal?: AbortSignal;
-    backgroundBashManager?: import("../managers/backgroundBashManager.js").BackgroundBashManager;
     backgroundTaskManager?: import("../managers/backgroundTaskManager.js").BackgroundTaskManager;
     workdir: string;
     /** Permission mode for this tool execution */

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/tools/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EACnB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,0BAA0B,CAAC;IACnC,OAAO,EAAE,CACP,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,EAAE,WAAW,KACjB,OAAO,CAAC,UAAU,CAAC,CAAC;IACzB,mBAAmB,CAAC,EAAE,CACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,OAAO,EAAE,WAAW,KACjB,MAAM,CAAC;IACZ;;OAEG;IACH,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE;QACf,kBAAkB,CAAC,EAAE,qBAAqB,EAAE,CAAC;QAC7C,eAAe,CAAC,EAAE,aAAa,EAAE,CAAC;QAClC,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,KAAK,MAAM,CAAC;CACd;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,MAAM,CAAC,EAAE,KAAK,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC,CAAC;IAEH,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,MAAM,WAAW,WAAW;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,qBAAqB,CAAC,EAAE,OAAO,sCAAsC,EAAE,qBAAqB,CAAC;IAC7F,qBAAqB,CAAC,EAAE,OAAO,sCAAsC,EAAE,qBAAqB,CAAC;IAC7F,OAAO,EAAE,MAAM,CAAC;IAChB,8CAA8C;IAC9C,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,iCAAiC;IACjC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,wDAAwD;IACxD,iBAAiB,CAAC,EAAE,OAAO,kCAAkC,EAAE,iBAAiB,CAAC;IACjF,iDAAiD;IACjD,UAAU,CAAC,EAAE,OAAO,2BAA2B,EAAE,UAAU,CAAC;IAC5D,iDAAiD;IACjD,UAAU,CAAC,EAAE,OAAO,iBAAiB,EAAE,WAAW,CAAC;IACnD,oDAAoD;IACpD,gBAAgB,CAAC,EAAE,OAAO,iCAAiC,EAAE,gBAAgB,CAAC;IAC9E,mDAAmD;IACnD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sDAAsD;IACtD,qBAAqB,CAAC,EAAE,OAAO,uBAAuB,EAAE,sBAAsB,CAAC;IAC/E,gDAAgD;IAChD,WAAW,EAAE,OAAO,4BAA4B,EAAE,WAAW,CAAC;IAC9D,oDAAoD;IACpD,eAAe,CAAC,EAAE,OAAO,gCAAgC,EAAE,eAAe,CAAC;IAC3E,kDAAkD;IAClD,YAAY,CAAC,EAAE,OAAO,6BAA6B,EAAE,YAAY,CAAC;IAClE,yBAAyB;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oEAAoE;IACpE,mBAAmB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;CACrD"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/tools/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EACnB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,0BAA0B,CAAC;IACnC,OAAO,EAAE,CACP,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,EAAE,WAAW,KACjB,OAAO,CAAC,UAAU,CAAC,CAAC;IACzB,mBAAmB,CAAC,EAAE,CACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,OAAO,EAAE,WAAW,KACjB,MAAM,CAAC;IACZ;;OAEG;IACH,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE;QACf,kBAAkB,CAAC,EAAE,qBAAqB,EAAE,CAAC;QAC7C,eAAe,CAAC,EAAE,aAAa,EAAE,CAAC;QAClC,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,KAAK,MAAM,CAAC;CACd;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,MAAM,CAAC,EAAE,KAAK,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC,CAAC;IAEH,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,MAAM,WAAW,WAAW;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,qBAAqB,CAAC,EAAE,OAAO,sCAAsC,EAAE,qBAAqB,CAAC;IAC7F,OAAO,EAAE,MAAM,CAAC;IAChB,8CAA8C;IAC9C,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,iCAAiC;IACjC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,wDAAwD;IACxD,iBAAiB,CAAC,EAAE,OAAO,kCAAkC,EAAE,iBAAiB,CAAC;IACjF,iDAAiD;IACjD,UAAU,CAAC,EAAE,OAAO,2BAA2B,EAAE,UAAU,CAAC;IAC5D,iDAAiD;IACjD,UAAU,CAAC,EAAE,OAAO,iBAAiB,EAAE,WAAW,CAAC;IACnD,oDAAoD;IACpD,gBAAgB,CAAC,EAAE,OAAO,iCAAiC,EAAE,gBAAgB,CAAC;IAC9E,mDAAmD;IACnD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sDAAsD;IACtD,qBAAqB,CAAC,EAAE,OAAO,uBAAuB,EAAE,sBAAsB,CAAC;IAC/E,gDAAgD;IAChD,WAAW,EAAE,OAAO,4BAA4B,EAAE,WAAW,CAAC;IAC9D,oDAAoD;IACpD,eAAe,CAAC,EAAE,OAAO,gCAAgC,EAAE,eAAe,CAAC;IAC3E,kDAAkD;IAClD,YAAY,CAAC,EAAE,OAAO,6BAA6B,EAAE,YAAY,CAAC;IAClE,yBAAyB;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oEAAoE;IACpE,mBAAmB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;CACrD"}

package/dist/tools/writeTool.js

@@ -100,7 +100,7 @@ Usage:
                         return {
                             success: false,
                             content: "",
-                            error: `Write operation denied, reason: ${permissionResult.message || "No reason provided"}`,
+                            error: `Write operation denied by user, reason: ${permissionResult.message || "No reason provided"}`,
                         };
                     }
                 }