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

package/dist/src/scheduler/tool-executor.test.js

@@ -0,0 +1,231 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { ToolExecutor } from './tool-executor.js';
+import { makeFakeConfig } from '../test-utils/config.js';
+import { MockTool } from '../test-utils/mock-tool.js';
+import { SHELL_TOOL_NAME } from '../tools/tool-names.js';
+import * as fileUtils from '../utils/fileUtils.js';
+import * as coreToolHookTriggers from '../core/coreToolHookTriggers.js';
+import { ShellToolInvocation } from '../tools/shell.js';
+import { createMockMessageBus } from '../test-utils/mock-message-bus.js';
+// Mock file utils
+vi.mock('../utils/fileUtils.js', () => ({
+    saveTruncatedContent: vi.fn(),
+}));
+// Mock executeToolWithHooks
+vi.mock('../core/coreToolHookTriggers.js', () => ({
+    executeToolWithHooks: vi.fn(),
+}));
+describe('ToolExecutor', () => {
+    let config;
+    let executor;
+    beforeEach(() => {
+        // Use the standard fake config factory
+        config = makeFakeConfig();
+        executor = new ToolExecutor(config);
+        // Reset mocks
+        vi.resetAllMocks();
+        // Default mock implementation for saveTruncatedContent
+        vi.mocked(fileUtils.saveTruncatedContent).mockImplementation(async (_content, _callId, _tempDir, _threshold, _lines) => ({
+            content: 'TruncatedContent...',
+            outputFile: '/tmp/truncated_output.txt',
+        }));
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    it('should execute a tool successfully', async () => {
+        const mockTool = new MockTool({
+            name: 'testTool',
+            execute: async () => ({
+                llmContent: 'Tool output',
+                returnDisplay: 'Tool output',
+            }),
+        });
+        const invocation = mockTool.build({});
+        // Mock executeToolWithHooks to return success
+        vi.mocked(coreToolHookTriggers.executeToolWithHooks).mockResolvedValue({
+            llmContent: 'Tool output',
+            returnDisplay: 'Tool output',
+        });
+        const scheduledCall = {
+            status: 'scheduled',
+            request: {
+                callId: 'call-1',
+                name: 'testTool',
+                args: {},
+                isClientInitiated: false,
+                prompt_id: 'prompt-1',
+            },
+            tool: mockTool,
+            invocation: invocation,
+            startTime: Date.now(),
+        };
+        const onUpdateToolCall = vi.fn();
+        const result = await executor.execute({
+            call: scheduledCall,
+            signal: new AbortController().signal,
+            onUpdateToolCall,
+        });
+        expect(result.status).toBe('success');
+        if (result.status === 'success') {
+            const response = result.response.responseParts[0]?.functionResponse
+                ?.response;
+            expect(response).toEqual({ output: 'Tool output' });
+        }
+    });
+    it('should handle execution errors', async () => {
+        const mockTool = new MockTool({
+            name: 'failTool',
+        });
+        const invocation = mockTool.build({});
+        // Mock executeToolWithHooks to throw
+        vi.mocked(coreToolHookTriggers.executeToolWithHooks).mockRejectedValue(new Error('Tool Failed'));
+        const scheduledCall = {
+            status: 'scheduled',
+            request: {
+                callId: 'call-2',
+                name: 'failTool',
+                args: {},
+                isClientInitiated: false,
+                prompt_id: 'prompt-2',
+            },
+            tool: mockTool,
+            invocation: invocation,
+            startTime: Date.now(),
+        };
+        const result = await executor.execute({
+            call: scheduledCall,
+            signal: new AbortController().signal,
+            onUpdateToolCall: vi.fn(),
+        });
+        expect(result.status).toBe('error');
+        if (result.status === 'error') {
+            expect(result.response.error?.message).toBe('Tool Failed');
+        }
+    });
+    it('should return cancelled result when signal is aborted', async () => {
+        const mockTool = new MockTool({
+            name: 'slowTool',
+        });
+        const invocation = mockTool.build({});
+        // Mock executeToolWithHooks to simulate slow execution or cancellation check
+        vi.mocked(coreToolHookTriggers.executeToolWithHooks).mockImplementation(async () => {
+            await new Promise((r) => setTimeout(r, 100));
+            return { llmContent: 'Done', returnDisplay: 'Done' };
+        });
+        const scheduledCall = {
+            status: 'scheduled',
+            request: {
+                callId: 'call-3',
+                name: 'slowTool',
+                args: {},
+                isClientInitiated: false,
+                prompt_id: 'prompt-3',
+            },
+            tool: mockTool,
+            invocation: invocation,
+            startTime: Date.now(),
+        };
+        const controller = new AbortController();
+        const promise = executor.execute({
+            call: scheduledCall,
+            signal: controller.signal,
+            onUpdateToolCall: vi.fn(),
+        });
+        controller.abort();
+        const result = await promise;
+        expect(result.status).toBe('cancelled');
+    });
+    it('should truncate large shell output', async () => {
+        // 1. Setup Config for Truncation
+        vi.spyOn(config, 'getEnableToolOutputTruncation').mockReturnValue(true);
+        vi.spyOn(config, 'getTruncateToolOutputThreshold').mockReturnValue(10);
+        vi.spyOn(config, 'getTruncateToolOutputLines').mockReturnValue(5);
+        const mockTool = new MockTool({ name: SHELL_TOOL_NAME });
+        const invocation = mockTool.build({});
+        const longOutput = 'This is a very long output that should be truncated.';
+        // 2. Mock execution returning long content
+        vi.mocked(coreToolHookTriggers.executeToolWithHooks).mockResolvedValue({
+            llmContent: longOutput,
+            returnDisplay: longOutput,
+        });
+        const scheduledCall = {
+            status: 'scheduled',
+            request: {
+                callId: 'call-trunc',
+                name: SHELL_TOOL_NAME,
+                args: { command: 'echo long' },
+                isClientInitiated: false,
+                prompt_id: 'prompt-trunc',
+            },
+            tool: mockTool,
+            invocation: invocation,
+            startTime: Date.now(),
+        };
+        // 3. Execute
+        const result = await executor.execute({
+            call: scheduledCall,
+            signal: new AbortController().signal,
+            onUpdateToolCall: vi.fn(),
+        });
+        // 4. Verify Truncation Logic
+        expect(fileUtils.saveTruncatedContent).toHaveBeenCalledWith(longOutput, 'call-trunc', expect.any(String), // temp dir
+        10, // threshold
+        5);
+        expect(result.status).toBe('success');
+        if (result.status === 'success') {
+            const response = result.response.responseParts[0]?.functionResponse
+                ?.response;
+            // The content should be the *truncated* version returned by the mock saveTruncatedContent
+            expect(response).toEqual({ output: 'TruncatedContent...' });
+            expect(result.response.outputFile).toBe('/tmp/truncated_output.txt');
+        }
+    });
+    it('should report PID updates for shell tools', async () => {
+        // 1. Setup ShellToolInvocation
+        const messageBus = createMockMessageBus();
+        const shellInvocation = new ShellToolInvocation(config, { command: 'sleep 10' }, messageBus);
+        // We need a dummy tool that matches the invocation just for structure
+        const mockTool = new MockTool({ name: SHELL_TOOL_NAME });
+        // 2. Mock executeToolWithHooks to trigger the PID callback
+        const testPid = 12345;
+        vi.mocked(coreToolHookTriggers.executeToolWithHooks).mockImplementation(async (_inv, _name, _sig, _bus, _hooks, _tool, _liveCb, _shellCfg, setPidCallback) => {
+            // Simulate the shell tool reporting a PID
+            if (setPidCallback) {
+                setPidCallback(testPid);
+            }
+            return { llmContent: 'done', returnDisplay: 'done' };
+        });
+        const scheduledCall = {
+            status: 'scheduled',
+            request: {
+                callId: 'call-pid',
+                name: SHELL_TOOL_NAME,
+                args: { command: 'sleep 10' },
+                isClientInitiated: false,
+                prompt_id: 'prompt-pid',
+            },
+            tool: mockTool,
+            invocation: shellInvocation,
+            startTime: Date.now(),
+        };
+        const onUpdateToolCall = vi.fn();
+        // 3. Execute
+        await executor.execute({
+            call: scheduledCall,
+            signal: new AbortController().signal,
+            onUpdateToolCall,
+        });
+        // 4. Verify PID was reported
+        expect(onUpdateToolCall).toHaveBeenCalledWith(expect.objectContaining({
+            status: 'executing',
+            pid: testPid,
+        }));
+    });
+});
+//# sourceMappingURL=tool-executor.test.js.map

package/dist/src/scheduler/tool-executor.test.js.map

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

package/dist/src/scheduler/tool-modifier.d.ts

@@ -0,0 +1,23 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { EditorType } from '../utils/editor.js';
+import type { ToolConfirmationPayload } from '../tools/tools.js';
+import type { WaitingToolCall } from './types.js';
+export interface ModificationResult {
+    updatedParams: Record<string, unknown>;
+    updatedDiff?: string;
+}
+export declare class ToolModificationHandler {
+    /**
+     * Handles the "Modify with Editor" flow where an external editor is launched
+     * to modify the tool's parameters.
+     */
+    handleModifyWithEditor(toolCall: WaitingToolCall, editorType: EditorType, signal: AbortSignal): Promise<ModificationResult | undefined>;
+    /**
+     * Applies user-provided inline content updates (e.g. from the chat UI).
+     */
+    applyInlineModify(toolCall: WaitingToolCall, payload: ToolConfirmationPayload, signal: AbortSignal): Promise<ModificationResult | undefined>;
+}

package/dist/src/scheduler/tool-modifier.js

@@ -0,0 +1,50 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as Diff from 'diff';
+import { isModifiableDeclarativeTool, modifyWithEditor, } from '../tools/modifiable-tool.js';
+export class ToolModificationHandler {
+    /**
+     * Handles the "Modify with Editor" flow where an external editor is launched
+     * to modify the tool's parameters.
+     */
+    async handleModifyWithEditor(toolCall, editorType, signal) {
+        if (!isModifiableDeclarativeTool(toolCall.tool)) {
+            return undefined;
+        }
+        const confirmationDetails = toolCall.confirmationDetails;
+        const modifyContext = toolCall.tool.getModifyContext(signal);
+        const contentOverrides = confirmationDetails.type === 'edit'
+            ? {
+                currentContent: confirmationDetails.originalContent,
+                proposedContent: confirmationDetails.newContent,
+            }
+            : undefined;
+        const { updatedParams, updatedDiff } = await modifyWithEditor(toolCall.request.args, modifyContext, editorType, signal, contentOverrides);
+        return {
+            updatedParams,
+            updatedDiff,
+        };
+    }
+    /**
+     * Applies user-provided inline content updates (e.g. from the chat UI).
+     */
+    async applyInlineModify(toolCall, payload, signal) {
+        if (toolCall.confirmationDetails.type !== 'edit' ||
+            !payload.newContent ||
+            !isModifiableDeclarativeTool(toolCall.tool)) {
+            return undefined;
+        }
+        const modifyContext = toolCall.tool.getModifyContext(signal);
+        const currentContent = await modifyContext.getCurrentContent(toolCall.request.args);
+        const updatedParams = modifyContext.createUpdatedParams(currentContent, payload.newContent, toolCall.request.args);
+        const updatedDiff = Diff.createPatch(modifyContext.getFilePath(toolCall.request.args), currentContent, payload.newContent, 'Current', 'Proposed');
+        return {
+            updatedParams,
+            updatedDiff,
+        };
+    }
+}
+//# sourceMappingURL=tool-modifier.js.map

package/dist/src/scheduler/tool-modifier.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-modifier.js","sourceRoot":"","sources":["../../../src/scheduler/tool-modifier.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EACL,2BAA2B,EAC3B,gBAAgB,GAEjB,MAAM,6BAA6B,CAAC;AASrC,MAAM,OAAO,uBAAuB;IAClC;;;OAGG;IACH,KAAK,CAAC,sBAAsB,CAC1B,QAAyB,EACzB,UAAsB,EACtB,MAAmB;QAEnB,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAChD,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,mBAAmB,GAAG,QAAQ,CAAC,mBAAmB,CAAC;QACzD,MAAM,aAAa,GAAG,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAE7D,MAAM,gBAAgB,GACpB,mBAAmB,CAAC,IAAI,KAAK,MAAM;YACjC,CAAC,CAAC;gBACE,cAAc,EAAE,mBAAmB,CAAC,eAAe;gBACnD,eAAe,EAAE,mBAAmB,CAAC,UAAU;aAChD;YACH,CAAC,CAAC,SAAS,CAAC;QAEhB,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,MAAM,gBAAgB,CAG3D,QAAQ,CAAC,OAAO,CAAC,IAAI,EACrB,aAA4D,EAC5D,UAAU,EACV,MAAM,EACN,gBAAgB,CACjB,CAAC;QAEF,OAAO;YACL,aAAa;YACb,WAAW;SACZ,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,iBAAiB,CACrB,QAAyB,EACzB,OAAgC,EAChC,MAAmB;QAEnB,IACE,QAAQ,CAAC,mBAAmB,CAAC,IAAI,KAAK,MAAM;YAC5C,CAAC,OAAO,CAAC,UAAU;YACnB,CAAC,2BAA2B,CAAC,QAAQ,CAAC,IAAI,CAAC,EAC3C,CAAC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,aAAa,GAAG,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAClD,MAAM,CACwC,CAAC;QACjD,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,iBAAiB,CAC1D,QAAQ,CAAC,OAAO,CAAC,IAAI,CACtB,CAAC;QAEF,MAAM,aAAa,GAAG,aAAa,CAAC,mBAAmB,CACrD,cAAc,EACd,OAAO,CAAC,UAAU,EAClB,QAAQ,CAAC,OAAO,CAAC,IAAI,CACtB,CAAC;QAEF,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAClC,aAAa,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAChD,cAAc,EACd,OAAO,CAAC,UAAU,EAClB,SAAS,EACT,UAAU,CACX,CAAC;QAEF,OAAO;YACL,aAAa;YACb,WAAW;SACZ,CAAC;IACJ,CAAC;CACF"}

package/dist/src/scheduler/tool-modifier.test.d.ts

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

package/dist/src/scheduler/tool-modifier.test.js

@@ -0,0 +1,159 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { ToolModificationHandler } from './tool-modifier.js';
+import * as modifiableToolModule from '../tools/modifiable-tool.js';
+import * as Diff from 'diff';
+import { MockModifiableTool, MockTool } from '../test-utils/mock-tool.js';
+// Mock the modules that export functions we need to control
+vi.mock('diff', () => ({
+    createPatch: vi.fn(),
+    diffLines: vi.fn(),
+}));
+vi.mock('../tools/modifiable-tool.js', () => ({
+    isModifiableDeclarativeTool: vi.fn(),
+    modifyWithEditor: vi.fn(),
+}));
+function createMockWaitingToolCall(overrides = {}) {
+    return {
+        status: 'awaiting_approval',
+        request: {
+            callId: 'test-call-id',
+            name: 'test-tool',
+            args: {},
+            isClientInitiated: false,
+            prompt_id: 'test-prompt-id',
+        },
+        tool: new MockTool({ name: 'test-tool' }),
+        invocation: {}, // We generally don't check invocation details in these tests
+        confirmationDetails: {
+            type: 'edit',
+            title: 'Test Confirmation',
+            fileName: 'test.txt',
+            filePath: '/path/to/test.txt',
+            fileDiff: 'diff',
+            originalContent: 'original',
+            newContent: 'new',
+            onConfirm: async () => { },
+        },
+        ...overrides,
+    };
+}
+describe('ToolModificationHandler', () => {
+    let handler;
+    let mockModifiableTool;
+    let mockPlainTool;
+    let mockModifyContext;
+    beforeEach(() => {
+        vi.clearAllMocks();
+        handler = new ToolModificationHandler();
+        mockModifiableTool = new MockModifiableTool();
+        mockPlainTool = new MockTool({ name: 'plainTool' });
+        mockModifyContext = {
+            getCurrentContent: vi.fn(),
+            getFilePath: vi.fn(),
+            createUpdatedParams: vi.fn(),
+            getProposedContent: vi.fn(),
+        };
+        vi.spyOn(mockModifiableTool, 'getModifyContext').mockReturnValue(mockModifyContext);
+    });
+    describe('handleModifyWithEditor', () => {
+        it('should return undefined if tool is not modifiable', async () => {
+            vi.mocked(modifiableToolModule.isModifiableDeclarativeTool).mockReturnValue(false);
+            const mockWaitingToolCall = createMockWaitingToolCall({
+                tool: mockPlainTool,
+                request: {
+                    callId: 'call-1',
+                    name: 'plainTool',
+                    args: { path: 'foo.txt' },
+                    isClientInitiated: false,
+                    prompt_id: 'p1',
+                },
+            });
+            const result = await handler.handleModifyWithEditor(mockWaitingToolCall, 'vscode', new AbortController().signal);
+            expect(result).toBeUndefined();
+        });
+        it('should call modifyWithEditor and return updated params', async () => {
+            vi.mocked(modifiableToolModule.isModifiableDeclarativeTool).mockReturnValue(true);
+            vi.mocked(modifiableToolModule.modifyWithEditor).mockResolvedValue({
+                updatedParams: { path: 'foo.txt', content: 'new' },
+                updatedDiff: 'diff',
+            });
+            const mockWaitingToolCall = createMockWaitingToolCall({
+                tool: mockModifiableTool,
+                request: {
+                    callId: 'call-1',
+                    name: 'mockModifiableTool',
+                    args: { path: 'foo.txt' },
+                    isClientInitiated: false,
+                    prompt_id: 'p1',
+                },
+                confirmationDetails: {
+                    type: 'edit',
+                    title: 'Confirm',
+                    fileName: 'foo.txt',
+                    filePath: 'foo.txt',
+                    fileDiff: 'diff',
+                    originalContent: 'old',
+                    newContent: 'new',
+                    onConfirm: async () => { },
+                },
+            });
+            const result = await handler.handleModifyWithEditor(mockWaitingToolCall, 'vscode', new AbortController().signal);
+            expect(modifiableToolModule.modifyWithEditor).toHaveBeenCalledWith(mockWaitingToolCall.request.args, mockModifyContext, 'vscode', expect.any(AbortSignal), { currentContent: 'old', proposedContent: 'new' });
+            expect(result).toEqual({
+                updatedParams: { path: 'foo.txt', content: 'new' },
+                updatedDiff: 'diff',
+            });
+        });
+    });
+    describe('applyInlineModify', () => {
+        it('should return undefined if tool is not modifiable', async () => {
+            vi.mocked(modifiableToolModule.isModifiableDeclarativeTool).mockReturnValue(false);
+            const mockWaitingToolCall = createMockWaitingToolCall({
+                tool: mockPlainTool,
+            });
+            const result = await handler.applyInlineModify(mockWaitingToolCall, { newContent: 'foo' }, new AbortController().signal);
+            expect(result).toBeUndefined();
+        });
+        it('should return undefined if payload has no new content', async () => {
+            vi.mocked(modifiableToolModule.isModifiableDeclarativeTool).mockReturnValue(true);
+            const mockWaitingToolCall = createMockWaitingToolCall({
+                tool: mockModifiableTool,
+            });
+            const result = await handler.applyInlineModify(mockWaitingToolCall, { newContent: undefined }, new AbortController().signal);
+            expect(result).toBeUndefined();
+        });
+        it('should calculate diff and return updated params', async () => {
+            vi.mocked(modifiableToolModule.isModifiableDeclarativeTool).mockReturnValue(true);
+            Diff.createPatch.mockReturnValue('mock-diff');
+            mockModifyContext.getCurrentContent.mockResolvedValue('old content');
+            mockModifyContext.getFilePath.mockReturnValue('test.txt');
+            mockModifyContext.createUpdatedParams.mockReturnValue({
+                content: 'new content',
+            });
+            const mockWaitingToolCall = createMockWaitingToolCall({
+                tool: mockModifiableTool,
+                request: {
+                    callId: 'call-1',
+                    name: 'mockModifiableTool',
+                    args: { content: 'original' },
+                    isClientInitiated: false,
+                    prompt_id: 'p1',
+                },
+            });
+            const result = await handler.applyInlineModify(mockWaitingToolCall, { newContent: 'new content' }, new AbortController().signal);
+            expect(mockModifyContext.getCurrentContent).toHaveBeenCalled();
+            expect(mockModifyContext.createUpdatedParams).toHaveBeenCalledWith('old content', 'new content', { content: 'original' });
+            expect(Diff.createPatch).toHaveBeenCalledWith('test.txt', 'old content', 'new content', 'Current', 'Proposed');
+            expect(result).toEqual({
+                updatedParams: { content: 'new content' },
+                updatedDiff: 'mock-diff',
+            });
+        });
+    });
+});
+//# sourceMappingURL=tool-modifier.test.js.map

package/dist/src/scheduler/tool-modifier.test.js.map

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

package/dist/src/scheduler/types.d.ts

@@ -0,0 +1,95 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { Part } from '@google/genai';
+import type { AnyDeclarativeTool, AnyToolInvocation, ToolCallConfirmationDetails, ToolConfirmationOutcome, ToolResultDisplay } from '../tools/tools.js';
+import type { AnsiOutput } from '../utils/terminalSerializer.js';
+import type { ToolErrorType } from '../tools/tool-error.js';
+export interface ToolCallRequestInfo {
+    callId: string;
+    name: string;
+    args: Record<string, unknown>;
+    isClientInitiated: boolean;
+    prompt_id: string;
+    checkpoint?: string;
+    traceId?: string;
+}
+export interface ToolCallResponseInfo {
+    callId: string;
+    responseParts: Part[];
+    resultDisplay: ToolResultDisplay | undefined;
+    error: Error | undefined;
+    errorType: ToolErrorType | undefined;
+    outputFile?: string | undefined;
+    contentLength?: number;
+}
+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;

package/dist/src/scheduler/types.js

@@ -0,0 +1,7 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};
+//# sourceMappingURL=types.js.map

package/dist/src/scheduler/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/scheduler/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG"}

package/dist/src/services/chatCompressionService.js

@@ -11,7 +11,8 @@ import { logChatCompression } from '../telemetry/loggers.js';
 import { makeChatCompressionEvent } from '../telemetry/types.js';
 import { getInitialChatHistory } from '../utils/environmentContext.js';
 import { calculateRequestTokenCount } from '../utils/tokenCalculation.js';
-import { DEFAULT_GEMINI_FLASH_LITE_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, PREVIEW_GEMINI_MODEL, } from '../config/models.js';
+import { DEFAULT_GEMINI_FLASH_LITE_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, PREVIEW_GEMINI_MODEL, PREVIEW_GEMINI_FLASH_MODEL, } from '../config/models.js';
+import { PreCompressTrigger } from '../hooks/types.js';
 /**
  * Default threshold for compression token count as a fraction of the model's
  * token limit. If the chat history exceeds this threshold, it will be compressed.
@@ -62,6 +63,8 @@ export function modelStringToModelConfigAlias(model) {
     switch (model) {
         case PREVIEW_GEMINI_MODEL:
             return 'chat-compression-3-pro';
+        case PREVIEW_GEMINI_FLASH_MODEL:
+            return 'chat-compression-3-flash';
         case DEFAULT_GEMINI_MODEL:
             return 'chat-compression-2.5-pro';
         case DEFAULT_GEMINI_FLASH_MODEL:
@@ -87,6 +90,10 @@ export class ChatCompressionService {
                 },
             };
         }
+        // Fire PreCompress hook before compression
+        // This fires for both manual and auto compression attempts
+        const trigger = force ? PreCompressTrigger.Manual : PreCompressTrigger.Auto;
+        await config.getHookSystem()?.firePreCompressEvent(trigger);
         const originalTokenCount = chat.getLastPromptTokenCount();
         // Don't compress if not forced and we are under the limit.
         if (!force) {