MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-05-14 05:42:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): update read_file schema for v1 compatibility (#22183) (#26922)

Browse Source
This commit is contained in:
Coco Sheng
2026-05-12 17:41:49 -04:00
committed by GitHub
parent c37b9113d7
commit 120dfc724d
5 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/core/src/tools/definitions/__snapshots__/coreToolsModelSnapshots.test.ts.snap
+10 -4
View File
@@ -319,6 +319,7 @@ exports[`coreTools snapshots for specific models > Model: gemini-2.5-pro > snaps
},
"context": {
"description": "Show this many lines of context around each match (equivalent to grep -C). Defaults to 0 if omitted.",
"minimum": 0,
"type": "integer",
},
"dir_path": {
@@ -416,7 +417,8 @@ exports[`coreTools snapshots for specific models > Model: gemini-2.5-pro > snaps
"properties": {
"end_line": {
"description": "Optional: The 1-based line number to end reading at (inclusive).",
"type": "number",
"minimum": 1,
"type": "integer",
},
"file_path": {
"description": "The path to the file to read.",
@@ -424,7 +426,8 @@ exports[`coreTools snapshots for specific models > Model: gemini-2.5-pro > snaps
},
"start_line": {
"description": "Optional: The 1-based line number to start reading from.",
"type": "number",
"minimum": 1,
"type": "integer",
},
},
"required": [
@@ -1149,6 +1152,7 @@ exports[`coreTools snapshots for specific models > Model: gemini-3-pro-preview >
},
"context": {
"description": "Show this many lines of context around each match (equivalent to grep -C). Defaults to 0 if omitted.",
"minimum": 0,
"type": "integer",
},
"dir_path": {
@@ -1246,7 +1250,8 @@ exports[`coreTools snapshots for specific models > Model: gemini-3-pro-preview >
"properties": {
"end_line": {
"description": "Optional: The 1-based line number to end reading at (inclusive).",
"type": "number",
"minimum": 1,
"type": "integer",
},
"file_path": {
"description": "The path to the file to read.",
@@ -1254,7 +1259,8 @@ exports[`coreTools snapshots for specific models > Model: gemini-3-pro-preview >
},
"start_line": {
"description": "Optional: The 1-based line number to start reading from.",
"type": "number",
"minimum": 1,
"type": "integer",
},
},
"required": [
packages/core/src/tools/definitions/model-family-sets/default-legacy.ts
+5 -2
View File
@@ -97,12 +97,14 @@ export const DEFAULT_LEGACY_SET: CoreToolSet = {
[READ_FILE_PARAM_START_LINE]: {
description:
'Optional: The 1-based line number to start reading from.',
type: 'number',
type: 'integer',
minimum: 1,
},
[READ_FILE_PARAM_END_LINE]: {
description:
'Optional: The 1-based line number to end reading at (inclusive).',
type: 'number',
type: 'integer',
minimum: 1,
},
},
required: [PARAM_FILE_PATH],
@@ -223,6 +225,7 @@ export const DEFAULT_LEGACY_SET: CoreToolSet = {
description:
'Show this many lines of context around each match (equivalent to grep -C). Defaults to 0 if omitted.',
type: 'integer',
minimum: 0,
},
[GREP_PARAM_AFTER]: {
description:
packages/core/src/tools/definitions/model-family-sets/gemini-3.ts
+5 -2
View File
@@ -106,12 +106,14 @@ export const GEMINI_3_SET: CoreToolSet = {
[READ_FILE_PARAM_START_LINE]: {
description:
'Optional: The 1-based line number to start reading from.',
type: 'number',
type: 'integer',
minimum: 1,
},
[READ_FILE_PARAM_END_LINE]: {
description:
'Optional: The 1-based line number to end reading at (inclusive).',
type: 'number',
type: 'integer',
minimum: 1,
},
},
required: [PARAM_FILE_PATH],
@@ -230,6 +232,7 @@ export const GEMINI_3_SET: CoreToolSet = {
description:
'Show this many lines of context around each match (equivalent to grep -C). Defaults to 0 if omitted.',
type: 'integer',
minimum: 0,
},
[GREP_PARAM_AFTER]: {
description:
packages/core/src/tools/read-file.test.ts
+6 -4
View File
@@ -148,18 +148,20 @@ describe('ReadFileTool', () => {
it('should throw error if start_line is less than 1', () => {
const params: ReadFileToolParams = {
file_path: path.join(tempRootDir, 'test.txt'),
file_path: 'test.txt',
start_line: 0,
};
expect(() => tool.build(params)).toThrow('start_line must be at least 1');
expect(() => tool.build(params)).toThrow(
'params/start_line must be >= 1',
);
});
it('should throw error if end_line is less than 1', () => {
const params: ReadFileToolParams = {
file_path: path.join(tempRootDir, 'test.txt'),
file_path: 'test.txt',
end_line: 0,
};
expect(() => tool.build(params)).toThrow('end_line must be at least 1');
expect(() => tool.build(params)).toThrow('params/end_line must be >= 1');
});
it('should throw error if start_line is greater than end_line', () => {
packages/core/src/tools/read-file.ts
-6
View File
@@ -255,12 +255,6 @@ export class ReadFileTool extends BaseDeclarativeTool<
return validationError;
}
if (params.start_line !== undefined && params.start_line < 1) {
return 'start_line must be at least 1';
}
if (params.end_line !== undefined && params.end_line < 1) {
return 'end_line must be at least 1';
}
if (
params.start_line !== undefined &&
params.end_line !== undefined &&