MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-04-21 18:44:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Allow @-includes outside of workspaces (with permission) (#18470)

Browse Source
This commit is contained in:
Tommaso Sciortino
2026-02-09 12:24:28 -08:00
committed by GitHub
parent e73288f25f
commit 262e8384d4
17 changed files with 250 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/core/src/tools/glob.ts
+8 -3
View File
@@ -123,8 +123,10 @@ class GlobToolInvocation extends BaseToolInvocation<
this.config.getTargetDir(),
this.params.dir_path,
);
const validationError =
this.config.validatePathAccess(searchDirAbsolute);
const validationError = this.config.validatePathAccess(
searchDirAbsolute,
'read',
);
if (validationError) {
return {
llmContent: validationError,
@@ -318,7 +320,10 @@ export class GlobTool extends BaseDeclarativeTool<GlobToolParams, ToolResult> {
params.dir_path || '.',
);
const validationError = this.config.validatePathAccess(searchDirAbsolute);
const validationError = this.config.validatePathAccess(
searchDirAbsolute,
'read',
);
if (validationError) {
return validationError;
}
packages/core/src/tools/grep.ts
+8 -2
View File
@@ -123,7 +123,10 @@ class GrepToolInvocation extends BaseToolInvocation<
let searchDirAbs: string | null = null;
if (pathParam) {
searchDirAbs = path.resolve(this.config.getTargetDir(), pathParam);
const validationError = this.config.validatePathAccess(searchDirAbs);
const validationError = this.config.validatePathAccess(
searchDirAbs,
'read',
);
if (validationError) {
return {
llmContent: validationError,
@@ -623,7 +626,10 @@ export class GrepTool extends BaseDeclarativeTool<GrepToolParams, ToolResult> {
this.config.getTargetDir(),
params.dir_path,
);
const validationError = this.config.validatePathAccess(resolvedPath);
const validationError = this.config.validatePathAccess(
resolvedPath,
'read',
);
if (validationError) {
return validationError;
}
packages/core/src/tools/ls.ts
+5 -2
View File
@@ -143,7 +143,10 @@ class LSToolInvocation extends BaseToolInvocation<LSToolParams, ToolResult> {
this.params.dir_path,
);
const validationError = this.config.validatePathAccess(resolvedDirPath);
const validationError = this.config.validatePathAccess(
resolvedDirPath,
'read',
);
if (validationError) {
return {
llmContent: validationError,
@@ -331,7 +334,7 @@ export class LSTool extends BaseDeclarativeTool<LSToolParams, ToolResult> {
this.config.getTargetDir(),
params.dir_path,
);
return this.config.validatePathAccess(resolvedPath);
return this.config.validatePathAccess(resolvedPath, 'read');
}
protected createInvocation(
packages/core/src/tools/read-file.ts
+8 -2
View File
@@ -76,7 +76,10 @@ class ReadFileToolInvocation extends BaseToolInvocation<
}
async execute(): Promise<ToolResult> {
const validationError = this.config.validatePathAccess(this.resolvedPath);
const validationError = this.config.validatePathAccess(
this.resolvedPath,
'read',
);
if (validationError) {
return {
llmContent: validationError,
@@ -213,7 +216,10 @@ export class ReadFileTool extends BaseDeclarativeTool<
params.file_path,
);
const validationError = this.config.validatePathAccess(resolvedPath);
const validationError = this.config.validatePathAccess(
resolvedPath,
'read',
);
if (validationError) {
return validationError;
}
packages/core/src/tools/read-many-files.ts
+4 -1
View File
@@ -221,7 +221,10 @@ ${finalExclusionPatternsForDescription
const fullPath = path.resolve(this.config.getTargetDir(), relativePath);
const validationError = this.config.validatePathAccess(fullPath);
const validationError = this.config.validatePathAccess(
fullPath,
'read',
);
if (validationError) {
skippedFiles.push({
path: fullPath,
packages/core/src/tools/ripGrep.ts
+8 -2
View File
@@ -164,7 +164,10 @@ class GrepToolInvocation extends BaseToolInvocation<
const pathParam = this.params.dir_path || '.';
const searchDirAbs = path.resolve(this.config.getTargetDir(), pathParam);
const validationError = this.config.validatePathAccess(searchDirAbs);
const validationError = this.config.validatePathAccess(
searchDirAbs,
'read',
);
if (validationError) {
return {
llmContent: validationError,
@@ -582,7 +585,10 @@ export class RipGrepTool extends BaseDeclarativeTool<
this.config.getTargetDir(),
params.dir_path,
);
const validationError = this.config.validatePathAccess(resolvedPath);
const validationError = this.config.validatePathAccess(
resolvedPath,
'read',
);
if (validationError) {
return validationError;
}