@office-ai/aioncli-core 0.18.6 → 0.24.0-preview.1

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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"}

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

@@ -3,82 +3,11 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import type { ToolCallRequestInfo, ToolCallResponseInfo, ToolCallConfirmationDetails, EditorType, Config, ToolConfirmationPayload, AnyDeclarativeTool, AnyToolInvocation, AnsiOutput } from '../index.js';
-import { ToolConfirmationOutcome } from '../index.js';
-import type { Part, PartListUnion } from '@google/genai';
-export type ValidatingToolCall = {
-    status: 'validating';
-    request: ToolCallRequestInfo;
-    tool: AnyDeclarativeTool;
-    invocation: AnyToolInvocation;
-    startTime?: number;
-    outcome?: ToolConfirmationOutcome;
-};
-export type ScheduledToolCall = {
-    status: 'scheduled';
-    request: ToolCallRequestInfo;
-    tool: AnyDeclarativeTool;
-    invocation: AnyToolInvocation;
-    startTime?: number;
-    outcome?: ToolConfirmationOutcome;
-};
-export type ErroredToolCall = {
-    status: 'error';
-    request: ToolCallRequestInfo;
-    response: ToolCallResponseInfo;
-    tool?: AnyDeclarativeTool;
-    durationMs?: number;
-    outcome?: ToolConfirmationOutcome;
-};
-export type SuccessfulToolCall = {
-    status: 'success';
-    request: ToolCallRequestInfo;
-    tool: AnyDeclarativeTool;
-    response: ToolCallResponseInfo;
-    invocation: AnyToolInvocation;
-    durationMs?: number;
-    outcome?: ToolConfirmationOutcome;
-};
-export type ExecutingToolCall = {
-    status: 'executing';
-    request: ToolCallRequestInfo;
-    tool: AnyDeclarativeTool;
-    invocation: AnyToolInvocation;
-    liveOutput?: string | AnsiOutput;
-    startTime?: number;
-    outcome?: ToolConfirmationOutcome;
-    pid?: number;
-};
-export type CancelledToolCall = {
-    status: 'cancelled';
-    request: ToolCallRequestInfo;
-    response: ToolCallResponseInfo;
-    tool: AnyDeclarativeTool;
-    invocation: AnyToolInvocation;
-    durationMs?: number;
-    outcome?: ToolConfirmationOutcome;
-};
-export type WaitingToolCall = {
-    status: 'awaiting_approval';
-    request: ToolCallRequestInfo;
-    tool: AnyDeclarativeTool;
-    invocation: AnyToolInvocation;
-    confirmationDetails: ToolCallConfirmationDetails;
-    startTime?: number;
-    outcome?: ToolConfirmationOutcome;
-};
-export type Status = ToolCall['status'];
-export type ToolCall = ValidatingToolCall | ScheduledToolCall | ErroredToolCall | SuccessfulToolCall | ExecutingToolCall | CancelledToolCall | WaitingToolCall;
-export type CompletedToolCall = SuccessfulToolCall | CancelledToolCall | ErroredToolCall;
-export type ConfirmHandler = (toolCall: WaitingToolCall) => Promise<ToolConfirmationOutcome>;
-export type OutputUpdateHandler = (toolCallId: string, outputChunk: string | AnsiOutput) => void;
-export type AllToolCallsCompleteHandler = (completedToolCalls: CompletedToolCall[]) => Promise<void>;
-export type ToolCallsUpdateHandler = (toolCalls: ToolCall[]) => void;
-export declare function convertToFunctionResponse(toolName: string, callId: string, llmContent: PartListUnion): Part[];
-export declare function truncateAndSaveToFile(content: string, callId: string, projectTempDir: string, threshold: number, truncateLines: number): Promise<{
-    content: string;
-    outputFile?: string;
-}>;
+import { type ToolConfirmationPayload, ToolConfirmationOutcome } from '../tools/tools.js';
+import type { EditorType } from '../utils/editor.js';
+import type { Config } from '../config/config.js';
+import { type ToolCall, type ValidatingToolCall, type ScheduledToolCall, type ErroredToolCall, type SuccessfulToolCall, type ExecutingToolCall, type CancelledToolCall, type WaitingToolCall, type Status, type CompletedToolCall, type ConfirmHandler, type OutputUpdateHandler, type AllToolCallsCompleteHandler, type ToolCallsUpdateHandler, type ToolCallRequestInfo, type ToolCallResponseInfo } from '../scheduler/types.js';
+export type { ToolCall, ValidatingToolCall, ScheduledToolCall, ErroredToolCall, SuccessfulToolCall, ExecutingToolCall, CancelledToolCall, WaitingToolCall, Status, CompletedToolCall, ConfirmHandler, OutputUpdateHandler, AllToolCallsCompleteHandler, ToolCallsUpdateHandler, ToolCallRequestInfo, ToolCallResponseInfo, };
 interface CoreToolSchedulerOptions {
     config: Config;
     outputUpdateHandler?: OutputUpdateHandler;
@@ -100,19 +29,12 @@ export declare class CoreToolScheduler {
     private requestQueue;
     private toolCallQueue;
     private completedToolCallsForBatch;
+    private toolExecutor;
     constructor(options: CoreToolSchedulerOptions);
     private setStatusInternal;
     private setArgsInternal;
     private isRunning;
     private buildInvocation;
-    /**
-     * Generates a suggestion string for a tool name that was not found in the registry.
-     * It finds the closest matches based on Levenshtein distance.
-     * @param unknownToolName The tool name that was not found.
-     * @param topN The number of suggestions to return. Defaults to 3.
-     * @returns A suggestion string like " Did you mean 'tool'?" or " Did you mean one of: 'tool1', 'tool2'?", or an empty string if no suggestions are found.
-     */
-    private getToolSuggestion;
     schedule(request: ToolCallRequestInfo | ToolCallRequestInfo[], signal: AbortSignal): Promise<void>;
     cancelAll(signal: AbortSignal): void;
     private _schedule;
@@ -132,4 +54,3 @@ export declare class CoreToolScheduler {
     private setToolCallOutcome;
     private isAutoApproved;
 }
-export {};