@google/gemini-cli-core 0.26.0-preview.4 → 0.27.0-nightly.20260126.cb772a5b7

package/dist/src/core/coreToolHookTriggers.js

@@ -3,96 +3,11 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { MessageBusType, } from '../confirmation-bus/types.js';
-import { createHookOutput, NotificationType, BeforeToolHookOutput, } from '../hooks/types.js';
+import { 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.
- */
-function toSerializableDetails(details) {
-    const base = {
-        type: details.type,
-        title: details.title,
-    };
-    switch (details.type) {
-        case 'edit':
-            return {
-                ...base,
-                fileName: details.fileName,
-                filePath: details.filePath,
-                fileDiff: details.fileDiff,
-                originalContent: details.originalContent,
-                newContent: details.newContent,
-                isModifying: details.isModifying,
-            };
-        case 'exec':
-            return {
-                ...base,
-                command: details.command,
-                rootCommand: details.rootCommand,
-            };
-        case 'mcp':
-            return {
-                ...base,
-                serverName: details.serverName,
-                toolName: details.toolName,
-                toolDisplayName: details.toolDisplayName,
-            };
-        case 'info':
-            return {
-                ...base,
-                prompt: details.prompt,
-                urls: details.urls,
-            };
-        default:
-            return base;
-    }
-}
-/**
- * Gets the message to display in the notification hook for tool confirmation.
- */
-function getNotificationMessage(confirmationDetails) {
-    switch (confirmationDetails.type) {
-        case 'edit':
-            return `Tool ${confirmationDetails.title} requires editing`;
-        case 'exec':
-            return `Tool ${confirmationDetails.title} requires execution`;
-        case 'mcp':
-            return `Tool ${confirmationDetails.title} requires MCP`;
-        case 'info':
-            return `Tool ${confirmationDetails.title} requires information`;
-        default:
-            return `Tool requires confirmation`;
-    }
-}
-/**
- * Fires the ToolPermission notification hook for a tool that needs confirmation.
- *
- * @param messageBus The message bus to use for hook communication
- * @param confirmationDetails The tool confirmation details
- */
-export async function fireToolNotificationHook(messageBus, confirmationDetails) {
-    try {
-        const message = getNotificationMessage(confirmationDetails);
-        const serializedDetails = toSerializableDetails(confirmationDetails);
-        await messageBus.request({
-            type: MessageBusType.HOOK_EXECUTION_REQUEST,
-            eventName: 'Notification',
-            input: {
-                notification_type: NotificationType.ToolPermission,
-                message,
-                details: serializedDetails,
-            },
-        }, MessageBusType.HOOK_EXECUTION_RESPONSE);
-    }
-    catch (error) {
-        debugLogger.debug(`Notification hook failed for ${confirmationDetails.title}:`, error);
-    }
-}
 /**
  * Extracts MCP context from a tool invocation if it's an MCP tool.
  *
@@ -123,89 +38,27 @@ function extractMcpContext(invocation, config) {
         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, mcpContext) {
-    try {
-        const response = await messageBus.request({
-            type: MessageBusType.HOOK_EXECUTION_REQUEST,
-            eventName: 'BeforeTool',
-            input: {
-                tool_name: toolName,
-                tool_input: toolInput,
-                ...(mcpContext && { mcp_context: mcpContext }),
-            },
-        }, MessageBusType.HOOK_EXECUTION_RESPONSE);
-        return response.output
-            ? createHookOutput('BeforeTool', response.output)
-            : undefined;
-    }
-    catch (error) {
-        debugLogger.debug(`BeforeTool hook failed for ${toolName}:`, error);
-        return undefined;
-    }
-}
-/**
- * Fires the AfterTool hook and returns the hook output.
- *
- * @param messageBus The message bus to use for hook communication
- * @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, mcpContext) {
-    try {
-        const response = await messageBus.request({
-            type: MessageBusType.HOOK_EXECUTION_REQUEST,
-            eventName: 'AfterTool',
-            input: {
-                tool_name: toolName,
-                tool_input: toolInput,
-                tool_response: toolResponse,
-                ...(mcpContext && { mcp_context: mcpContext }),
-            },
-        }, MessageBusType.HOOK_EXECUTION_RESPONSE);
-        return response.output
-            ? createHookOutput('AfterTool', response.output)
-            : undefined;
-    }
-    catch (error) {
-        debugLogger.debug(`AfterTool hook failed for ${toolName}:`, error);
-        return undefined;
-    }
-}
 /**
  * Execute a tool with BeforeTool and AfterTool hooks.
  *
  * @param invocation The tool invocation to execute
  * @param toolName The name of the tool
  * @param signal Abort signal for cancellation
- * @param messageBus Optional message bus for hook communication
- * @param hooksEnabled Whether hooks are enabled
  * @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, tool, liveOutputCallback, shellExecutionConfig, setPidCallback, config) {
+export async function executeToolWithHooks(invocation, toolName, signal, 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, mcpContext);
+    const hookSystem = config?.getHookSystem();
+    if (hookSystem) {
+        const beforeOutput = await hookSystem.fireBeforeToolEvent(toolName, toolInput, mcpContext);
         // Check if hook requested to stop entire agent execution
         if (beforeOutput?.shouldStopExecution()) {
             const reason = beforeOutput.getEffectiveReason();
@@ -285,9 +138,8 @@ export async function executeToolWithHooks(invocation, toolName, signal, message
             ];
         }
     }
-    // Fire AfterTool hook through MessageBus (only if hooks are enabled)
-    if (hooksEnabled && messageBus) {
-        const afterOutput = await fireAfterToolHook(messageBus, toolName, toolInput, {
+    if (hookSystem) {
+        const afterOutput = await hookSystem.fireAfterToolEvent(toolName, toolInput, {
             llmContent: toolResult.llmContent,
             returnDisplay: toolResult.returnDisplay,
             error: toolResult.error,
@@ -319,21 +171,22 @@ export async function executeToolWithHooks(invocation, toolName, signal, message
         // Add additional context from hooks to the tool result
         const additionalContext = afterOutput?.getAdditionalContext();
         if (additionalContext) {
+            const wrappedContext = `\n\n<hook_context>${additionalContext}</hook_context>`;
             if (typeof toolResult.llmContent === 'string') {
-                toolResult.llmContent += '\n\n' + additionalContext;
+                toolResult.llmContent += wrappedContext;
             }
             else if (Array.isArray(toolResult.llmContent)) {
-                toolResult.llmContent.push({ text: '\n\n' + additionalContext });
+                toolResult.llmContent.push({ text: wrappedContext });
             }
             else if (toolResult.llmContent) {
                 // Handle single Part case by converting to an array
                 toolResult.llmContent = [
                     toolResult.llmContent,
-                    { text: '\n\n' + additionalContext },
+                    { text: wrappedContext },
                 ];
             }
             else {
-                toolResult.llmContent = additionalContext;
+                toolResult.llmContent = wrappedContext;
             }
         }
     }

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

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

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

@@ -7,7 +7,7 @@ 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';
+import { BeforeToolHookOutput, } from '../hooks/types.js';
 class MockInvocation extends BaseToolInvocation {
     constructor(params, messageBus) {
         super(params, messageBus);
@@ -27,6 +27,8 @@ class MockInvocation extends BaseToolInvocation {
 describe('executeToolWithHooks', () => {
     let messageBus;
     let mockTool;
+    let mockHookSystem;
+    let mockConfig;
     beforeEach(() => {
         messageBus = {
             request: vi.fn(),
@@ -34,6 +36,15 @@ describe('executeToolWithHooks', () => {
             subscribe: vi.fn(),
             unsubscribe: vi.fn(),
         };
+        mockHookSystem = {
+            fireBeforeToolEvent: vi.fn(),
+            fireAfterToolEvent: vi.fn(),
+        };
+        mockConfig = {
+            getHookSystem: vi.fn().mockReturnValue(mockHookSystem),
+            getMcpClientManager: vi.fn().mockReturnValue(undefined),
+            getMcpServers: vi.fn().mockReturnValue({}),
+        };
         mockTool = {
             build: vi
                 .fn()
@@ -43,34 +54,27 @@ describe('executeToolWithHooks', () => {
     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',
+        vi.mocked(mockHookSystem.fireBeforeToolEvent).mockResolvedValue({
+            shouldStopExecution: () => true,
+            getEffectiveReason: () => 'Stop immediately',
+            getBlockingError: () => ({
+                blocked: false,
                 reason: 'Should be ignored because continue is false',
-            },
+            }),
         });
-        const result = await executeToolWithHooks(invocation, 'test_tool', abortSignal, messageBus, true, mockTool);
+        const result = await executeToolWithHooks(invocation, 'test_tool', abortSignal, mockTool, undefined, undefined, undefined, mockConfig);
         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',
-            },
+        vi.mocked(mockHookSystem.fireBeforeToolEvent).mockResolvedValue({
+            shouldStopExecution: () => false,
+            getEffectiveReason: () => '',
+            getBlockingError: () => ({ blocked: true, reason: 'Execution blocked' }),
         });
-        const result = await executeToolWithHooks(invocation, 'test_tool', abortSignal, messageBus, true, mockTool);
+        const result = await executeToolWithHooks(invocation, 'test_tool', abortSignal, mockTool, undefined, undefined, undefined, mockConfig);
         expect(result.error?.type).toBe(ToolErrorType.EXECUTION_FAILED);
         expect(result.error?.message).toBe('Execution blocked');
     });
@@ -78,25 +82,17 @@ describe('executeToolWithHooks', () => {
         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',
-            },
+        vi.mocked(mockHookSystem.fireBeforeToolEvent).mockResolvedValue({
+            shouldStopExecution: () => false,
+            getEffectiveReason: () => '',
+            getBlockingError: () => ({ blocked: false, reason: '' }),
         });
-        const result = await executeToolWithHooks(invocation, 'test_tool', abortSignal, messageBus, true, mockTool);
+        vi.mocked(mockHookSystem.fireAfterToolEvent).mockResolvedValue({
+            shouldStopExecution: () => true,
+            getEffectiveReason: () => 'Stop after execution',
+            getBlockingError: () => ({ blocked: false, reason: '' }),
+        });
+        const result = await executeToolWithHooks(invocation, 'test_tool', abortSignal, mockTool, undefined, undefined, undefined, mockConfig);
         expect(result.error?.type).toBe(ToolErrorType.STOP_EXECUTION);
         expect(result.error?.message).toBe('Stop after execution');
         expect(spy).toHaveBeenCalled();
@@ -104,25 +100,17 @@ describe('executeToolWithHooks', () => {
     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',
-            },
+        vi.mocked(mockHookSystem.fireBeforeToolEvent).mockResolvedValue({
+            shouldStopExecution: () => false,
+            getEffectiveReason: () => '',
+            getBlockingError: () => ({ blocked: false, reason: '' }),
         });
-        const result = await executeToolWithHooks(invocation, 'test_tool', abortSignal, messageBus, true, mockTool);
+        vi.mocked(mockHookSystem.fireAfterToolEvent).mockResolvedValue({
+            shouldStopExecution: () => false,
+            getEffectiveReason: () => '',
+            getBlockingError: () => ({ blocked: true, reason: 'Result denied' }),
+        });
+        const result = await executeToolWithHooks(invocation, 'test_tool', abortSignal, mockTool, undefined, undefined, undefined, mockConfig);
         expect(result.error?.type).toBe(ToolErrorType.EXECUTION_FAILED);
         expect(result.error?.message).toBe('Result denied');
     });
@@ -131,38 +119,21 @@ describe('executeToolWithHooks', () => {
         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: {},
-            };
+        const mockBeforeOutput = new BeforeToolHookOutput({
+            continue: true,
+            hookSpecificOutput: {
+                hookEventName: 'BeforeTool',
+                tool_input: { key: 'modified' },
+            },
         });
-        messageBus.request = requestSpy;
-        const result = await executeToolWithHooks(invocation, toolName, abortSignal, messageBus, true, // hooksEnabled
-        mockTool);
+        vi.mocked(mockHookSystem.fireBeforeToolEvent).mockResolvedValue(mockBeforeOutput);
+        vi.mocked(mockHookSystem.fireAfterToolEvent).mockResolvedValue(undefined);
+        const result = await executeToolWithHooks(invocation, toolName, abortSignal, mockTool, undefined, undefined, undefined, mockConfig);
         // 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(mockHookSystem.fireBeforeToolEvent).toHaveBeenCalled();
         expect(mockTool.build).toHaveBeenCalledWith({ key: 'modified' });
     });
     it('should not modify input if hook does not provide tool_input', async () => {
@@ -170,19 +141,16 @@ describe('executeToolWithHooks', () => {
         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 mockBeforeOutput = new BeforeToolHookOutput({
+            continue: true,
+            hookSpecificOutput: {
+                hookEventName: 'BeforeTool',
+                // No tool input
             },
         });
-        const result = await executeToolWithHooks(invocation, toolName, abortSignal, messageBus, true, // hooksEnabled
-        mockTool);
+        vi.mocked(mockHookSystem.fireBeforeToolEvent).mockResolvedValue(mockBeforeOutput);
+        vi.mocked(mockHookSystem.fireAfterToolEvent).mockResolvedValue(undefined);
+        const result = await executeToolWithHooks(invocation, toolName, abortSignal, mockTool, undefined, undefined, undefined, mockConfig);
         expect(result.llmContent).toBe('key: original');
         expect(invocation.params.key).toBe('original');
         expect(mockTool.build).not.toHaveBeenCalled();

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

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

package/dist/src/core/coreToolScheduler.js

@@ -12,7 +12,6 @@ import { runInDevTraceSpan } from '../telemetry/trace.js';
 import { ToolModificationHandler } from '../scheduler/tool-modifier.js';
 import { getToolSuggestion } from '../utils/tool-utils.js';
 import { MessageBusType } from '../confirmation-bus/types.js';
-import { fireToolNotificationHook } from './coreToolHookTriggers.js';
 import {} from '../scheduler/types.js';
 import { ToolExecutor } from '../scheduler/tool-executor.js';
 import { DiscoveredMCPTool } from '../tools/mcp-tool.js';
@@ -427,10 +426,9 @@ export class CoreToolScheduler {
                             throw new Error(`Tool execution for "${toolCall.tool.displayName || toolCall.tool.name}" requires user confirmation, which is not supported in non-interactive mode.`);
                         }
                         // Fire Notification hook before showing confirmation to user
-                        const messageBus = this.config.getMessageBus();
-                        const hooksEnabled = this.config.getEnableHooks();
-                        if (hooksEnabled && messageBus) {
-                            await fireToolNotificationHook(messageBus, confirmationDetails);
+                        const hookSystem = this.config.getHookSystem();
+                        if (hookSystem) {
+                            await hookSystem.fireToolNotificationEvent(confirmationDetails);
                         }
                         // Allow IDE to resolve confirmation
                         if (confirmationDetails.type === 'edit' &&