@google/gemini-cli-core 0.21.0-nightly.20251210.d90356e8a → 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/dist/google-gemini-cli-core-0.21.0-nightly.20251209.ec9a8c7a7.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/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/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/config/config.js +28 -17
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +49 -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/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/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/index.d.ts +1 -0
- package/dist/src/index.js +1 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/policy/policies/agent.toml +31 -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/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/test-data/resolved-aliases-retry.golden.json +222 -0
- 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/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/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
|
@@ -0,0 +1,222 @@
|
|
|
1
|
+
{
|
|
2
|
+
"base": {
|
|
3
|
+
"generateContentConfig": {
|
|
4
|
+
"temperature": 0,
|
|
5
|
+
"topP": 1
|
|
6
|
+
}
|
|
7
|
+
},
|
|
8
|
+
"chat-base": {
|
|
9
|
+
"generateContentConfig": {
|
|
10
|
+
"temperature": 1,
|
|
11
|
+
"topP": 0.95,
|
|
12
|
+
"thinkingConfig": {
|
|
13
|
+
"includeThoughts": true
|
|
14
|
+
},
|
|
15
|
+
"topK": 64
|
|
16
|
+
}
|
|
17
|
+
},
|
|
18
|
+
"chat-base-2.5": {
|
|
19
|
+
"generateContentConfig": {
|
|
20
|
+
"temperature": 1,
|
|
21
|
+
"topP": 0.95,
|
|
22
|
+
"thinkingConfig": {
|
|
23
|
+
"includeThoughts": true,
|
|
24
|
+
"thinkingBudget": 8192
|
|
25
|
+
},
|
|
26
|
+
"topK": 64
|
|
27
|
+
}
|
|
28
|
+
},
|
|
29
|
+
"chat-base-3": {
|
|
30
|
+
"generateContentConfig": {
|
|
31
|
+
"temperature": 1,
|
|
32
|
+
"topP": 0.95,
|
|
33
|
+
"thinkingConfig": {
|
|
34
|
+
"includeThoughts": true,
|
|
35
|
+
"thinkingLevel": "HIGH"
|
|
36
|
+
},
|
|
37
|
+
"topK": 64
|
|
38
|
+
}
|
|
39
|
+
},
|
|
40
|
+
"gemini-3-pro-preview": {
|
|
41
|
+
"model": "gemini-3-pro-preview",
|
|
42
|
+
"generateContentConfig": {
|
|
43
|
+
"temperature": 1,
|
|
44
|
+
"topP": 0.95,
|
|
45
|
+
"thinkingConfig": {
|
|
46
|
+
"includeThoughts": true,
|
|
47
|
+
"thinkingLevel": "HIGH"
|
|
48
|
+
},
|
|
49
|
+
"topK": 64
|
|
50
|
+
}
|
|
51
|
+
},
|
|
52
|
+
"gemini-2.5-pro": {
|
|
53
|
+
"model": "gemini-2.5-pro",
|
|
54
|
+
"generateContentConfig": {
|
|
55
|
+
"temperature": 1,
|
|
56
|
+
"topP": 0.95,
|
|
57
|
+
"thinkingConfig": {
|
|
58
|
+
"includeThoughts": true,
|
|
59
|
+
"thinkingBudget": 8192
|
|
60
|
+
},
|
|
61
|
+
"topK": 64
|
|
62
|
+
}
|
|
63
|
+
},
|
|
64
|
+
"gemini-2.5-flash": {
|
|
65
|
+
"model": "gemini-2.5-flash",
|
|
66
|
+
"generateContentConfig": {
|
|
67
|
+
"temperature": 1,
|
|
68
|
+
"topP": 0.95,
|
|
69
|
+
"thinkingConfig": {
|
|
70
|
+
"includeThoughts": true,
|
|
71
|
+
"thinkingBudget": 8192
|
|
72
|
+
},
|
|
73
|
+
"topK": 64
|
|
74
|
+
}
|
|
75
|
+
},
|
|
76
|
+
"gemini-2.5-flash-lite": {
|
|
77
|
+
"model": "gemini-2.5-flash-lite",
|
|
78
|
+
"generateContentConfig": {
|
|
79
|
+
"temperature": 1,
|
|
80
|
+
"topP": 0.95,
|
|
81
|
+
"thinkingConfig": {
|
|
82
|
+
"includeThoughts": true,
|
|
83
|
+
"thinkingBudget": 8192
|
|
84
|
+
},
|
|
85
|
+
"topK": 64
|
|
86
|
+
}
|
|
87
|
+
},
|
|
88
|
+
"gemini-2.5-flash-base": {
|
|
89
|
+
"model": "gemini-2.5-flash",
|
|
90
|
+
"generateContentConfig": {
|
|
91
|
+
"temperature": 0,
|
|
92
|
+
"topP": 1
|
|
93
|
+
}
|
|
94
|
+
},
|
|
95
|
+
"classifier": {
|
|
96
|
+
"model": "gemini-2.5-flash-lite",
|
|
97
|
+
"generateContentConfig": {
|
|
98
|
+
"temperature": 0,
|
|
99
|
+
"topP": 1,
|
|
100
|
+
"maxOutputTokens": 1024,
|
|
101
|
+
"thinkingConfig": {
|
|
102
|
+
"thinkingBudget": 512
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
},
|
|
106
|
+
"prompt-completion": {
|
|
107
|
+
"model": "gemini-2.5-flash-lite",
|
|
108
|
+
"generateContentConfig": {
|
|
109
|
+
"temperature": 0.3,
|
|
110
|
+
"topP": 1,
|
|
111
|
+
"maxOutputTokens": 16000,
|
|
112
|
+
"thinkingConfig": {
|
|
113
|
+
"thinkingBudget": 0
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
},
|
|
117
|
+
"edit-corrector": {
|
|
118
|
+
"model": "gemini-2.5-flash-lite",
|
|
119
|
+
"generateContentConfig": {
|
|
120
|
+
"temperature": 0,
|
|
121
|
+
"topP": 1,
|
|
122
|
+
"thinkingConfig": {
|
|
123
|
+
"thinkingBudget": 0
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
},
|
|
127
|
+
"summarizer-default": {
|
|
128
|
+
"model": "gemini-2.5-flash-lite",
|
|
129
|
+
"generateContentConfig": {
|
|
130
|
+
"temperature": 0,
|
|
131
|
+
"topP": 1,
|
|
132
|
+
"maxOutputTokens": 2000
|
|
133
|
+
}
|
|
134
|
+
},
|
|
135
|
+
"summarizer-shell": {
|
|
136
|
+
"model": "gemini-2.5-flash-lite",
|
|
137
|
+
"generateContentConfig": {
|
|
138
|
+
"temperature": 0,
|
|
139
|
+
"topP": 1,
|
|
140
|
+
"maxOutputTokens": 2000
|
|
141
|
+
}
|
|
142
|
+
},
|
|
143
|
+
"web-search": {
|
|
144
|
+
"model": "gemini-2.5-flash",
|
|
145
|
+
"generateContentConfig": {
|
|
146
|
+
"temperature": 0,
|
|
147
|
+
"topP": 1,
|
|
148
|
+
"tools": [
|
|
149
|
+
{
|
|
150
|
+
"googleSearch": {}
|
|
151
|
+
}
|
|
152
|
+
]
|
|
153
|
+
}
|
|
154
|
+
},
|
|
155
|
+
"web-fetch": {
|
|
156
|
+
"model": "gemini-2.5-flash",
|
|
157
|
+
"generateContentConfig": {
|
|
158
|
+
"temperature": 0,
|
|
159
|
+
"topP": 1,
|
|
160
|
+
"tools": [
|
|
161
|
+
{
|
|
162
|
+
"urlContext": {}
|
|
163
|
+
}
|
|
164
|
+
]
|
|
165
|
+
}
|
|
166
|
+
},
|
|
167
|
+
"web-fetch-fallback": {
|
|
168
|
+
"model": "gemini-2.5-flash",
|
|
169
|
+
"generateContentConfig": {
|
|
170
|
+
"temperature": 0,
|
|
171
|
+
"topP": 1
|
|
172
|
+
}
|
|
173
|
+
},
|
|
174
|
+
"loop-detection": {
|
|
175
|
+
"model": "gemini-2.5-flash",
|
|
176
|
+
"generateContentConfig": {
|
|
177
|
+
"temperature": 0,
|
|
178
|
+
"topP": 1
|
|
179
|
+
}
|
|
180
|
+
},
|
|
181
|
+
"loop-detection-double-check": {
|
|
182
|
+
"model": "gemini-2.5-pro",
|
|
183
|
+
"generateContentConfig": {
|
|
184
|
+
"temperature": 0,
|
|
185
|
+
"topP": 1
|
|
186
|
+
}
|
|
187
|
+
},
|
|
188
|
+
"llm-edit-fixer": {
|
|
189
|
+
"model": "gemini-2.5-flash",
|
|
190
|
+
"generateContentConfig": {
|
|
191
|
+
"temperature": 0,
|
|
192
|
+
"topP": 1
|
|
193
|
+
}
|
|
194
|
+
},
|
|
195
|
+
"next-speaker-checker": {
|
|
196
|
+
"model": "gemini-2.5-flash",
|
|
197
|
+
"generateContentConfig": {
|
|
198
|
+
"temperature": 0,
|
|
199
|
+
"topP": 1
|
|
200
|
+
}
|
|
201
|
+
},
|
|
202
|
+
"chat-compression-3-pro": {
|
|
203
|
+
"model": "gemini-3-pro-preview",
|
|
204
|
+
"generateContentConfig": {}
|
|
205
|
+
},
|
|
206
|
+
"chat-compression-2.5-pro": {
|
|
207
|
+
"model": "gemini-2.5-pro",
|
|
208
|
+
"generateContentConfig": {}
|
|
209
|
+
},
|
|
210
|
+
"chat-compression-2.5-flash": {
|
|
211
|
+
"model": "gemini-2.5-flash",
|
|
212
|
+
"generateContentConfig": {}
|
|
213
|
+
},
|
|
214
|
+
"chat-compression-2.5-flash-lite": {
|
|
215
|
+
"model": "gemini-2.5-flash-lite",
|
|
216
|
+
"generateContentConfig": {}
|
|
217
|
+
},
|
|
218
|
+
"chat-compression-default": {
|
|
219
|
+
"model": "gemini-2.5-pro",
|
|
220
|
+
"generateContentConfig": {}
|
|
221
|
+
}
|
|
222
|
+
}
|
|
@@ -16,3 +16,4 @@ export declare const READ_FILE_TOOL_NAME = "read_file";
|
|
|
16
16
|
export declare const LS_TOOL_NAME = "list_directory";
|
|
17
17
|
export declare const MEMORY_TOOL_NAME = "save_memory";
|
|
18
18
|
export declare const EDIT_TOOL_NAMES: Set<string>;
|
|
19
|
+
export declare const DELEGATE_TO_AGENT_TOOL_NAME = "delegate_to_agent";
|
|
@@ -19,4 +19,5 @@ export const READ_FILE_TOOL_NAME = 'read_file';
|
|
|
19
19
|
export const LS_TOOL_NAME = 'list_directory';
|
|
20
20
|
export const MEMORY_TOOL_NAME = 'save_memory';
|
|
21
21
|
export const EDIT_TOOL_NAMES = new Set([EDIT_TOOL_NAME, WRITE_FILE_TOOL_NAME]);
|
|
22
|
+
export const DELEGATE_TO_AGENT_TOOL_NAME = 'delegate_to_agent';
|
|
22
23
|
//# sourceMappingURL=tool-names.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-names.js","sourceRoot":"","sources":["../../../src/tools/tool-names.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,wCAAwC;AACxC,sFAAsF;AACtF,+EAA+E;AAE/E,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC;AACrC,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,CAAC;AACnD,MAAM,CAAC,MAAM,oBAAoB,GAAG,YAAY,CAAC;AACjD,MAAM,CAAC,MAAM,oBAAoB,GAAG,mBAAmB,CAAC;AACxD,MAAM,CAAC,MAAM,mBAAmB,GAAG,WAAW,CAAC;AAC/C,MAAM,CAAC,MAAM,cAAc,GAAG,SAAS,CAAC;AACxC,MAAM,CAAC,MAAM,eAAe,GAAG,mBAAmB,CAAC;AACnD,MAAM,CAAC,MAAM,cAAc,GAAG,qBAAqB,CAAC;AACpD,MAAM,CAAC,MAAM,yBAAyB,GAAG,iBAAiB,CAAC;AAC3D,MAAM,CAAC,MAAM,mBAAmB,GAAG,WAAW,CAAC;AAC/C,MAAM,CAAC,MAAM,YAAY,GAAG,gBAAgB,CAAC;AAC7C,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,CAAC;AAC9C,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,cAAc,EAAE,oBAAoB,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"tool-names.js","sourceRoot":"","sources":["../../../src/tools/tool-names.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,wCAAwC;AACxC,sFAAsF;AACtF,+EAA+E;AAE/E,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC;AACrC,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,CAAC;AACnD,MAAM,CAAC,MAAM,oBAAoB,GAAG,YAAY,CAAC;AACjD,MAAM,CAAC,MAAM,oBAAoB,GAAG,mBAAmB,CAAC;AACxD,MAAM,CAAC,MAAM,mBAAmB,GAAG,WAAW,CAAC;AAC/C,MAAM,CAAC,MAAM,cAAc,GAAG,SAAS,CAAC;AACxC,MAAM,CAAC,MAAM,eAAe,GAAG,mBAAmB,CAAC;AACnD,MAAM,CAAC,MAAM,cAAc,GAAG,qBAAqB,CAAC;AACpD,MAAM,CAAC,MAAM,yBAAyB,GAAG,iBAAiB,CAAC;AAC3D,MAAM,CAAC,MAAM,mBAAmB,GAAG,WAAW,CAAC;AAC/C,MAAM,CAAC,MAAM,YAAY,GAAG,gBAAgB,CAAC;AAC7C,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,CAAC;AAC9C,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,cAAc,EAAE,oBAAoB,CAAC,CAAC,CAAC;AAC/E,MAAM,CAAC,MAAM,2BAA2B,GAAG,mBAAmB,CAAC"}
|
|
@@ -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":"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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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"}
|
|
@@ -66,29 +66,29 @@ export function parseGoogleApiError(error) {
|
|
|
66
66
|
const code = currentError.code;
|
|
67
67
|
const message = currentError.message;
|
|
68
68
|
const errorDetails = currentError.details;
|
|
69
|
-
if (
|
|
69
|
+
if (code && message) {
|
|
70
70
|
const details = [];
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
if (typeKey
|
|
77
|
-
|
|
78
|
-
|
|
71
|
+
if (Array.isArray(errorDetails)) {
|
|
72
|
+
for (const detail of errorDetails) {
|
|
73
|
+
if (detail && typeof detail === 'object') {
|
|
74
|
+
const detailObj = detail;
|
|
75
|
+
const typeKey = Object.keys(detailObj).find((key) => key.trim() === '@type');
|
|
76
|
+
if (typeKey) {
|
|
77
|
+
if (typeKey !== '@type') {
|
|
78
|
+
detailObj['@type'] = detailObj[typeKey];
|
|
79
|
+
delete detailObj[typeKey];
|
|
80
|
+
}
|
|
81
|
+
// We can just cast it; the consumer will have to switch on @type
|
|
82
|
+
details.push(detailObj);
|
|
79
83
|
}
|
|
80
|
-
// We can just cast it; the consumer will have to switch on @type
|
|
81
|
-
details.push(detailObj);
|
|
82
84
|
}
|
|
83
85
|
}
|
|
84
86
|
}
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
};
|
|
91
|
-
}
|
|
87
|
+
return {
|
|
88
|
+
code,
|
|
89
|
+
message,
|
|
90
|
+
details,
|
|
91
|
+
};
|
|
92
92
|
}
|
|
93
93
|
return null;
|
|
94
94
|
}
|
|
@@ -136,6 +136,19 @@ function fromApiError(errorObj) {
|
|
|
136
136
|
}
|
|
137
137
|
catch (_) {
|
|
138
138
|
// Not a JSON string, can't parse.
|
|
139
|
+
// Try one more fallback: look for the first '{' and last '}'
|
|
140
|
+
if (typeof data === 'string') {
|
|
141
|
+
const firstBrace = data.indexOf('{');
|
|
142
|
+
const lastBrace = data.lastIndexOf('}');
|
|
143
|
+
if (firstBrace !== -1 && lastBrace !== -1 && lastBrace > firstBrace) {
|
|
144
|
+
try {
|
|
145
|
+
data = JSON.parse(data.substring(firstBrace, lastBrace + 1));
|
|
146
|
+
}
|
|
147
|
+
catch (__) {
|
|
148
|
+
// Still failed
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
}
|
|
139
152
|
}
|
|
140
153
|
}
|
|
141
154
|
if (Array.isArray(data) && data.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"googleErrors.js","sourceRoot":"","sources":["../../../src/utils/googleErrors.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAkHH;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAc;IAChD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,QAAQ,GAAY,KAAK,CAAC;IAE9B,yCAAyC;IACzC,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACjC,IAAI,CAAC;YACH,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,kCAAkC;YAClC,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnD,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IAED,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACtD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,YAAY,GACd,eAAe,CAAC,QAAQ,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,CAAC;IAEtD,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,+EAA+E;IAC/E,mFAAmF;IACnF,OACE,YAAY;QACZ,OAAO,YAAY,CAAC,OAAO,KAAK,QAAQ;QACxC,KAAK,GAAG,QAAQ,EAChB,CAAC;QACD,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAC9B,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAChE,CAAC;YACF,IAAI,aAAa,CAAC,KAAK,EAAE,CAAC;gBACxB,YAAY,GAAG,aAAa,CAAC,KAAK,CAAC;gBACnC,KAAK,EAAE,CAAC;YACV,CAAC;iBAAM,CAAC;gBACN,+DAA+D;gBAC/D,MAAM;YACR,CAAC;QACH,CAAC;QAAC,OAAO,MAAM,EAAE,CAAC;YAChB,mEAAmE;YACnE,MAAM;QACR,CAAC;IACH,CAAC;IAED,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC;IAC/B,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;IACrC,MAAM,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC;IAE1C,IAAI,
|
|
1
|
+
{"version":3,"file":"googleErrors.js","sourceRoot":"","sources":["../../../src/utils/googleErrors.ts"],"names":[],"mappings":"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"}
|
|
@@ -83,7 +83,11 @@ describe('parseGoogleApiError', () => {
|
|
|
83
83
|
},
|
|
84
84
|
},
|
|
85
85
|
};
|
|
86
|
-
expect(parseGoogleApiError(mockError)).
|
|
86
|
+
expect(parseGoogleApiError(mockError)).toEqual({
|
|
87
|
+
code: 400,
|
|
88
|
+
message: 'Bad Request',
|
|
89
|
+
details: [],
|
|
90
|
+
});
|
|
87
91
|
});
|
|
88
92
|
it('should return null if there are no valid details', () => {
|
|
89
93
|
const mockError = {
|
|
@@ -103,7 +107,11 @@ describe('parseGoogleApiError', () => {
|
|
|
103
107
|
},
|
|
104
108
|
},
|
|
105
109
|
};
|
|
106
|
-
expect(parseGoogleApiError(mockError)).
|
|
110
|
+
expect(parseGoogleApiError(mockError)).toEqual({
|
|
111
|
+
code: 400,
|
|
112
|
+
message: 'Bad Request',
|
|
113
|
+
details: [],
|
|
114
|
+
});
|
|
107
115
|
});
|
|
108
116
|
it('should parse a doubly nested error in the message', () => {
|
|
109
117
|
const innerError = {
|