@office-ai/aioncli-core 0.26.0 → 0.30.1

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

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
@@ -11,6 +11,7 @@ import { LoggingContentGenerator } from './loggingContentGenerator.js';
 import { loadApiKey } from './apiKeyCredentialStorage.js';
 import { FakeContentGenerator } from './fakeContentGenerator.js';
 import { RecordingContentGenerator } from './recordingContentGenerator.js';
+import { resetVersionCache } from '../utils/version.js';
 vi.mock('../code_assist/codeAssist.js');
 vi.mock('@google/genai');
 vi.mock('./apiKeyCredentialStorage.js', () => ({
@@ -21,10 +22,10 @@ const mockConfig = {
     getModel: vi.fn().mockReturnValue('gemini-pro'),
     getProxy: vi.fn().mockReturnValue(undefined),
     getUsageStatisticsEnabled: vi.fn().mockReturnValue(true),
-    getPreviewFeatures: vi.fn().mockReturnValue(false),
 };
 describe('createContentGenerator', () => {
     beforeEach(() => {
+        resetVersionCache();
         vi.clearAllMocks();
     });
     afterEach(() => {
@@ -78,7 +79,6 @@ describe('createContentGenerator', () => {
             getModel: vi.fn().mockReturnValue('gemini-pro'),
             getProxy: vi.fn().mockReturnValue(undefined),
             getUsageStatisticsEnabled: () => true,
-            getPreviewFeatures: vi.fn().mockReturnValue(false),
         };
         // Set a fixed version for testing
         vi.stubEnv('CLI_VERSION', '1.2.3');
@@ -93,12 +93,11 @@ describe('createContentGenerator', () => {
         expect(GoogleGenAI).toHaveBeenCalledWith({
             apiKey: 'test-api-key',
             vertexai: undefined,
-            httpOptions: {
-                headers: {
+            httpOptions: expect.objectContaining({
+                headers: expect.objectContaining({
                     'User-Agent': expect.stringContaining('GeminiCLI/1.2.3/gemini-pro'),
-                    'x-gemini-api-privileged-user-id': expect.any(String),
-                },
-            },
+                }),
+            }),
         });
         expect(generator).toEqual(new LoggingContentGenerator(mockGenerator.models, mockConfig));
     });
@@ -122,7 +121,6 @@ describe('createContentGenerator', () => {
             getModel: vi.fn().mockReturnValue('gemini-pro'),
             getProxy: vi.fn().mockReturnValue(undefined),
             getUsageStatisticsEnabled: () => false,
-            getPreviewFeatures: vi.fn().mockReturnValue(false),
         };
         const mockGenerator = {
             models: {},
@@ -136,20 +134,20 @@ describe('createContentGenerator', () => {
         expect(GoogleGenAI).toHaveBeenCalledWith({
             apiKey: 'test-api-key',
             vertexai: undefined,
-            httpOptions: {
+            httpOptions: expect.objectContaining({
                 headers: expect.objectContaining({
                     'User-Agent': expect.any(String),
                     'X-Test-Header': 'test',
                     Another: 'value',
                 }),
-            },
+            }),
         });
         expect(GoogleGenAI).toHaveBeenCalledWith(expect.not.objectContaining({
-            httpOptions: {
+            httpOptions: expect.objectContaining({
                 headers: expect.objectContaining({
                     Authorization: expect.any(String),
                 }),
-            },
+            }),
         }));
     });
     it('should pass api key as Authorization Header when GEMINI_API_KEY_AUTH_MECHANISM is set to bearer', async () => {
@@ -157,7 +155,6 @@ describe('createContentGenerator', () => {
             getModel: vi.fn().mockReturnValue('gemini-pro'),
             getProxy: vi.fn().mockReturnValue(undefined),
             getUsageStatisticsEnabled: () => false,
-            getPreviewFeatures: vi.fn().mockReturnValue(false),
         };
         const mockGenerator = {
             models: {},
@@ -171,12 +168,12 @@ describe('createContentGenerator', () => {
         expect(GoogleGenAI).toHaveBeenCalledWith({
             apiKey: 'test-api-key',
             vertexai: undefined,
-            httpOptions: {
+            httpOptions: expect.objectContaining({
                 headers: expect.objectContaining({
                     'User-Agent': expect.any(String),
                     Authorization: 'Bearer test-api-key',
                 }),
-            },
+            }),
         });
     });
     it('should not pass api key as Authorization Header when GEMINI_API_KEY_AUTH_MECHANISM is not set (default behavior)', async () => {
@@ -184,7 +181,6 @@ describe('createContentGenerator', () => {
             getModel: vi.fn().mockReturnValue('gemini-pro'),
             getProxy: vi.fn().mockReturnValue(undefined),
             getUsageStatisticsEnabled: () => false,
-            getPreviewFeatures: vi.fn().mockReturnValue(false),
         };
         const mockGenerator = {
             models: {},
@@ -198,26 +194,25 @@ describe('createContentGenerator', () => {
         expect(GoogleGenAI).toHaveBeenCalledWith({
             apiKey: 'test-api-key',
             vertexai: undefined,
-            httpOptions: {
+            httpOptions: expect.objectContaining({
                 headers: expect.objectContaining({
                     'User-Agent': expect.any(String),
                 }),
-            },
+            }),
         });
         // Explicitly assert that Authorization header is NOT present
         expect(GoogleGenAI).toHaveBeenCalledWith(expect.not.objectContaining({
-            httpOptions: {
+            httpOptions: expect.objectContaining({
                 headers: expect.objectContaining({
                     Authorization: expect.any(String),
                 }),
-            },
+            }),
         }));
     });
     it('should create a GoogleGenAI content generator with client install id logging disabled', async () => {
         const mockConfig = {
             getModel: vi.fn().mockReturnValue('gemini-pro'),
             getUsageStatisticsEnabled: () => false,
-            getPreviewFeatures: vi.fn().mockReturnValue(false),
         };
         const mockGenerator = {
             models: {},
@@ -230,14 +225,122 @@ describe('createContentGenerator', () => {
         expect(GoogleGenAI).toHaveBeenCalledWith({
             apiKey: 'test-api-key',
             vertexai: undefined,
-            httpOptions: {
+            httpOptions: expect.objectContaining({
                 headers: {
                     'User-Agent': expect.any(String),
                 },
-            },
+            }),
         });
         expect(generator).toEqual(new LoggingContentGenerator(mockGenerator.models, mockConfig));
     });
+    it('should pass apiVersion to GoogleGenAI when GOOGLE_GENAI_API_VERSION is set', async () => {
+        const mockConfig = {
+            getModel: vi.fn().mockReturnValue('gemini-pro'),
+            getProxy: vi.fn().mockReturnValue(undefined),
+            getUsageStatisticsEnabled: () => false,
+        };
+        const mockGenerator = {
+            models: {},
+        };
+        vi.mocked(GoogleGenAI).mockImplementation(() => mockGenerator);
+        vi.stubEnv('GOOGLE_GENAI_API_VERSION', 'v1');
+        await createContentGenerator({
+            apiKey: 'test-api-key',
+            authType: AuthType.USE_GEMINI,
+        }, mockConfig);
+        expect(GoogleGenAI).toHaveBeenCalledWith({
+            apiKey: 'test-api-key',
+            vertexai: undefined,
+            httpOptions: expect.objectContaining({
+                headers: expect.objectContaining({
+                    'User-Agent': expect.any(String),
+                }),
+            }),
+            apiVersion: 'v1',
+        });
+    });
+    it('should not include apiVersion when GOOGLE_GENAI_API_VERSION is not set', async () => {
+        const mockConfig = {
+            getModel: vi.fn().mockReturnValue('gemini-pro'),
+            getProxy: vi.fn().mockReturnValue(undefined),
+            getUsageStatisticsEnabled: () => false,
+        };
+        const mockGenerator = {
+            models: {},
+        };
+        vi.mocked(GoogleGenAI).mockImplementation(() => mockGenerator);
+        await createContentGenerator({
+            apiKey: 'test-api-key',
+            authType: AuthType.USE_GEMINI,
+        }, mockConfig);
+        expect(GoogleGenAI).toHaveBeenCalledWith({
+            apiKey: 'test-api-key',
+            vertexai: undefined,
+            httpOptions: expect.objectContaining({
+                headers: expect.objectContaining({
+                    'User-Agent': expect.any(String),
+                }),
+            }),
+        });
+        expect(GoogleGenAI).toHaveBeenCalledWith(expect.not.objectContaining({
+            apiVersion: expect.any(String),
+        }));
+    });
+    it('should not include apiVersion when GOOGLE_GENAI_API_VERSION is an empty string', async () => {
+        const mockConfig = {
+            getModel: vi.fn().mockReturnValue('gemini-pro'),
+            getProxy: vi.fn().mockReturnValue(undefined),
+            getUsageStatisticsEnabled: () => false,
+        };
+        const mockGenerator = {
+            models: {},
+        };
+        vi.mocked(GoogleGenAI).mockImplementation(() => mockGenerator);
+        vi.stubEnv('GOOGLE_GENAI_API_VERSION', '');
+        await createContentGenerator({
+            apiKey: 'test-api-key',
+            authType: AuthType.USE_GEMINI,
+        }, mockConfig);
+        expect(GoogleGenAI).toHaveBeenCalledWith({
+            apiKey: 'test-api-key',
+            vertexai: undefined,
+            httpOptions: expect.objectContaining({
+                headers: expect.objectContaining({
+                    'User-Agent': expect.any(String),
+                }),
+            }),
+        });
+        expect(GoogleGenAI).toHaveBeenCalledWith(expect.not.objectContaining({
+            apiVersion: expect.any(String),
+        }));
+    });
+    it('should pass apiVersion for Vertex AI when GOOGLE_GENAI_API_VERSION is set', async () => {
+        const mockConfig = {
+            getModel: vi.fn().mockReturnValue('gemini-pro'),
+            getProxy: vi.fn().mockReturnValue(undefined),
+            getUsageStatisticsEnabled: () => false,
+        };
+        const mockGenerator = {
+            models: {},
+        };
+        vi.mocked(GoogleGenAI).mockImplementation(() => mockGenerator);
+        vi.stubEnv('GOOGLE_GENAI_API_VERSION', 'v1alpha');
+        await createContentGenerator({
+            apiKey: 'test-api-key',
+            vertexai: true,
+            authType: AuthType.USE_VERTEX_AI,
+        }, mockConfig);
+        expect(GoogleGenAI).toHaveBeenCalledWith({
+            apiKey: 'test-api-key',
+            vertexai: true,
+            httpOptions: expect.objectContaining({
+                headers: expect.objectContaining({
+                    'User-Agent': expect.any(String),
+                }),
+            }),
+            apiVersion: 'v1alpha',
+        });
+    });
 });
 describe('createContentGeneratorConfig', () => {
     const mockConfig = {

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

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

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

@@ -3,53 +3,21 @@
  * Copyright 2025 Google LLC
  * 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, AnyDeclarativeTool } from '../tools/tools.js';
+import type { Config } from '../config/config.js';
+import type { 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';
-/**
- * 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 declare function fireToolNotificationHook(messageBus: MessageBus, confirmationDetails: ToolCallConfirmationDetails): Promise<void>;
-/**
- * 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
- * @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>;
-/**
- * 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
- * @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>;
 /**
  * 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 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): Promise<ToolResult>;
+export declare function executeToolWithHooks(invocation: ShellToolInvocation | AnyToolInvocation, toolName: string, signal: AbortSignal, tool: AnyDeclarativeTool, liveOutputCallback?: (outputChunk: string | AnsiOutput) => void, shellExecutionConfig?: ShellExecutionConfig, setPidCallback?: (pid: number) => void, config?: Config): Promise<ToolResult>;

package/dist/src/core/coreToolHookTriggers.js

@@ -3,150 +3,40 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { MessageBusType, } from '../confirmation-bus/types.js';
-import { BeforeToolHookOutput, createHookOutput, NotificationType, } from '../hooks/types.js';
-import { ShellToolInvocation } from '../tools/shell.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);
-    }
-}
-/**
- * Fires the BeforeTool hook and returns the hook output.
+ * Extracts MCP context from a tool invocation if it's an MCP tool.
  *
- * @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
- * @returns The hook output, or undefined if no hook was executed or on error
+ * @param invocation The tool invocation
+ * @param config Config to look up server details
+ * @returns MCP context if this is an MCP tool, undefined otherwise
  */
-export async function fireBeforeToolHook(messageBus, toolName, toolInput) {
-    try {
-        const response = await messageBus.request({
-            type: MessageBusType.HOOK_EXECUTION_REQUEST,
-            eventName: 'BeforeTool',
-            input: {
-                tool_name: toolName,
-                tool_input: toolInput,
-            },
-        }, MessageBusType.HOOK_EXECUTION_RESPONSE);
-        return response.output
-            ? createHookOutput('BeforeTool', response.output)
-            : undefined;
-    }
-    catch (error) {
-        debugLogger.debug(`BeforeTool hook failed for ${toolName}:`, error);
+function extractMcpContext(invocation, config) {
+    if (!(invocation instanceof DiscoveredMCPToolInvocation)) {
         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
- * @returns The hook output, or undefined if no hook was executed or on error
- */
-export async function fireAfterToolHook(messageBus, toolName, toolInput, toolResponse) {
-    try {
-        const response = await messageBus.request({
-            type: MessageBusType.HOOK_EXECUTION_REQUEST,
-            eventName: 'AfterTool',
-            input: {
-                tool_name: toolName,
-                tool_input: toolInput,
-                tool_response: toolResponse,
-            },
-        }, MessageBusType.HOOK_EXECUTION_RESPONSE);
-        return response.output
-            ? createHookOutput('AfterTool', response.output)
-            : undefined;
-    }
-    catch (error) {
-        debugLogger.debug(`AfterTool hook failed for ${toolName}:`, error);
+    // 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,
+    };
 }
 /**
  * Execute a tool with BeforeTool and AfterTool hooks.
@@ -154,20 +44,22 @@ export async function fireAfterToolHook(messageBus, toolName, toolInput, toolRes
  * @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) {
+export async function executeToolWithHooks(invocation, toolName, signal, tool, liveOutputCallback, shellExecutionConfig, setPidCallback, config) {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     const toolInput = (invocation.params || {});
     let inputWasModified = false;
     let modifiedKeys = [];
-    // Fire BeforeTool hook through MessageBus (only if hooks are enabled)
-    if (hooksEnabled && messageBus) {
-        const beforeOutput = await fireBeforeToolHook(messageBus, toolName, toolInput);
+    // Extract MCP context if this is an MCP tool (only if config is provided)
+    const mcpContext = config ? extractMcpContext(invocation, config) : undefined;
+    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();
@@ -247,13 +139,12 @@ 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,
-        });
+        }, mcpContext);
         // Check if hook requested to stop entire agent execution
         if (afterOutput?.shouldStopExecution()) {
             const reason = afterOutput.getEffectiveReason();
@@ -281,24 +172,25 @@ 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;
             }
         }
     }
     return toolResult;
 }
-//# sourceMappingURL=coreToolHookTriggers.js.map
+//# sourceMappingURL=coreToolHookTriggers.js.map