@google/gemini-cli-core 0.22.1 → 0.22.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/google-gemini-cli-core-0.22.0-preview.3.tgz +0 -0
- package/dist/src/agents/delegate-to-agent-tool.d.ts +19 -0
- package/dist/src/agents/delegate-to-agent-tool.js +111 -0
- package/dist/src/agents/delegate-to-agent-tool.js.map +1 -0
- package/dist/src/agents/delegate-to-agent-tool.test.d.ts +6 -0
- package/dist/src/agents/delegate-to-agent-tool.test.js +133 -0
- package/dist/src/agents/delegate-to-agent-tool.test.js.map +1 -0
- package/dist/src/agents/executor.js +1 -1
- package/dist/src/agents/executor.js.map +1 -1
- package/dist/src/agents/executor.test.js.map +1 -1
- package/dist/src/agents/registry.d.ts +15 -0
- package/dist/src/agents/registry.js +39 -0
- package/dist/src/agents/registry.js.map +1 -1
- package/dist/src/agents/registry.test.js +18 -0
- package/dist/src/agents/registry.test.js.map +1 -1
- package/dist/src/availability/policyCatalog.test.js.map +1 -1
- package/dist/src/code_assist/experiments/client_metadata.js +2 -1
- package/dist/src/code_assist/experiments/client_metadata.js.map +1 -1
- package/dist/src/code_assist/experiments/client_metadata.test.js +7 -10
- package/dist/src/code_assist/experiments/client_metadata.test.js.map +1 -1
- package/dist/src/commands/init.d.ts +7 -0
- package/dist/src/commands/init.js +53 -0
- package/dist/src/commands/init.js.map +1 -0
- package/dist/src/commands/init.test.d.ts +6 -0
- package/dist/src/commands/init.test.js +25 -0
- package/dist/src/commands/init.test.js.map +1 -0
- package/dist/src/config/config.d.ts +0 -1
- package/dist/src/config/config.js +31 -22
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +32 -8
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/defaultModelConfigs.js +10 -0
- package/dist/src/config/defaultModelConfigs.js.map +1 -1
- package/dist/src/config/models.d.ts +9 -1
- package/dist/src/config/models.js +11 -1
- package/dist/src/config/models.js.map +1 -1
- package/dist/src/config/models.test.js +14 -1
- package/dist/src/config/models.test.js.map +1 -1
- package/dist/src/confirmation-bus/message-bus.js.map +1 -1
- package/dist/src/confirmation-bus/types.d.ts +4 -0
- package/dist/src/core/baseLlmClient.test.js.map +1 -1
- package/dist/src/core/contentGenerator.js +5 -3
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/contentGenerator.test.js +29 -2
- package/dist/src/core/contentGenerator.test.js.map +1 -1
- package/dist/src/core/coreToolScheduler.d.ts +1 -1
- package/dist/src/core/coreToolScheduler.js +72 -34
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +134 -37
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/geminiChat.js +1 -3
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/core/logger.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.test.js +4 -5
- package/dist/src/core/nonInteractiveToolExecutor.test.js.map +1 -1
- package/dist/src/core/prompts.js +8 -6
- package/dist/src/core/prompts.js.map +1 -1
- package/dist/src/core/prompts.test.js +9 -3
- package/dist/src/core/prompts.test.js.map +1 -1
- package/dist/src/core/turn.js +1 -1
- package/dist/src/core/turn.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/hooks/hookEventHandler.js +6 -1
- package/dist/src/hooks/hookEventHandler.js.map +1 -1
- package/dist/src/hooks/hookEventHandler.test.js +8 -1
- package/dist/src/hooks/hookEventHandler.test.js.map +1 -1
- package/dist/src/hooks/hookRegistry.d.ts +0 -7
- package/dist/src/hooks/hookRegistry.js +0 -20
- package/dist/src/hooks/hookRegistry.js.map +1 -1
- package/dist/src/hooks/hookRegistry.test.js +1 -7
- package/dist/src/hooks/hookRegistry.test.js.map +1 -1
- package/dist/src/hooks/hookRunner.test.js +1 -1
- package/dist/src/hooks/hookRunner.test.js.map +1 -1
- package/dist/src/hooks/hookSystem.d.ts +0 -8
- package/dist/src/hooks/hookSystem.js +0 -18
- package/dist/src/hooks/hookSystem.js.map +1 -1
- package/dist/src/hooks/hookSystem.test.js +2 -21
- package/dist/src/hooks/hookSystem.test.js.map +1 -1
- package/dist/src/ide/detect-ide.test.js +32 -1
- package/dist/src/ide/detect-ide.test.js.map +1 -1
- package/dist/src/ide/ide-installer.test.js +1 -1
- package/dist/src/ide/ide-installer.test.js.map +1 -1
- package/dist/src/index.d.ts +3 -0
- package/dist/src/index.js +3 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/mcp/oauth-provider.js.map +1 -1
- package/dist/src/output/json-formatter.test.js +2 -0
- package/dist/src/output/json-formatter.test.js.map +1 -1
- package/dist/src/output/stream-json-formatter.js +6 -0
- package/dist/src/output/stream-json-formatter.js.map +1 -1
- package/dist/src/output/stream-json-formatter.test.js +98 -100
- package/dist/src/output/stream-json-formatter.test.js.map +1 -1
- package/dist/src/output/types.d.ts +2 -0
- package/dist/src/policy/config.js +73 -3
- package/dist/src/policy/config.js.map +1 -1
- package/dist/src/policy/persistence.test.d.ts +6 -0
- package/dist/src/policy/persistence.test.js +154 -0
- package/dist/src/policy/persistence.test.js.map +1 -0
- package/dist/src/policy/policies/agent.toml +31 -0
- package/dist/src/policy/policy-engine.d.ts +10 -1
- package/dist/src/policy/policy-engine.js +79 -5
- package/dist/src/policy/policy-engine.js.map +1 -1
- package/dist/src/policy/policy-engine.test.js +26 -2
- package/dist/src/policy/policy-engine.test.js.map +1 -1
- package/dist/src/policy/shell-safety.test.d.ts +6 -0
- package/dist/src/policy/shell-safety.test.js +75 -0
- package/dist/src/policy/shell-safety.test.js.map +1 -0
- package/dist/src/policy/toml-loader.d.ts +11 -5
- package/dist/src/policy/toml-loader.js +38 -23
- package/dist/src/policy/toml-loader.js.map +1 -1
- package/dist/src/policy/toml-loader.test.js +28 -7
- package/dist/src/policy/toml-loader.test.js.map +1 -1
- package/dist/src/policy/types.d.ts +15 -0
- package/dist/src/safety/checker-runner.js +17 -6
- package/dist/src/safety/checker-runner.js.map +1 -1
- package/dist/src/services/chatRecordingService.d.ts +5 -0
- package/dist/src/services/chatRecordingService.js +7 -0
- package/dist/src/services/chatRecordingService.js.map +1 -1
- package/dist/src/services/fileSystemService.d.ts +0 -9
- package/dist/src/services/fileSystemService.js +0 -11
- package/dist/src/services/fileSystemService.js.map +1 -1
- package/dist/src/services/loopDetectionService.js +2 -2
- package/dist/src/services/loopDetectionService.js.map +1 -1
- package/dist/src/services/modelConfig.golden.test.js +32 -0
- package/dist/src/services/modelConfig.golden.test.js.map +1 -1
- package/dist/src/services/modelConfigService.d.ts +3 -0
- package/dist/src/services/modelConfigService.js +3 -2
- package/dist/src/services/modelConfigService.js.map +1 -1
- package/dist/src/services/modelConfigService.test.js +110 -0
- package/dist/src/services/modelConfigService.test.js.map +1 -1
- package/dist/src/services/shellExecutionService.js +1 -2
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.test.js +6 -3
- package/dist/src/services/shellExecutionService.test.js.map +1 -1
- package/dist/src/services/test-data/resolved-aliases-retry.golden.json +238 -0
- package/dist/src/telemetry/activity-detector.test.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +5 -5
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js +18 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js.map +1 -1
- package/dist/src/telemetry/config.js.map +1 -1
- package/dist/src/telemetry/loggers.test.js +5 -5
- package/dist/src/telemetry/loggers.test.js.map +1 -1
- package/dist/src/telemetry/metrics.test.js.map +1 -1
- package/dist/src/telemetry/startupProfiler.js +3 -3
- package/dist/src/telemetry/startupProfiler.js.map +1 -1
- package/dist/src/telemetry/startupProfiler.test.js +11 -2
- package/dist/src/telemetry/startupProfiler.test.js.map +1 -1
- package/dist/src/telemetry/trace.js.map +1 -1
- package/dist/src/telemetry/types.d.ts +10 -5
- package/dist/src/telemetry/types.js +16 -8
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.d.ts +1 -0
- package/dist/src/telemetry/uiTelemetry.js +2 -0
- package/dist/src/telemetry/uiTelemetry.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.test.js +4 -0
- package/dist/src/telemetry/uiTelemetry.test.js.map +1 -1
- package/dist/src/test-utils/mock-message-bus.js.map +1 -1
- package/dist/src/tools/confirmation-policy.test.d.ts +6 -0
- package/dist/src/tools/confirmation-policy.test.js +152 -0
- package/dist/src/tools/confirmation-policy.test.js.map +1 -0
- package/dist/src/tools/edit.js +5 -0
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/edit.test.js.map +1 -1
- package/dist/src/tools/grep.js.map +1 -1
- package/dist/src/tools/mcp-tool.js +13 -0
- package/dist/src/tools/mcp-tool.js.map +1 -1
- package/dist/src/tools/mcp-tool.test.js +25 -0
- package/dist/src/tools/mcp-tool.test.js.map +1 -1
- package/dist/src/tools/memoryTool.js +1 -0
- package/dist/src/tools/memoryTool.js.map +1 -1
- package/dist/src/tools/modifiable-tool.js.map +1 -1
- package/dist/src/tools/read-file.test.js.map +1 -1
- package/dist/src/tools/shell.d.ts +2 -1
- package/dist/src/tools/shell.js +9 -1
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.js +2 -1
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/smart-edit.js +5 -0
- package/dist/src/tools/smart-edit.js.map +1 -1
- package/dist/src/tools/smart-edit.test.js.map +1 -1
- package/dist/src/tools/tool-names.d.ts +1 -0
- package/dist/src/tools/tool-names.js +1 -0
- package/dist/src/tools/tool-names.js.map +1 -1
- package/dist/src/tools/tools.d.ts +19 -0
- package/dist/src/tools/tools.js +28 -9
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/web-fetch.js +5 -0
- package/dist/src/tools/web-fetch.js.map +1 -1
- package/dist/src/tools/write-file.js +5 -0
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-file.test.js.map +1 -1
- package/dist/src/utils/bfsFileSearch.d.ts +8 -0
- package/dist/src/utils/bfsFileSearch.js +63 -23
- package/dist/src/utils/bfsFileSearch.js.map +1 -1
- package/dist/src/utils/bfsFileSearch.test.js +65 -1
- package/dist/src/utils/bfsFileSearch.test.js.map +1 -1
- package/dist/src/utils/checkpointUtils.js.map +1 -1
- package/dist/src/utils/extensionLoader.d.ts +2 -2
- package/dist/src/utils/extensionLoader.js +5 -6
- package/dist/src/utils/extensionLoader.js.map +1 -1
- package/dist/src/utils/extensionLoader.test.js +11 -0
- package/dist/src/utils/extensionLoader.test.js.map +1 -1
- package/dist/src/utils/filesearch/crawlCache.js.map +1 -1
- package/dist/src/utils/filesearch/fileSearch.js.map +1 -1
- package/dist/src/utils/pathCorrector.js +12 -2
- package/dist/src/utils/pathCorrector.js.map +1 -1
- package/dist/src/utils/pathCorrector.test.js +6 -2
- package/dist/src/utils/pathCorrector.test.js.map +1 -1
- package/dist/src/utils/shell-permissions.d.ts +52 -0
- package/dist/src/utils/shell-permissions.js +188 -0
- package/dist/src/utils/shell-permissions.js.map +1 -0
- package/dist/src/utils/shell-permissions.test.d.ts +6 -0
- package/dist/src/utils/shell-permissions.test.js +342 -0
- package/dist/src/utils/shell-permissions.test.js.map +1 -0
- package/dist/src/utils/shell-utils.d.ts +10 -47
- package/dist/src/utils/shell-utils.js +1 -182
- package/dist/src/utils/shell-utils.js.map +1 -1
- package/dist/src/utils/shell-utils.test.js +1 -288
- package/dist/src/utils/shell-utils.test.js.map +1 -1
- package/dist/src/utils/tool-utils.js.map +1 -1
- package/dist/src/utils/version.d.ts +6 -0
- package/dist/src/utils/version.js +15 -0
- package/dist/src/utils/version.js.map +1 -0
- package/dist/src/utils/version.test.d.ts +6 -0
- package/dist/src/utils/version.test.js +39 -0
- package/dist/src/utils/version.test.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -1
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import * as fs from 'node:fs/promises';
|
|
7
|
+
import * as fsSync from 'node:fs';
|
|
7
8
|
import * as path from 'node:path';
|
|
8
9
|
import { debugLogger } from './debugLogger.js';
|
|
9
10
|
// Simple console logger for now.
|
|
@@ -20,7 +21,7 @@ const logger = {
|
|
|
20
21
|
* @returns A promise that resolves to an array of paths where the file was found.
|
|
21
22
|
*/
|
|
22
23
|
export async function bfsFileSearch(rootDir, options) {
|
|
23
|
-
const {
|
|
24
|
+
const { ignoreDirs = [], maxDirs = Infinity, debug = false } = options;
|
|
24
25
|
const foundFiles = [];
|
|
25
26
|
const queue = [rootDir];
|
|
26
27
|
const visited = new Set();
|
|
@@ -66,31 +67,70 @@ export async function bfsFileSearch(rootDir, options) {
|
|
|
66
67
|
});
|
|
67
68
|
const results = await Promise.all(readPromises);
|
|
68
69
|
for (const { currentDir, entries } of results) {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
70
|
+
processDirEntries(currentDir, entries, options, ignoreDirsSet, queue, foundFiles);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
return foundFiles;
|
|
74
|
+
}
|
|
75
|
+
/**
|
|
76
|
+
* Performs a synchronous breadth-first search for a specific file within a directory structure.
|
|
77
|
+
*
|
|
78
|
+
* @param rootDir The directory to start the search from.
|
|
79
|
+
* @param options Configuration for the search.
|
|
80
|
+
* @returns An array of paths where the file was found.
|
|
81
|
+
*/
|
|
82
|
+
export function bfsFileSearchSync(rootDir, options) {
|
|
83
|
+
const { ignoreDirs = [], maxDirs = Infinity, debug = false } = options;
|
|
84
|
+
const foundFiles = [];
|
|
85
|
+
const queue = [rootDir];
|
|
86
|
+
const visited = new Set();
|
|
87
|
+
let scannedDirCount = 0;
|
|
88
|
+
let queueHead = 0;
|
|
89
|
+
const ignoreDirsSet = new Set(ignoreDirs);
|
|
90
|
+
while (queueHead < queue.length && scannedDirCount < maxDirs) {
|
|
91
|
+
const currentDir = queue[queueHead];
|
|
92
|
+
queueHead++;
|
|
93
|
+
if (!visited.has(currentDir)) {
|
|
94
|
+
visited.add(currentDir);
|
|
95
|
+
scannedDirCount++;
|
|
96
|
+
if (debug) {
|
|
97
|
+
logger.debug(`Scanning Sync [${scannedDirCount}/${maxDirs}]: ${currentDir}`);
|
|
98
|
+
}
|
|
99
|
+
try {
|
|
100
|
+
const entries = fsSync.readdirSync(currentDir, { withFileTypes: true });
|
|
101
|
+
processDirEntries(currentDir, entries, options, ignoreDirsSet, queue, foundFiles);
|
|
102
|
+
}
|
|
103
|
+
catch (error) {
|
|
104
|
+
const message = error?.message ?? 'Unknown error';
|
|
105
|
+
debugLogger.warn(`[WARN] Skipping unreadable directory: ${currentDir} (${message})`);
|
|
91
106
|
}
|
|
92
107
|
}
|
|
93
108
|
}
|
|
94
109
|
return foundFiles;
|
|
95
110
|
}
|
|
111
|
+
function processDirEntries(currentDir, entries, options, ignoreDirsSet, queue, foundFiles) {
|
|
112
|
+
for (const entry of entries) {
|
|
113
|
+
const fullPath = path.join(currentDir, entry.name);
|
|
114
|
+
const isDirectory = entry.isDirectory();
|
|
115
|
+
const isMatchingFile = entry.isFile() && entry.name === options.fileName;
|
|
116
|
+
if (!isDirectory && !isMatchingFile) {
|
|
117
|
+
continue;
|
|
118
|
+
}
|
|
119
|
+
if (isDirectory && ignoreDirsSet.has(entry.name)) {
|
|
120
|
+
continue;
|
|
121
|
+
}
|
|
122
|
+
if (options.fileService?.shouldIgnoreFile(fullPath, {
|
|
123
|
+
respectGitIgnore: options.fileFilteringOptions?.respectGitIgnore,
|
|
124
|
+
respectGeminiIgnore: options.fileFilteringOptions?.respectGeminiIgnore,
|
|
125
|
+
})) {
|
|
126
|
+
continue;
|
|
127
|
+
}
|
|
128
|
+
if (isDirectory) {
|
|
129
|
+
queue.push(fullPath);
|
|
130
|
+
}
|
|
131
|
+
else {
|
|
132
|
+
foundFiles.push(fullPath);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
}
|
|
96
136
|
//# sourceMappingURL=bfsFileSearch.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bfsFileSearch.js","sourceRoot":"","sources":["../../../src/utils/bfsFileSearch.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAGlC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,iCAAiC;AACjC,yDAAyD;AACzD,MAAM,MAAM,GAAG;IACb,8DAA8D;IAC9D,KAAK,EAAE,CAAC,GAAG,IAAW,EAAE,EAAE,CACxB,WAAW,CAAC,KAAK,CAAC,yBAAyB,EAAE,GAAG,IAAI,CAAC;CACxD,CAAC;AAWF;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAe,EACf,OAA6B;IAE7B,MAAM,
|
|
1
|
+
{"version":3,"file":"bfsFileSearch.js","sourceRoot":"","sources":["../../../src/utils/bfsFileSearch.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ import { describe, it, expect, beforeEach, afterEach } from 'vitest';
|
|
|
7
7
|
import * as fsPromises from 'node:fs/promises';
|
|
8
8
|
import * as path from 'node:path';
|
|
9
9
|
import * as os from 'node:os';
|
|
10
|
-
import { bfsFileSearch } from './bfsFileSearch.js';
|
|
10
|
+
import { bfsFileSearch, bfsFileSearchSync } from './bfsFileSearch.js';
|
|
11
11
|
import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
|
|
12
12
|
describe('bfsFileSearch', () => {
|
|
13
13
|
let testRootDir;
|
|
@@ -160,4 +160,68 @@ describe('bfsFileSearch', () => {
|
|
|
160
160
|
expect(result.sort()).toEqual(expectedFiles.sort());
|
|
161
161
|
});
|
|
162
162
|
});
|
|
163
|
+
describe('bfsFileSearchSync', () => {
|
|
164
|
+
let testRootDir;
|
|
165
|
+
async function createEmptyDir(...pathSegments) {
|
|
166
|
+
const fullPath = path.join(testRootDir, ...pathSegments);
|
|
167
|
+
await fsPromises.mkdir(fullPath, { recursive: true });
|
|
168
|
+
return fullPath;
|
|
169
|
+
}
|
|
170
|
+
async function createTestFile(content, ...pathSegments) {
|
|
171
|
+
const fullPath = path.join(testRootDir, ...pathSegments);
|
|
172
|
+
await fsPromises.mkdir(path.dirname(fullPath), { recursive: true });
|
|
173
|
+
await fsPromises.writeFile(fullPath, content);
|
|
174
|
+
return fullPath;
|
|
175
|
+
}
|
|
176
|
+
beforeEach(async () => {
|
|
177
|
+
testRootDir = await fsPromises.mkdtemp(path.join(os.tmpdir(), 'bfs-file-search-sync-test-'));
|
|
178
|
+
});
|
|
179
|
+
afterEach(async () => {
|
|
180
|
+
await fsPromises.rm(testRootDir, { recursive: true, force: true });
|
|
181
|
+
});
|
|
182
|
+
it('should find a file in the root directory synchronously', async () => {
|
|
183
|
+
const targetFilePath = await createTestFile('content', 'target.txt');
|
|
184
|
+
const result = bfsFileSearchSync(testRootDir, { fileName: 'target.txt' });
|
|
185
|
+
expect(result).toEqual([targetFilePath]);
|
|
186
|
+
});
|
|
187
|
+
it('should find a file in a nested directory synchronously', async () => {
|
|
188
|
+
const targetFilePath = await createTestFile('content', 'a', 'b', 'target.txt');
|
|
189
|
+
const result = bfsFileSearchSync(testRootDir, { fileName: 'target.txt' });
|
|
190
|
+
expect(result).toEqual([targetFilePath]);
|
|
191
|
+
});
|
|
192
|
+
it('should respect the maxDirs limit and not find the file synchronously', async () => {
|
|
193
|
+
await createTestFile('content', 'a', 'b', 'c', 'target.txt');
|
|
194
|
+
const result = bfsFileSearchSync(testRootDir, {
|
|
195
|
+
fileName: 'target.txt',
|
|
196
|
+
maxDirs: 3,
|
|
197
|
+
});
|
|
198
|
+
expect(result).toEqual([]);
|
|
199
|
+
});
|
|
200
|
+
it('should ignore directories synchronously', async () => {
|
|
201
|
+
await createTestFile('content', 'ignored', 'target.txt');
|
|
202
|
+
const targetFilePath = await createTestFile('content', 'not-ignored', 'target.txt');
|
|
203
|
+
const result = bfsFileSearchSync(testRootDir, {
|
|
204
|
+
fileName: 'target.txt',
|
|
205
|
+
ignoreDirs: ['ignored'],
|
|
206
|
+
});
|
|
207
|
+
expect(result).toEqual([targetFilePath]);
|
|
208
|
+
});
|
|
209
|
+
it('should work with FileDiscoveryService synchronously', async () => {
|
|
210
|
+
const projectRoot = await createEmptyDir('project');
|
|
211
|
+
await createEmptyDir('project', '.git');
|
|
212
|
+
await createTestFile('node_modules/', 'project', '.gitignore');
|
|
213
|
+
await createTestFile('content', 'project', 'node_modules', 'target.txt');
|
|
214
|
+
const targetFilePath = await createTestFile('content', 'project', 'not-ignored', 'target.txt');
|
|
215
|
+
const fileService = new FileDiscoveryService(projectRoot);
|
|
216
|
+
const result = bfsFileSearchSync(projectRoot, {
|
|
217
|
+
fileName: 'target.txt',
|
|
218
|
+
fileService,
|
|
219
|
+
fileFilteringOptions: {
|
|
220
|
+
respectGitIgnore: true,
|
|
221
|
+
respectGeminiIgnore: true,
|
|
222
|
+
},
|
|
223
|
+
});
|
|
224
|
+
expect(result).toEqual([targetFilePath]);
|
|
225
|
+
});
|
|
226
|
+
});
|
|
163
227
|
//# sourceMappingURL=bfsFileSearch.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bfsFileSearch.test.js","sourceRoot":"","sources":["../../../src/utils/bfsFileSearch.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACrE,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"bfsFileSearch.test.js","sourceRoot":"","sources":["../../../src/utils/bfsFileSearch.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkpointUtils.js","sourceRoot":"","sources":["../../../src/utils/checkpointUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAGlC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAexB,MAAM,aAAa,GAAG,CAAC;KACpB,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;CACtC,CAAC;KACD,WAAW,EAAE,CAAC;AAEjB,MAAM,UAAU,qBAAqB,CAAC,iBAAgC;IACpE,MAAM,MAAM,GAAG,iBAAiB,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC;IAE5C,OAAO,CAAC,CAAC,MAAM,CAAC;QACd,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE;QACnC,aAAa,EAAE,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE;QAChD,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QACjC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC;YACjB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;YAChB,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;SAC5B,CAAC;QACF,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;KACjC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,QAA6B;IAE7B,MAAM,QAAQ,GAAG,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"checkpointUtils.js","sourceRoot":"","sources":["../../../src/utils/checkpointUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,7 +46,7 @@ export declare abstract class ExtensionLoader {
|
|
|
46
46
|
* then calls `startExtension` to include all extension features into the
|
|
47
47
|
* program.
|
|
48
48
|
*/
|
|
49
|
-
protected maybeStartExtension(extension: GeminiCLIExtension): Promise<void
|
|
49
|
+
protected maybeStartExtension(extension: GeminiCLIExtension): Promise<void>;
|
|
50
50
|
/**
|
|
51
51
|
* Unconditionally stops an `extension` and unloads all its MCP servers,
|
|
52
52
|
* context, custom commands, etc. Assumes that `start` has already been called
|
|
@@ -62,7 +62,7 @@ export declare abstract class ExtensionLoader {
|
|
|
62
62
|
* then this also performs all necessary steps to remove all extension
|
|
63
63
|
* features from the rest of the system.
|
|
64
64
|
*/
|
|
65
|
-
protected maybeStopExtension(extension: GeminiCLIExtension): Promise<void
|
|
65
|
+
protected maybeStopExtension(extension: GeminiCLIExtension): Promise<void>;
|
|
66
66
|
restartExtension(extension: GeminiCLIExtension): Promise<void>;
|
|
67
67
|
}
|
|
68
68
|
export interface ExtensionEvents {
|
|
@@ -94,6 +94,7 @@ export class ExtensionLoader {
|
|
|
94
94
|
// reload memory, this is somewhat expensive and also busts the context
|
|
95
95
|
// cache, we want to only do it once.
|
|
96
96
|
await refreshServerHierarchicalMemory(this.config);
|
|
97
|
+
await this.config.getHookSystem()?.initialize();
|
|
97
98
|
}
|
|
98
99
|
}
|
|
99
100
|
/**
|
|
@@ -113,11 +114,10 @@ export class ExtensionLoader {
|
|
|
113
114
|
* then calls `startExtension` to include all extension features into the
|
|
114
115
|
* program.
|
|
115
116
|
*/
|
|
116
|
-
maybeStartExtension(extension) {
|
|
117
|
+
async maybeStartExtension(extension) {
|
|
117
118
|
if (this.config && this.config.getEnableExtensionReloading()) {
|
|
118
|
-
|
|
119
|
+
await this.startExtension(extension);
|
|
119
120
|
}
|
|
120
|
-
return;
|
|
121
121
|
}
|
|
122
122
|
/**
|
|
123
123
|
* Unconditionally stops an `extension` and unloads all its MCP servers,
|
|
@@ -165,11 +165,10 @@ export class ExtensionLoader {
|
|
|
165
165
|
* then this also performs all necessary steps to remove all extension
|
|
166
166
|
* features from the rest of the system.
|
|
167
167
|
*/
|
|
168
|
-
maybeStopExtension(extension) {
|
|
168
|
+
async maybeStopExtension(extension) {
|
|
169
169
|
if (this.config && this.config.getEnableExtensionReloading()) {
|
|
170
|
-
|
|
170
|
+
await this.stopExtension(extension);
|
|
171
171
|
}
|
|
172
|
-
return;
|
|
173
172
|
}
|
|
174
173
|
async restartExtension(extension) {
|
|
175
174
|
await this.stopExtension(extension);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extensionLoader.js","sourceRoot":"","sources":["../../../src/utils/extensionLoader.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"extensionLoader.js","sourceRoot":"","sources":["../../../src/utils/extensionLoader.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@ describe('SimpleExtensionLoader', () => {
|
|
|
19
19
|
let extensionReloadingEnabled;
|
|
20
20
|
let mockMcpClientManager;
|
|
21
21
|
let mockGeminiClientSetTools;
|
|
22
|
+
let mockHookSystemInit;
|
|
22
23
|
const activeExtension = {
|
|
23
24
|
name: 'test-extension',
|
|
24
25
|
isActive: true,
|
|
@@ -43,6 +44,7 @@ describe('SimpleExtensionLoader', () => {
|
|
|
43
44
|
};
|
|
44
45
|
extensionReloadingEnabled = false;
|
|
45
46
|
mockGeminiClientSetTools = vi.fn();
|
|
47
|
+
mockHookSystemInit = vi.fn();
|
|
46
48
|
mockConfig = {
|
|
47
49
|
getMcpClientManager: () => mockMcpClientManager,
|
|
48
50
|
getEnableExtensionReloading: () => extensionReloadingEnabled,
|
|
@@ -50,6 +52,9 @@ describe('SimpleExtensionLoader', () => {
|
|
|
50
52
|
isInitialized: () => true,
|
|
51
53
|
setTools: mockGeminiClientSetTools,
|
|
52
54
|
})),
|
|
55
|
+
getHookSystem: () => ({
|
|
56
|
+
initialize: mockHookSystemInit,
|
|
57
|
+
}),
|
|
53
58
|
};
|
|
54
59
|
});
|
|
55
60
|
afterEach(() => {
|
|
@@ -92,24 +97,29 @@ describe('SimpleExtensionLoader', () => {
|
|
|
92
97
|
if (reloadingEnabled) {
|
|
93
98
|
expect(mockMcpClientManager.startExtension).toHaveBeenCalledExactlyOnceWith(activeExtension);
|
|
94
99
|
expect(mockRefreshServerHierarchicalMemory).toHaveBeenCalledOnce();
|
|
100
|
+
expect(mockHookSystemInit).toHaveBeenCalledOnce();
|
|
95
101
|
expect(mockGeminiClientSetTools).toHaveBeenCalledOnce();
|
|
96
102
|
}
|
|
97
103
|
else {
|
|
98
104
|
expect(mockMcpClientManager.startExtension).not.toHaveBeenCalled();
|
|
99
105
|
expect(mockRefreshServerHierarchicalMemory).not.toHaveBeenCalled();
|
|
106
|
+
expect(mockHookSystemInit).not.toHaveBeenCalled();
|
|
100
107
|
expect(mockGeminiClientSetTools).not.toHaveBeenCalledOnce();
|
|
101
108
|
}
|
|
102
109
|
mockRefreshServerHierarchicalMemory.mockClear();
|
|
110
|
+
mockHookSystemInit.mockClear();
|
|
103
111
|
mockGeminiClientSetTools.mockClear();
|
|
104
112
|
await loader.unloadExtension(activeExtension);
|
|
105
113
|
if (reloadingEnabled) {
|
|
106
114
|
expect(mockMcpClientManager.stopExtension).toHaveBeenCalledExactlyOnceWith(activeExtension);
|
|
107
115
|
expect(mockRefreshServerHierarchicalMemory).toHaveBeenCalledOnce();
|
|
116
|
+
expect(mockHookSystemInit).toHaveBeenCalledOnce();
|
|
108
117
|
expect(mockGeminiClientSetTools).toHaveBeenCalledOnce();
|
|
109
118
|
}
|
|
110
119
|
else {
|
|
111
120
|
expect(mockMcpClientManager.stopExtension).not.toHaveBeenCalled();
|
|
112
121
|
expect(mockRefreshServerHierarchicalMemory).not.toHaveBeenCalled();
|
|
122
|
+
expect(mockHookSystemInit).not.toHaveBeenCalled();
|
|
113
123
|
expect(mockGeminiClientSetTools).not.toHaveBeenCalledOnce();
|
|
114
124
|
}
|
|
115
125
|
});
|
|
@@ -127,6 +137,7 @@ describe('SimpleExtensionLoader', () => {
|
|
|
127
137
|
loader.loadExtension(anotherExtension),
|
|
128
138
|
]);
|
|
129
139
|
expect(mockRefreshServerHierarchicalMemory).toHaveBeenCalledOnce();
|
|
140
|
+
expect(mockHookSystemInit).toHaveBeenCalledOnce();
|
|
130
141
|
});
|
|
131
142
|
});
|
|
132
143
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extensionLoader.test.js","sourceRoot":"","sources":["../../../src/utils/extensionLoader.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,QAAQ,EACR,MAAM,EACN,EAAE,EACF,EAAE,EACF,UAAU,EACV,SAAS,GAEV,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,OAAO,EAAyB,MAAM,gCAAgC,CAAC;AAGvE,MAAM,mCAAmC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAEtE,EAAE,CAAC,IAAI,CAAC,sBAAsB,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE;IACrD,MAAM,MAAM,GAAG,MAAM,YAAY,EAAyC,CAAC;IAC3E,OAAO;QACL,GAAG,MAAM;QACT,+BAA+B,EAAE,mCAAmC;KACrE,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,IAAI,UAAkB,CAAC;IACvB,IAAI,yBAAkC,CAAC;IACvC,IAAI,oBAAsC,CAAC;IAC3C,IAAI,wBAEH,CAAC;
|
|
1
|
+
{"version":3,"file":"extensionLoader.test.js","sourceRoot":"","sources":["../../../src/utils/extensionLoader.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crawlCache.js","sourceRoot":"","sources":["../../../../src/utils/filesearch/crawlCache.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,MAAM,UAAU,GAAG,IAAI,GAAG,EAAoB,CAAC;AAC/C,MAAM,WAAW,GAAG,IAAI,GAAG,EAA0B,CAAC;AAEtD;;;;GAIG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,SAAiB,EACjB,aAAqB,EACrB,QAAiB,EACT,EAAE;IACV,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACzC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACvB,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAC3B,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC5B,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,GAAW,EAAwB,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAE/E;;GAEG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,GAAW,EAAE,OAAiB,EAAE,KAAa,EAAQ,EAAE;IAC3E,sEAAsE;IACtE,IAAI,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QACzB,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"crawlCache.js","sourceRoot":"","sources":["../../../../src/utils/filesearch/crawlCache.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,MAAM,UAAU,GAAG,IAAI,GAAG,EAAoB,CAAC;AAC/C,MAAM,WAAW,GAAG,IAAI,GAAG,EAA0B,CAAC;AAEtD;;;;GAIG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,SAAiB,EACjB,aAAqB,EACrB,QAAiB,EACT,EAAE;IACV,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACzC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACvB,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAC3B,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC5B,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,GAAW,EAAwB,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAE/E;;GAEG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,GAAW,EAAE,OAAiB,EAAE,KAAa,EAAQ,EAAE;IAC3E,sEAAsE;IACtE,IAAI,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QACzB,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,qBAAqB;IACrB,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAE7B,oEAAoE;IACpE,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;QAC9B,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvB,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC,EAAE,KAAK,CAAC,CAAC;IAEV,oEAAoE;IACpE,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAChC,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,GAAS,EAAE;IAC9B,KAAK,MAAM,OAAO,IAAI,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC;QAC3C,YAAY,CAAC,OAAO,CAAC,CAAC;IACxB,CAAC;IACD,UAAU,CAAC,KAAK,EAAE,CAAC;IACnB,WAAW,CAAC,KAAK,EAAE,CAAC;AACtB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileSearch.js","sourceRoot":"","sources":["../../../../src/utils/filesearch/fileSearch.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,SAAS,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAc3C,MAAM,OAAO,UAAW,SAAQ,KAAK;IACnC,YAAY,OAAO,GAAG,gBAAgB;QACpC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;IAC3B,CAAC;CACF;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,QAAkB,EAClB,OAAe,EACf,MAA+B;IAE/B,MAAM,aAAa,GAAG,SAAS,CAAC,OAAO,EAAE;QACvC,GAAG,EAAE,IAAI;QACT,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,IAAI;KACb,CAAC,CAAC;IAEH,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;QACxC,oEAAoE;QACpE,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,EAAE,CAAC;YACnB,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;YACtD,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;gBACpB,MAAM,IAAI,UAAU,EAAE,CAAC;YACzB,CAAC;QACH,CAAC;QAED,IAAI,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IAED,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACpB,MAAM,MAAM,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAE/B,IAAI,MAAM,IAAI,CAAC,MAAM;YAAE,OAAO,CAAC,CAAC,CAAC;QACjC,IAAI,CAAC,MAAM,IAAI,MAAM;YAAE,OAAO,CAAC,CAAC;QAEhC,2EAA2E;QAC3E,iDAAiD;QACjD,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC;AACjB,CAAC;AAYD,MAAM,mBAAmB;IAMM;IALrB,MAAM,CAAqB;IAC3B,WAAW,CAA0B;IACrC,QAAQ,GAAa,EAAE,CAAC;IACxB,GAAG,CAAiC;IAE5C,YAA6B,OAA0B;QAA1B,YAAO,GAAP,OAAO,CAAmB;IAAG,CAAC;IAE3D,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE5C,IAAI,CAAC,QAAQ,GAAG,MAAM,KAAK,CAAC;YAC1B,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;YACxC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;YAC7B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;YACzB,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC/B,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;SAChC,CAAC,CAAC;QACH,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,MAAM,CACV,OAAe,EACf,UAAyB,EAAE;QAE3B,IACE,CAAC,IAAI,CAAC,WAAW;YACjB,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC;YAC/C,CAAC,IAAI,CAAC,MAAM,EACZ,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACtE,CAAC;QAED,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC;QAEvC,IAAI,kBAAkB,CAAC;QACvB,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,GACvC,MAAM,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"fileSearch.js","sourceRoot":"","sources":["../../../../src/utils/filesearch/fileSearch.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,SAAS,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAc3C,MAAM,OAAO,UAAW,SAAQ,KAAK;IACnC,YAAY,OAAO,GAAG,gBAAgB;QACpC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;IAC3B,CAAC;CACF;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,QAAkB,EAClB,OAAe,EACf,MAA+B;IAE/B,MAAM,aAAa,GAAG,SAAS,CAAC,OAAO,EAAE;QACvC,GAAG,EAAE,IAAI;QACT,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,IAAI;KACb,CAAC,CAAC;IAEH,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;QACxC,oEAAoE;QACpE,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,EAAE,CAAC;YACnB,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;YACtD,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;gBACpB,MAAM,IAAI,UAAU,EAAE,CAAC;YACzB,CAAC;QACH,CAAC;QAED,IAAI,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IAED,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACpB,MAAM,MAAM,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAE/B,IAAI,MAAM,IAAI,CAAC,MAAM;YAAE,OAAO,CAAC,CAAC,CAAC;QACjC,IAAI,CAAC,MAAM,IAAI,MAAM;YAAE,OAAO,CAAC,CAAC;QAEhC,2EAA2E;QAC3E,iDAAiD;QACjD,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC;AACjB,CAAC;AAYD,MAAM,mBAAmB;IAMM;IALrB,MAAM,CAAqB;IAC3B,WAAW,CAA0B;IACrC,QAAQ,GAAa,EAAE,CAAC;IACxB,GAAG,CAAiC;IAE5C,YAA6B,OAA0B;QAA1B,YAAO,GAAP,OAAO,CAAmB;IAAG,CAAC;IAE3D,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE5C,IAAI,CAAC,QAAQ,GAAG,MAAM,KAAK,CAAC;YAC1B,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;YACxC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;YAC7B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;YACzB,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC/B,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;SAChC,CAAC,CAAC;QACH,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,MAAM,CACV,OAAe,EACf,UAAyB,EAAE;QAE3B,IACE,CAAC,IAAI,CAAC,WAAW;YACjB,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC;YAC/C,CAAC,IAAI,CAAC,MAAM,EACZ,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACtE,CAAC;QAED,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC;QAEvC,IAAI,kBAAkB,CAAC;QACvB,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,GACvC,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAEtC,IAAI,YAAY,EAAE,CAAC;YACjB,yBAAyB;YACzB,kBAAkB,GAAG,UAAU,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,IAAI,WAAW,GAAG,IAAI,CAAC;YACvB,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;gBACvC,kBAAkB,GAAG,MAAM,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YACzE,CAAC;iBAAM,CAAC;gBACN,kBAAkB,GAAG,MAAM,IAAI,CAAC,GAAG;qBAChC,IAAI,CAAC,OAAO,CAAC;qBACb,IAAI,CAAC,CAAC,OAAqC,EAAE,EAAE,CAC9C,OAAO,CAAC,GAAG,CAAC,CAAC,KAA4B,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAC1D;qBACA,KAAK,CAAC,GAAG,EAAE;oBACV,WAAW,GAAG,KAAK,CAAC;oBACpB,OAAO,EAAE,CAAC;gBACZ,CAAC,CAAC,CAAC;YACP,CAAC;YAED,IAAI,WAAW,EAAE,CAAC;gBAChB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;QAC/C,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,KAAK,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC,IAAI,kBAAkB,CAAC,OAAO,EAAE,EAAE,CAAC;YAC1D,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,EAAE,CAAC;gBACnB,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;gBACtD,IAAI,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;oBAC5B,MAAM,IAAI,UAAU,EAAE,CAAC;gBACzB,CAAC;YACH,CAAC;YAED,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,QAAQ,CAAC,EAAE,CAAC;gBACvD,MAAM;YACR,CAAC;YACD,IAAI,SAAS,KAAK,GAAG,EAAE,CAAC;gBACtB,SAAS;YACX,CAAC;YACD,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC3B,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,gBAAgB;QACtB,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;YACrC,mEAAmE;YACnE,wEAAwE;YACxE,mEAAmE;YACnE,IAAI,CAAC,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACrC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;aAClD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF;AAED,MAAM,mBAAmB;IAGM;IAFrB,MAAM,CAAqB;IAEnC,YAA6B,OAA0B;QAA1B,YAAO,GAAP,OAAO,CAAmB;IAAG,CAAC;IAE3D,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,MAAM,CACV,OAAe,EACf,UAAyB,EAAE;QAE3B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACtE,CAAC;QACD,OAAO,GAAG,OAAO,IAAI,GAAG,CAAC;QAEzB,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACpE,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC;YAC1B,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC;YACxD,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;YAC7B,QAAQ,EAAE,CAAC;YACX,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;YACzB,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;SAChC,CAAC,CAAC;QAEH,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAEvE,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;QAC/C,MAAM,YAAY,GAAa,EAAE,CAAC;QAClC,KAAK,MAAM,SAAS,IAAI,eAAe,EAAE,CAAC;YACxC,IAAI,YAAY,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,QAAQ,CAAC,EAAE,CAAC;gBAC5D,MAAM;YACR,CAAC;YACD,IAAI,SAAS,KAAK,GAAG,EAAE,CAAC;gBACtB,SAAS;YACX,CAAC;YACD,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC3B,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;CACF;AAED,MAAM,OAAO,iBAAiB;IAC5B,MAAM,CAAC,MAAM,CAAC,OAA0B;QACtC,IAAI,OAAO,CAAC,yBAAyB,EAAE,CAAC;YACtC,OAAO,IAAI,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO,IAAI,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;CACF"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import * as fs from 'node:fs';
|
|
7
7
|
import * as path from 'node:path';
|
|
8
|
+
import { bfsFileSearchSync } from './bfsFileSearch.js';
|
|
8
9
|
export function correctPath(filePath, config) {
|
|
9
10
|
// Check for direct path relative to the primary target directory.
|
|
10
11
|
const directPath = path.join(config.getTargetDir(), filePath);
|
|
@@ -13,9 +14,18 @@ export function correctPath(filePath, config) {
|
|
|
13
14
|
}
|
|
14
15
|
// If not found directly, search across all workspace directories for ambiguous matches.
|
|
15
16
|
const workspaceContext = config.getWorkspaceContext();
|
|
16
|
-
const fileSystem = config.getFileSystemService();
|
|
17
17
|
const searchPaths = workspaceContext.getDirectories();
|
|
18
|
-
const
|
|
18
|
+
const basename = path.basename(filePath);
|
|
19
|
+
const normalizedTarget = filePath.replace(/\\/g, '/');
|
|
20
|
+
// Normalize path for matching and check if it ends with the provided relative path
|
|
21
|
+
const foundFiles = searchPaths
|
|
22
|
+
.flatMap((searchPath) => bfsFileSearchSync(searchPath, {
|
|
23
|
+
fileName: basename,
|
|
24
|
+
maxDirs: 50, // Capped to avoid deep hangs
|
|
25
|
+
fileService: config.getFileService(),
|
|
26
|
+
fileFilteringOptions: config.getFileFilteringOptions(),
|
|
27
|
+
}))
|
|
28
|
+
.filter((f) => f.replace(/\\/g, '/').endsWith(normalizedTarget));
|
|
19
29
|
if (foundFiles.length === 0) {
|
|
20
30
|
return {
|
|
21
31
|
success: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pathCorrector.js","sourceRoot":"","sources":["../../../src/utils/pathCorrector.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"pathCorrector.js","sourceRoot":"","sources":["../../../src/utils/pathCorrector.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAuBvD,MAAM,UAAU,WAAW,CACzB,QAAgB,EAChB,MAAc;IAEd,kEAAkE;IAClE,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,QAAQ,CAAC,CAAC;IAC9D,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC9B,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC;IACtD,CAAC;IAED,wFAAwF;IACxF,MAAM,gBAAgB,GAAG,MAAM,CAAC,mBAAmB,EAAE,CAAC;IACtD,MAAM,WAAW,GAAG,gBAAgB,CAAC,cAAc,EAAE,CAAC;IACtD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACzC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAEtD,mFAAmF;IACnF,MAAM,UAAU,GAAG,WAAW;SAC3B,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE,CACtB,iBAAiB,CAAC,UAAU,EAAE;QAC5B,QAAQ,EAAE,QAAQ;QAClB,OAAO,EAAE,EAAE,EAAE,6BAA6B;QAC1C,WAAW,EAAE,MAAM,CAAC,cAAc,EAAE;QACpC,oBAAoB,EAAE,MAAM,CAAC,uBAAuB,EAAE;KACvD,CAAC,CACH;SACA,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAEnE,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,uBAAuB,QAAQ,6BAA6B;SACpE,CAAC;IACJ,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,kBAAkB,QAAQ,4FAA4F,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;SACrJ,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;AACzD,CAAC"}
|
|
@@ -8,7 +8,7 @@ import * as fs from 'node:fs';
|
|
|
8
8
|
import * as path from 'node:path';
|
|
9
9
|
import * as os from 'node:os';
|
|
10
10
|
import { createMockWorkspaceContext } from '../test-utils/mockWorkspaceContext.js';
|
|
11
|
-
import {
|
|
11
|
+
import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
|
|
12
12
|
import { correctPath } from './pathCorrector.js';
|
|
13
13
|
describe('pathCorrector', () => {
|
|
14
14
|
let tempDir;
|
|
@@ -24,7 +24,11 @@ describe('pathCorrector', () => {
|
|
|
24
24
|
mockConfig = {
|
|
25
25
|
getTargetDir: () => rootDir,
|
|
26
26
|
getWorkspaceContext: () => createMockWorkspaceContext(rootDir, [otherWorkspaceDir]),
|
|
27
|
-
|
|
27
|
+
getFileService: () => new FileDiscoveryService(rootDir),
|
|
28
|
+
getFileFilteringOptions: () => ({
|
|
29
|
+
respectGitIgnore: true,
|
|
30
|
+
respectGeminiIgnore: true,
|
|
31
|
+
}),
|
|
28
32
|
};
|
|
29
33
|
});
|
|
30
34
|
afterEach(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pathCorrector.test.js","sourceRoot":"","sources":["../../../src/utils/pathCorrector.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"pathCorrector.test.js","sourceRoot":"","sources":["../../../src/utils/pathCorrector.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import type { AnyToolInvocation } from '../index.js';
|
|
7
|
+
import type { Config } from '../config/config.js';
|
|
8
|
+
/**
|
|
9
|
+
* Checks a shell command against security policies and allowlists.
|
|
10
|
+
*
|
|
11
|
+
* This function operates in one of two modes depending on the presence of
|
|
12
|
+
* the `sessionAllowlist` parameter:
|
|
13
|
+
*
|
|
14
|
+
* 1. **"Default Deny" Mode (sessionAllowlist is provided):** This is the
|
|
15
|
+
* strictest mode, used for user-defined scripts like custom commands.
|
|
16
|
+
* A command is only permitted if it is found on the global `coreTools`
|
|
17
|
+
* allowlist OR the provided `sessionAllowlist`. It must not be on the
|
|
18
|
+
* global `excludeTools` blocklist.
|
|
19
|
+
*
|
|
20
|
+
* 2. **"Default Allow" Mode (sessionAllowlist is NOT provided):** This mode
|
|
21
|
+
* is used for direct tool invocations (e.g., by the model). If a strict
|
|
22
|
+
* global `coreTools` allowlist exists, commands must be on it. Otherwise,
|
|
23
|
+
* any command is permitted as long as it is not on the `excludeTools`
|
|
24
|
+
* blocklist.
|
|
25
|
+
*
|
|
26
|
+
* @param command The shell command string to validate.
|
|
27
|
+
* @param config The application configuration.
|
|
28
|
+
* @param sessionAllowlist A session-level list of approved commands. Its
|
|
29
|
+
* presence activates "Default Deny" mode.
|
|
30
|
+
* @returns An object detailing which commands are not allowed.
|
|
31
|
+
*/
|
|
32
|
+
export declare function checkCommandPermissions(command: string, config: Config, sessionAllowlist?: Set<string>): {
|
|
33
|
+
allAllowed: boolean;
|
|
34
|
+
disallowedCommands: string[];
|
|
35
|
+
blockReason?: string;
|
|
36
|
+
isHardDenial?: boolean;
|
|
37
|
+
};
|
|
38
|
+
export declare function isCommandAllowed(command: string, config: Config): {
|
|
39
|
+
allowed: boolean;
|
|
40
|
+
reason?: string;
|
|
41
|
+
};
|
|
42
|
+
/**
|
|
43
|
+
* Determines whether a shell invocation should be auto-approved based on an allowlist.
|
|
44
|
+
*
|
|
45
|
+
* This reuses the same parsing logic as command-permission enforcement so that
|
|
46
|
+
* chained commands must be individually covered by the allowlist.
|
|
47
|
+
*
|
|
48
|
+
* @param invocation The shell tool invocation being evaluated.
|
|
49
|
+
* @param allowedPatterns The configured allowlist patterns (e.g. `run_shell_command(git)`).
|
|
50
|
+
* @returns True if every parsed command segment is allowed by the patterns; false otherwise.
|
|
51
|
+
*/
|
|
52
|
+
export declare function isShellInvocationAllowlisted(invocation: AnyToolInvocation, allowedPatterns: string[]): boolean;
|