@office-ai/aioncli-core 0.26.0 → 0.30.0

package/dist/src/tools/definitions/resolver.d.ts

@@ -0,0 +1,15 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type FunctionDeclaration } from '@google/genai';
+import type { ToolDefinition } from './types.js';
+/**
+ * Resolves the declaration for a tool.
+ *
+ * @param definition The tool definition containing the base declaration and optional overrides.
+ * @param modelId Optional model identifier to apply specific overrides.
+ * @returns The FunctionDeclaration to be sent to the API.
+ */
+export declare function resolveToolDeclaration(definition: ToolDefinition, modelId?: string): FunctionDeclaration;

package/dist/src/tools/definitions/resolver.js

@@ -0,0 +1,27 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import {} from '@google/genai';
+/**
+ * Resolves the declaration for a tool.
+ *
+ * @param definition The tool definition containing the base declaration and optional overrides.
+ * @param modelId Optional model identifier to apply specific overrides.
+ * @returns The FunctionDeclaration to be sent to the API.
+ */
+export function resolveToolDeclaration(definition, modelId) {
+    if (!modelId || !definition.overrides) {
+        return definition.base;
+    }
+    const override = definition.overrides(modelId);
+    if (!override) {
+        return definition.base;
+    }
+    return {
+        ...definition.base,
+        ...override,
+    };
+}
+//# sourceMappingURL=resolver.js.map

package/dist/src/tools/definitions/resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../../../src/tools/definitions/resolver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAA4B,MAAM,eAAe,CAAC;AAGzD;;;;;;GAMG;AACH,MAAM,UAAU,sBAAsB,CACpC,UAA0B,EAC1B,OAAgB;IAEhB,IAAI,CAAC,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;QACtC,OAAO,UAAU,CAAC,IAAI,CAAC;IACzB,CAAC;IAED,MAAM,QAAQ,GAAG,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAC/C,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,UAAU,CAAC,IAAI,CAAC;IACzB,CAAC;IAED,OAAO;QACL,GAAG,UAAU,CAAC,IAAI;QAClB,GAAG,QAAQ;KACZ,CAAC;AACJ,CAAC"}

package/dist/src/tools/definitions/resolver.test.d.ts

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

package/dist/src/tools/definitions/resolver.test.js

@@ -0,0 +1,58 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect } from 'vitest';
+import { Type } from '@google/genai';
+import { resolveToolDeclaration } from './resolver.js';
+describe('resolveToolDeclaration', () => {
+    const mockDefinition = {
+        base: {
+            name: 'test_tool',
+            description: 'A test tool description',
+            parameters: {
+                type: Type.OBJECT,
+                properties: {
+                    param1: { type: Type.STRING },
+                },
+            },
+        },
+    };
+    it('should return the base definition when no modelId is provided', () => {
+        const result = resolveToolDeclaration(mockDefinition);
+        expect(result).toEqual(mockDefinition.base);
+    });
+    it('should return overridden description when modelId matches override criteria', () => {
+        const definitionWithOverride = {
+            ...mockDefinition,
+            overrides: (modelId) => {
+                if (modelId === 'special-model') {
+                    return { description: 'Overridden description' };
+                }
+                return undefined;
+            },
+        };
+        const result = resolveToolDeclaration(definitionWithOverride, 'special-model');
+        expect(result.description).toBe('Overridden description');
+        expect(result.name).toBe(mockDefinition.base.name);
+    });
+    it('should return base definition when modelId does not match override criteria', () => {
+        const definitionWithOverride = {
+            ...mockDefinition,
+            overrides: (modelId) => {
+                if (modelId === 'special-model') {
+                    return { description: 'Overridden description' };
+                }
+                return undefined;
+            },
+        };
+        const result = resolveToolDeclaration(definitionWithOverride, 'regular-model');
+        expect(result.description).toBe(mockDefinition.base.description);
+    });
+    it('should return the base definition when a modelId is provided but no overrides exist', () => {
+        const result = resolveToolDeclaration(mockDefinition, 'gemini-1.5-pro');
+        expect(result).toEqual(mockDefinition.base);
+    });
+});
+//# sourceMappingURL=resolver.test.js.map

package/dist/src/tools/definitions/resolver.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolver.test.js","sourceRoot":"","sources":["../../../../src/tools/definitions/resolver.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAGvD,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACtC,MAAM,cAAc,GAAmB;QACrC,IAAI,EAAE;YACJ,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,yBAAyB;YACtC,UAAU,EAAE;gBACV,IAAI,EAAE,IAAI,CAAC,MAAM;gBACjB,UAAU,EAAE;oBACV,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE;iBAC9B;aACF;SACF;KACF,CAAC;IAEF,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,MAAM,MAAM,GAAG,sBAAsB,CAAC,cAAc,CAAC,CAAC;QACtD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6EAA6E,EAAE,GAAG,EAAE;QACrF,MAAM,sBAAsB,GAAmB;YAC7C,GAAG,cAAc;YACjB,SAAS,EAAE,CAAC,OAAe,EAAE,EAAE;gBAC7B,IAAI,OAAO,KAAK,eAAe,EAAE,CAAC;oBAChC,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,CAAC;gBACnD,CAAC;gBACD,OAAO,SAAS,CAAC;YACnB,CAAC;SACF,CAAC;QAEF,MAAM,MAAM,GAAG,sBAAsB,CACnC,sBAAsB,EACtB,eAAe,CAChB,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAC1D,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6EAA6E,EAAE,GAAG,EAAE;QACrF,MAAM,sBAAsB,GAAmB;YAC7C,GAAG,cAAc;YACjB,SAAS,EAAE,CAAC,OAAe,EAAE,EAAE;gBAC7B,IAAI,OAAO,KAAK,eAAe,EAAE,CAAC;oBAChC,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,CAAC;gBACnD,CAAC;gBACD,OAAO,SAAS,CAAC;YACnB,CAAC;SACF,CAAC;QAEF,MAAM,MAAM,GAAG,sBAAsB,CACnC,sBAAsB,EACtB,eAAe,CAChB,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qFAAqF,EAAE,GAAG,EAAE;QAC7F,MAAM,MAAM,GAAG,sBAAsB,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;QACxE,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/tools/definitions/types.d.ts

@@ -0,0 +1,44 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type FunctionDeclaration } from '@google/genai';
+/**
+ * Supported model families for tool definitions.
+ */
+export type ToolFamily = 'default-legacy' | 'gemini-3';
+/**
+ * Defines a tool's identity using a structured declaration.
+ */
+export interface ToolDefinition {
+    /** The base declaration for the tool. */
+    base: FunctionDeclaration;
+    /**
+     * Optional overrides for specific model families or versions.
+     */
+    overrides?: (modelId: string) => Partial<FunctionDeclaration> | undefined;
+}
+/**
+ * Explicit mapping of all core tools for a specific model family.
+ */
+export interface CoreToolSet {
+    read_file: FunctionDeclaration;
+    write_file: FunctionDeclaration;
+    grep_search: FunctionDeclaration;
+    grep_search_ripgrep: FunctionDeclaration;
+    glob: FunctionDeclaration;
+    list_directory: FunctionDeclaration;
+    run_shell_command: (enableInteractiveShell: boolean, enableEfficiency: boolean) => FunctionDeclaration;
+    replace: FunctionDeclaration;
+    google_web_search: FunctionDeclaration;
+    web_fetch: FunctionDeclaration;
+    read_many_files: FunctionDeclaration;
+    save_memory: FunctionDeclaration;
+    write_todos: FunctionDeclaration;
+    get_internal_docs: FunctionDeclaration;
+    ask_user: FunctionDeclaration;
+    enter_plan_mode: FunctionDeclaration;
+    exit_plan_mode: (plansDir: string) => FunctionDeclaration;
+    activate_skill: (skillNames: string[]) => FunctionDeclaration;
+}

package/dist/src/tools/definitions/types.js

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

package/dist/src/tools/definitions/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/tools/definitions/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAA4B,MAAM,eAAe,CAAC"}

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

@@ -5,5 +5,5 @@
  */
 import * as Diff from 'diff';
 import type { DiffStat } from './tools.js';
-export declare const DEFAULT_DIFF_OPTIONS: Diff.PatchOptions;
+export declare const DEFAULT_DIFF_OPTIONS: Diff.CreatePatchOptionsNonabortable;
 export declare function getDiffStat(fileName: string, oldStr: string, aiStr: string, userStr: string): DiffStat;

package/dist/src/tools/diffOptions.js

@@ -4,9 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import * as Diff from 'diff';
+const DEFAULT_STRUCTURED_PATCH_OPTS = {
+    context: 3,
+    ignoreWhitespace: false,
+};
 export const DEFAULT_DIFF_OPTIONS = {
     context: 3,
-    ignoreWhitespace: true,
+    ignoreWhitespace: false,
 };
 export function getDiffStat(fileName, oldStr, aiStr, userStr) {
     const getStats = (patch) => {
@@ -28,9 +32,9 @@ export function getDiffStat(fileName, oldStr, aiStr, userStr) {
         });
         return { addedLines, removedLines, addedChars, removedChars };
     };
-    const modelPatch = Diff.structuredPatch(fileName, fileName, oldStr, aiStr, 'Current', 'Proposed', DEFAULT_DIFF_OPTIONS);
+    const modelPatch = Diff.structuredPatch(fileName, fileName, oldStr, aiStr, 'Current', 'Proposed', DEFAULT_STRUCTURED_PATCH_OPTS);
     const modelStats = getStats(modelPatch);
-    const userPatch = Diff.structuredPatch(fileName, fileName, aiStr, userStr, 'Proposed', 'User', DEFAULT_DIFF_OPTIONS);
+    const userPatch = Diff.structuredPatch(fileName, fileName, aiStr, userStr, 'Proposed', 'User', DEFAULT_STRUCTURED_PATCH_OPTS);
     const userStats = getStats(userPatch);
     return {
         model_added_lines: modelStats.addedLines,

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

@@ -1 +1 @@
-{"version":3,"file":"diffOptions.js","sourceRoot":"","sources":["../../../src/tools/diffOptions.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAG7B,MAAM,CAAC,MAAM,oBAAoB,GAAsB;IACrD,OAAO,EAAE,CAAC;IACV,gBAAgB,EAAE,IAAI;CACvB,CAAC;AAEF,MAAM,UAAU,WAAW,CACzB,QAAgB,EAChB,MAAc,EACd,KAAa,EACb,OAAe;IAEf,MAAM,QAAQ,GAAG,CAAC,KAAsB,EAAE,EAAE;QAC1C,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,IAAI,YAAY,GAAG,CAAC,CAAC;QACrB,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,IAAI,YAAY,GAAG,CAAC,CAAC;QAErB,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAe,EAAE,EAAE;YACtC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,EAAE;gBAClC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBACzB,UAAU,EAAE,CAAC;oBACb,UAAU,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;gBAChC,CAAC;qBAAM,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBAChC,YAAY,EAAE,CAAC;oBACf,YAAY,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;gBAClC,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC;IAChE,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CACrC,QAAQ,EACR,QAAQ,EACR,MAAM,EACN,KAAK,EACL,SAAS,EACT,UAAU,EACV,oBAAoB,CACrB,CAAC;IACF,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;IAExC,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CACpC,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,OAAO,EACP,UAAU,EACV,MAAM,EACN,oBAAoB,CACrB,CAAC;IACF,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;IAEtC,OAAO;QACL,iBAAiB,EAAE,UAAU,CAAC,UAAU;QACxC,mBAAmB,EAAE,UAAU,CAAC,YAAY;QAC5C,iBAAiB,EAAE,UAAU,CAAC,UAAU;QACxC,mBAAmB,EAAE,UAAU,CAAC,YAAY;QAC5C,gBAAgB,EAAE,SAAS,CAAC,UAAU;QACtC,kBAAkB,EAAE,SAAS,CAAC,YAAY;QAC1C,gBAAgB,EAAE,SAAS,CAAC,UAAU;QACtC,kBAAkB,EAAE,SAAS,CAAC,YAAY;KAC3C,CAAC;AACJ,CAAC"}
+{"version":3,"file":"diffOptions.js","sourceRoot":"","sources":["../../../src/tools/diffOptions.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAG7B,MAAM,6BAA6B,GAA4C;IAC7E,OAAO,EAAE,CAAC;IACV,gBAAgB,EAAE,KAAK;CACxB,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAwC;IACvE,OAAO,EAAE,CAAC;IACV,gBAAgB,EAAE,KAAK;CACxB,CAAC;AAEF,MAAM,UAAU,WAAW,CACzB,QAAgB,EAChB,MAAc,EACd,KAAa,EACb,OAAe;IAEf,MAAM,QAAQ,GAAG,CAAC,KAA2B,EAAE,EAAE;QAC/C,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,IAAI,YAAY,GAAG,CAAC,CAAC;QACrB,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,IAAI,YAAY,GAAG,CAAC,CAAC;QAErB,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAA8B,EAAE,EAAE;YACrD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,EAAE;gBAClC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBACzB,UAAU,EAAE,CAAC;oBACb,UAAU,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;gBAChC,CAAC;qBAAM,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBAChC,YAAY,EAAE,CAAC;oBACf,YAAY,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;gBAClC,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC;IAChE,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CACrC,QAAQ,EACR,QAAQ,EACR,MAAM,EACN,KAAK,EACL,SAAS,EACT,UAAU,EACV,6BAA6B,CAC9B,CAAC;IACF,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;IAExC,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CACpC,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,OAAO,EACP,UAAU,EACV,MAAM,EACN,6BAA6B,CAC9B,CAAC;IACF,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;IAEtC,OAAO;QACL,iBAAiB,EAAE,UAAU,CAAC,UAAU;QACxC,mBAAmB,EAAE,UAAU,CAAC,YAAY;QAC5C,iBAAiB,EAAE,UAAU,CAAC,UAAU;QACxC,mBAAmB,EAAE,UAAU,CAAC,YAAY;QAC5C,gBAAgB,EAAE,SAAS,CAAC,UAAU;QACtC,kBAAkB,EAAE,SAAS,CAAC,YAAY;QAC1C,gBAAgB,EAAE,SAAS,CAAC,UAAU;QACtC,kBAAkB,EAAE,SAAS,CAAC,YAAY;KAC3C,CAAC;AACJ,CAAC"}

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

@@ -151,5 +151,22 @@ describe('getDiffStat', () => {
             user_removed_chars: 0,
         });
     });
+    it('should correctly report whitespace-only changes', () => {
+        const fileName = 'test.py';
+        const oldStr = 'def hello():\n print("world")';
+        const aiStr = 'def hello():\n    print("world")';
+        const userStr = aiStr;
+        const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
+        expect(diffStat).toEqual({
+            model_added_lines: 1,
+            model_removed_lines: 1,
+            model_added_chars: 18,
+            model_removed_chars: 15,
+            user_added_lines: 0,
+            user_removed_lines: 0,
+            user_added_chars: 0,
+            user_removed_chars: 0,
+        });
+    });
 });
 //# sourceMappingURL=diffOptions.test.js.map

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

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

@@ -74,6 +74,7 @@ export declare class EditTool extends BaseDeclarativeTool<EditToolParams, ToolRe
      */
     protected validateToolParamValues(params: EditToolParams): string | null;
     protected createInvocation(params: EditToolParams, messageBus: MessageBus): ToolInvocation<EditToolParams, ToolResult>;
+    getSchema(modelId?: string): import("@google/genai").FunctionDeclaration;
     getModifyContext(_: AbortSignal): ModifyContext<EditToolParams>;
 }
 export {};

package/dist/src/tools/edit.js

@@ -3,8 +3,9 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import * as fs from 'node:fs';
+import * as fsPromises from 'node:fs/promises';
 import * as path from 'node:path';
+import * as os from 'node:os';
 import * as crypto from 'node:crypto';
 import * as Diff from 'diff';
 import { BaseDeclarativeTool, BaseToolInvocation, Kind, ToolConfirmationOutcome, } from './tools.js';
@@ -12,18 +13,21 @@ import { ToolErrorType } from './tool-error.js';
 import { makeRelative, shortenPath } from '../utils/paths.js';
 import { isNodeError } from '../utils/errors.js';
 import { ApprovalMode } from '../policy/types.js';
+import { CoreToolCallStatus } from '../scheduler/types.js';
 import { DEFAULT_DIFF_OPTIONS, getDiffStat } from './diffOptions.js';
 import {} from './modifiable-tool.js';
 import { IdeClient } from '../ide/ide-client.js';
 import { FixLLMEditWithInstruction } from '../utils/llm-edit-fixer.js';
-import { safeLiteralReplace } from '../utils/textUtils.js';
+import { safeLiteralReplace, detectLineEnding } from '../utils/textUtils.js';
 import { EditStrategyEvent } from '../telemetry/types.js';
 import { logEditStrategy } from '../telemetry/loggers.js';
 import { EditCorrectionEvent } from '../telemetry/types.js';
 import { logEditCorrectionEvent } from '../telemetry/loggers.js';
 import { correctPath } from '../utils/pathCorrector.js';
-import { EDIT_TOOL_NAME, READ_FILE_TOOL_NAME } from './tool-names.js';
+import { EDIT_TOOL_NAME, READ_FILE_TOOL_NAME, EDIT_DISPLAY_NAME, } from './tool-names.js';
 import { debugLogger } from '../utils/debugLogger.js';
+import { EDIT_DEFINITION } from './definitions/coreTools.js';
+import { resolveToolDeclaration } from './definitions/resolver.js';
 export function applyReplacement(currentContent, oldString, newString, isNewFile) {
     if (isNewFile) {
         return newString;
@@ -104,7 +108,7 @@ async function calculateFlexibleReplacement(context) {
         if (isMatch) {
             flexibleOccurrences++;
             const firstLineInMatch = window[0];
-            const indentationMatch = firstLineInMatch.match(/^(\s*)/);
+            const indentationMatch = firstLineInMatch.match(/^([ \t]*)/);
             const indentation = indentationMatch ? indentationMatch[1] : '';
             const newBlockWithIndent = replaceLines.map((line) => `${indentation}${line}`);
             sourceLines.splice(i, searchLinesStripped.length, newBlockWithIndent.join('\n'));
@@ -149,7 +153,7 @@ async function calculateRegexReplacement(context) {
     const pattern = escapedTokens.join('\\s*');
     // The final pattern captures leading whitespace (indentation) and then matches the token pattern.
     // 'm' flag enables multi-line mode, so '^' matches the start of any line.
-    const finalPattern = `^(\\s*)${pattern}`;
+    const finalPattern = `^([ \t]*)${pattern}`;
     const flexibleRegex = new RegExp(finalPattern, 'm');
     const match = flexibleRegex.exec(currentContent);
     if (!match) {
@@ -170,16 +174,6 @@ async function calculateRegexReplacement(context) {
         finalNewString: normalizedReplace,
     };
 }
-/**
- * Detects the line ending style of a string.
- * @param content The string content to analyze.
- * @returns '\r\n' for Windows-style, '\n' for Unix-style.
- */
-function detectLineEnding(content) {
-    // If a Carriage Return is found, assume Windows-style endings.
-    // This is a simple but effective heuristic.
-    return content.includes('\r\n') ? '\r\n' : '\n';
-}
 export async function calculateReplacement(config, context) {
     const { currentContent, params } = context;
     const { old_string, new_string } = params;
@@ -223,7 +217,7 @@ export function getErrorReplaceResult(params, occurrences, expectedReplacements,
     if (occurrences === 0) {
         error = {
             display: `Failed to edit, could not find the string to replace.`,
-            raw: `Failed to edit, 0 occurrences found for old_string (${finalOldString}). Original old_string was (${params.old_string}) in ${params.file_path}. No edits made. The exact text in old_string was not found. Ensure you're not escaping content incorrectly and check whitespace, indentation, and context. Use ${READ_FILE_TOOL_NAME} tool to verify.`,
+            raw: `Failed to edit, 0 occurrences found for old_string in ${params.file_path}. Ensure you're not escaping content incorrectly and check whitespace, indentation, and context. Use ${READ_FILE_TOOL_NAME} tool to verify.`,
             type: ToolErrorType.EDIT_NO_OCCURRENCE_FOUND,
         };
     }
@@ -318,7 +312,7 @@ class EditToolInvocation extends BaseToolInvocation {
                 originalLineEnding,
             };
         }
-        const event = new EditCorrectionEvent('success');
+        const event = new EditCorrectionEvent(CoreToolCallStatus.Success);
         logEditCorrectionEvent(this.config, event);
         return {
             currentContent: contentForLlmEditFixer,
@@ -424,6 +418,16 @@ class EditToolInvocation extends BaseToolInvocation {
                 originalLineEnding,
             };
         }
+        if (this.config.getDisableLLMCorrection()) {
+            return {
+                currentContent,
+                newContent: currentContent,
+                occurrences: replacementResult.occurrences,
+                isNewFile: false,
+                error: initialError,
+                originalLineEnding,
+            };
+        }
         // If there was an error, try to self-correct.
         return this.attemptSelfCorrection(params, currentContent, initialError, abortSignal, originalLineEnding);
     }
@@ -508,6 +512,18 @@ class EditToolInvocation extends BaseToolInvocation {
      * @returns Result of the edit operation
      */
     async execute(signal) {
+        const resolvedPath = path.resolve(this.config.getTargetDir(), this.params.file_path);
+        const validationError = this.config.validatePathAccess(resolvedPath);
+        if (validationError) {
+            return {
+                llmContent: validationError,
+                returnDisplay: 'Error: Path not in workspace.',
+                error: {
+                    message: validationError,
+                    type: ToolErrorType.PATH_NOT_IN_WORKSPACE,
+                },
+            };
+        }
         let editData;
         try {
             editData = await this.calculateEdit(this.params, signal);
@@ -537,11 +553,13 @@ class EditToolInvocation extends BaseToolInvocation {
             };
         }
         try {
-            this.ensureParentDirectoriesExist(this.params.file_path);
+            await this.ensureParentDirectoriesExistAsync(this.params.file_path);
             let finalContent = editData.newContent;
-            // Restore original line endings if they were CRLF
-            if (!editData.isNewFile && editData.originalLineEnding === '\r\n') {
-                finalContent = finalContent.replace(/\n/g, '\r\n');
+            // Restore original line endings if they were CRLF, or use OS default for new files
+            const useCRLF = (!editData.isNewFile && editData.originalLineEnding === '\r\n') ||
+                (editData.isNewFile && os.EOL === '\r\n');
+            if (useCRLF) {
+                finalContent = finalContent.replace(/\r?\n/g, '\r\n');
             }
             await this.config
                 .getFileSystemService()
@@ -560,9 +578,11 @@ class EditToolInvocation extends BaseToolInvocation {
                 displayResult = {
                     fileDiff,
                     fileName,
+                    filePath: this.params.file_path,
                     originalContent: editData.currentContent,
                     newContent: editData.newContent,
                     diffStat,
+                    isNewFile: editData.isNewFile,
                 };
             }
             const llmSuccessMessageParts = [
@@ -593,10 +613,13 @@ class EditToolInvocation extends BaseToolInvocation {
     /**
      * Creates parent directories if they don't exist
      */
-    ensureParentDirectoriesExist(filePath) {
+    async ensureParentDirectoriesExistAsync(filePath) {
         const dirName = path.dirname(filePath);
-        if (!fs.existsSync(dirName)) {
-            fs.mkdirSync(dirName, { recursive: true });
+        try {
+            await fsPromises.access(dirName);
+        }
+        catch {
+            await fsPromises.mkdir(dirName, { recursive: true });
         }
     }
 }
@@ -607,58 +630,7 @@ export class EditTool extends BaseDeclarativeTool {
     config;
     static Name = EDIT_TOOL_NAME;
     constructor(config, messageBus) {
-        super(EditTool.Name, 'Edit', `Replaces text within a file. By default, replaces a single occurrence, but can replace multiple occurrences when \`expected_replacements\` is specified. This tool requires providing significant context around the change to ensure precise targeting. Always use the ${READ_FILE_TOOL_NAME} tool to examine the file's current content before attempting a text replacement.
-      
-      The user has the ability to modify the \`new_string\` content. If modified, this will be stated in the response.
-      
-      Expectation for required parameters:
-      1. \`old_string\` MUST be the exact literal text to replace (including all whitespace, indentation, newlines, and surrounding code etc.).
-      2. \`new_string\` MUST be the exact literal text to replace \`old_string\` with (also including all whitespace, indentation, newlines, and surrounding code etc.). Ensure the resulting code is correct and idiomatic and that \`old_string\` and \`new_string\` are different.
-      3. \`instruction\` is the detailed instruction of what needs to be changed. It is important to Make it specific and detailed so developers or large language models can understand what needs to be changed and perform the changes on their own if necessary. 
-      4. NEVER escape \`old_string\` or \`new_string\`, that would break the exact literal text requirement.
-      **Important:** If ANY of the above are not satisfied, the tool will fail. CRITICAL for \`old_string\`: Must uniquely identify the single instance to change. Include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. If this string matches multiple locations, or does not match exactly, the tool will fail.
-      5. Prefer to break down complex and long changes into multiple smaller atomic calls to this tool. Always check the content of the file after changes or not finding a string to match.
-      **Multiple replacements:** Set \`expected_replacements\` to the number of occurrences you want to replace. The tool will replace ALL occurrences that match \`old_string\` exactly. Ensure the number of replacements matches your expectation.`, Kind.Edit, {
-            properties: {
-                file_path: {
-                    description: 'The path to the file to modify.',
-                    type: 'string',
-                },
-                instruction: {
-                    description: `A clear, semantic instruction for the code change, acting as a high-quality prompt for an expert LLM assistant. It must be self-contained and explain the goal of the change.
-
-A good instruction should concisely answer:
-1.  WHY is the change needed? (e.g., "To fix a bug where users can be null...")
-2.  WHERE should the change happen? (e.g., "...in the 'renderUserProfile' function...")
-3.  WHAT is the high-level change? (e.g., "...add a null check for the 'user' object...")
-4.  WHAT is the desired outcome? (e.g., "...so that it displays a loading spinner instead of crashing.")
-
-**GOOD Example:** "In the 'calculateTotal' function, correct the sales tax calculation by updating the 'taxRate' constant from 0.05 to 0.075 to reflect the new regional tax laws."
-
-**BAD Examples:**
-- "Change the text." (Too vague)
-- "Fix the bug." (Doesn't explain the bug or the fix)
-- "Replace the line with this new line." (Brittle, just repeats the other parameters)
-`,
-                    type: 'string',
-                },
-                old_string: {
-                    description: 'The exact literal text to replace, preferably unescaped. For single replacements (default), include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. If this string is not the exact literal text (i.e. you escaped it) or does not match exactly, the tool will fail.',
-                    type: 'string',
-                },
-                new_string: {
-                    description: 'The exact literal text to replace `old_string` with, preferably unescaped. Provide the EXACT text. Ensure the resulting code is correct and idiomatic.',
-                    type: 'string',
-                },
-                expected_replacements: {
-                    type: 'number',
-                    description: 'Number of replacements expected. Defaults to 1 if not specified. Use when you want to replace multiple occurrences.',
-                    minimum: 1,
-                },
-            },
-            required: ['file_path', 'instruction', 'old_string', 'new_string'],
-            type: 'object',
-        }, messageBus, true, // isOutputMarkdown
+        super(EditTool.Name, EDIT_DISPLAY_NAME, EDIT_DEFINITION.base.description, Kind.Edit, EDIT_DEFINITION.base.parametersJsonSchema, messageBus, true, // isOutputMarkdown
         false);
         this.config = config;
     }
@@ -681,16 +653,14 @@ A good instruction should concisely answer:
             filePath = result.correctedPath;
         }
         params.file_path = filePath;
-        const workspaceContext = this.config.getWorkspaceContext();
-        if (!workspaceContext.isPathWithinWorkspace(params.file_path)) {
-            const directories = workspaceContext.getDirectories();
-            return `File path must be within one of the workspace directories: ${directories.join(', ')}`;
-        }
-        return null;
+        return this.config.validatePathAccess(params.file_path);
     }
     createInvocation(params, messageBus) {
         return new EditToolInvocation(this.config, params, messageBus, this.name, this.displayName);
     }
+    getSchema(modelId) {
+        return resolveToolDeclaration(EDIT_DEFINITION, modelId);
+    }
     getModifyContext(_) {
         return {
             getFilePath: (params) => params.file_path,