@google/gemini-cli-core 0.1.18 → 0.1.19-nightly.250813.9d023be1

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

@@ -3,83 +3,172 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { FunctionDeclaration, PartListUnion, Schema } from '@google/genai';
+import { FunctionDeclaration, PartListUnion } from '@google/genai';
 import { ToolErrorType } from './tool-error.js';
+import { DiffUpdateResult } from '../ide/ideContext.js';
 /**
- * Interface representing the base Tool functionality
+ * Represents a validated and ready-to-execute tool call.
+ * An instance of this is created by a `ToolBuilder`.
  */
-export interface Tool<TParams = unknown, TResult extends ToolResult = ToolResult> {
+export interface ToolInvocation<TParams extends object, TResult extends ToolResult> {
     /**
-     * The internal name of the tool (used for API calls)
+     * The validated parameters for this specific invocation.
+     */
+    params: TParams;
+    /**
+     * Gets a pre-execution description of the tool operation.
+     * @returns A markdown string describing what the tool will do.
+     */
+    getDescription(): string;
+    /**
+     * Determines what file system paths the tool will affect.
+     * @returns A list of such paths.
+     */
+    toolLocations(): ToolLocation[];
+    /**
+     * Determines if the tool should prompt for confirmation before execution.
+     * @returns Confirmation details or false if no confirmation is needed.
+     */
+    shouldConfirmExecute(abortSignal: AbortSignal): Promise<ToolCallConfirmationDetails | false>;
+    /**
+     * Executes the tool with the validated parameters.
+     * @param signal AbortSignal for tool cancellation.
+     * @param updateOutput Optional callback to stream output.
+     * @returns Result of the tool execution.
+     */
+    execute(signal: AbortSignal, updateOutput?: (output: string) => void): Promise<TResult>;
+}
+/**
+ * A convenience base class for ToolInvocation.
+ */
+export declare abstract class BaseToolInvocation<TParams extends object, TResult extends ToolResult> implements ToolInvocation<TParams, TResult> {
+    readonly params: TParams;
+    constructor(params: TParams);
+    abstract getDescription(): string;
+    toolLocations(): ToolLocation[];
+    shouldConfirmExecute(_abortSignal: AbortSignal): Promise<ToolCallConfirmationDetails | false>;
+    abstract execute(signal: AbortSignal, updateOutput?: (output: string) => void): Promise<TResult>;
+}
+/**
+ * A type alias for a tool invocation where the specific parameter and result types are not known.
+ */
+export type AnyToolInvocation = ToolInvocation<object, ToolResult>;
+/**
+ * An adapter that wraps the legacy `Tool` interface to make it compatible
+ * with the new `ToolInvocation` pattern.
+ */
+export declare class LegacyToolInvocation<TParams extends object, TResult extends ToolResult> implements ToolInvocation<TParams, TResult> {
+    private readonly legacyTool;
+    readonly params: TParams;
+    constructor(legacyTool: BaseTool<TParams, TResult>, params: TParams);
+    getDescription(): string;
+    toolLocations(): ToolLocation[];
+    shouldConfirmExecute(abortSignal: AbortSignal): Promise<ToolCallConfirmationDetails | false>;
+    execute(signal: AbortSignal, updateOutput?: (output: string) => void): Promise<TResult>;
+}
+/**
+ * Interface for a tool builder that validates parameters and creates invocations.
+ */
+export interface ToolBuilder<TParams extends object, TResult extends ToolResult> {
+    /**
+     * The internal name of the tool (used for API calls).
      */
     name: string;
     /**
-     * The user-friendly display name of the tool
+     * The user-friendly display name of the tool.
      */
     displayName: string;
     /**
-     * Description of what the tool does
+     * Description of what the tool does.
      */
     description: string;
     /**
-     * The icon to display when interacting via ACP
+     * The icon to display when interacting via ACP.
      */
     icon: Icon;
     /**
-     * Function declaration schema from @google/genai
+     * Function declaration schema from @google/genai.
      */
     schema: FunctionDeclaration;
     /**
-     * Whether the tool's output should be rendered as markdown
+     * Whether the tool's output should be rendered as markdown.
      */
     isOutputMarkdown: boolean;
     /**
-     * Whether the tool supports live (streaming) output
+     * Whether the tool supports live (streaming) output.
      */
     canUpdateOutput: boolean;
     /**
-     * Validates the parameters for the tool
-     * Should be called from both `shouldConfirmExecute` and `execute`
-     * `shouldConfirmExecute` should return false immediately if invalid
-     * @param params Parameters to validate
-     * @returns An error message string if invalid, null otherwise
-     */
-    validateToolParams(params: TParams): string | null;
-    /**
-     * Gets a pre-execution description of the tool operation
-     * @param params Parameters for the tool execution
-     * @returns A markdown string describing what the tool will do
-     * Optional for backward compatibility
+     * Validates raw parameters and builds a ready-to-execute invocation.
+     * @param params The raw, untrusted parameters from the model.
+     * @returns A valid `ToolInvocation` if successful. Throws an error if validation fails.
      */
-    getDescription(params: TParams): string;
+    build(params: TParams): ToolInvocation<TParams, TResult>;
+}
+/**
+ * New base class for tools that separates validation from execution.
+ * New tools should extend this class.
+ */
+export declare abstract class DeclarativeTool<TParams extends object, TResult extends ToolResult> implements ToolBuilder<TParams, TResult> {
+    readonly name: string;
+    readonly displayName: string;
+    readonly description: string;
+    readonly icon: Icon;
+    readonly parameterSchema: unknown;
+    readonly isOutputMarkdown: boolean;
+    readonly canUpdateOutput: boolean;
+    constructor(name: string, displayName: string, description: string, icon: Icon, parameterSchema: unknown, isOutputMarkdown?: boolean, canUpdateOutput?: boolean);
+    get schema(): FunctionDeclaration;
     /**
-     * Determines what file system paths the tool will affect
-     * @param params Parameters for the tool execution
-     * @returns A list of such paths
+     * Validates the raw tool parameters.
+     * Subclasses should override this to add custom validation logic
+     * beyond the JSON schema check.
+     * @param params The raw parameters from the model.
+     * @returns An error message string if invalid, null otherwise.
      */
-    toolLocations(params: TParams): ToolLocation[];
+    protected validateToolParams(_params: TParams): string | null;
     /**
-     * Determines if the tool should prompt for confirmation before execution
-     * @param params Parameters for the tool execution
-     * @returns Whether execute should be confirmed.
+     * The core of the new pattern. It validates parameters and, if successful,
+     * returns a `ToolInvocation` object that encapsulates the logic for the
+     * specific, validated call.
+     * @param params The raw, untrusted parameters from the model.
+     * @returns A `ToolInvocation` instance.
      */
-    shouldConfirmExecute(params: TParams, abortSignal: AbortSignal): Promise<ToolCallConfirmationDetails | false>;
+    abstract build(params: TParams): ToolInvocation<TParams, TResult>;
     /**
-     * Executes the tool with the given parameters
-     * @param params Parameters for the tool execution
-     * @returns Result of the tool execution
+     * A convenience method that builds and executes the tool in one step.
+     * Throws an error if validation fails.
+     * @param params The raw, untrusted parameters from the model.
+     * @param signal AbortSignal for tool cancellation.
+     * @param updateOutput Optional callback to stream output.
+     * @returns The result of the tool execution.
      */
-    execute(params: TParams, signal: AbortSignal, updateOutput?: (output: string) => void): Promise<TResult>;
+    buildAndExecute(params: TParams, signal: AbortSignal, updateOutput?: (output: string) => void): Promise<TResult>;
 }
+/**
+ * New base class for declarative tools that separates validation from execution.
+ * New tools should extend this class, which provides a `build` method that
+ * validates parameters before deferring to a `createInvocation` method for
+ * the final `ToolInvocation` object instantiation.
+ */
+export declare abstract class BaseDeclarativeTool<TParams extends object, TResult extends ToolResult> extends DeclarativeTool<TParams, TResult> {
+    build(params: TParams): ToolInvocation<TParams, TResult>;
+    protected abstract createInvocation(params: TParams): ToolInvocation<TParams, TResult>;
+}
+/**
+ * A type alias for a declarative tool where the specific parameter and result types are not known.
+ */
+export type AnyDeclarativeTool = DeclarativeTool<object, ToolResult>;
 /**
  * Base implementation for tools with common functionality
+ * @deprecated Use `DeclarativeTool` for new tools.
  */
-export declare abstract class BaseTool<TParams = unknown, TResult extends ToolResult = ToolResult> implements Tool<TParams, TResult> {
+export declare abstract class BaseTool<TParams extends object, TResult extends ToolResult = ToolResult> extends DeclarativeTool<TParams, TResult> {
     readonly name: string;
     readonly displayName: string;
     readonly description: string;
     readonly icon: Icon;
-    readonly parameterSchema: Schema;
+    readonly parameterSchema: unknown;
     readonly isOutputMarkdown: boolean;
     readonly canUpdateOutput: boolean;
     /**
@@ -89,13 +178,10 @@ export declare abstract class BaseTool<TParams = unknown, TResult extends ToolRe
      * @param description Description of what the tool does
      * @param isOutputMarkdown Whether the tool's output should be rendered as markdown
      * @param canUpdateOutput Whether the tool supports live (streaming) output
-     * @param parameterSchema Open API 3.0 Schema defining the parameters
-     */
-    constructor(name: string, displayName: string, description: string, icon: Icon, parameterSchema: Schema, isOutputMarkdown?: boolean, canUpdateOutput?: boolean);
-    /**
-     * Function declaration schema computed from name, description, and parameterSchema
+     * @param parameterSchema JSON Schema defining the parameters
      */
-    get schema(): FunctionDeclaration;
+    constructor(name: string, displayName: string, description: string, icon: Icon, parameterSchema: unknown, isOutputMarkdown?: boolean, canUpdateOutput?: boolean);
+    build(params: TParams): ToolInvocation<TParams, TResult>;
     /**
      * Validates the parameters for the tool
      * This is a placeholder implementation and should be overridden
@@ -160,22 +246,37 @@ export interface ToolResult {
         type?: ToolErrorType;
     };
 }
+/**
+ * Detects cycles in a JSON schemas due to `$ref`s.
+ * @param schema The root of the JSON schema.
+ * @returns `true` if a cycle is detected, `false` otherwise.
+ */
+export declare function hasCycleInSchema(schema: object): boolean;
 export type ToolResultDisplay = string | FileDiff;
 export interface FileDiff {
     fileDiff: string;
     fileName: string;
     originalContent: string | null;
     newContent: string;
+    diffStat?: DiffStat;
+}
+export interface DiffStat {
+    ai_removed_lines: number;
+    ai_added_lines: number;
+    user_added_lines: number;
+    user_removed_lines: number;
 }
 export interface ToolEditConfirmationDetails {
     type: 'edit';
     title: string;
     onConfirm: (outcome: ToolConfirmationOutcome, payload?: ToolConfirmationPayload) => Promise<void>;
     fileName: string;
+    filePath: string;
     fileDiff: string;
     originalContent: string | null;
     newContent: string;
     isModifying?: boolean;
+    ideConfirmation?: Promise<DiffUpdateResult>;
 }
 export interface ToolConfirmationPayload {
     newContent: string;

package/dist/src/tools/tools.js

@@ -3,10 +3,117 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+/**
+ * A convenience base class for ToolInvocation.
+ */
+export class BaseToolInvocation {
+    params;
+    constructor(params) {
+        this.params = params;
+    }
+    toolLocations() {
+        return [];
+    }
+    shouldConfirmExecute(_abortSignal) {
+        return Promise.resolve(false);
+    }
+}
+/**
+ * An adapter that wraps the legacy `Tool` interface to make it compatible
+ * with the new `ToolInvocation` pattern.
+ */
+export class LegacyToolInvocation {
+    legacyTool;
+    params;
+    constructor(legacyTool, params) {
+        this.legacyTool = legacyTool;
+        this.params = params;
+    }
+    getDescription() {
+        return this.legacyTool.getDescription(this.params);
+    }
+    toolLocations() {
+        return this.legacyTool.toolLocations(this.params);
+    }
+    shouldConfirmExecute(abortSignal) {
+        return this.legacyTool.shouldConfirmExecute(this.params, abortSignal);
+    }
+    execute(signal, updateOutput) {
+        return this.legacyTool.execute(this.params, signal, updateOutput);
+    }
+}
+/**
+ * New base class for tools that separates validation from execution.
+ * New tools should extend this class.
+ */
+export class DeclarativeTool {
+    name;
+    displayName;
+    description;
+    icon;
+    parameterSchema;
+    isOutputMarkdown;
+    canUpdateOutput;
+    constructor(name, displayName, description, icon, parameterSchema, isOutputMarkdown = true, canUpdateOutput = false) {
+        this.name = name;
+        this.displayName = displayName;
+        this.description = description;
+        this.icon = icon;
+        this.parameterSchema = parameterSchema;
+        this.isOutputMarkdown = isOutputMarkdown;
+        this.canUpdateOutput = canUpdateOutput;
+    }
+    get schema() {
+        return {
+            name: this.name,
+            description: this.description,
+            parametersJsonSchema: this.parameterSchema,
+        };
+    }
+    /**
+     * Validates the raw tool parameters.
+     * Subclasses should override this to add custom validation logic
+     * beyond the JSON schema check.
+     * @param params The raw parameters from the model.
+     * @returns An error message string if invalid, null otherwise.
+     */
+    validateToolParams(_params) {
+        // Base implementation can be extended by subclasses.
+        return null;
+    }
+    /**
+     * A convenience method that builds and executes the tool in one step.
+     * Throws an error if validation fails.
+     * @param params The raw, untrusted parameters from the model.
+     * @param signal AbortSignal for tool cancellation.
+     * @param updateOutput Optional callback to stream output.
+     * @returns The result of the tool execution.
+     */
+    async buildAndExecute(params, signal, updateOutput) {
+        const invocation = this.build(params);
+        return invocation.execute(signal, updateOutput);
+    }
+}
+/**
+ * New base class for declarative tools that separates validation from execution.
+ * New tools should extend this class, which provides a `build` method that
+ * validates parameters before deferring to a `createInvocation` method for
+ * the final `ToolInvocation` object instantiation.
+ */
+export class BaseDeclarativeTool extends DeclarativeTool {
+    build(params) {
+        const validationError = this.validateToolParams(params);
+        if (validationError) {
+            throw new Error(validationError);
+        }
+        return this.createInvocation(params);
+    }
+}
 /**
  * Base implementation for tools with common functionality
+ * @deprecated Use `DeclarativeTool` for new tools.
  */
-export class BaseTool {
+export class BaseTool extends DeclarativeTool {
     name;
     displayName;
     description;
@@ -21,9 +128,10 @@ export class BaseTool {
      * @param description Description of what the tool does
      * @param isOutputMarkdown Whether the tool's output should be rendered as markdown
      * @param canUpdateOutput Whether the tool supports live (streaming) output
-     * @param parameterSchema Open API 3.0 Schema defining the parameters
+     * @param parameterSchema JSON Schema defining the parameters
      */
     constructor(name, displayName, description, icon, parameterSchema, isOutputMarkdown = true, canUpdateOutput = false) {
+        super(name, displayName, description, icon, parameterSchema, isOutputMarkdown, canUpdateOutput);
         this.name = name;
         this.displayName = displayName;
         this.description = description;
@@ -32,15 +140,12 @@ export class BaseTool {
         this.isOutputMarkdown = isOutputMarkdown;
         this.canUpdateOutput = canUpdateOutput;
     }
-    /**
-     * Function declaration schema computed from name, description, and parameterSchema
-     */
-    get schema() {
-        return {
-            name: this.name,
-            description: this.description,
-            parameters: this.parameterSchema,
-        };
+    build(params) {
+        const validationError = this.validateToolParams(params);
+        if (validationError) {
+            throw new Error(validationError);
+        }
+        return new LegacyToolInvocation(this, params);
     }
     /**
      * Validates the parameters for the tool
@@ -88,6 +193,71 @@ export class BaseTool {
         return [];
     }
 }
+/**
+ * Detects cycles in a JSON schemas due to `$ref`s.
+ * @param schema The root of the JSON schema.
+ * @returns `true` if a cycle is detected, `false` otherwise.
+ */
+export function hasCycleInSchema(schema) {
+    function resolveRef(ref) {
+        if (!ref.startsWith('#/')) {
+            return null;
+        }
+        const path = ref.substring(2).split('/');
+        let current = schema;
+        for (const segment of path) {
+            if (typeof current !== 'object' ||
+                current === null ||
+                !Object.prototype.hasOwnProperty.call(current, segment)) {
+                return null;
+            }
+            current = current[segment];
+        }
+        return current;
+    }
+    function traverse(node, visitedRefs, pathRefs) {
+        if (typeof node !== 'object' || node === null) {
+            return false;
+        }
+        if (Array.isArray(node)) {
+            for (const item of node) {
+                if (traverse(item, visitedRefs, pathRefs)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        if ('$ref' in node && typeof node.$ref === 'string') {
+            const ref = node.$ref;
+            if (ref === '#/' || pathRefs.has(ref)) {
+                // A ref to just '#/' is always a cycle.
+                return true; // Cycle detected!
+            }
+            if (visitedRefs.has(ref)) {
+                return false; // Bail early, we have checked this ref before.
+            }
+            const resolvedNode = resolveRef(ref);
+            if (resolvedNode) {
+                // Add it to both visited and the current path
+                visitedRefs.add(ref);
+                pathRefs.add(ref);
+                const hasCycle = traverse(resolvedNode, visitedRefs, pathRefs);
+                pathRefs.delete(ref); // Backtrack, leaving it in visited
+                return hasCycle;
+            }
+        }
+        // Crawl all the properties of node
+        for (const key in node) {
+            if (Object.prototype.hasOwnProperty.call(node, key)) {
+                if (traverse(node[key], visitedRefs, pathRefs)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    return traverse(schema, new Set(), new Set());
+}
 export var ToolConfirmationOutcome;
 (function (ToolConfirmationOutcome) {
     ToolConfirmationOutcome["ProceedOnce"] = "proceed_once";

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

@@ -1 +1 @@
-{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../../src/tools/tools.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA6FH;;GAEG;AACH,MAAM,OAAgB,QAAQ;IAejB;IACA;IACA;IACA;IACA;IACA;IACA;IAhBX;;;;;;;;OAQG;IACH,YACW,IAAY,EACZ,WAAmB,EACnB,WAAmB,EACnB,IAAU,EACV,eAAuB,EACvB,mBAA4B,IAAI,EAChC,kBAA2B,KAAK;QANhC,SAAI,GAAJ,IAAI,CAAQ;QACZ,gBAAW,GAAX,WAAW,CAAQ;QACnB,gBAAW,GAAX,WAAW,CAAQ;QACnB,SAAI,GAAJ,IAAI,CAAM;QACV,oBAAe,GAAf,eAAe,CAAQ;QACvB,qBAAgB,GAAhB,gBAAgB,CAAgB;QAChC,oBAAe,GAAf,eAAe,CAAiB;IACxC,CAAC;IAEJ;;OAEG;IACH,IAAI,MAAM;QACR,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,UAAU,EAAE,IAAI,CAAC,eAAe;SACjC,CAAC;IACJ,CAAC;IAED;;;;;;;OAOG;IACH,6DAA6D;IAC7D,kBAAkB,CAAC,MAAe;QAChC,6DAA6D;QAC7D,sEAAsE;QACtE,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACH,cAAc,CAAC,MAAe;QAC5B,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;IAED;;;;OAIG;IACH,oBAAoB;IAClB,6DAA6D;IAC7D,MAAe;IACf,6DAA6D;IAC7D,WAAwB;QAExB,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED;;;;OAIG;IACH,aAAa;IACX,6DAA6D;IAC7D,MAAe;QAEf,OAAO,EAAE,CAAC;IACZ,CAAC;CAcF;AA4FD,MAAM,CAAN,IAAY,uBAOX;AAPD,WAAY,uBAAuB;IACjC,uDAA4B,CAAA;IAC5B,2DAAgC,CAAA;IAChC,wEAA6C,CAAA;IAC7C,oEAAyC,CAAA;IACzC,kEAAuC,CAAA;IACvC,4CAAiB,CAAA;AACnB,CAAC,EAPW,uBAAuB,KAAvB,uBAAuB,QAOlC;AAED,MAAM,CAAN,IAAY,IASX;AATD,WAAY,IAAI;IACd,iCAAyB,CAAA;IACzB,yBAAiB,CAAA;IACjB,uBAAe,CAAA;IACf,yBAAiB,CAAA;IACjB,+BAAuB,CAAA;IACvB,yBAAiB,CAAA;IACjB,uBAAe,CAAA;IACf,6BAAqB,CAAA;AACvB,CAAC,EATW,IAAI,KAAJ,IAAI,QASf"}
+{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../../src/tools/tools.ts"],"names":[],"mappings":"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"}

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

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

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

@@ -0,0 +1,117 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect } from 'vitest';
+import { hasCycleInSchema } from './tools.js'; // Added getStringifiedResultForDisplay
+describe('hasCycleInSchema', () => {
+    it('should detect a simple direct cycle', () => {
+        const schema = {
+            properties: {
+                data: {
+                    $ref: '#/properties/data',
+                },
+            },
+        };
+        expect(hasCycleInSchema(schema)).toBe(true);
+    });
+    it('should detect a cycle from object properties referencing parent properties', () => {
+        const schema = {
+            type: 'object',
+            properties: {
+                data: {
+                    type: 'object',
+                    properties: {
+                        child: { $ref: '#/properties/data' },
+                    },
+                },
+            },
+        };
+        expect(hasCycleInSchema(schema)).toBe(true);
+    });
+    it('should detect a cycle from array items referencing parent properties', () => {
+        const schema = {
+            type: 'object',
+            properties: {
+                data: {
+                    type: 'array',
+                    items: {
+                        type: 'object',
+                        properties: {
+                            child: { $ref: '#/properties/data/items' },
+                        },
+                    },
+                },
+            },
+        };
+        expect(hasCycleInSchema(schema)).toBe(true);
+    });
+    it('should detect a cycle between sibling properties', () => {
+        const schema = {
+            type: 'object',
+            properties: {
+                a: {
+                    type: 'object',
+                    properties: {
+                        child: { $ref: '#/properties/b' },
+                    },
+                },
+                b: {
+                    type: 'object',
+                    properties: {
+                        child: { $ref: '#/properties/a' },
+                    },
+                },
+            },
+        };
+        expect(hasCycleInSchema(schema)).toBe(true);
+    });
+    it('should not detect a cycle in a valid schema', () => {
+        const schema = {
+            type: 'object',
+            properties: {
+                name: { type: 'string' },
+                address: { $ref: '#/definitions/address' },
+            },
+            definitions: {
+                address: {
+                    type: 'object',
+                    properties: {
+                        street: { type: 'string' },
+                        city: { type: 'string' },
+                    },
+                },
+            },
+        };
+        expect(hasCycleInSchema(schema)).toBe(false);
+    });
+    it('should handle non-cyclic sibling refs', () => {
+        const schema = {
+            properties: {
+                a: { $ref: '#/definitions/stringDef' },
+                b: { $ref: '#/definitions/stringDef' },
+            },
+            definitions: {
+                stringDef: { type: 'string' },
+            },
+        };
+        expect(hasCycleInSchema(schema)).toBe(false);
+    });
+    it('should handle nested but not cyclic refs', () => {
+        const schema = {
+            properties: {
+                a: { $ref: '#/definitions/defA' },
+            },
+            definitions: {
+                defA: { properties: { b: { $ref: '#/definitions/defB' } } },
+                defB: { type: 'string' },
+            },
+        };
+        expect(hasCycleInSchema(schema)).toBe(false);
+    });
+    it('should return false for an empty schema', () => {
+        expect(hasCycleInSchema({})).toBe(false);
+    });
+});
+//# sourceMappingURL=tools.test.js.map

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

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

package/dist/src/tools/web-fetch.js

@@ -5,7 +5,6 @@
  */
 import { SchemaValidator } from '../utils/schemaValidator.js';
 import { BaseTool, ToolConfirmationOutcome, Icon, } from './tools.js';
-import { Type } from '@google/genai';
 import { getErrorMessage } from '../utils/errors.js';
 import { ApprovalMode } from '../config/config.js';
 import { getResponseText } from '../utils/generateContentResponseUtilities.js';
@@ -30,11 +29,11 @@ export class WebFetchTool extends BaseTool {
             properties: {
                 prompt: {
                     description: 'A comprehensive prompt that includes the URL(s) (up to 20) to fetch and specific instructions on how to process their content (e.g., "Summarize https://example.com/article and extract key points from https://another.com/data"). Must contain as least one URL starting with http:// or https://.',
-                    type: Type.STRING,
+                    type: 'string',
                 },
             },
             required: ['prompt'],
-            type: Type.OBJECT,
+            type: 'object',
         });
         this.config = config;
         const proxy = config.getProxy();
@@ -96,7 +95,7 @@ ${textContent}
         }
     }
     validateParams(params) {
-        const errors = SchemaValidator.validate(this.schema.parameters, params);
+        const errors = SchemaValidator.validate(this.schema.parametersJsonSchema, params);
         if (errors) {
             return errors;
         }