@google/gemini-cli-core 0.21.0-nightly.20251209.ec9a8c7a7 → 0.21.0-nightly.20251211.8c83e1ea9
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/README.md +1 -1
- package/dist/google-gemini-cli-core-0.21.0-nightly.20251209.ec9a8c7a7.tgz +0 -0
- package/dist/src/agents/codebase-investigator.js +2 -2
- package/dist/src/agents/codebase-investigator.js.map +1 -1
- package/dist/src/agents/codebase-investigator.test.js +2 -2
- package/dist/src/agents/codebase-investigator.test.js.map +1 -1
- 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/registry.d.ts +15 -0
- package/dist/src/agents/registry.js +51 -2
- package/dist/src/agents/registry.js.map +1 -1
- package/dist/src/agents/registry.test.js +32 -0
- package/dist/src/agents/registry.test.js.map +1 -1
- package/dist/src/availability/modelAvailabilityService.d.ts +1 -0
- package/dist/src/availability/modelAvailabilityService.js +3 -0
- package/dist/src/availability/modelAvailabilityService.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/restore.d.ts +1 -11
- package/dist/src/commands/restore.js +1 -0
- package/dist/src/commands/restore.js.map +1 -1
- package/dist/src/commands/restore.test.js +1 -0
- package/dist/src/commands/restore.test.js.map +1 -1
- package/dist/src/config/config.d.ts +3 -0
- package/dist/src/config/config.js +36 -19
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +53 -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 +1 -0
- package/dist/src/config/models.js +6 -0
- package/dist/src/config/models.js.map +1 -1
- package/dist/src/core/contentGenerator.js +4 -2
- 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/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.d.ts +1 -0
- 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/ide/ide-client.js +3 -3
- package/dist/src/ide/ide-client.js.map +1 -1
- package/dist/src/ide/ide-client.test.js +17 -0
- package/dist/src/ide/ide-client.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/policy/policies/agent.toml +31 -0
- package/dist/src/resources/resource-registry.d.ts +30 -0
- package/dist/src/resources/resource-registry.js +57 -0
- package/dist/src/resources/resource-registry.js.map +1 -0
- package/dist/src/resources/resource-registry.test.d.ts +6 -0
- package/dist/src/resources/resource-registry.test.js +54 -0
- package/dist/src/resources/resource-registry.test.js.map +1 -0
- 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/gitService.js +5 -0
- package/dist/src/services/gitService.js.map +1 -1
- package/dist/src/services/gitService.test.js +28 -0
- package/dist/src/services/gitService.test.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/sessionSummaryUtils.d.ts +8 -3
- package/dist/src/services/sessionSummaryUtils.js +106 -38
- package/dist/src/services/sessionSummaryUtils.js.map +1 -1
- package/dist/src/services/sessionSummaryUtils.test.js +83 -244
- package/dist/src/services/sessionSummaryUtils.test.js.map +1 -1
- package/dist/src/services/shellExecutionService.js +47 -2
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.test.js +102 -1
- package/dist/src/services/shellExecutionService.test.js.map +1 -1
- package/dist/src/services/test-data/resolved-aliases-retry.golden.json +222 -0
- package/dist/src/tools/mcp-client-manager.d.ts +2 -1
- package/dist/src/tools/mcp-client-manager.js +4 -1
- package/dist/src/tools/mcp-client-manager.js.map +1 -1
- package/dist/src/tools/mcp-client-manager.test.js +13 -10
- package/dist/src/tools/mcp-client-manager.test.js.map +1 -1
- package/dist/src/tools/mcp-client.d.ts +25 -4
- package/dist/src/tools/mcp-client.js +132 -22
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +197 -17
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/tools/tool-names.d.ts +2 -0
- package/dist/src/tools/tool-names.js +2 -0
- package/dist/src/tools/tool-names.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.d.ts +82 -0
- package/dist/src/utils/checkpointUtils.js +117 -0
- package/dist/src/utils/checkpointUtils.js.map +1 -0
- package/dist/src/utils/checkpointUtils.test.d.ts +6 -0
- package/dist/src/utils/checkpointUtils.test.js +229 -0
- package/dist/src/utils/checkpointUtils.test.js.map +1 -0
- package/dist/src/utils/googleErrors.js +31 -18
- package/dist/src/utils/googleErrors.js.map +1 -1
- package/dist/src/utils/googleErrors.test.js +10 -2
- package/dist/src/utils/googleErrors.test.js.map +1 -1
- package/dist/src/utils/googleQuotaErrors.js +6 -3
- package/dist/src/utils/googleQuotaErrors.js.map +1 -1
- package/dist/src/utils/googleQuotaErrors.test.js +41 -0
- package/dist/src/utils/googleQuotaErrors.test.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/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 +1 -1
- package/dist/google-gemini-cli-core-0.21.0-nightly.20251207.025e450ac.tgz +0 -0
|
@@ -21,4 +21,12 @@ interface BfsFileSearchOptions {
|
|
|
21
21
|
* @returns A promise that resolves to an array of paths where the file was found.
|
|
22
22
|
*/
|
|
23
23
|
export declare function bfsFileSearch(rootDir: string, options: BfsFileSearchOptions): Promise<string[]>;
|
|
24
|
+
/**
|
|
25
|
+
* Performs a synchronous breadth-first search for a specific file within a directory structure.
|
|
26
|
+
*
|
|
27
|
+
* @param rootDir The directory to start the search from.
|
|
28
|
+
* @param options Configuration for the search.
|
|
29
|
+
* @returns An array of paths where the file was found.
|
|
30
|
+
*/
|
|
31
|
+
export declare function bfsFileSearchSync(rootDir: string, options: BfsFileSearchOptions): string[];
|
|
24
32
|
export {};
|
|
@@ -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":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,MAAM,MAAM,SAAS,CAAC;AAClC,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,EAAE,UAAU,GAAG,EAAE,EAAE,OAAO,GAAG,QAAQ,EAAE,KAAK,GAAG,KAAK,EAAE,GAAG,OAAO,CAAC;IACvE,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,MAAM,KAAK,GAAa,CAAC,OAAO,CAAC,CAAC;IAClC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,IAAI,eAAe,GAAG,CAAC,CAAC;IACxB,IAAI,SAAS,GAAG,CAAC,CAAC,CAAC,gEAAgE;IAEnF,8DAA8D;IAC9D,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;IAE1C,kEAAkE;IAClE,MAAM,mBAAmB,GAAG,EAAE,CAAC,CAAC,yDAAyD;IAEzF,OAAO,SAAS,GAAG,KAAK,CAAC,MAAM,IAAI,eAAe,GAAG,OAAO,EAAE,CAAC;QAC7D,+DAA+D;QAC/D,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,mBAAmB,EAAE,OAAO,GAAG,eAAe,CAAC,CAAC;QAC3E,MAAM,YAAY,GAAG,EAAE,CAAC;QACxB,OAAO,YAAY,CAAC,MAAM,GAAG,SAAS,IAAI,SAAS,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;YACnE,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;YACpC,SAAS,EAAE,CAAC;YACZ,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC7B,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBACxB,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAChC,CAAC;QACH,CAAC;QACD,eAAe,IAAI,YAAY,CAAC,MAAM,CAAC;QAEvC,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAExC,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,CAAC,KAAK,CACV,aAAa,eAAe,IAAI,OAAO,eAAe,YAAY,CAAC,MAAM,EAAE,CAC5E,CAAC;QACJ,CAAC;QAED,qDAAqD;QACrD,MAAM,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;YACzD,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;gBACtE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;YACjC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,gFAAgF;gBAChF,MAAM,OAAO,GAAI,KAAe,EAAE,OAAO,IAAI,eAAe,CAAC;gBAC7D,WAAW,CAAC,IAAI,CACd,yCAAyC,UAAU,KAAK,OAAO,GAAG,CACnE,CAAC;gBACF,IAAI,KAAK,EAAE,CAAC;oBACV,MAAM,CAAC,KAAK,CAAC,kBAAkB,UAAU,GAAG,EAAE,KAAK,CAAC,CAAC;gBACvD,CAAC;gBACD,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;YACrC,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAEhD,KAAK,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,OAAO,EAAE,CAAC;YAC9C,iBAAiB,CACf,UAAU,EACV,OAAO,EACP,OAAO,EACP,aAAa,EACb,KAAK,EACL,UAAU,CACX,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAC/B,OAAe,EACf,OAA6B;IAE7B,MAAM,EAAE,UAAU,GAAG,EAAE,EAAE,OAAO,GAAG,QAAQ,EAAE,KAAK,GAAG,KAAK,EAAE,GAAG,OAAO,CAAC;IACvE,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,MAAM,KAAK,GAAa,CAAC,OAAO,CAAC,CAAC;IAClC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,IAAI,eAAe,GAAG,CAAC,CAAC;IACxB,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;IAE1C,OAAO,SAAS,GAAG,KAAK,CAAC,MAAM,IAAI,eAAe,GAAG,OAAO,EAAE,CAAC;QAC7D,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;QACpC,SAAS,EAAE,CAAC;QAEZ,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YAC7B,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACxB,eAAe,EAAE,CAAC;YAElB,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,CAAC,KAAK,CACV,kBAAkB,eAAe,IAAI,OAAO,MAAM,UAAU,EAAE,CAC/D,CAAC;YACJ,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;gBACxE,iBAAiB,CACf,UAAU,EACV,OAAO,EACP,OAAO,EACP,aAAa,EACb,KAAK,EACL,UAAU,CACX,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,OAAO,GAAI,KAAe,EAAE,OAAO,IAAI,eAAe,CAAC;gBAC7D,WAAW,CAAC,IAAI,CACd,yCAAyC,UAAU,KAAK,OAAO,GAAG,CACnE,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,iBAAiB,CACxB,UAAkB,EAClB,OAAwB,EACxB,OAA6B,EAC7B,aAA0B,EAC1B,KAAe,EACf,UAAoB;IAEpB,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QACnD,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QACxC,MAAM,cAAc,GAAG,KAAK,CAAC,MAAM,EAAE,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,QAAQ,CAAC;QAEzE,IAAI,CAAC,WAAW,IAAI,CAAC,cAAc,EAAE,CAAC;YACpC,SAAS;QACX,CAAC;QACD,IAAI,WAAW,IAAI,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YACjD,SAAS;QACX,CAAC;QAED,IACE,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,QAAQ,EAAE;YAC9C,gBAAgB,EAAE,OAAO,CAAC,oBAAoB,EAAE,gBAAgB;YAChE,mBAAmB,EAAE,OAAO,CAAC,oBAAoB,EAAE,mBAAmB;SACvE,CAAC,EACF,CAAC;YACD,SAAS;QACX,CAAC;QAED,IAAI,WAAW,EAAE,CAAC;YAChB,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -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":"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,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,IAAI,WAAmB,CAAC;IAExB,KAAK,UAAU,cAAc,CAAC,GAAG,YAAsB;QACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,YAAY,CAAC,CAAC;QACzD,MAAM,UAAU,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACtD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,UAAU,cAAc,CAAC,OAAe,EAAE,GAAG,YAAsB;QACtE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,YAAY,CAAC,CAAC;QACzD,MAAM,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACpE,MAAM,UAAU,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC9C,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,WAAW,GAAG,MAAM,UAAU,CAAC,OAAO,CACpC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,uBAAuB,CAAC,CAChD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,MAAM,UAAU,CAAC,EAAE,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QACrE,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;QAC5E,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,cAAc,GAAG,MAAM,cAAc,CACzC,SAAS,EACT,GAAG,EACH,GAAG,EACH,YAAY,CACb,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;QAC5E,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;QAC7D,MAAM,eAAe,GAAG,MAAM,cAAc,CAAC,UAAU,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;QAC5E,MAAM,eAAe,GAAG,MAAM,cAAc,CAAC,UAAU,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;QAC5E,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;QAC5E,MAAM,CAAC,IAAI,EAAE,CAAC;QACd,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;QAChE,MAAM,cAAc,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAC7C,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;QAC5E,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;QACjE,MAAM,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;QACzD,MAAM,cAAc,GAAG,MAAM,cAAc,CACzC,SAAS,EACT,aAAa,EACb,YAAY,CACb,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE;YAC9C,QAAQ,EAAE,YAAY;YACtB,UAAU,EAAE,CAAC,SAAS,CAAC;SACxB,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,cAAc,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;QAC7D,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE;YAC9C,QAAQ,EAAE,YAAY;YACtB,OAAO,EAAE,CAAC;SACX,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;QAClE,MAAM,cAAc,GAAG,MAAM,cAAc,CACzC,SAAS,EACT,GAAG,EACH,GAAG,EACH,GAAG,EACH,YAAY,CACb,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE;YAC9C,QAAQ,EAAE,YAAY;YACtB,OAAO,EAAE,CAAC;SACX,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACzC,IAAI,WAAmB,CAAC;QAExB,UAAU,CAAC,KAAK,IAAI,EAAE;YACpB,WAAW,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;YAC9C,MAAM,cAAc,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACxC,MAAM,cAAc,CAAC,eAAe,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;YAC/D,MAAM,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;YACzE,MAAM,cAAc,GAAG,MAAM,cAAc,CACzC,SAAS,EACT,SAAS,EACT,aAAa,EACb,YAAY,CACb,CAAC;YAEF,MAAM,WAAW,GAAG,IAAI,oBAAoB,CAAC,WAAW,CAAC,CAAC;YAC1D,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE;gBAC9C,QAAQ,EAAE,YAAY;gBACtB,WAAW;gBACX,oBAAoB,EAAE;oBACpB,gBAAgB,EAAE,IAAI;oBACtB,mBAAmB,EAAE,IAAI;iBAC1B;aACF,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;YACjD,MAAM,cAAc,CAAC,eAAe,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;YAClE,MAAM,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;YACzE,MAAM,cAAc,GAAG,MAAM,cAAc,CACzC,SAAS,EACT,SAAS,EACT,aAAa,EACb,YAAY,CACb,CAAC;YAEF,MAAM,WAAW,GAAG,IAAI,oBAAoB,CAAC,WAAW,CAAC,CAAC;YAC1D,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE;gBAC9C,QAAQ,EAAE,YAAY;gBACtB,WAAW;gBACX,oBAAoB,EAAE;oBACpB,gBAAgB,EAAE,KAAK;oBACvB,mBAAmB,EAAE,IAAI;iBAC1B;aACF,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;YAClE,MAAM,cAAc,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACxC,MAAM,cAAc,CAAC,eAAe,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;YAC/D,MAAM,OAAO,GAAG,MAAM,cAAc,CAClC,SAAS,EACT,SAAS,EACT,cAAc,EACd,YAAY,CACb,CAAC;YACF,MAAM,OAAO,GAAG,MAAM,cAAc,CAClC,SAAS,EACT,SAAS,EACT,aAAa,EACb,YAAY,CACb,CAAC;YAEF,MAAM,WAAW,GAAG,IAAI,oBAAoB,CAAC,WAAW,CAAC,CAAC;YAC1D,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE;gBAC9C,QAAQ,EAAE,YAAY;gBACtB,WAAW;gBACX,oBAAoB,EAAE;oBACpB,gBAAgB,EAAE,KAAK;oBACvB,mBAAmB,EAAE,KAAK;iBAC3B;aACF,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,oEAAoE;QACpE,oCAAoC;QACpC,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,MAAM,cAAc,GAAG,CAAC,CAAC;QACzB,MAAM,aAAa,GAAG,EAAE,CAAC;QAEzB,MAAM,mBAAmB,GAA4B,EAAE,CAAC;QACxD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC;YACjC,mBAAmB,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;YACpD,mBAAmB,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC;YAC/D,mBAAmB,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC;YAC/D,mBAAmB,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;QACzE,CAAC;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QAEvC,MAAM,oBAAoB,GAA2B,EAAE,CAAC;QACxD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,EAAE,CAAC,EAAE,EAAE,CAAC;YACvC,uCAAuC;YACvC,oBAAoB,CAAC,IAAI,CACvB,cAAc,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,WAAW,CAAC,CAClD,CAAC;YACF,oBAAoB,CAAC,IAAI,CACvB,cAAc,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,WAAW,CAAC,CAC7D,CAAC;QACJ,CAAC;QACD,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAE9D,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE;YAC9C,QAAQ,EAAE,WAAW;YACrB,yEAAyE;YACzE,sDAAsD;YACtD,OAAO,EAAE,GAAG;SACb,CAAC,CAAC;QAEH,6CAA6C;QAC7C,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,aAAa,GAAG,cAAc,CAAC,CAAC;QAC3D,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,IAAI,WAAmB,CAAC;IAExB,KAAK,UAAU,cAAc,CAAC,GAAG,YAAsB;QACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,YAAY,CAAC,CAAC;QACzD,MAAM,UAAU,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACtD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,UAAU,cAAc,CAAC,OAAe,EAAE,GAAG,YAAsB;QACtE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,YAAY,CAAC,CAAC;QACzD,MAAM,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACpE,MAAM,UAAU,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC9C,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,WAAW,GAAG,MAAM,UAAU,CAAC,OAAO,CACpC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,4BAA4B,CAAC,CACrD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,MAAM,UAAU,CAAC,EAAE,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QACrE,MAAM,MAAM,GAAG,iBAAiB,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;QAC1E,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,cAAc,GAAG,MAAM,cAAc,CACzC,SAAS,EACT,GAAG,EACH,GAAG,EACH,YAAY,CACb,CAAC;QACF,MAAM,MAAM,GAAG,iBAAiB,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;QAC1E,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sEAAsE,EAAE,KAAK,IAAI,EAAE;QACpF,MAAM,cAAc,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;QAC7D,MAAM,MAAM,GAAG,iBAAiB,CAAC,WAAW,EAAE;YAC5C,QAAQ,EAAE,YAAY;YACtB,OAAO,EAAE,CAAC;SACX,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,MAAM,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;QACzD,MAAM,cAAc,GAAG,MAAM,cAAc,CACzC,SAAS,EACT,aAAa,EACb,YAAY,CACb,CAAC;QACF,MAAM,MAAM,GAAG,iBAAiB,CAAC,WAAW,EAAE;YAC5C,QAAQ,EAAE,YAAY;YACtB,UAAU,EAAE,CAAC,SAAS,CAAC;SACxB,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,KAAK,IAAI,EAAE;QACnE,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC,CAAC;QACpD,MAAM,cAAc,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACxC,MAAM,cAAc,CAAC,eAAe,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;QAC/D,MAAM,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;QACzE,MAAM,cAAc,GAAG,MAAM,cAAc,CACzC,SAAS,EACT,SAAS,EACT,aAAa,EACb,YAAY,CACb,CAAC;QAEF,MAAM,WAAW,GAAG,IAAI,oBAAoB,CAAC,WAAW,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,iBAAiB,CAAC,WAAW,EAAE;YAC5C,QAAQ,EAAE,YAAY;YACtB,WAAW;YACX,oBAAoB,EAAE;gBACpB,gBAAgB,EAAE,IAAI;gBACtB,mBAAmB,EAAE,IAAI;aAC1B;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import type { GitService } from '../services/gitService.js';
|
|
7
|
+
import type { GeminiClient } from '../core/client.js';
|
|
8
|
+
import { z } from 'zod';
|
|
9
|
+
import type { Content } from '@google/genai';
|
|
10
|
+
import type { ToolCallRequestInfo } from '../core/turn.js';
|
|
11
|
+
export interface ToolCallData<HistoryType = unknown, ArgsType = unknown> {
|
|
12
|
+
history?: HistoryType;
|
|
13
|
+
clientHistory?: Content[];
|
|
14
|
+
commitHash?: string;
|
|
15
|
+
toolCall: {
|
|
16
|
+
name: string;
|
|
17
|
+
args: ArgsType;
|
|
18
|
+
};
|
|
19
|
+
messageId?: string;
|
|
20
|
+
}
|
|
21
|
+
export declare function getToolCallDataSchema(historyItemSchema?: z.ZodTypeAny): z.ZodObject<{
|
|
22
|
+
history: z.ZodOptional<z.ZodArray<z.ZodTypeAny, "many">>;
|
|
23
|
+
clientHistory: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
24
|
+
role: z.ZodOptional<z.ZodString>;
|
|
25
|
+
parts: z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">;
|
|
26
|
+
}, "passthrough", z.ZodTypeAny, z.objectOutputType<{
|
|
27
|
+
role: z.ZodOptional<z.ZodString>;
|
|
28
|
+
parts: z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">;
|
|
29
|
+
}, z.ZodTypeAny, "passthrough">, z.objectInputType<{
|
|
30
|
+
role: z.ZodOptional<z.ZodString>;
|
|
31
|
+
parts: z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">;
|
|
32
|
+
}, z.ZodTypeAny, "passthrough">>, "many">>;
|
|
33
|
+
commitHash: z.ZodOptional<z.ZodString>;
|
|
34
|
+
toolCall: z.ZodObject<{
|
|
35
|
+
name: z.ZodString;
|
|
36
|
+
args: z.ZodRecord<z.ZodString, z.ZodUnknown>;
|
|
37
|
+
}, "strip", z.ZodTypeAny, {
|
|
38
|
+
name: string;
|
|
39
|
+
args: Record<string, unknown>;
|
|
40
|
+
}, {
|
|
41
|
+
name: string;
|
|
42
|
+
args: Record<string, unknown>;
|
|
43
|
+
}>;
|
|
44
|
+
messageId: z.ZodOptional<z.ZodString>;
|
|
45
|
+
}, "strip", z.ZodTypeAny, {
|
|
46
|
+
toolCall: {
|
|
47
|
+
name: string;
|
|
48
|
+
args: Record<string, unknown>;
|
|
49
|
+
};
|
|
50
|
+
history?: any[] | undefined;
|
|
51
|
+
clientHistory?: z.objectOutputType<{
|
|
52
|
+
role: z.ZodOptional<z.ZodString>;
|
|
53
|
+
parts: z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">;
|
|
54
|
+
}, z.ZodTypeAny, "passthrough">[] | undefined;
|
|
55
|
+
commitHash?: string | undefined;
|
|
56
|
+
messageId?: string | undefined;
|
|
57
|
+
}, {
|
|
58
|
+
toolCall: {
|
|
59
|
+
name: string;
|
|
60
|
+
args: Record<string, unknown>;
|
|
61
|
+
};
|
|
62
|
+
history?: any[] | undefined;
|
|
63
|
+
clientHistory?: z.objectInputType<{
|
|
64
|
+
role: z.ZodOptional<z.ZodString>;
|
|
65
|
+
parts: z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">;
|
|
66
|
+
}, z.ZodTypeAny, "passthrough">[] | undefined;
|
|
67
|
+
commitHash?: string | undefined;
|
|
68
|
+
messageId?: string | undefined;
|
|
69
|
+
}>;
|
|
70
|
+
export declare function generateCheckpointFileName(toolCall: ToolCallRequestInfo): string | null;
|
|
71
|
+
export declare function formatCheckpointDisplayList(filenames: string[]): string;
|
|
72
|
+
export declare function getTruncatedCheckpointNames(filenames: string[]): string[];
|
|
73
|
+
export declare function processRestorableToolCalls<HistoryType>(toolCalls: ToolCallRequestInfo[], gitService: GitService, geminiClient: GeminiClient, history?: HistoryType): Promise<{
|
|
74
|
+
checkpointsToWrite: Map<string, string>;
|
|
75
|
+
toolCallToCheckpointMap: Map<string, string>;
|
|
76
|
+
errors: string[];
|
|
77
|
+
}>;
|
|
78
|
+
export interface CheckpointInfo {
|
|
79
|
+
messageId: string;
|
|
80
|
+
checkpoint: string;
|
|
81
|
+
}
|
|
82
|
+
export declare function getCheckpointInfoList(checkpointFiles: Map<string, string>): CheckpointInfo[];
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import * as path from 'node:path';
|
|
7
|
+
import { getErrorMessage } from './errors.js';
|
|
8
|
+
import { z } from 'zod';
|
|
9
|
+
const ContentSchema = z
|
|
10
|
+
.object({
|
|
11
|
+
role: z.string().optional(),
|
|
12
|
+
parts: z.array(z.record(z.unknown())),
|
|
13
|
+
})
|
|
14
|
+
.passthrough();
|
|
15
|
+
export function getToolCallDataSchema(historyItemSchema) {
|
|
16
|
+
const schema = historyItemSchema ?? z.any();
|
|
17
|
+
return z.object({
|
|
18
|
+
history: z.array(schema).optional(),
|
|
19
|
+
clientHistory: z.array(ContentSchema).optional(),
|
|
20
|
+
commitHash: z.string().optional(),
|
|
21
|
+
toolCall: z.object({
|
|
22
|
+
name: z.string(),
|
|
23
|
+
args: z.record(z.unknown()),
|
|
24
|
+
}),
|
|
25
|
+
messageId: z.string().optional(),
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
export function generateCheckpointFileName(toolCall) {
|
|
29
|
+
const toolArgs = toolCall.args;
|
|
30
|
+
const toolFilePath = toolArgs['file_path'];
|
|
31
|
+
if (!toolFilePath) {
|
|
32
|
+
return null;
|
|
33
|
+
}
|
|
34
|
+
const timestamp = new Date()
|
|
35
|
+
.toISOString()
|
|
36
|
+
.replace(/:/g, '-')
|
|
37
|
+
.replace(/\./g, '_');
|
|
38
|
+
const toolName = toolCall.name;
|
|
39
|
+
const fileName = path.basename(toolFilePath);
|
|
40
|
+
return `${timestamp}-${fileName}-${toolName}`;
|
|
41
|
+
}
|
|
42
|
+
export function formatCheckpointDisplayList(filenames) {
|
|
43
|
+
return getTruncatedCheckpointNames(filenames).join('\n');
|
|
44
|
+
}
|
|
45
|
+
export function getTruncatedCheckpointNames(filenames) {
|
|
46
|
+
return filenames.map((file) => {
|
|
47
|
+
const components = file.split('.');
|
|
48
|
+
if (components.length <= 1) {
|
|
49
|
+
return file;
|
|
50
|
+
}
|
|
51
|
+
components.pop();
|
|
52
|
+
return components.join('.');
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
export async function processRestorableToolCalls(toolCalls, gitService, geminiClient, history) {
|
|
56
|
+
const checkpointsToWrite = new Map();
|
|
57
|
+
const toolCallToCheckpointMap = new Map();
|
|
58
|
+
const errors = [];
|
|
59
|
+
for (const toolCall of toolCalls) {
|
|
60
|
+
try {
|
|
61
|
+
let commitHash;
|
|
62
|
+
try {
|
|
63
|
+
commitHash = await gitService.createFileSnapshot(`Snapshot for ${toolCall.name}`);
|
|
64
|
+
}
|
|
65
|
+
catch (error) {
|
|
66
|
+
errors.push(`Failed to create new snapshot for ${toolCall.name}: ${getErrorMessage(error)}. Attempting to use current commit.`);
|
|
67
|
+
commitHash = await gitService.getCurrentCommitHash();
|
|
68
|
+
}
|
|
69
|
+
if (!commitHash) {
|
|
70
|
+
errors.push(`Failed to create snapshot for ${toolCall.name}. Checkpointing may not be working properly. Ensure Git is installed and the project directory is accessible.`);
|
|
71
|
+
continue;
|
|
72
|
+
}
|
|
73
|
+
const checkpointFileName = generateCheckpointFileName(toolCall);
|
|
74
|
+
if (!checkpointFileName) {
|
|
75
|
+
errors.push(`Skipping restorable tool call due to missing file_path: ${toolCall.name}`);
|
|
76
|
+
continue;
|
|
77
|
+
}
|
|
78
|
+
const clientHistory = await geminiClient.getHistory();
|
|
79
|
+
const checkpointData = {
|
|
80
|
+
history,
|
|
81
|
+
clientHistory,
|
|
82
|
+
toolCall: {
|
|
83
|
+
name: toolCall.name,
|
|
84
|
+
args: toolCall.args,
|
|
85
|
+
},
|
|
86
|
+
commitHash,
|
|
87
|
+
messageId: toolCall.prompt_id,
|
|
88
|
+
};
|
|
89
|
+
const fileName = `${checkpointFileName}.json`;
|
|
90
|
+
checkpointsToWrite.set(fileName, JSON.stringify(checkpointData, null, 2));
|
|
91
|
+
toolCallToCheckpointMap.set(toolCall.callId, fileName.replace('.json', ''));
|
|
92
|
+
}
|
|
93
|
+
catch (error) {
|
|
94
|
+
errors.push(`Failed to create checkpoint for ${toolCall.name}: ${getErrorMessage(error)}`);
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
return { checkpointsToWrite, toolCallToCheckpointMap, errors };
|
|
98
|
+
}
|
|
99
|
+
export function getCheckpointInfoList(checkpointFiles) {
|
|
100
|
+
const checkpointInfoList = [];
|
|
101
|
+
for (const [file, content] of checkpointFiles) {
|
|
102
|
+
try {
|
|
103
|
+
const toolCallData = JSON.parse(content);
|
|
104
|
+
if (toolCallData.messageId) {
|
|
105
|
+
checkpointInfoList.push({
|
|
106
|
+
messageId: toolCallData.messageId,
|
|
107
|
+
checkpoint: file.replace('.json', ''),
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
catch (_e) {
|
|
112
|
+
// Ignore invalid JSON files
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
return checkpointInfoList;
|
|
116
|
+
}
|
|
117
|
+
//# sourceMappingURL=checkpointUtils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"checkpointUtils.js","sourceRoot":"","sources":["../../../src/utils/checkpointUtils.ts"],"names":[],"mappings":"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"}
|