@machina.ai/cell-cli 1.64.0-rc2 → 1.66.0-rc1
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/index.js +14 -9
- package/dist/index.js.map +1 -1
- package/dist/package.json +4 -4
- package/dist/src/acp/acpSession.js +9 -13
- package/dist/src/acp/acpSession.js.map +1 -1
- package/dist/src/acp/acpSession.test.js +88 -0
- package/dist/src/acp/acpSession.test.js.map +1 -1
- package/dist/src/commands/mcp/add.js +14 -6
- package/dist/src/commands/mcp/add.js.map +1 -1
- package/dist/src/commands/mcp/add.test.js +61 -0
- package/dist/src/commands/mcp/add.test.js.map +1 -1
- package/dist/src/commands/mcp/remove.js +14 -1
- package/dist/src/commands/mcp/remove.js.map +1 -1
- package/dist/src/commands/mcp/remove.test.js +63 -0
- package/dist/src/commands/mcp/remove.test.js.map +1 -1
- package/dist/src/config/config.js +12 -0
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +17 -0
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/envDefaults.d.ts +20 -0
- package/dist/src/config/envDefaults.js +29 -0
- package/dist/src/config/envDefaults.js.map +1 -0
- package/dist/src/config/envDefaults.test.d.ts +6 -0
- package/dist/src/config/envDefaults.test.js +23 -0
- package/dist/src/config/envDefaults.test.js.map +1 -0
- package/dist/src/config/extension-manager.js +13 -4
- package/dist/src/config/extension-manager.js.map +1 -1
- package/dist/src/config/extension.test.js +117 -0
- package/dist/src/config/extension.test.js.map +1 -1
- package/dist/src/config/extensions/github.test.js +34 -0
- package/dist/src/config/extensions/github.test.js.map +1 -1
- package/dist/src/config/extensions/github_fetch.js +110 -18
- package/dist/src/config/extensions/github_fetch.js.map +1 -1
- package/dist/src/config/extensions/github_fetch.test.js +251 -36
- package/dist/src/config/extensions/github_fetch.test.js.map +1 -1
- package/dist/src/config/settings.d.ts +1 -0
- package/dist/src/config/settings.js +148 -58
- package/dist/src/config/settings.js.map +1 -1
- package/dist/src/config/settings.test.js +300 -0
- package/dist/src/config/settings.test.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +1 -1
- package/dist/src/config/settingsSchema.js +6 -1
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/gemini.test.js +69 -0
- package/dist/src/gemini.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/interactiveCli.js +8 -3
- package/dist/src/interactiveCli.js.map +1 -1
- package/dist/src/services/CommandService.js +1 -1
- package/dist/src/services/CommandService.js.map +1 -1
- package/dist/src/services/CommandService.test.js +18 -1
- package/dist/src/services/CommandService.test.js.map +1 -1
- package/dist/src/services/SlashCommandConflictHandler.d.ts +1 -0
- package/dist/src/services/SlashCommandConflictHandler.js +18 -2
- package/dist/src/services/SlashCommandConflictHandler.js.map +1 -1
- package/dist/src/services/SlashCommandConflictHandler.test.js +85 -8
- package/dist/src/services/SlashCommandConflictHandler.test.js.map +1 -1
- package/dist/src/ui/AppContainer.js +254 -12
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/AppContainer.test.js +362 -6
- package/dist/src/ui/AppContainer.test.js.map +1 -1
- package/dist/src/ui/auth/AuthDialog.js +21 -5
- package/dist/src/ui/auth/AuthDialog.js.map +1 -1
- package/dist/src/ui/auth/AuthDialog.test.js +83 -0
- package/dist/src/ui/auth/AuthDialog.test.js.map +1 -1
- package/dist/src/ui/auth/useAuth.js +7 -1
- package/dist/src/ui/auth/useAuth.js.map +1 -1
- package/dist/src/ui/auth/useAuth.test.js +9 -0
- package/dist/src/ui/auth/useAuth.test.js.map +1 -1
- package/dist/src/ui/commands/marketplaceCommand.js +92 -4
- package/dist/src/ui/commands/marketplaceCommand.js.map +1 -1
- package/dist/src/ui/commands/marketplaceCommand.test.js +98 -1
- package/dist/src/ui/commands/marketplaceCommand.test.js.map +1 -1
- package/dist/src/ui/components/AsciiArt.d.ts +6 -6
- package/dist/src/ui/components/AsciiArt.js +6 -6
- package/dist/src/ui/components/CliSpinner.d.ts +3 -2
- package/dist/src/ui/components/CliSpinner.js +27 -3
- package/dist/src/ui/components/CliSpinner.js.map +1 -1
- package/dist/src/ui/components/CliSpinner.test.js +42 -3
- package/dist/src/ui/components/CliSpinner.test.js.map +1 -1
- package/dist/src/ui/components/Composer.js +3 -3
- package/dist/src/ui/components/Composer.js.map +1 -1
- package/dist/src/ui/components/Composer.test.js +39 -1
- package/dist/src/ui/components/Composer.test.js.map +1 -1
- package/dist/src/ui/components/DetailedMessagesDisplay.js +5 -1
- package/dist/src/ui/components/DetailedMessagesDisplay.js.map +1 -1
- package/dist/src/ui/components/DetailedMessagesDisplay.test.js +19 -1
- package/dist/src/ui/components/DetailedMessagesDisplay.test.js.map +1 -1
- package/dist/src/ui/components/Footer.js +1 -1
- package/dist/src/ui/components/Footer.js.map +1 -1
- package/dist/src/ui/components/GeminiRespondingSpinner.d.ts +1 -1
- package/dist/src/ui/components/GeminiRespondingSpinner.js +9 -2
- package/dist/src/ui/components/GeminiRespondingSpinner.js.map +1 -1
- package/dist/src/ui/components/GeminiSpinner.d.ts +1 -1
- package/dist/src/ui/components/GeminiSpinner.js +18 -7
- package/dist/src/ui/components/GeminiSpinner.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.js +5 -2
- package/dist/src/ui/components/HistoryItemDisplay.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.test.js +21 -0
- package/dist/src/ui/components/HistoryItemDisplay.test.js.map +1 -1
- package/dist/src/ui/components/LoadingIndicator.d.ts +1 -1
- package/dist/src/ui/components/LoadingIndicator.js +4 -2
- package/dist/src/ui/components/LoadingIndicator.js.map +1 -1
- package/dist/src/ui/components/MainContent.js +47 -9
- package/dist/src/ui/components/MainContent.js.map +1 -1
- package/dist/src/ui/components/MainContent.test.js +87 -1
- package/dist/src/ui/components/MainContent.test.js.map +1 -1
- package/dist/src/ui/components/MemoryUsageDisplay.js +8 -4
- package/dist/src/ui/components/MemoryUsageDisplay.js.map +1 -1
- package/dist/src/ui/components/ModelDialog.js +30 -16
- package/dist/src/ui/components/ModelDialog.js.map +1 -1
- package/dist/src/ui/components/ModelDialog.test.js +32 -24
- package/dist/src/ui/components/ModelDialog.test.js.map +1 -1
- package/dist/src/ui/components/StatusRow.d.ts +7 -6
- package/dist/src/ui/components/StatusRow.js +24 -10
- package/dist/src/ui/components/StatusRow.js.map +1 -1
- package/dist/src/ui/components/ValidationDialog.js +13 -6
- package/dist/src/ui/components/ValidationDialog.js.map +1 -1
- package/dist/src/ui/components/ValidationDialog.test.js +40 -0
- package/dist/src/ui/components/ValidationDialog.test.js.map +1 -1
- package/dist/src/ui/components/messages/DenseToolMessage.js +17 -12
- package/dist/src/ui/components/messages/DenseToolMessage.js.map +1 -1
- package/dist/src/ui/components/messages/DenseToolMessage.test.js +71 -0
- package/dist/src/ui/components/messages/DenseToolMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolResultDisplay.js +14 -11
- package/dist/src/ui/components/messages/ToolResultDisplay.js.map +1 -1
- package/dist/src/ui/components/messages/ToolResultDisplay.test.js +32 -0
- package/dist/src/ui/components/messages/ToolResultDisplay.test.js.map +1 -1
- package/dist/src/ui/components/shared/MaxSizedBox.js +8 -2
- package/dist/src/ui/components/shared/MaxSizedBox.js.map +1 -1
- package/dist/src/ui/components/shared/MaxSizedBox.test.js +23 -1
- package/dist/src/ui/components/shared/MaxSizedBox.test.js.map +1 -1
- package/dist/src/ui/contexts/ToolActionsContext.js +7 -1
- package/dist/src/ui/contexts/ToolActionsContext.js.map +1 -1
- package/dist/src/ui/contexts/ToolActionsContext.test.js +54 -1
- package/dist/src/ui/contexts/ToolActionsContext.test.js.map +1 -1
- package/dist/src/ui/hooks/atCommandProcessor.d.ts +2 -1
- package/dist/src/ui/hooks/atCommandProcessor.js +15 -15
- package/dist/src/ui/hooks/atCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/useAgentStream.d.ts +9 -2
- package/dist/src/ui/hooks/useAgentStream.js +173 -8
- package/dist/src/ui/hooks/useAgentStream.js.map +1 -1
- package/dist/src/ui/hooks/useAgentStream.test.js +104 -1
- package/dist/src/ui/hooks/useAgentStream.test.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.d.ts +1 -1
- package/dist/src/ui/hooks/useGeminiStream.js +174 -59
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.test.js +230 -3
- package/dist/src/ui/hooks/useGeminiStream.test.js.map +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.d.ts +2 -1
- package/dist/src/ui/hooks/useLoadingIndicator.js +3 -3
- package/dist/src/ui/hooks/useLoadingIndicator.js.map +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.test.js +23 -4
- package/dist/src/ui/hooks/useLoadingIndicator.test.js.map +1 -1
- package/dist/src/ui/hooks/useReverseSearchCompletion.js +10 -6
- package/dist/src/ui/hooks/useReverseSearchCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useReverseSearchCompletion.test.js +49 -0
- package/dist/src/ui/hooks/useReverseSearchCompletion.test.js.map +1 -1
- package/dist/src/ui/key/keyBindings.js +19 -6
- package/dist/src/ui/key/keyBindings.js.map +1 -1
- package/dist/src/ui/key/keyBindings.test.js +106 -0
- package/dist/src/ui/key/keyBindings.test.js.map +1 -1
- package/dist/src/ui/utils/formatters.d.ts +2 -0
- package/dist/src/ui/utils/formatters.js +13 -5
- package/dist/src/ui/utils/formatters.js.map +1 -1
- package/dist/src/ui/utils/formatters.test.js +18 -0
- package/dist/src/ui/utils/formatters.test.js.map +1 -1
- package/dist/src/utils/activityLogger.js +109 -33
- package/dist/src/utils/activityLogger.js.map +1 -1
- package/dist/src/utils/activityLogger.test.js +441 -0
- package/dist/src/utils/activityLogger.test.js.map +1 -1
- package/dist/src/utils/handleAutoUpdate.d.ts +4 -1
- package/dist/src/utils/handleAutoUpdate.js +45 -3
- package/dist/src/utils/handleAutoUpdate.js.map +1 -1
- package/dist/src/utils/handleAutoUpdate.test.js +280 -2
- package/dist/src/utils/handleAutoUpdate.test.js.map +1 -1
- package/dist/src/utils/nodeVersion.d.ts +11 -0
- package/dist/src/utils/nodeVersion.js +42 -0
- package/dist/src/utils/nodeVersion.js.map +1 -0
- package/dist/src/utils/nodeVersion.test.d.ts +6 -0
- package/dist/src/utils/nodeVersion.test.js +35 -0
- package/dist/src/utils/nodeVersion.test.js.map +1 -0
- package/dist/src/utils/processUtils.d.ts +23 -0
- package/dist/src/utils/processUtils.js +72 -0
- package/dist/src/utils/processUtils.js.map +1 -1
- package/dist/src/utils/processUtils.test.js +95 -1
- package/dist/src/utils/processUtils.test.js.map +1 -1
- package/dist/src/utils/relaunch.js +8 -6
- package/dist/src/utils/relaunch.js.map +1 -1
- package/dist/src/utils/relaunch.test.js +107 -1
- package/dist/src/utils/relaunch.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -4
|
@@ -3,6 +3,10 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
+
import http from 'node:http';
|
|
7
|
+
import https from 'node:https';
|
|
8
|
+
import zlib from 'node:zlib';
|
|
9
|
+
import { EventEmitter } from 'node:events';
|
|
6
10
|
import { describe, it, expect, beforeEach, vi } from 'vitest';
|
|
7
11
|
import { ActivityLogger } from './activityLogger.js';
|
|
8
12
|
describe('ActivityLogger', () => {
|
|
@@ -192,5 +196,442 @@ describe('ActivityLogger', () => {
|
|
|
192
196
|
logger.isInterceptionEnabled = false;
|
|
193
197
|
}
|
|
194
198
|
});
|
|
199
|
+
it('preserves multibyte UTF-8 characters split across Node HTTP data chunks', () => {
|
|
200
|
+
const originalHttpRequest = http.request;
|
|
201
|
+
const originalHttpsRequest = https.request;
|
|
202
|
+
const fakeReq = Object.assign(new EventEmitter(), {
|
|
203
|
+
method: 'GET',
|
|
204
|
+
getHeaders: () => ({}),
|
|
205
|
+
write: vi.fn(),
|
|
206
|
+
end: vi.fn(),
|
|
207
|
+
});
|
|
208
|
+
const mockHttpRequest = vi.fn(() => fakeReq);
|
|
209
|
+
Object.defineProperty(http, 'request', {
|
|
210
|
+
value: mockHttpRequest,
|
|
211
|
+
writable: true,
|
|
212
|
+
configurable: true,
|
|
213
|
+
});
|
|
214
|
+
try {
|
|
215
|
+
// @ts-expect-error - accessing private property for testing
|
|
216
|
+
logger.isInterceptionEnabled = false;
|
|
217
|
+
logger.enable();
|
|
218
|
+
const req = http.request('http://api.example.com/stream');
|
|
219
|
+
req.end();
|
|
220
|
+
const response = Object.assign(new EventEmitter(), {
|
|
221
|
+
statusCode: 200,
|
|
222
|
+
headers: {},
|
|
223
|
+
});
|
|
224
|
+
req.emit('response', response);
|
|
225
|
+
const euro = Buffer.from('€');
|
|
226
|
+
response.emit('data', euro.subarray(0, 1));
|
|
227
|
+
response.emit('data', euro.subarray(1));
|
|
228
|
+
response.emit('end');
|
|
229
|
+
const events = logger.getBufferedLogs().network;
|
|
230
|
+
const chunkEvents = events.flatMap((event) => event.chunk ? [event.chunk] : []);
|
|
231
|
+
const streamed = chunkEvents.map((chunk) => chunk.data).join('');
|
|
232
|
+
const completed = events.find((event) => event.response)?.response?.body;
|
|
233
|
+
expect(streamed).toBe('€');
|
|
234
|
+
expect(completed).toBe('€');
|
|
235
|
+
expect(chunkEvents).toEqual([
|
|
236
|
+
expect.objectContaining({ index: 0, data: '€' }),
|
|
237
|
+
]);
|
|
238
|
+
}
|
|
239
|
+
finally {
|
|
240
|
+
Object.defineProperty(http, 'request', {
|
|
241
|
+
value: originalHttpRequest,
|
|
242
|
+
writable: true,
|
|
243
|
+
configurable: true,
|
|
244
|
+
});
|
|
245
|
+
Object.defineProperty(https, 'request', {
|
|
246
|
+
value: originalHttpsRequest,
|
|
247
|
+
writable: true,
|
|
248
|
+
configurable: true,
|
|
249
|
+
});
|
|
250
|
+
// @ts-expect-error - reset private property
|
|
251
|
+
logger.isInterceptionEnabled = false;
|
|
252
|
+
}
|
|
253
|
+
});
|
|
254
|
+
it('preserves 4-byte UTF-8 characters split across multiple Node HTTPS data chunks', () => {
|
|
255
|
+
const originalHttpRequest = http.request;
|
|
256
|
+
const originalHttpsRequest = https.request;
|
|
257
|
+
const fakeReq = Object.assign(new EventEmitter(), {
|
|
258
|
+
method: 'POST',
|
|
259
|
+
getHeaders: () => ({}),
|
|
260
|
+
write: vi.fn(),
|
|
261
|
+
end: vi.fn(),
|
|
262
|
+
});
|
|
263
|
+
const mockHttpsRequest = vi.fn(() => fakeReq);
|
|
264
|
+
Object.defineProperty(https, 'request', {
|
|
265
|
+
value: mockHttpsRequest,
|
|
266
|
+
writable: true,
|
|
267
|
+
configurable: true,
|
|
268
|
+
});
|
|
269
|
+
try {
|
|
270
|
+
// @ts-expect-error - accessing private property for testing
|
|
271
|
+
logger.isInterceptionEnabled = false;
|
|
272
|
+
logger.enable();
|
|
273
|
+
const req = https.request('https://api.example.com/stream');
|
|
274
|
+
req.end();
|
|
275
|
+
const response = Object.assign(new EventEmitter(), {
|
|
276
|
+
statusCode: 200,
|
|
277
|
+
headers: {},
|
|
278
|
+
});
|
|
279
|
+
req.emit('response', response);
|
|
280
|
+
const rocket = Buffer.from('🚀');
|
|
281
|
+
response.emit('data', Buffer.concat([Buffer.from('Hi '), rocket.subarray(0, 1)]));
|
|
282
|
+
response.emit('data', rocket.subarray(1, 3));
|
|
283
|
+
response.emit('data', Buffer.concat([rocket.subarray(3), Buffer.from('!')]));
|
|
284
|
+
response.emit('end');
|
|
285
|
+
const events = logger.getBufferedLogs().network;
|
|
286
|
+
const chunkEvents = events.flatMap((event) => event.chunk ? [event.chunk] : []);
|
|
287
|
+
const streamed = chunkEvents.map((chunk) => chunk.data).join('');
|
|
288
|
+
const completed = events.find((event) => event.response)?.response?.body;
|
|
289
|
+
expect(streamed).toBe('Hi 🚀!');
|
|
290
|
+
expect(completed).toBe('Hi 🚀!');
|
|
291
|
+
expect(chunkEvents).toEqual([
|
|
292
|
+
expect.objectContaining({ index: 0, data: 'Hi ' }),
|
|
293
|
+
expect.objectContaining({ index: 1, data: '🚀!' }),
|
|
294
|
+
]);
|
|
295
|
+
}
|
|
296
|
+
finally {
|
|
297
|
+
Object.defineProperty(http, 'request', {
|
|
298
|
+
value: originalHttpRequest,
|
|
299
|
+
writable: true,
|
|
300
|
+
configurable: true,
|
|
301
|
+
});
|
|
302
|
+
Object.defineProperty(https, 'request', {
|
|
303
|
+
value: originalHttpsRequest,
|
|
304
|
+
writable: true,
|
|
305
|
+
configurable: true,
|
|
306
|
+
});
|
|
307
|
+
// @ts-expect-error - reset private property
|
|
308
|
+
logger.isInterceptionEnabled = false;
|
|
309
|
+
}
|
|
310
|
+
});
|
|
311
|
+
it('flushes trailing incomplete UTF-8 bytes at the end of a Node HTTP response', () => {
|
|
312
|
+
const originalHttpRequest = http.request;
|
|
313
|
+
const originalHttpsRequest = https.request;
|
|
314
|
+
const fakeReq = Object.assign(new EventEmitter(), {
|
|
315
|
+
method: 'GET',
|
|
316
|
+
getHeaders: () => ({}),
|
|
317
|
+
write: vi.fn(),
|
|
318
|
+
end: vi.fn(),
|
|
319
|
+
});
|
|
320
|
+
const mockHttpRequest = vi.fn(() => fakeReq);
|
|
321
|
+
Object.defineProperty(http, 'request', {
|
|
322
|
+
value: mockHttpRequest,
|
|
323
|
+
writable: true,
|
|
324
|
+
configurable: true,
|
|
325
|
+
});
|
|
326
|
+
try {
|
|
327
|
+
// @ts-expect-error - accessing private property for testing
|
|
328
|
+
logger.isInterceptionEnabled = false;
|
|
329
|
+
logger.enable();
|
|
330
|
+
const req = http.request('http://api.example.com/truncated');
|
|
331
|
+
req.end();
|
|
332
|
+
const response = Object.assign(new EventEmitter(), {
|
|
333
|
+
statusCode: 200,
|
|
334
|
+
headers: {},
|
|
335
|
+
});
|
|
336
|
+
req.emit('response', response);
|
|
337
|
+
const euro = Buffer.from('€');
|
|
338
|
+
response.emit('data', Buffer.concat([Buffer.from('abc'), euro.subarray(0, 1)]));
|
|
339
|
+
response.emit('data', euro.subarray(1, 2));
|
|
340
|
+
response.emit('end');
|
|
341
|
+
const events = logger.getBufferedLogs().network;
|
|
342
|
+
const chunkEvents = events.flatMap((event) => event.chunk ? [event.chunk] : []);
|
|
343
|
+
const streamed = chunkEvents.map((chunk) => chunk.data).join('');
|
|
344
|
+
const completed = events.find((event) => event.response)?.response?.body;
|
|
345
|
+
expect(streamed).toBe('abc\uFFFD');
|
|
346
|
+
expect(completed).toBe('abc\uFFFD');
|
|
347
|
+
expect(chunkEvents).toEqual([
|
|
348
|
+
expect.objectContaining({ index: 0, data: 'abc' }),
|
|
349
|
+
expect.objectContaining({ index: 1, data: '\uFFFD' }),
|
|
350
|
+
]);
|
|
351
|
+
}
|
|
352
|
+
finally {
|
|
353
|
+
Object.defineProperty(http, 'request', {
|
|
354
|
+
value: originalHttpRequest,
|
|
355
|
+
writable: true,
|
|
356
|
+
configurable: true,
|
|
357
|
+
});
|
|
358
|
+
Object.defineProperty(https, 'request', {
|
|
359
|
+
value: originalHttpsRequest,
|
|
360
|
+
writable: true,
|
|
361
|
+
configurable: true,
|
|
362
|
+
});
|
|
363
|
+
// @ts-expect-error - reset private property
|
|
364
|
+
logger.isInterceptionEnabled = false;
|
|
365
|
+
}
|
|
366
|
+
});
|
|
367
|
+
it('decompresses gzip-encoded Node HTTP response chunks before decoding UTF-8', async () => {
|
|
368
|
+
const originalHttpRequest = http.request;
|
|
369
|
+
const originalHttpsRequest = https.request;
|
|
370
|
+
const fakeReq = Object.assign(new EventEmitter(), {
|
|
371
|
+
method: 'GET',
|
|
372
|
+
getHeaders: () => ({}),
|
|
373
|
+
write: vi.fn(),
|
|
374
|
+
end: vi.fn(),
|
|
375
|
+
});
|
|
376
|
+
const mockHttpRequest = vi.fn(() => fakeReq);
|
|
377
|
+
Object.defineProperty(http, 'request', {
|
|
378
|
+
value: mockHttpRequest,
|
|
379
|
+
writable: true,
|
|
380
|
+
configurable: true,
|
|
381
|
+
});
|
|
382
|
+
try {
|
|
383
|
+
// @ts-expect-error - accessing private property for testing
|
|
384
|
+
logger.isInterceptionEnabled = false;
|
|
385
|
+
logger.enable();
|
|
386
|
+
const req = http.request('http://api.example.com/gzip-stream');
|
|
387
|
+
req.end();
|
|
388
|
+
const response = Object.assign(new EventEmitter(), {
|
|
389
|
+
statusCode: 200,
|
|
390
|
+
headers: { 'content-encoding': 'gzip' },
|
|
391
|
+
});
|
|
392
|
+
req.emit('response', response);
|
|
393
|
+
const expectedText = 'Hello € world 🚀!';
|
|
394
|
+
const compressed = zlib.gzipSync(Buffer.from(expectedText, 'utf8'));
|
|
395
|
+
const completedPromise = new Promise((resolve) => {
|
|
396
|
+
const onNetwork = (log) => {
|
|
397
|
+
if (log.pending === false && log.response) {
|
|
398
|
+
logger.off('network', onNetwork);
|
|
399
|
+
resolve();
|
|
400
|
+
}
|
|
401
|
+
};
|
|
402
|
+
logger.on('network', onNetwork);
|
|
403
|
+
});
|
|
404
|
+
response.emit('data', compressed.subarray(0, 12));
|
|
405
|
+
response.emit('data', compressed.subarray(12, 22));
|
|
406
|
+
response.emit('data', compressed.subarray(22));
|
|
407
|
+
response.emit('end');
|
|
408
|
+
await completedPromise;
|
|
409
|
+
const events = logger.getBufferedLogs().network;
|
|
410
|
+
const chunkEvents = events.flatMap((event) => event.chunk ? [event.chunk] : []);
|
|
411
|
+
const streamed = chunkEvents.map((chunk) => chunk.data).join('');
|
|
412
|
+
const responseIndex = events.findIndex((event) => event.pending === false && event.response !== undefined);
|
|
413
|
+
const lastChunkEventIndex = events.reduce((lastIdx, event, idx) => (event.chunk ? idx : lastIdx), -1);
|
|
414
|
+
expect(streamed).toBe(expectedText);
|
|
415
|
+
expect(events[responseIndex]?.response?.body).toBe(expectedText);
|
|
416
|
+
expect(lastChunkEventIndex).toBeGreaterThan(0);
|
|
417
|
+
expect(lastChunkEventIndex).toBeLessThan(responseIndex);
|
|
418
|
+
}
|
|
419
|
+
finally {
|
|
420
|
+
Object.defineProperty(http, 'request', {
|
|
421
|
+
value: originalHttpRequest,
|
|
422
|
+
writable: true,
|
|
423
|
+
configurable: true,
|
|
424
|
+
});
|
|
425
|
+
Object.defineProperty(https, 'request', {
|
|
426
|
+
value: originalHttpsRequest,
|
|
427
|
+
writable: true,
|
|
428
|
+
configurable: true,
|
|
429
|
+
});
|
|
430
|
+
// @ts-expect-error - reset private property
|
|
431
|
+
logger.isInterceptionEnabled = false;
|
|
432
|
+
}
|
|
433
|
+
});
|
|
434
|
+
it('decompresses deflate-encoded Node HTTP response chunks before decoding UTF-8', async () => {
|
|
435
|
+
const originalHttpRequest = http.request;
|
|
436
|
+
const originalHttpsRequest = https.request;
|
|
437
|
+
const fakeReq = Object.assign(new EventEmitter(), {
|
|
438
|
+
method: 'GET',
|
|
439
|
+
getHeaders: () => ({}),
|
|
440
|
+
write: vi.fn(),
|
|
441
|
+
end: vi.fn(),
|
|
442
|
+
});
|
|
443
|
+
const mockHttpRequest = vi.fn(() => fakeReq);
|
|
444
|
+
Object.defineProperty(http, 'request', {
|
|
445
|
+
value: mockHttpRequest,
|
|
446
|
+
writable: true,
|
|
447
|
+
configurable: true,
|
|
448
|
+
});
|
|
449
|
+
try {
|
|
450
|
+
// @ts-expect-error - accessing private property for testing
|
|
451
|
+
logger.isInterceptionEnabled = false;
|
|
452
|
+
logger.enable();
|
|
453
|
+
const req = http.request('http://api.example.com/deflate-stream');
|
|
454
|
+
req.end();
|
|
455
|
+
const response = Object.assign(new EventEmitter(), {
|
|
456
|
+
statusCode: 200,
|
|
457
|
+
headers: { 'content-encoding': 'deflate' },
|
|
458
|
+
});
|
|
459
|
+
req.emit('response', response);
|
|
460
|
+
const expectedText = 'Deflate € payload 🚀';
|
|
461
|
+
const compressed = zlib.deflateSync(Buffer.from(expectedText, 'utf8'));
|
|
462
|
+
const completedPromise = new Promise((resolve) => {
|
|
463
|
+
const onNetwork = (log) => {
|
|
464
|
+
if (log.pending === false && log.response) {
|
|
465
|
+
logger.off('network', onNetwork);
|
|
466
|
+
resolve();
|
|
467
|
+
}
|
|
468
|
+
};
|
|
469
|
+
logger.on('network', onNetwork);
|
|
470
|
+
});
|
|
471
|
+
response.emit('data', compressed.subarray(0, 8));
|
|
472
|
+
response.emit('data', compressed.subarray(8));
|
|
473
|
+
response.emit('end');
|
|
474
|
+
await completedPromise;
|
|
475
|
+
const events = logger.getBufferedLogs().network;
|
|
476
|
+
const streamed = events
|
|
477
|
+
.flatMap((event) => (event.chunk ? [event.chunk.data] : []))
|
|
478
|
+
.join('');
|
|
479
|
+
const completed = events.find((event) => event.response)?.response?.body;
|
|
480
|
+
expect(streamed).toBe(expectedText);
|
|
481
|
+
expect(completed).toBe(expectedText);
|
|
482
|
+
}
|
|
483
|
+
finally {
|
|
484
|
+
Object.defineProperty(http, 'request', {
|
|
485
|
+
value: originalHttpRequest,
|
|
486
|
+
writable: true,
|
|
487
|
+
configurable: true,
|
|
488
|
+
});
|
|
489
|
+
Object.defineProperty(https, 'request', {
|
|
490
|
+
value: originalHttpsRequest,
|
|
491
|
+
writable: true,
|
|
492
|
+
configurable: true,
|
|
493
|
+
});
|
|
494
|
+
// @ts-expect-error - reset private property
|
|
495
|
+
logger.isInterceptionEnabled = false;
|
|
496
|
+
}
|
|
497
|
+
});
|
|
498
|
+
it('falls back to raw buffer when compressed Node HTTP response fails decompression', async () => {
|
|
499
|
+
const originalHttpRequest = http.request;
|
|
500
|
+
const originalHttpsRequest = https.request;
|
|
501
|
+
const fakeReq = Object.assign(new EventEmitter(), {
|
|
502
|
+
method: 'GET',
|
|
503
|
+
getHeaders: () => ({}),
|
|
504
|
+
write: vi.fn(),
|
|
505
|
+
end: vi.fn(),
|
|
506
|
+
});
|
|
507
|
+
const mockHttpRequest = vi.fn(() => fakeReq);
|
|
508
|
+
Object.defineProperty(http, 'request', {
|
|
509
|
+
value: mockHttpRequest,
|
|
510
|
+
writable: true,
|
|
511
|
+
configurable: true,
|
|
512
|
+
});
|
|
513
|
+
try {
|
|
514
|
+
// @ts-expect-error - accessing private property for testing
|
|
515
|
+
logger.isInterceptionEnabled = false;
|
|
516
|
+
logger.enable();
|
|
517
|
+
const req = http.request('http://api.example.com/corrupt-gzip');
|
|
518
|
+
req.end();
|
|
519
|
+
const response = Object.assign(new EventEmitter(), {
|
|
520
|
+
statusCode: 200,
|
|
521
|
+
headers: { 'content-encoding': 'gzip' },
|
|
522
|
+
});
|
|
523
|
+
req.emit('response', response);
|
|
524
|
+
const completedPromise = new Promise((resolve) => {
|
|
525
|
+
const onNetwork = (log) => {
|
|
526
|
+
if (log.pending === false && log.response) {
|
|
527
|
+
logger.off('network', onNetwork);
|
|
528
|
+
resolve();
|
|
529
|
+
}
|
|
530
|
+
};
|
|
531
|
+
logger.on('network', onNetwork);
|
|
532
|
+
});
|
|
533
|
+
response.emit('data', Buffer.from('not-valid-gzip-data'));
|
|
534
|
+
response.emit('end');
|
|
535
|
+
await completedPromise;
|
|
536
|
+
const events = logger.getBufferedLogs().network;
|
|
537
|
+
const completed = events.find((event) => event.response)?.response?.body;
|
|
538
|
+
expect(completed).toBe('not-valid-gzip-data');
|
|
539
|
+
}
|
|
540
|
+
finally {
|
|
541
|
+
Object.defineProperty(http, 'request', {
|
|
542
|
+
value: originalHttpRequest,
|
|
543
|
+
writable: true,
|
|
544
|
+
configurable: true,
|
|
545
|
+
});
|
|
546
|
+
Object.defineProperty(https, 'request', {
|
|
547
|
+
value: originalHttpsRequest,
|
|
548
|
+
writable: true,
|
|
549
|
+
configurable: true,
|
|
550
|
+
});
|
|
551
|
+
// @ts-expect-error - reset private property
|
|
552
|
+
logger.isInterceptionEnabled = false;
|
|
553
|
+
}
|
|
554
|
+
});
|
|
555
|
+
it('handles synchronous errors from decompressor.write and decompressor.end gracefully', async () => {
|
|
556
|
+
const originalHttpRequest = http.request;
|
|
557
|
+
const originalHttpsRequest = https.request;
|
|
558
|
+
const fakeReq = Object.assign(new EventEmitter(), {
|
|
559
|
+
method: 'GET',
|
|
560
|
+
getHeaders: () => ({}),
|
|
561
|
+
write: vi.fn(),
|
|
562
|
+
end: vi.fn(),
|
|
563
|
+
});
|
|
564
|
+
const mockHttpRequest = vi.fn(() => fakeReq);
|
|
565
|
+
Object.defineProperty(http, 'request', {
|
|
566
|
+
value: mockHttpRequest,
|
|
567
|
+
writable: true,
|
|
568
|
+
configurable: true,
|
|
569
|
+
});
|
|
570
|
+
const createGunzipSpy = vi.spyOn(zlib, 'createGunzip');
|
|
571
|
+
try {
|
|
572
|
+
// @ts-expect-error - accessing private property for testing
|
|
573
|
+
logger.isInterceptionEnabled = false;
|
|
574
|
+
logger.enable();
|
|
575
|
+
// Case 1: decompressor.write throws synchronously
|
|
576
|
+
const writeThrowingStream = Object.assign(new EventEmitter(), {
|
|
577
|
+
destroyed: false,
|
|
578
|
+
writableEnded: false,
|
|
579
|
+
write: vi.fn(() => {
|
|
580
|
+
throw new Error('write after end');
|
|
581
|
+
}),
|
|
582
|
+
end: vi.fn(),
|
|
583
|
+
});
|
|
584
|
+
createGunzipSpy.mockReturnValueOnce(writeThrowingStream);
|
|
585
|
+
const req1 = http.request('http://api.example.com/sync-write-throw');
|
|
586
|
+
req1.end();
|
|
587
|
+
const res1 = Object.assign(new EventEmitter(), {
|
|
588
|
+
statusCode: 200,
|
|
589
|
+
headers: { 'content-encoding': 'gzip' },
|
|
590
|
+
});
|
|
591
|
+
req1.emit('response', res1);
|
|
592
|
+
res1.emit('data', Buffer.from('raw-fallback-from-write'));
|
|
593
|
+
res1.emit('end');
|
|
594
|
+
// Case 2: decompressor.end throws synchronously
|
|
595
|
+
const endThrowingStream = Object.assign(new EventEmitter(), {
|
|
596
|
+
destroyed: false,
|
|
597
|
+
writableEnded: false,
|
|
598
|
+
write: vi.fn(() => true),
|
|
599
|
+
end: vi.fn(() => {
|
|
600
|
+
throw new Error('stream already closed');
|
|
601
|
+
}),
|
|
602
|
+
});
|
|
603
|
+
createGunzipSpy.mockReturnValueOnce(endThrowingStream);
|
|
604
|
+
const req2 = http.request('http://api.example.com/sync-end-throw');
|
|
605
|
+
req2.end();
|
|
606
|
+
const res2 = Object.assign(new EventEmitter(), {
|
|
607
|
+
statusCode: 200,
|
|
608
|
+
headers: { 'content-encoding': 'gzip' },
|
|
609
|
+
});
|
|
610
|
+
req2.emit('response', res2);
|
|
611
|
+
res2.emit('data', Buffer.from('raw-fallback-from-end'));
|
|
612
|
+
res2.emit('end');
|
|
613
|
+
const events = logger.getBufferedLogs().network;
|
|
614
|
+
const bodies = events
|
|
615
|
+
.filter((event) => event.pending === false && event.response)
|
|
616
|
+
.map((event) => event.response?.body);
|
|
617
|
+
expect(bodies).toContain('raw-fallback-from-write');
|
|
618
|
+
expect(bodies).toContain('raw-fallback-from-end');
|
|
619
|
+
}
|
|
620
|
+
finally {
|
|
621
|
+
createGunzipSpy.mockRestore();
|
|
622
|
+
Object.defineProperty(http, 'request', {
|
|
623
|
+
value: originalHttpRequest,
|
|
624
|
+
writable: true,
|
|
625
|
+
configurable: true,
|
|
626
|
+
});
|
|
627
|
+
Object.defineProperty(https, 'request', {
|
|
628
|
+
value: originalHttpsRequest,
|
|
629
|
+
writable: true,
|
|
630
|
+
configurable: true,
|
|
631
|
+
});
|
|
632
|
+
// @ts-expect-error - reset private property
|
|
633
|
+
logger.isInterceptionEnabled = false;
|
|
634
|
+
}
|
|
635
|
+
});
|
|
195
636
|
});
|
|
196
637
|
//# sourceMappingURL=activityLogger.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activityLogger.test.js","sourceRoot":"","sources":["../../../src/utils/activityLogger.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"activityLogger.test.js","sourceRoot":"","sources":["../../../src/utils/activityLogger.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,5 +14,8 @@ export declare function isUpdateInProgress(): boolean;
|
|
|
14
14
|
* Returns a promise that resolves when the update process completes or times out.
|
|
15
15
|
*/
|
|
16
16
|
export declare function waitForUpdateCompletion(timeoutMs?: number): Promise<void>;
|
|
17
|
-
export declare function handleAutoUpdate(info: UpdateObject | null, settings: LoadedSettings, projectRoot: string, isSandboxEnabled: boolean, spawnFn?: typeof spawn
|
|
17
|
+
export declare function handleAutoUpdate(info: UpdateObject | null, settings: LoadedSettings, projectRoot: string, isSandboxEnabled: boolean, spawnFn?: typeof spawn, getPackageJsonFn?: (cwd: string) => Promise<{
|
|
18
|
+
name?: string;
|
|
19
|
+
version?: string;
|
|
20
|
+
} | undefined>): import("child_process").ChildProcess | undefined;
|
|
18
21
|
export declare function setUpdateHandler(addItem: (item: Omit<HistoryItem, 'id'>, timestamp: number) => void, setUpdateInfo: (info: UpdateObject | null) => void): () => void;
|
|
@@ -7,7 +7,10 @@ import { getInstallationInfo, PackageManager } from './installationInfo.js';
|
|
|
7
7
|
import { updateEventEmitter } from './updateEventEmitter.js';
|
|
8
8
|
import { MessageType } from '../ui/types.js';
|
|
9
9
|
import { spawnWrapper } from './spawnWrapper.js';
|
|
10
|
-
import
|
|
10
|
+
import * as fs from 'node:fs';
|
|
11
|
+
import * as path from 'node:path';
|
|
12
|
+
import semver from 'semver';
|
|
13
|
+
import { debugLogger, getChannelFromVersion, getPackageJson, RELEASE_CHANNEL_STABILITY, } from '@google/gemini-cli-core';
|
|
11
14
|
let _updateInProgress = false;
|
|
12
15
|
/** @internal */
|
|
13
16
|
export function _setUpdateStateForTesting(value) {
|
|
@@ -42,10 +45,25 @@ export async function waitForUpdateCompletion(timeoutMs = 30000) {
|
|
|
42
45
|
updateEventEmitter.once('update-failed', cleanup);
|
|
43
46
|
});
|
|
44
47
|
}
|
|
45
|
-
export function handleAutoUpdate(info, settings, projectRoot, isSandboxEnabled, spawnFn = spawnWrapper) {
|
|
48
|
+
export function handleAutoUpdate(info, settings, projectRoot, isSandboxEnabled, spawnFn = spawnWrapper, getPackageJsonFn = getPackageJson) {
|
|
46
49
|
if (!info) {
|
|
47
50
|
return;
|
|
48
51
|
}
|
|
52
|
+
const rawCliPath = process.argv[1];
|
|
53
|
+
let resolvedCliPath;
|
|
54
|
+
if (rawCliPath) {
|
|
55
|
+
try {
|
|
56
|
+
resolvedCliPath = fs.realpathSync(rawCliPath);
|
|
57
|
+
}
|
|
58
|
+
catch {
|
|
59
|
+
resolvedCliPath = path.resolve(rawCliPath);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
const latestVersion = info.update?.latest ?? '';
|
|
63
|
+
if (!latestVersion || !semver.valid(latestVersion)) {
|
|
64
|
+
debugLogger.warn('Update check: latest version is missing or invalid. Skipping automatic update for safety.');
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
49
67
|
if (isSandboxEnabled) {
|
|
50
68
|
updateEventEmitter.emit('update-info', {
|
|
51
69
|
message: `${info.message}\nAutomatic update is not available in sandbox mode.`,
|
|
@@ -107,9 +125,33 @@ export function handleAutoUpdate(info, settings, projectRoot, isSandboxEnabled,
|
|
|
107
125
|
_updateInProgress = true;
|
|
108
126
|
// Un-reference the child process to allow the parent to exit independently.
|
|
109
127
|
updateProcess.unref();
|
|
110
|
-
updateProcess.on('close', (code) => {
|
|
128
|
+
updateProcess.on('close', async (code) => {
|
|
111
129
|
_updateInProgress = false;
|
|
112
130
|
if (code === 0) {
|
|
131
|
+
let isVerified = true;
|
|
132
|
+
try {
|
|
133
|
+
if (resolvedCliPath && info.update.latest) {
|
|
134
|
+
const checkDir = path.dirname(resolvedCliPath);
|
|
135
|
+
const updatedPkg = await getPackageJsonFn(checkDir);
|
|
136
|
+
if (updatedPkg?.version &&
|
|
137
|
+
info.update.name &&
|
|
138
|
+
updatedPkg.name === info.update.name &&
|
|
139
|
+
semver.valid(updatedPkg.version) &&
|
|
140
|
+
semver.valid(info.update.latest) &&
|
|
141
|
+
semver.lt(updatedPkg.version, info.update.latest)) {
|
|
142
|
+
isVerified = false;
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
catch (err) {
|
|
147
|
+
debugLogger.log('Failed to verify binary update version:', err);
|
|
148
|
+
}
|
|
149
|
+
if (!isVerified) {
|
|
150
|
+
updateEventEmitter.emit('update-failed', {
|
|
151
|
+
message: `Automatic update completed, but the active binary (${resolvedCliPath ?? process.argv[1] ?? 'unknown path'}) was not updated. It may be shadowed by another installation in your PATH. Please try updating manually:\n\n${updateCommand}`,
|
|
152
|
+
});
|
|
153
|
+
return;
|
|
154
|
+
}
|
|
113
155
|
updateEventEmitter.emit('update-success', {
|
|
114
156
|
message: 'Update successful! The new version will be used on your next run.',
|
|
115
157
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleAutoUpdate.js","sourceRoot":"","sources":["../../../src/utils/handleAutoUpdate.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAoB,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EACL,WAAW,EACX,qBAAqB,EACrB,yBAAyB,GAC1B,MAAM,yBAAyB,CAAC;AAEjC,IAAI,iBAAiB,GAAG,KAAK,CAAC;AAE9B,gBAAgB;AAChB,MAAM,UAAU,yBAAyB,CAAC,KAAc;IACtD,iBAAiB,GAAG,KAAK,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,kBAAkB;IAChC,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,SAAS,GAAG,KAAK;IAEjB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,OAAO;IACT,CAAC;IAED,WAAW,CAAC,GAAG,CACb,kFAAkF,CACnF,CAAC;IAEF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,gFAAgF;QAChF,iFAAiF;QACjF,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,OAAO,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QAED,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAE7C,SAAS,OAAO;YACd,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,kBAAkB,CAAC,GAAG,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;YAClD,kBAAkB,CAAC,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YACjD,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,kBAAkB,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;QACnD,kBAAkB,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,IAAyB,EACzB,QAAwB,EACxB,WAAmB,EACnB,gBAAyB,EACzB,UAAwB,YAAY;
|
|
1
|
+
{"version":3,"file":"handleAutoUpdate.js","sourceRoot":"","sources":["../../../src/utils/handleAutoUpdate.ts"],"names":[],"mappings":"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"}
|