@machina.ai/cell-cli-core 1.0.13-rc9 → 1.0.21-rc1

package/dist/src/tools/diffOptions.test.js

@@ -0,0 +1,119 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, expect, it } from 'vitest';
+import { getDiffStat } from './diffOptions.js';
+describe('getDiffStat', () => {
+    const fileName = 'test.txt';
+    it('should return 0 for all stats when there are no changes', () => {
+        const oldStr = 'line1\nline2\n';
+        const aiStr = 'line1\nline2\n';
+        const userStr = 'line1\nline2\n';
+        const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
+        expect(diffStat).toEqual({
+            ai_added_lines: 0,
+            ai_removed_lines: 0,
+            user_added_lines: 0,
+            user_removed_lines: 0,
+        });
+    });
+    it('should correctly report AI additions', () => {
+        const oldStr = 'line1\nline2\n';
+        const aiStr = 'line1\nline2\nline3\n';
+        const userStr = 'line1\nline2\nline3\n';
+        const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
+        expect(diffStat).toEqual({
+            ai_added_lines: 1,
+            ai_removed_lines: 0,
+            user_added_lines: 0,
+            user_removed_lines: 0,
+        });
+    });
+    it('should correctly report AI removals', () => {
+        const oldStr = 'line1\nline2\nline3\n';
+        const aiStr = 'line1\nline3\n';
+        const userStr = 'line1\nline3\n';
+        const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
+        expect(diffStat).toEqual({
+            ai_added_lines: 0,
+            ai_removed_lines: 1,
+            user_added_lines: 0,
+            user_removed_lines: 0,
+        });
+    });
+    it('should correctly report AI modifications', () => {
+        const oldStr = 'line1\nline2\nline3\n';
+        const aiStr = 'line1\nline_two\nline3\n';
+        const userStr = 'line1\nline_two\nline3\n';
+        const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
+        expect(diffStat).toEqual({
+            ai_added_lines: 1,
+            ai_removed_lines: 1,
+            user_added_lines: 0,
+            user_removed_lines: 0,
+        });
+    });
+    it('should correctly report user additions', () => {
+        const oldStr = 'line1\nline2\n';
+        const aiStr = 'line1\nline2\nline3\n';
+        const userStr = 'line1\nline2\nline3\nline4\n';
+        const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
+        expect(diffStat).toEqual({
+            ai_added_lines: 1,
+            ai_removed_lines: 0,
+            user_added_lines: 1,
+            user_removed_lines: 0,
+        });
+    });
+    it('should correctly report user removals', () => {
+        const oldStr = 'line1\nline2\n';
+        const aiStr = 'line1\nline2\nline3\n';
+        const userStr = 'line1\nline2\n';
+        const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
+        expect(diffStat).toEqual({
+            ai_added_lines: 1,
+            ai_removed_lines: 0,
+            user_added_lines: 0,
+            user_removed_lines: 1,
+        });
+    });
+    it('should correctly report user modifications', () => {
+        const oldStr = 'line1\nline2\n';
+        const aiStr = 'line1\nline2\nline3\n';
+        const userStr = 'line1\nline2\nline_three\n';
+        const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
+        expect(diffStat).toEqual({
+            ai_added_lines: 1,
+            ai_removed_lines: 0,
+            user_added_lines: 1,
+            user_removed_lines: 1,
+        });
+    });
+    it('should handle complex changes from both AI and user', () => {
+        const oldStr = 'line1\nline2\nline3\nline4\n';
+        const aiStr = 'line_one\nline2\nline_three\nline4\n';
+        const userStr = 'line_one\nline_two\nline_three\nline4\nline5\n';
+        const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
+        expect(diffStat).toEqual({
+            ai_added_lines: 2,
+            ai_removed_lines: 2,
+            user_added_lines: 2,
+            user_removed_lines: 1,
+        });
+    });
+    it('should report a single line modification as one addition and one removal', () => {
+        const oldStr = 'hello world';
+        const aiStr = 'hello universe';
+        const userStr = 'hello universe';
+        const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
+        expect(diffStat).toEqual({
+            ai_added_lines: 1,
+            ai_removed_lines: 1,
+            user_added_lines: 0,
+            user_removed_lines: 0,
+        });
+    });
+});
+//# sourceMappingURL=diffOptions.test.js.map

package/dist/src/tools/diffOptions.test.js.map

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

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

@@ -3,9 +3,10 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { BaseTool, ToolCallConfirmationDetails, ToolLocation, ToolResult } from './tools.js';
+import { BaseDeclarativeTool, ToolInvocation, ToolResult } from './tools.js';
 import { Config } from '../config/config.js';
-import { ModifiableTool, ModifyContext } from './modifiable-tool.js';
+import { ModifiableDeclarativeTool, ModifyContext } from './modifiable-tool.js';
+export declare function applyReplacement(currentContent: string | null, oldString: string, newString: string, isNewFile: boolean): string;
 /**
  * Parameters for the Edit tool
  */
@@ -31,11 +32,15 @@ export interface EditToolParams {
      * Whether the edit was modified manually by the user.
      */
     modified_by_user?: boolean;
+    /**
+     * Initially proposed string.
+     */
+    ai_proposed_string?: string;
 }
 /**
  * Implementation of the Edit tool logic
  */
-export declare class EditTool extends BaseTool<EditToolParams, ToolResult> implements ModifiableTool<EditToolParams> {
+export declare class EditTool extends BaseDeclarativeTool<EditToolParams, ToolResult> implements ModifiableDeclarativeTool<EditToolParams> {
     private readonly config;
     static readonly Name = "replace";
     constructor(config: Config);
@@ -44,36 +49,7 @@ export declare class EditTool extends BaseTool<EditToolParams, ToolResult> imple
      * @param params Parameters to validate
      * @returns Error message string or null if valid
      */
-    validateToolParams(params: EditToolParams): string | null;
-    /**
-     * Determines any file locations affected by the tool execution
-     * @param params Parameters for the tool execution
-     * @returns A list of such paths
-     */
-    toolLocations(params: EditToolParams): ToolLocation[];
-    private _applyReplacement;
-    /**
-     * Calculates the potential outcome of an edit operation.
-     * @param params Parameters for the edit operation
-     * @returns An object describing the potential edit outcome
-     * @throws File system errors if reading the file fails unexpectedly (e.g., permissions)
-     */
-    private calculateEdit;
-    /**
-     * Handles the confirmation prompt for the Edit tool in the CLI.
-     * It needs to calculate the diff to show the user.
-     */
-    shouldConfirmExecute(params: EditToolParams, abortSignal: AbortSignal): Promise<ToolCallConfirmationDetails | false>;
-    getDescription(params: EditToolParams): string;
-    /**
-     * Executes the edit operation with the given parameters.
-     * @param params Parameters for the edit operation
-     * @returns Result of the edit operation
-     */
-    execute(params: EditToolParams, signal: AbortSignal): Promise<ToolResult>;
-    /**
-     * Creates parent directories if they don't exist
-     */
-    private ensureParentDirectoriesExist;
+    protected validateToolParamValues(params: EditToolParams): string | null;
+    protected createInvocation(params: EditToolParams): ToolInvocation<EditToolParams, ToolResult>;
     getModifyContext(_: AbortSignal): ModifyContext<EditToolParams>;
 }