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

package/dist/src/tools/confirmation-policy.test.js

@@ -0,0 +1,143 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { EditTool } from './edit.js';
+import { WriteFileTool } from './write-file.js';
+import { WebFetchTool } from './web-fetch.js';
+import { ToolConfirmationOutcome } from './tools.js';
+import { ApprovalMode } from '../policy/types.js';
+import { MessageBusType } from '../confirmation-bus/types.js';
+import path from 'node:path';
+import fs from 'node:fs';
+import os from 'node:os';
+// Mock telemetry loggers to avoid failures
+vi.mock('../telemetry/loggers.js', () => ({
+    logEditStrategy: vi.fn(),
+    logEditCorrectionEvent: vi.fn(),
+    logFileOperation: vi.fn(),
+}));
+describe('Tool Confirmation Policy Updates', () => {
+    let mockConfig;
+    let mockMessageBus;
+    const rootDir = path.join(os.tmpdir(), `gemini-cli-policy-test-${Date.now()}`);
+    beforeEach(() => {
+        if (!fs.existsSync(rootDir)) {
+            fs.mkdirSync(rootDir, { recursive: true });
+        }
+        mockMessageBus = {
+            publish: vi.fn(),
+            subscribe: vi.fn(),
+            unsubscribe: vi.fn(),
+        };
+        mockConfig = {
+            getTargetDir: () => rootDir,
+            getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
+            setApprovalMode: vi.fn(),
+            getFileSystemService: () => ({
+                readTextFile: vi.fn().mockImplementation((p) => {
+                    if (fs.existsSync(p)) {
+                        return fs.readFileSync(p, 'utf8');
+                    }
+                    return 'existing content';
+                }),
+                writeTextFile: vi.fn().mockImplementation((p, c) => {
+                    fs.writeFileSync(p, c);
+                }),
+            }),
+            getFileService: () => ({}),
+            getFileFilteringOptions: () => ({}),
+            getGeminiClient: () => ({}),
+            getBaseLlmClient: () => ({}),
+            getDisableLLMCorrection: () => false,
+            getIdeMode: () => false,
+            getWorkspaceContext: () => ({
+                isPathWithinWorkspace: () => true,
+                getDirectories: () => [rootDir],
+            }),
+        };
+    });
+    afterEach(() => {
+        if (fs.existsSync(rootDir)) {
+            fs.rmSync(rootDir, { recursive: true, force: true });
+        }
+        vi.restoreAllMocks();
+    });
+    const tools = [
+        {
+            name: 'EditTool',
+            create: (config, bus) => new EditTool(config, bus),
+            params: {
+                file_path: 'test.txt',
+                instruction: 'change content',
+                old_string: 'existing',
+                new_string: 'new',
+            },
+        },
+        {
+            name: 'WriteFileTool',
+            create: (config, bus) => new WriteFileTool(config, bus),
+            params: {
+                file_path: path.join(rootDir, 'test.txt'),
+                content: 'new content',
+            },
+        },
+        {
+            name: 'WebFetchTool',
+            create: (config, bus) => new WebFetchTool(config, bus),
+            params: {
+                prompt: 'fetch https://example.com',
+            },
+        },
+    ];
+    describe.each(tools)('$name policy updates', ({ create, params }) => {
+        it.each([
+            {
+                outcome: ToolConfirmationOutcome.ProceedAlways,
+                shouldPublish: false,
+                expectedApprovalMode: ApprovalMode.AUTO_EDIT,
+            },
+            {
+                outcome: ToolConfirmationOutcome.ProceedAlwaysAndSave,
+                shouldPublish: true,
+                persist: true,
+            },
+        ])('should handle $outcome correctly', async ({ outcome, shouldPublish, persist, expectedApprovalMode }) => {
+            const tool = create(mockConfig, mockMessageBus);
+            // For file-based tools, ensure the file exists if needed
+            if (params.file_path) {
+                const fullPath = path.isAbsolute(params.file_path)
+                    ? params.file_path
+                    : path.join(rootDir, params.file_path);
+                fs.writeFileSync(fullPath, 'existing content');
+            }
+            const invocation = tool.build(params);
+            // Mock getMessageBusDecision to trigger ASK_USER flow
+            vi.spyOn(invocation, 'getMessageBusDecision').mockResolvedValue('ASK_USER');
+            const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
+            expect(confirmation).not.toBe(false);
+            if (confirmation) {
+                await confirmation.onConfirm(outcome);
+                if (shouldPublish) {
+                    expect(mockMessageBus.publish).toHaveBeenCalledWith(expect.objectContaining({
+                        type: MessageBusType.UPDATE_POLICY,
+                        persist,
+                    }));
+                }
+                else {
+                    // Should not publish UPDATE_POLICY message for ProceedAlways
+                    const publishCalls = mockMessageBus.publish.mock.calls;
+                    const hasUpdatePolicy = publishCalls.some((call) => call[0].type === MessageBusType.UPDATE_POLICY);
+                    expect(hasUpdatePolicy).toBe(false);
+                }
+                if (expectedApprovalMode !== undefined) {
+                    expect(mockConfig.setApprovalMode).toHaveBeenCalledWith(expectedApprovalMode);
+                }
+            }
+        });
+    });
+});
+//# sourceMappingURL=confirmation-policy.test.js.map

package/dist/src/tools/confirmation-policy.test.js.map

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

package/dist/src/tools/edit.d.ts

@@ -3,12 +3,29 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool } from './tools.js';
+import { BaseDeclarativeTool, type ToolInvocation, type ToolResult } from './tools.js';
 import type { MessageBus } from '../confirmation-bus/message-bus.js';
+import { ToolErrorType } from './tool-error.js';
 import type { Config } from '../config/config.js';
-import type { ModifiableDeclarativeTool, ModifyContext } from './modifiable-tool.js';
+import { type ModifiableDeclarativeTool, type ModifyContext } from './modifiable-tool.js';
+interface ReplacementContext {
+    params: EditToolParams;
+    currentContent: string;
+    abortSignal: AbortSignal;
+}
+interface ReplacementResult {
+    newContent: string;
+    occurrences: number;
+    finalOldString: string;
+    finalNewString: string;
+}
 export declare function applyReplacement(currentContent: string | null, oldString: string, newString: string, isNewFile: boolean): string;
+export declare function calculateReplacement(config: Config, context: ReplacementContext): Promise<ReplacementResult>;
+export declare function getErrorReplaceResult(params: EditToolParams, occurrences: number, expectedReplacements: number, finalOldString: string, finalNewString: string): {
+    display: string;
+    raw: string;
+    type: ToolErrorType;
+} | undefined;
 /**
  * Parameters for the Edit tool
  */
@@ -30,6 +47,10 @@ export interface EditToolParams {
      * Use when you want to replace multiple occurrences.
      */
     expected_replacements?: number;
+    /**
+     * The instruction for what needs to be done.
+     */
+    instruction?: string;
     /**
      * Whether the edit was modified manually by the user.
      */
@@ -45,13 +66,14 @@ export interface EditToolParams {
 export declare class EditTool extends BaseDeclarativeTool<EditToolParams, ToolResult> implements ModifiableDeclarativeTool<EditToolParams> {
     private readonly config;
     static readonly Name = "replace";
-    constructor(config: Config, messageBus?: MessageBus);
+    constructor(config: Config, messageBus: MessageBus);
     /**
      * Validates the parameters for the Edit tool
      * @param params Parameters to validate
      * @returns Error message string or null if valid
      */
     protected validateToolParamValues(params: EditToolParams): string | null;
-    protected createInvocation(params: EditToolParams, messageBus?: MessageBus, toolName?: string, displayName?: string): ToolInvocation<EditToolParams, ToolResult>;
+    protected createInvocation(params: EditToolParams, messageBus: MessageBus): ToolInvocation<EditToolParams, ToolResult>;
     getModifyContext(_: AbortSignal): ModifyContext<EditToolParams>;
 }
+export {};