@google/gemini-cli-core 0.67.0-preview.0 → 0.68.0-preview.0
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 +18 -24
- package/dist/docs/changelogs/index.md +24 -0
- package/dist/docs/changelogs/latest.md +83 -90
- package/dist/docs/changelogs/preview.md +89 -87
- package/dist/docs/cli/sandbox.md +8 -2
- package/dist/docs/cli/themes.md +6 -3
- package/dist/docs/extensions/releasing.md +32 -0
- package/dist/docs/reference/configuration.md +2 -10
- package/dist/src/availability/autoRoutingFallback.integration.test.js +95 -2
- package/dist/src/availability/autoRoutingFallback.integration.test.js.map +1 -1
- package/dist/src/availability/errorClassification.d.ts +2 -0
- package/dist/src/availability/errorClassification.js +8 -0
- package/dist/src/availability/errorClassification.js.map +1 -1
- package/dist/src/availability/errorClassification.test.d.ts +6 -0
- package/dist/src/availability/errorClassification.test.js +56 -0
- package/dist/src/availability/errorClassification.test.js.map +1 -0
- package/dist/src/availability/policyHelpers.test.js +8 -1
- package/dist/src/availability/policyHelpers.test.js.map +1 -1
- package/dist/src/code_assist/oauth2.test.js +4 -1
- package/dist/src/code_assist/oauth2.test.js.map +1 -1
- package/dist/src/code_assist/server.js +24 -15
- package/dist/src/code_assist/server.js.map +1 -1
- package/dist/src/code_assist/server.test.js +165 -0
- package/dist/src/code_assist/server.test.js.map +1 -1
- package/dist/src/config/config.js +1 -0
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +4 -1
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/defaultModelConfigs.js +1 -7
- package/dist/src/config/defaultModelConfigs.js.map +1 -1
- package/dist/src/config/models.d.ts +2 -1
- package/dist/src/config/models.js +20 -7
- package/dist/src/config/models.js.map +1 -1
- package/dist/src/config/models.test.js +43 -1
- package/dist/src/config/models.test.js.map +1 -1
- package/dist/src/core/baseLlmClient.js +15 -0
- package/dist/src/core/baseLlmClient.js.map +1 -1
- package/dist/src/core/baseLlmClient.test.js +37 -0
- package/dist/src/core/baseLlmClient.test.js.map +1 -1
- package/dist/src/core/client.js +26 -1
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +8 -3
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/geminiChat.js +29 -4
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +80 -0
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/fallback/handler.js +13 -5
- package/dist/src/fallback/handler.js.map +1 -1
- package/dist/src/fallback/handler.test.js +30 -2
- package/dist/src/fallback/handler.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/ide/process-utils.integration.test.d.ts +6 -0
- package/dist/src/ide/process-utils.integration.test.js +276 -0
- package/dist/src/ide/process-utils.integration.test.js.map +1 -0
- package/dist/src/ide/process-utils.js +69 -20
- package/dist/src/ide/process-utils.js.map +1 -1
- package/dist/src/ide/process-utils.test.js +161 -18
- package/dist/src/ide/process-utils.test.js.map +1 -1
- package/dist/src/routing/strategies/defaultStrategy.js +1 -1
- package/dist/src/routing/strategies/defaultStrategy.js.map +1 -1
- package/dist/src/routing/strategies/defaultStrategy.test.js +14 -0
- package/dist/src/routing/strategies/defaultStrategy.test.js.map +1 -1
- package/dist/src/routing/strategies/fallbackStrategy.js +3 -2
- package/dist/src/routing/strategies/fallbackStrategy.js.map +1 -1
- package/dist/src/routing/strategies/fallbackStrategy.test.js +32 -0
- package/dist/src/routing/strategies/fallbackStrategy.test.js.map +1 -1
- package/dist/src/routing/strategies/overrideStrategy.js +1 -1
- package/dist/src/routing/strategies/overrideStrategy.js.map +1 -1
- package/dist/src/routing/strategies/overrideStrategy.test.js +11 -0
- package/dist/src/routing/strategies/overrideStrategy.test.js.map +1 -1
- package/dist/src/services/executionLifecycleService.d.ts +7 -1
- package/dist/src/services/executionLifecycleService.js +9 -2
- package/dist/src/services/executionLifecycleService.js.map +1 -1
- package/dist/src/services/executionLifecycleService.test.js +27 -0
- package/dist/src/services/executionLifecycleService.test.js.map +1 -1
- package/dist/src/services/gitService.js +136 -2
- package/dist/src/services/gitService.js.map +1 -1
- package/dist/src/services/gitService.test.js +208 -3
- package/dist/src/services/gitService.test.js.map +1 -1
- package/dist/src/services/modelConfigService.test.js +23 -0
- package/dist/src/services/modelConfigService.test.js.map +1 -1
- package/dist/src/services/sessionSummaryService.js +5 -2
- package/dist/src/services/sessionSummaryService.js.map +1 -1
- package/dist/src/services/sessionSummaryService.test.js +18 -0
- package/dist/src/services/sessionSummaryService.test.js.map +1 -1
- package/dist/src/services/shellExecutionService.d.ts +2 -1
- package/dist/src/services/shellExecutionService.js +15 -5
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.test.js +22 -2
- package/dist/src/services/shellExecutionService.test.js.map +1 -1
- package/dist/src/tools/ask-user.js +2 -1
- package/dist/src/tools/ask-user.js.map +1 -1
- package/dist/src/tools/ask-user.test.js +28 -0
- package/dist/src/tools/ask-user.test.js.map +1 -1
- package/dist/src/tools/glob.js +19 -4
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/glob.test.js +91 -0
- package/dist/src/tools/glob.test.js.map +1 -1
- package/dist/src/tools/shellBackgroundTools.test.js +4 -0
- package/dist/src/tools/shellBackgroundTools.test.js.map +1 -1
- package/dist/src/tools/write-file.js +1 -1
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-file.test.js +18 -0
- package/dist/src/tools/write-file.test.js.map +1 -1
- package/dist/src/utils/editCorrector.js +12 -12
- package/dist/src/utils/editCorrector.js.map +1 -1
- package/dist/src/utils/editCorrector.test.js +16 -0
- package/dist/src/utils/editCorrector.test.js.map +1 -1
- package/dist/src/utils/events.d.ts +1 -0
- package/dist/src/utils/events.js.map +1 -1
- package/dist/src/utils/fileUtils.js +39 -19
- package/dist/src/utils/fileUtils.js.map +1 -1
- package/dist/src/utils/fileUtils.test.js +284 -0
- package/dist/src/utils/fileUtils.test.js.map +1 -1
- package/dist/src/utils/filesearch/fileSearch.js +36 -5
- package/dist/src/utils/filesearch/fileSearch.js.map +1 -1
- package/dist/src/utils/filesearch/fileSearch.test.js +146 -0
- package/dist/src/utils/filesearch/fileSearch.test.js.map +1 -1
- package/dist/src/utils/ignorePathUtils.js +3 -2
- package/dist/src/utils/ignorePathUtils.js.map +1 -1
- package/dist/src/utils/ignorePathUtils.test.js +20 -1
- package/dist/src/utils/ignorePathUtils.test.js.map +1 -1
- package/dist/src/utils/llm-edit-fixer.js +13 -10
- package/dist/src/utils/llm-edit-fixer.js.map +1 -1
- package/dist/src/utils/llm-edit-fixer.test.js +30 -0
- package/dist/src/utils/llm-edit-fixer.test.js.map +1 -1
- package/dist/src/utils/summarizer.js +7 -3
- package/dist/src/utils/summarizer.js.map +1 -1
- package/dist/src/utils/summarizer.test.js +14 -0
- package/dist/src/utils/summarizer.test.js.map +1 -1
- package/dist/src/utils/textUtils.d.ts +7 -0
- package/dist/src/utils/textUtils.js +157 -0
- package/dist/src/utils/textUtils.js.map +1 -1
- package/dist/src/utils/textUtils.test.js +41 -1
- package/dist/src/utils/textUtils.test.js.map +1 -1
- package/dist/src/voice/whisperModelManager.d.ts +4 -1
- package/dist/src/voice/whisperModelManager.js +175 -8
- package/dist/src/voice/whisperModelManager.js.map +1 -1
- package/dist/src/voice/whisperModelManager.test.d.ts +6 -0
- package/dist/src/voice/whisperModelManager.test.js +514 -0
- package/dist/src/voice/whisperModelManager.test.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -19,27 +19,90 @@ const ALLOWED_MODELS = [
|
|
|
19
19
|
*/
|
|
20
20
|
export class WhisperModelManager extends EventEmitter {
|
|
21
21
|
modelsDir;
|
|
22
|
+
inFlightDownloads = new Map();
|
|
22
23
|
constructor() {
|
|
23
24
|
super();
|
|
24
25
|
this.modelsDir = path.join(homedir(), GEMINI_DIR, 'whisper_models');
|
|
25
26
|
}
|
|
26
27
|
isModelInstalled(modelName) {
|
|
27
28
|
this.validateModelName(modelName);
|
|
28
|
-
|
|
29
|
+
const modelPath = path.join(this.modelsDir, modelName);
|
|
30
|
+
try {
|
|
31
|
+
const stat = fs.statSync(modelPath);
|
|
32
|
+
return stat.isFile() && stat.size > 0;
|
|
33
|
+
}
|
|
34
|
+
catch {
|
|
35
|
+
return false;
|
|
36
|
+
}
|
|
29
37
|
}
|
|
30
38
|
getModelPath(modelName) {
|
|
31
39
|
this.validateModelName(modelName);
|
|
32
40
|
return path.join(this.modelsDir, modelName);
|
|
33
41
|
}
|
|
34
|
-
async downloadModel(modelName) {
|
|
42
|
+
async downloadModel(modelName, signal) {
|
|
35
43
|
this.validateModelName(modelName);
|
|
36
|
-
if (
|
|
37
|
-
|
|
44
|
+
if (signal?.aborted) {
|
|
45
|
+
throw this.getAbortError(signal);
|
|
46
|
+
}
|
|
47
|
+
let inFlight = this.inFlightDownloads.get(modelName);
|
|
48
|
+
if (!inFlight) {
|
|
49
|
+
const controller = new AbortController();
|
|
50
|
+
const promise = this.executeDownload(modelName, controller.signal).finally(() => {
|
|
51
|
+
this.inFlightDownloads.delete(modelName);
|
|
52
|
+
});
|
|
53
|
+
promise.catch(() => { });
|
|
54
|
+
inFlight = { promise, controller, activeCallers: 0 };
|
|
55
|
+
this.inFlightDownloads.set(modelName, inFlight);
|
|
38
56
|
}
|
|
57
|
+
inFlight.activeCallers += 1;
|
|
58
|
+
const currentInFlight = inFlight;
|
|
59
|
+
if (!signal) {
|
|
60
|
+
return currentInFlight.promise;
|
|
61
|
+
}
|
|
62
|
+
return new Promise((resolve, reject) => {
|
|
63
|
+
let settled = false;
|
|
64
|
+
const onAbort = () => {
|
|
65
|
+
if (settled)
|
|
66
|
+
return;
|
|
67
|
+
const abortError = this.getAbortError(signal);
|
|
68
|
+
currentInFlight.activeCallers -= 1;
|
|
69
|
+
if (currentInFlight.activeCallers <= 0) {
|
|
70
|
+
currentInFlight.controller.abort(abortError);
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
settled = true;
|
|
74
|
+
reject(abortError);
|
|
75
|
+
}
|
|
76
|
+
};
|
|
77
|
+
signal.addEventListener('abort', onAbort, { once: true });
|
|
78
|
+
currentInFlight.promise.then(() => {
|
|
79
|
+
if (settled)
|
|
80
|
+
return;
|
|
81
|
+
settled = true;
|
|
82
|
+
signal.removeEventListener('abort', onAbort);
|
|
83
|
+
resolve();
|
|
84
|
+
}, (err) => {
|
|
85
|
+
if (settled)
|
|
86
|
+
return;
|
|
87
|
+
settled = true;
|
|
88
|
+
signal.removeEventListener('abort', onAbort);
|
|
89
|
+
reject(err);
|
|
90
|
+
});
|
|
91
|
+
});
|
|
92
|
+
}
|
|
93
|
+
getAbortError(signal) {
|
|
94
|
+
return signal?.reason instanceof Error
|
|
95
|
+
? signal.reason
|
|
96
|
+
: new DOMException('The operation was aborted.', 'AbortError');
|
|
97
|
+
}
|
|
98
|
+
async executeDownload(modelName, signal) {
|
|
99
|
+
signal?.throwIfAborted();
|
|
100
|
+
await fs.promises.mkdir(this.modelsDir, { recursive: true });
|
|
39
101
|
const destination = path.join(this.modelsDir, modelName);
|
|
102
|
+
const tempDestination = `${destination}.${Math.random().toString(36).slice(2)}.downloading`;
|
|
40
103
|
const url = `https://huggingface.co/ggerganov/whisper.cpp/resolve/main/${modelName}`;
|
|
41
104
|
debugLogger.debug(`[WhisperModelManager] Downloading ${modelName} from ${url}`);
|
|
42
|
-
const response = await fetch(url);
|
|
105
|
+
const response = await fetch(url, signal ? { signal } : undefined);
|
|
43
106
|
if (!response.ok) {
|
|
44
107
|
throw new Error(`Failed to download model: ${response.statusText}`);
|
|
45
108
|
}
|
|
@@ -49,14 +112,106 @@ export class WhisperModelManager extends EventEmitter {
|
|
|
49
112
|
if (!reader) {
|
|
50
113
|
throw new Error('Response body is not readable');
|
|
51
114
|
}
|
|
52
|
-
|
|
115
|
+
try {
|
|
116
|
+
const files = await fs.promises.readdir(this.modelsDir);
|
|
117
|
+
for (const file of files) {
|
|
118
|
+
if ((file === modelName + '.downloading' ||
|
|
119
|
+
file.startsWith(modelName + '.')) &&
|
|
120
|
+
file.endsWith('.downloading')) {
|
|
121
|
+
await fs.promises
|
|
122
|
+
.unlink(path.join(this.modelsDir, file))
|
|
123
|
+
.catch(() => { });
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
catch {
|
|
128
|
+
// Ignore directory read errors
|
|
129
|
+
}
|
|
130
|
+
const writer = fs.createWriteStream(tempDestination);
|
|
131
|
+
let streamError = null;
|
|
132
|
+
const closePromise = new Promise((resolve, reject) => {
|
|
133
|
+
writer.once('close', () => {
|
|
134
|
+
if (streamError) {
|
|
135
|
+
reject(streamError);
|
|
136
|
+
}
|
|
137
|
+
else {
|
|
138
|
+
resolve();
|
|
139
|
+
}
|
|
140
|
+
});
|
|
141
|
+
writer.once('error', (err) => {
|
|
142
|
+
streamError = err;
|
|
143
|
+
void reader.cancel?.().catch(() => { });
|
|
144
|
+
});
|
|
145
|
+
});
|
|
146
|
+
closePromise.catch(() => { });
|
|
147
|
+
const onAbort = () => {
|
|
148
|
+
const abortError = signal?.reason instanceof Error
|
|
149
|
+
? signal.reason
|
|
150
|
+
: new DOMException('The operation was aborted.', 'AbortError');
|
|
151
|
+
streamError = abortError;
|
|
152
|
+
void reader.cancel?.(abortError).catch(() => { });
|
|
153
|
+
writer.destroy(abortError);
|
|
154
|
+
};
|
|
155
|
+
signal?.addEventListener('abort', onAbort, { once: true });
|
|
156
|
+
if (signal?.aborted) {
|
|
157
|
+
onAbort();
|
|
158
|
+
}
|
|
53
159
|
try {
|
|
54
160
|
while (true) {
|
|
161
|
+
signal?.throwIfAborted();
|
|
55
162
|
const { done, value } = await reader.read();
|
|
163
|
+
if (streamError) {
|
|
164
|
+
throw streamError;
|
|
165
|
+
}
|
|
166
|
+
signal?.throwIfAborted();
|
|
56
167
|
if (done)
|
|
57
168
|
break;
|
|
58
169
|
transferred += value.length;
|
|
59
|
-
writer.write(value);
|
|
170
|
+
const writeOk = writer.write(value);
|
|
171
|
+
if (streamError) {
|
|
172
|
+
throw streamError;
|
|
173
|
+
}
|
|
174
|
+
if (!writeOk) {
|
|
175
|
+
if (writer.destroyed || !writer.writable) {
|
|
176
|
+
throw streamError ?? new Error('Stream is not writable');
|
|
177
|
+
}
|
|
178
|
+
await new Promise((resolve, reject) => {
|
|
179
|
+
if (streamError) {
|
|
180
|
+
reject(streamError);
|
|
181
|
+
return;
|
|
182
|
+
}
|
|
183
|
+
if (signal?.aborted) {
|
|
184
|
+
reject(streamError ?? this.getAbortError(signal));
|
|
185
|
+
return;
|
|
186
|
+
}
|
|
187
|
+
const onDrain = () => {
|
|
188
|
+
cleanup();
|
|
189
|
+
resolve();
|
|
190
|
+
};
|
|
191
|
+
const onError = (err) => {
|
|
192
|
+
cleanup();
|
|
193
|
+
reject(err);
|
|
194
|
+
};
|
|
195
|
+
const onClose = () => {
|
|
196
|
+
cleanup();
|
|
197
|
+
reject(new Error('Stream closed before drain'));
|
|
198
|
+
};
|
|
199
|
+
const onSignalAbort = () => {
|
|
200
|
+
cleanup();
|
|
201
|
+
reject(streamError ?? this.getAbortError(signal));
|
|
202
|
+
};
|
|
203
|
+
const cleanup = () => {
|
|
204
|
+
writer.off('drain', onDrain);
|
|
205
|
+
writer.off('error', onError);
|
|
206
|
+
writer.off('close', onClose);
|
|
207
|
+
signal?.removeEventListener('abort', onSignalAbort);
|
|
208
|
+
};
|
|
209
|
+
writer.once('drain', onDrain);
|
|
210
|
+
writer.once('error', onError);
|
|
211
|
+
writer.once('close', onClose);
|
|
212
|
+
signal?.addEventListener('abort', onSignalAbort, { once: true });
|
|
213
|
+
});
|
|
214
|
+
}
|
|
60
215
|
const percentage = total > 0 ? transferred / total : 0;
|
|
61
216
|
this.emit('progress', {
|
|
62
217
|
modelName,
|
|
@@ -65,9 +220,21 @@ export class WhisperModelManager extends EventEmitter {
|
|
|
65
220
|
percentage,
|
|
66
221
|
});
|
|
67
222
|
}
|
|
223
|
+
writer.end();
|
|
224
|
+
await closePromise;
|
|
225
|
+
if (transferred === 0 || (total > 0 && transferred !== total)) {
|
|
226
|
+
throw new Error(`Incomplete download for ${modelName}: expected ${total} bytes, received ${transferred} bytes`);
|
|
227
|
+
}
|
|
228
|
+
await fs.promises.rename(tempDestination, destination);
|
|
229
|
+
}
|
|
230
|
+
catch (error) {
|
|
231
|
+
writer.destroy(error instanceof Error ? error : undefined);
|
|
232
|
+
await closePromise.catch(() => { });
|
|
233
|
+
await fs.promises.unlink(tempDestination).catch(() => { });
|
|
234
|
+
throw error;
|
|
68
235
|
}
|
|
69
236
|
finally {
|
|
70
|
-
|
|
237
|
+
signal?.removeEventListener('abort', onAbort);
|
|
71
238
|
}
|
|
72
239
|
}
|
|
73
240
|
validateModelName(modelName) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whisperModelManager.js","sourceRoot":"","sources":["../../../src/voice/whisperModelManager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAatD,MAAM,cAAc,GAAG;IACrB,kBAAkB;IAClB,kBAAkB;IAClB,8BAA8B;IAC9B,8BAA8B;CAC/B,CAAC;
|
|
1
|
+
{"version":3,"file":"whisperModelManager.js","sourceRoot":"","sources":["../../../src/voice/whisperModelManager.ts"],"names":[],"mappings":"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"}
|