@machina.ai/cell-cli-core 1.20.2-rc1 → 1.25.0-rc1

package/dist/src/core/coreToolHookTriggers.d.ts

@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { type DefaultHookOutput } from '../hooks/types.js';
-import type { ToolCallConfirmationDetails, ToolResult } from '../tools/tools.js';
+import { type DefaultHookOutput, type McpToolContext } from '../hooks/types.js';
+import type { Config } from '../config/config.js';
+import type { ToolCallConfirmationDetails, ToolResult, AnyDeclarativeTool } from '../tools/tools.js';
 import type { AnsiOutput, ShellExecutionConfig } from '../index.js';
 import type { AnyToolInvocation } from '../tools/tools.js';
 import { ShellToolInvocation } from '../tools/shell.js';
@@ -22,9 +23,10 @@ export declare function fireToolNotificationHook(messageBus: MessageBus, confirm
  * @param messageBus The message bus to use for hook communication
  * @param toolName The name of the tool being executed
  * @param toolInput The input parameters for the tool
+ * @param mcpContext Optional MCP context for MCP tools
  * @returns The hook output, or undefined if no hook was executed or on error
  */
-export declare function fireBeforeToolHook(messageBus: MessageBus, toolName: string, toolInput: Record<string, unknown>): Promise<DefaultHookOutput | undefined>;
+export declare function fireBeforeToolHook(messageBus: MessageBus, toolName: string, toolInput: Record<string, unknown>, mcpContext?: McpToolContext): Promise<DefaultHookOutput | undefined>;
 /**
  * Fires the AfterTool hook and returns the hook output.
  *
@@ -32,13 +34,14 @@ export declare function fireBeforeToolHook(messageBus: MessageBus, toolName: str
  * @param toolName The name of the tool that was executed
  * @param toolInput The input parameters for the tool
  * @param toolResponse The result from the tool execution
+ * @param mcpContext Optional MCP context for MCP tools
  * @returns The hook output, or undefined if no hook was executed or on error
  */
 export declare function fireAfterToolHook(messageBus: MessageBus, toolName: string, toolInput: Record<string, unknown>, toolResponse: {
     llmContent: ToolResult['llmContent'];
     returnDisplay: ToolResult['returnDisplay'];
     error: ToolResult['error'];
-}): Promise<DefaultHookOutput | undefined>;
+}, mcpContext?: McpToolContext): Promise<DefaultHookOutput | undefined>;
 /**
  * Execute a tool with BeforeTool and AfterTool hooks.
  *
@@ -50,6 +53,7 @@ export declare function fireAfterToolHook(messageBus: MessageBus, toolName: stri
  * @param liveOutputCallback Optional callback for live output updates
  * @param shellExecutionConfig Optional shell execution config
  * @param setPidCallback Optional callback to set the PID for shell invocations
+ * @param config Config to look up MCP server details for hook context
  * @returns The tool result
  */
-export declare function executeToolWithHooks(invocation: ShellToolInvocation | AnyToolInvocation, toolName: string, signal: AbortSignal, messageBus: MessageBus | undefined, hooksEnabled: boolean, liveOutputCallback?: (outputChunk: string | AnsiOutput) => void, shellExecutionConfig?: ShellExecutionConfig, setPidCallback?: (pid: number) => void): Promise<ToolResult>;
+export declare function executeToolWithHooks(invocation: ShellToolInvocation | AnyToolInvocation, toolName: string, signal: AbortSignal, messageBus: MessageBus | undefined, hooksEnabled: boolean, tool: AnyDeclarativeTool, liveOutputCallback?: (outputChunk: string | AnsiOutput) => void, shellExecutionConfig?: ShellExecutionConfig, setPidCallback?: (pid: number) => void, config?: Config): Promise<ToolResult>;

package/dist/src/core/coreToolHookTriggers.js

@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { MessageBusType, } from '../confirmation-bus/types.js';
-import { createHookOutput, NotificationType, } from '../hooks/types.js';
+import { createHookOutput, NotificationType, BeforeToolHookOutput, } from '../hooks/types.js';
 import { ToolErrorType } from '../tools/tool-error.js';
 import { debugLogger } from '../utils/debugLogger.js';
 import { ShellToolInvocation } from '../tools/shell.js';
+import { DiscoveredMCPToolInvocation } from '../tools/mcp-tool.js';
 /**
  * Converts ToolCallConfirmationDetails to a serializable format for hooks.
  * Excludes function properties (onConfirm, ideConfirmation) that can't be serialized.
@@ -89,18 +90,49 @@ export async function fireToolNotificationHook(messageBus, confirmationDetails)
         }, MessageBusType.HOOK_EXECUTION_RESPONSE);
     }
     catch (error) {
-        debugLogger.warn(`Notification hook failed for ${confirmationDetails.title}:`, error);
+        debugLogger.debug(`Notification hook failed for ${confirmationDetails.title}:`, error);
     }
 }
+/**
+ * Extracts MCP context from a tool invocation if it's an MCP tool.
+ *
+ * @param invocation The tool invocation
+ * @param config Config to look up server details
+ * @returns MCP context if this is an MCP tool, undefined otherwise
+ */
+function extractMcpContext(invocation, config) {
+    if (!(invocation instanceof DiscoveredMCPToolInvocation)) {
+        return undefined;
+    }
+    // Get the server config
+    const mcpServers = config.getMcpClientManager()?.getMcpServers() ??
+        config.getMcpServers() ??
+        {};
+    const serverConfig = mcpServers[invocation.serverName];
+    if (!serverConfig) {
+        return undefined;
+    }
+    return {
+        server_name: invocation.serverName,
+        tool_name: invocation.serverToolName,
+        // Non-sensitive connection details only
+        command: serverConfig.command,
+        args: serverConfig.args,
+        cwd: serverConfig.cwd,
+        url: serverConfig.url ?? serverConfig.httpUrl,
+        tcp: serverConfig.tcp,
+    };
+}
 /**
  * Fires the BeforeTool hook and returns the hook output.
  *
  * @param messageBus The message bus to use for hook communication
  * @param toolName The name of the tool being executed
  * @param toolInput The input parameters for the tool
+ * @param mcpContext Optional MCP context for MCP tools
  * @returns The hook output, or undefined if no hook was executed or on error
  */
-export async function fireBeforeToolHook(messageBus, toolName, toolInput) {
+export async function fireBeforeToolHook(messageBus, toolName, toolInput, mcpContext) {
     try {
         const response = await messageBus.request({
             type: MessageBusType.HOOK_EXECUTION_REQUEST,
@@ -108,6 +140,7 @@ export async function fireBeforeToolHook(messageBus, toolName, toolInput) {
             input: {
                 tool_name: toolName,
                 tool_input: toolInput,
+                ...(mcpContext && { mcp_context: mcpContext }),
             },
         }, MessageBusType.HOOK_EXECUTION_RESPONSE);
         return response.output
@@ -115,7 +148,7 @@ export async function fireBeforeToolHook(messageBus, toolName, toolInput) {
             : undefined;
     }
     catch (error) {
-        debugLogger.warn(`BeforeTool hook failed for ${toolName}:`, error);
+        debugLogger.debug(`BeforeTool hook failed for ${toolName}:`, error);
         return undefined;
     }
 }
@@ -126,9 +159,10 @@ export async function fireBeforeToolHook(messageBus, toolName, toolInput) {
  * @param toolName The name of the tool that was executed
  * @param toolInput The input parameters for the tool
  * @param toolResponse The result from the tool execution
+ * @param mcpContext Optional MCP context for MCP tools
  * @returns The hook output, or undefined if no hook was executed or on error
  */
-export async function fireAfterToolHook(messageBus, toolName, toolInput, toolResponse) {
+export async function fireAfterToolHook(messageBus, toolName, toolInput, toolResponse, mcpContext) {
     try {
         const response = await messageBus.request({
             type: MessageBusType.HOOK_EXECUTION_REQUEST,
@@ -137,6 +171,7 @@ export async function fireAfterToolHook(messageBus, toolName, toolInput, toolRes
                 tool_name: toolName,
                 tool_input: toolInput,
                 tool_response: toolResponse,
+                ...(mcpContext && { mcp_context: mcpContext }),
             },
         }, MessageBusType.HOOK_EXECUTION_RESPONSE);
         return response.output
@@ -144,7 +179,7 @@ export async function fireAfterToolHook(messageBus, toolName, toolInput, toolRes
             : undefined;
     }
     catch (error) {
-        debugLogger.warn(`AfterTool hook failed for ${toolName}:`, error);
+        debugLogger.debug(`AfterTool hook failed for ${toolName}:`, error);
         return undefined;
     }
 }
@@ -159,13 +194,30 @@ export async function fireAfterToolHook(messageBus, toolName, toolInput, toolRes
  * @param liveOutputCallback Optional callback for live output updates
  * @param shellExecutionConfig Optional shell execution config
  * @param setPidCallback Optional callback to set the PID for shell invocations
+ * @param config Config to look up MCP server details for hook context
  * @returns The tool result
  */
-export async function executeToolWithHooks(invocation, toolName, signal, messageBus, hooksEnabled, liveOutputCallback, shellExecutionConfig, setPidCallback) {
+export async function executeToolWithHooks(invocation, toolName, signal, messageBus, hooksEnabled, tool, liveOutputCallback, shellExecutionConfig, setPidCallback, config) {
     const toolInput = (invocation.params || {});
+    let inputWasModified = false;
+    let modifiedKeys = [];
+    // Extract MCP context if this is an MCP tool (only if config is provided)
+    const mcpContext = config ? extractMcpContext(invocation, config) : undefined;
     // Fire BeforeTool hook through MessageBus (only if hooks are enabled)
     if (hooksEnabled && messageBus) {
-        const beforeOutput = await fireBeforeToolHook(messageBus, toolName, toolInput);
+        const beforeOutput = await fireBeforeToolHook(messageBus, toolName, toolInput, mcpContext);
+        // Check if hook requested to stop entire agent execution
+        if (beforeOutput?.shouldStopExecution()) {
+            const reason = beforeOutput.getEffectiveReason();
+            return {
+                llmContent: `Agent execution stopped by hook: ${reason}`,
+                returnDisplay: `Agent execution stopped by hook: ${reason}`,
+                error: {
+                    type: ToolErrorType.STOP_EXECUTION,
+                    message: reason,
+                },
+            };
+        }
         // Check if hook blocked the tool execution
         const blockingError = beforeOutput?.getBlockingError();
         if (blockingError?.blocked) {
@@ -178,17 +230,34 @@ export async function executeToolWithHooks(invocation, toolName, signal, message
                 },
             };
         }
-        // Check if hook requested to stop entire agent execution
-        if (beforeOutput?.shouldStopExecution()) {
-            const reason = beforeOutput.getEffectiveReason();
-            return {
-                llmContent: `Agent execution stopped by hook: ${reason}`,
-                returnDisplay: `Agent execution stopped by hook: ${reason}`,
-                error: {
-                    type: ToolErrorType.EXECUTION_FAILED,
-                    message: `Agent execution stopped: ${reason}`,
-                },
-            };
+        // Check if hook requested to update tool input
+        if (beforeOutput instanceof BeforeToolHookOutput) {
+            const modifiedInput = beforeOutput.getModifiedToolInput();
+            if (modifiedInput) {
+                // We modify the toolInput object in-place, which should be the same reference as invocation.params
+                // We use Object.assign to update properties
+                Object.assign(invocation.params, modifiedInput);
+                debugLogger.debug(`Tool input modified by hook for ${toolName}`);
+                inputWasModified = true;
+                modifiedKeys = Object.keys(modifiedInput);
+                // Recreate the invocation with the new parameters
+                // to ensure any derived state (like resolvedPath in ReadFileTool) is updated.
+                try {
+                    // We use the tool's build method to validate and create the invocation
+                    // This ensures consistent behavior with the initial creation
+                    invocation = tool.build(invocation.params);
+                }
+                catch (error) {
+                    return {
+                        llmContent: `Tool parameter modification by hook failed validation: ${error instanceof Error ? error.message : String(error)}`,
+                        returnDisplay: `Tool parameter modification by hook failed validation.`,
+                        error: {
+                            type: ToolErrorType.INVALID_TOOL_PARAMS,
+                            message: String(error),
+                        },
+                    };
+                }
+            }
         }
     }
     // Execute the actual tool
@@ -199,22 +268,51 @@ export async function executeToolWithHooks(invocation, toolName, signal, message
     else {
         toolResult = await invocation.execute(signal, liveOutputCallback, shellExecutionConfig);
     }
+    // Append notification if parameters were modified
+    if (inputWasModified) {
+        const modificationMsg = `\n\n[System] Tool input parameters (${modifiedKeys.join(', ')}) were modified by a hook before execution.`;
+        if (typeof toolResult.llmContent === 'string') {
+            toolResult.llmContent += modificationMsg;
+        }
+        else if (Array.isArray(toolResult.llmContent)) {
+            toolResult.llmContent.push({ text: modificationMsg });
+        }
+        else if (toolResult.llmContent) {
+            // Handle single Part case by converting to an array
+            toolResult.llmContent = [
+                toolResult.llmContent,
+                { text: modificationMsg },
+            ];
+        }
+    }
     // Fire AfterTool hook through MessageBus (only if hooks are enabled)
     if (hooksEnabled && messageBus) {
         const afterOutput = await fireAfterToolHook(messageBus, toolName, toolInput, {
             llmContent: toolResult.llmContent,
             returnDisplay: toolResult.returnDisplay,
             error: toolResult.error,
-        });
+        }, mcpContext);
         // Check if hook requested to stop entire agent execution
         if (afterOutput?.shouldStopExecution()) {
             const reason = afterOutput.getEffectiveReason();
             return {
                 llmContent: `Agent execution stopped by hook: ${reason}`,
                 returnDisplay: `Agent execution stopped by hook: ${reason}`,
+                error: {
+                    type: ToolErrorType.STOP_EXECUTION,
+                    message: reason,
+                },
+            };
+        }
+        // Check if hook blocked the tool result
+        const blockingError = afterOutput?.getBlockingError();
+        if (blockingError?.blocked) {
+            return {
+                llmContent: `Tool result blocked: ${blockingError.reason}`,
+                returnDisplay: `Tool result blocked: ${blockingError.reason}`,
                 error: {
                     type: ToolErrorType.EXECUTION_FAILED,
-                    message: `Agent execution stopped: ${reason}`,
+                    message: blockingError.reason,
                 },
             };
         }

package/dist/src/core/coreToolHookTriggers.js.map

@@ -1 +1 @@
-{"version":3,"file":"coreToolHookTriggers.js","sourceRoot":"","sources":["../../../src/core/coreToolHookTriggers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"coreToolHookTriggers.js","sourceRoot":"","sources":["../../../src/core/coreToolHookTriggers.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACL,cAAc,GAGf,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAGhB,oBAAoB,GACrB,MAAM,mBAAmB,CAAC;AAO3B,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AA4BnE;;;GAGG;AACH,SAAS,qBAAqB,CAC5B,OAAoC;IAEpC,MAAM,IAAI,GAAoC;QAC5C,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,KAAK,EAAE,OAAO,CAAC,KAAK;KACrB,CAAC;IAEF,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,KAAK,MAAM;YACT,OAAO;gBACL,GAAG,IAAI;gBACP,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,WAAW,EAAE,OAAO,CAAC,WAAW;aACjC,CAAC;QACJ,KAAK,MAAM;YACT,OAAO;gBACL,GAAG,IAAI;gBACP,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,WAAW,EAAE,OAAO,CAAC,WAAW;aACjC,CAAC;QACJ,KAAK,KAAK;YACR,OAAO;gBACL,GAAG,IAAI;gBACP,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,eAAe,EAAE,OAAO,CAAC,eAAe;aACzC,CAAC;QACJ,KAAK,MAAM;YACT,OAAO;gBACL,GAAG,IAAI;gBACP,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,IAAI,EAAE,OAAO,CAAC,IAAI;aACnB,CAAC;QACJ;YACE,OAAO,IAAI,CAAC;IAChB,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAS,sBAAsB,CAC7B,mBAAgD;IAEhD,QAAQ,mBAAmB,CAAC,IAAI,EAAE,CAAC;QACjC,KAAK,MAAM;YACT,OAAO,QAAQ,mBAAmB,CAAC,KAAK,mBAAmB,CAAC;QAC9D,KAAK,MAAM;YACT,OAAO,QAAQ,mBAAmB,CAAC,KAAK,qBAAqB,CAAC;QAChE,KAAK,KAAK;YACR,OAAO,QAAQ,mBAAmB,CAAC,KAAK,eAAe,CAAC;QAC1D,KAAK,MAAM;YACT,OAAO,QAAQ,mBAAmB,CAAC,KAAK,uBAAuB,CAAC;QAClE;YACE,OAAO,4BAA4B,CAAC;IACxC,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,UAAsB,EACtB,mBAAgD;IAEhD,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,sBAAsB,CAAC,mBAAmB,CAAC,CAAC;QAC5D,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,mBAAmB,CAAC,CAAC;QAErE,MAAM,UAAU,CAAC,OAAO,CACtB;YACE,IAAI,EAAE,cAAc,CAAC,sBAAsB;YAC3C,SAAS,EAAE,cAAc;YACzB,KAAK,EAAE;gBACL,iBAAiB,EAAE,gBAAgB,CAAC,cAAc;gBAClD,OAAO;gBACP,OAAO,EAAE,iBAAiB;aAC3B;SACF,EACD,cAAc,CAAC,uBAAuB,CACvC,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,WAAW,CAAC,KAAK,CACf,gCAAgC,mBAAmB,CAAC,KAAK,GAAG,EAC5D,KAAK,CACN,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,SAAS,iBAAiB,CACxB,UAAmD,EACnD,MAAc;IAEd,IAAI,CAAC,CAAC,UAAU,YAAY,2BAA2B,CAAC,EAAE,CAAC;QACzD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,wBAAwB;IACxB,MAAM,UAAU,GACd,MAAM,CAAC,mBAAmB,EAAE,EAAE,aAAa,EAAE;QAC7C,MAAM,CAAC,aAAa,EAAE;QACtB,EAAE,CAAC;IACL,MAAM,YAAY,GAAG,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IACvD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO;QACL,WAAW,EAAE,UAAU,CAAC,UAAU;QAClC,SAAS,EAAE,UAAU,CAAC,cAAc;QACpC,wCAAwC;QACxC,OAAO,EAAE,YAAY,CAAC,OAAO;QAC7B,IAAI,EAAE,YAAY,CAAC,IAAI;QACvB,GAAG,EAAE,YAAY,CAAC,GAAG;QACrB,GAAG,EAAE,YAAY,CAAC,GAAG,IAAI,YAAY,CAAC,OAAO;QAC7C,GAAG,EAAE,YAAY,CAAC,GAAG;KACtB,CAAC;AACJ,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,UAAsB,EACtB,QAAgB,EAChB,SAAkC,EAClC,UAA2B;IAE3B,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,OAAO,CAIvC;YACE,IAAI,EAAE,cAAc,CAAC,sBAAsB;YAC3C,SAAS,EAAE,YAAY;YACvB,KAAK,EAAE;gBACL,SAAS,EAAE,QAAQ;gBACnB,UAAU,EAAE,SAAS;gBACrB,GAAG,CAAC,UAAU,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC;aAC/C;SACF,EACD,cAAc,CAAC,uBAAuB,CACvC,CAAC;QAEF,OAAO,QAAQ,CAAC,MAAM;YACpB,CAAC,CAAC,gBAAgB,CAAC,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC;YACjD,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,WAAW,CAAC,KAAK,CAAC,8BAA8B,QAAQ,GAAG,EAAE,KAAK,CAAC,CAAC;QACpE,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,UAAsB,EACtB,QAAgB,EAChB,SAAkC,EAClC,YAIC,EACD,UAA2B;IAE3B,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,OAAO,CAIvC;YACE,IAAI,EAAE,cAAc,CAAC,sBAAsB;YAC3C,SAAS,EAAE,WAAW;YACtB,KAAK,EAAE;gBACL,SAAS,EAAE,QAAQ;gBACnB,UAAU,EAAE,SAAS;gBACrB,aAAa,EAAE,YAAY;gBAC3B,GAAG,CAAC,UAAU,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC;aAC/C;SACF,EACD,cAAc,CAAC,uBAAuB,CACvC,CAAC;QAEF,OAAO,QAAQ,CAAC,MAAM;YACpB,CAAC,CAAC,gBAAgB,CAAC,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC;YAChD,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,WAAW,CAAC,KAAK,CAAC,6BAA6B,QAAQ,GAAG,EAAE,KAAK,CAAC,CAAC;QACnE,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,UAAmD,EACnD,QAAgB,EAChB,MAAmB,EACnB,UAAkC,EAClC,YAAqB,EACrB,IAAwB,EACxB,kBAA+D,EAC/D,oBAA2C,EAC3C,cAAsC,EACtC,MAAe;IAEf,MAAM,SAAS,GAAG,CAAC,UAAU,CAAC,MAAM,IAAI,EAAE,CAA4B,CAAC;IACvE,IAAI,gBAAgB,GAAG,KAAK,CAAC;IAC7B,IAAI,YAAY,GAAa,EAAE,CAAC;IAEhC,0EAA0E;IAC1E,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE9E,sEAAsE;IACtE,IAAI,YAAY,IAAI,UAAU,EAAE,CAAC;QAC/B,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAC3C,UAAU,EACV,QAAQ,EACR,SAAS,EACT,UAAU,CACX,CAAC;QAEF,yDAAyD;QACzD,IAAI,YAAY,EAAE,mBAAmB,EAAE,EAAE,CAAC;YACxC,MAAM,MAAM,GAAG,YAAY,CAAC,kBAAkB,EAAE,CAAC;YACjD,OAAO;gBACL,UAAU,EAAE,oCAAoC,MAAM,EAAE;gBACxD,aAAa,EAAE,oCAAoC,MAAM,EAAE;gBAC3D,KAAK,EAAE;oBACL,IAAI,EAAE,aAAa,CAAC,cAAc;oBAClC,OAAO,EAAE,MAAM;iBAChB;aACF,CAAC;QACJ,CAAC;QAED,2CAA2C;QAC3C,MAAM,aAAa,GAAG,YAAY,EAAE,gBAAgB,EAAE,CAAC;QACvD,IAAI,aAAa,EAAE,OAAO,EAAE,CAAC;YAC3B,OAAO;gBACL,UAAU,EAAE,2BAA2B,aAAa,CAAC,MAAM,EAAE;gBAC7D,aAAa,EAAE,2BAA2B,aAAa,CAAC,MAAM,EAAE;gBAChE,KAAK,EAAE;oBACL,IAAI,EAAE,aAAa,CAAC,gBAAgB;oBACpC,OAAO,EAAE,aAAa,CAAC,MAAM;iBAC9B;aACF,CAAC;QACJ,CAAC;QAED,+CAA+C;QAC/C,IAAI,YAAY,YAAY,oBAAoB,EAAE,CAAC;YACjD,MAAM,aAAa,GAAG,YAAY,CAAC,oBAAoB,EAAE,CAAC;YAC1D,IAAI,aAAa,EAAE,CAAC;gBAClB,mGAAmG;gBACnG,4CAA4C;gBAC5C,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;gBAChD,WAAW,CAAC,KAAK,CAAC,mCAAmC,QAAQ,EAAE,CAAC,CAAC;gBACjE,gBAAgB,GAAG,IAAI,CAAC;gBACxB,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBAE1C,kDAAkD;gBAClD,8EAA8E;gBAC9E,IAAI,CAAC;oBACH,uEAAuE;oBACvE,6DAA6D;oBAC7D,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;gBAC7C,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO;wBACL,UAAU,EAAE,0DACV,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CACvD,EAAE;wBACF,aAAa,EAAE,wDAAwD;wBACvE,KAAK,EAAE;4BACL,IAAI,EAAE,aAAa,CAAC,mBAAmB;4BACvC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC;yBACvB;qBACF,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,0BAA0B;IAC1B,IAAI,UAAsB,CAAC;IAC3B,IAAI,cAAc,IAAI,UAAU,YAAY,mBAAmB,EAAE,CAAC;QAChE,UAAU,GAAG,MAAM,UAAU,CAAC,OAAO,CACnC,MAAM,EACN,kBAAkB,EAClB,oBAAoB,EACpB,cAAc,CACf,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,UAAU,GAAG,MAAM,UAAU,CAAC,OAAO,CACnC,MAAM,EACN,kBAAkB,EAClB,oBAAoB,CACrB,CAAC;IACJ,CAAC;IAED,kDAAkD;IAClD,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,eAAe,GAAG,uCAAuC,YAAY,CAAC,IAAI,CAC9E,IAAI,CACL,6CAA6C,CAAC;QAC/C,IAAI,OAAO,UAAU,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;YAC9C,UAAU,CAAC,UAAU,IAAI,eAAe,CAAC;QAC3C,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YAChD,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;QACxD,CAAC;aAAM,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;YACjC,oDAAoD;YACpD,UAAU,CAAC,UAAU,GAAG;gBACtB,UAAU,CAAC,UAAU;gBACrB,EAAE,IAAI,EAAE,eAAe,EAAE;aAC1B,CAAC;QACJ,CAAC;IACH,CAAC;IAED,qEAAqE;IACrE,IAAI,YAAY,IAAI,UAAU,EAAE,CAAC;QAC/B,MAAM,WAAW,GAAG,MAAM,iBAAiB,CACzC,UAAU,EACV,QAAQ,EACR,SAAS,EACT;YACE,UAAU,EAAE,UAAU,CAAC,UAAU;YACjC,aAAa,EAAE,UAAU,CAAC,aAAa;YACvC,KAAK,EAAE,UAAU,CAAC,KAAK;SACxB,EACD,UAAU,CACX,CAAC;QAEF,yDAAyD;QACzD,IAAI,WAAW,EAAE,mBAAmB,EAAE,EAAE,CAAC;YACvC,MAAM,MAAM,GAAG,WAAW,CAAC,kBAAkB,EAAE,CAAC;YAChD,OAAO;gBACL,UAAU,EAAE,oCAAoC,MAAM,EAAE;gBACxD,aAAa,EAAE,oCAAoC,MAAM,EAAE;gBAC3D,KAAK,EAAE;oBACL,IAAI,EAAE,aAAa,CAAC,cAAc;oBAClC,OAAO,EAAE,MAAM;iBAChB;aACF,CAAC;QACJ,CAAC;QAED,wCAAwC;QACxC,MAAM,aAAa,GAAG,WAAW,EAAE,gBAAgB,EAAE,CAAC;QACtD,IAAI,aAAa,EAAE,OAAO,EAAE,CAAC;YAC3B,OAAO;gBACL,UAAU,EAAE,wBAAwB,aAAa,CAAC,MAAM,EAAE;gBAC1D,aAAa,EAAE,wBAAwB,aAAa,CAAC,MAAM,EAAE;gBAC7D,KAAK,EAAE;oBACL,IAAI,EAAE,aAAa,CAAC,gBAAgB;oBACpC,OAAO,EAAE,aAAa,CAAC,MAAM;iBAC9B;aACF,CAAC;QACJ,CAAC;QAED,uDAAuD;QACvD,MAAM,iBAAiB,GAAG,WAAW,EAAE,oBAAoB,EAAE,CAAC;QAC9D,IAAI,iBAAiB,EAAE,CAAC;YACtB,IAAI,OAAO,UAAU,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;gBAC9C,UAAU,CAAC,UAAU,IAAI,MAAM,GAAG,iBAAiB,CAAC;YACtD,CAAC;iBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;gBAChD,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,iBAAiB,EAAE,CAAC,CAAC;YACnE,CAAC;iBAAM,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;gBACjC,oDAAoD;gBACpD,UAAU,CAAC,UAAU,GAAG;oBACtB,UAAU,CAAC,UAAU;oBACrB,EAAE,IAAI,EAAE,MAAM,GAAG,iBAAiB,EAAE;iBACrC,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,UAAU,CAAC,UAAU,GAAG,iBAAiB,CAAC;YAC5C,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC"}

package/dist/src/core/coreToolHookTriggers.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/core/coreToolHookTriggers.test.js

@@ -0,0 +1,191 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { executeToolWithHooks } from './coreToolHookTriggers.js';
+import { ToolErrorType } from '../tools/tool-error.js';
+import { BaseToolInvocation, } from '../tools/tools.js';
+import { MessageBusType, } from '../confirmation-bus/types.js';
+class MockInvocation extends BaseToolInvocation {
+    constructor(params, messageBus) {
+        super(params, messageBus);
+    }
+    getDescription() {
+        return 'mock';
+    }
+    async execute() {
+        return {
+            llmContent: this.params.key ? `key: ${this.params.key}` : 'success',
+            returnDisplay: this.params.key
+                ? `key: ${this.params.key}`
+                : 'success display',
+        };
+    }
+}
+describe('executeToolWithHooks', () => {
+    let messageBus;
+    let mockTool;
+    beforeEach(() => {
+        messageBus = {
+            request: vi.fn(),
+            publish: vi.fn(),
+            subscribe: vi.fn(),
+            unsubscribe: vi.fn(),
+        };
+        mockTool = {
+            build: vi
+                .fn()
+                .mockImplementation((params) => new MockInvocation(params, messageBus)),
+        };
+    });
+    it('should prioritize continue: false over decision: block in BeforeTool', async () => {
+        const invocation = new MockInvocation({}, messageBus);
+        const abortSignal = new AbortController().signal;
+        vi.mocked(messageBus.request).mockResolvedValue({
+            type: MessageBusType.HOOK_EXECUTION_RESPONSE,
+            correlationId: 'test-id',
+            success: true,
+            output: {
+                continue: false,
+                stopReason: 'Stop immediately',
+                decision: 'block',
+                reason: 'Should be ignored because continue is false',
+            },
+        });
+        const result = await executeToolWithHooks(invocation, 'test_tool', abortSignal, messageBus, true, mockTool);
+        expect(result.error?.type).toBe(ToolErrorType.STOP_EXECUTION);
+        expect(result.error?.message).toBe('Stop immediately');
+    });
+    it('should block execution in BeforeTool if decision is block', async () => {
+        const invocation = new MockInvocation({}, messageBus);
+        const abortSignal = new AbortController().signal;
+        vi.mocked(messageBus.request).mockResolvedValue({
+            type: MessageBusType.HOOK_EXECUTION_RESPONSE,
+            correlationId: 'test-id',
+            success: true,
+            output: {
+                decision: 'block',
+                reason: 'Execution blocked',
+            },
+        });
+        const result = await executeToolWithHooks(invocation, 'test_tool', abortSignal, messageBus, true, mockTool);
+        expect(result.error?.type).toBe(ToolErrorType.EXECUTION_FAILED);
+        expect(result.error?.message).toBe('Execution blocked');
+    });
+    it('should handle continue: false in AfterTool', async () => {
+        const invocation = new MockInvocation({}, messageBus);
+        const abortSignal = new AbortController().signal;
+        const spy = vi.spyOn(invocation, 'execute');
+        // BeforeTool allow
+        vi.mocked(messageBus.request)
+            .mockResolvedValueOnce({
+            type: MessageBusType.HOOK_EXECUTION_RESPONSE,
+            correlationId: 'test-id',
+            success: true,
+            output: { decision: 'allow' },
+        })
+            // AfterTool stop
+            .mockResolvedValueOnce({
+            type: MessageBusType.HOOK_EXECUTION_RESPONSE,
+            correlationId: 'test-id',
+            success: true,
+            output: {
+                continue: false,
+                stopReason: 'Stop after execution',
+            },
+        });
+        const result = await executeToolWithHooks(invocation, 'test_tool', abortSignal, messageBus, true, mockTool);
+        expect(result.error?.type).toBe(ToolErrorType.STOP_EXECUTION);
+        expect(result.error?.message).toBe('Stop after execution');
+        expect(spy).toHaveBeenCalled();
+    });
+    it('should block result in AfterTool if decision is deny', async () => {
+        const invocation = new MockInvocation({}, messageBus);
+        const abortSignal = new AbortController().signal;
+        // BeforeTool allow
+        vi.mocked(messageBus.request)
+            .mockResolvedValueOnce({
+            type: MessageBusType.HOOK_EXECUTION_RESPONSE,
+            correlationId: 'test-id',
+            success: true,
+            output: { decision: 'allow' },
+        })
+            // AfterTool deny
+            .mockResolvedValueOnce({
+            type: MessageBusType.HOOK_EXECUTION_RESPONSE,
+            correlationId: 'test-id',
+            success: true,
+            output: {
+                decision: 'deny',
+                reason: 'Result denied',
+            },
+        });
+        const result = await executeToolWithHooks(invocation, 'test_tool', abortSignal, messageBus, true, mockTool);
+        expect(result.error?.type).toBe(ToolErrorType.EXECUTION_FAILED);
+        expect(result.error?.message).toBe('Result denied');
+    });
+    it('should apply modified tool input from BeforeTool hook', async () => {
+        const params = { key: 'original' };
+        const invocation = new MockInvocation(params, messageBus);
+        const toolName = 'test-tool';
+        const abortSignal = new AbortController().signal;
+        // Capture arguments to verify what was passed before modification
+        const requestSpy = vi.fn().mockImplementation(async (request) => {
+            if (request.eventName === 'BeforeTool') {
+                // Verify input is original before we return modification instruction
+                expect(request.input.tool_input.key).toBe('original');
+                return {
+                    type: MessageBusType.HOOK_EXECUTION_RESPONSE,
+                    correlationId: 'test-id',
+                    success: true,
+                    output: {
+                        hookSpecificOutput: {
+                            hookEventName: 'BeforeTool',
+                            tool_input: { key: 'modified' },
+                        },
+                    },
+                };
+            }
+            return {
+                type: MessageBusType.HOOK_EXECUTION_RESPONSE,
+                correlationId: 'test-id',
+                success: true,
+                output: {},
+            };
+        });
+        messageBus.request = requestSpy;
+        const result = await executeToolWithHooks(invocation, toolName, abortSignal, messageBus, true, // hooksEnabled
+        mockTool);
+        // Verify result reflects modified input
+        expect(result.llmContent).toBe('key: modified\n\n[System] Tool input parameters (key) were modified by a hook before execution.');
+        // Verify params object was modified in place
+        expect(invocation.params.key).toBe('modified');
+        expect(requestSpy).toHaveBeenCalled();
+        expect(mockTool.build).toHaveBeenCalledWith({ key: 'modified' });
+    });
+    it('should not modify input if hook does not provide tool_input', async () => {
+        const params = { key: 'original' };
+        const invocation = new MockInvocation(params, messageBus);
+        const toolName = 'test-tool';
+        const abortSignal = new AbortController().signal;
+        vi.mocked(messageBus.request).mockResolvedValue({
+            type: MessageBusType.HOOK_EXECUTION_RESPONSE,
+            correlationId: 'test-id',
+            success: true,
+            output: {
+                hookSpecificOutput: {
+                    hookEventName: 'BeforeTool',
+                    // No tool_input
+                },
+            },
+        });
+        const result = await executeToolWithHooks(invocation, toolName, abortSignal, messageBus, true, // hooksEnabled
+        mockTool);
+        expect(result.llmContent).toBe('key: original');
+        expect(invocation.params.key).toBe('original');
+        expect(mockTool.build).not.toHaveBeenCalled();
+    });
+});
+//# sourceMappingURL=coreToolHookTriggers.test.js.map

package/dist/src/core/coreToolHookTriggers.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"coreToolHookTriggers.test.js","sourceRoot":"","sources":["../../../src/core/coreToolHookTriggers.test.ts"],"names":[],"mappings":"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"}