@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
|
@@ -16,6 +16,14 @@ vi.mock('./installationInfo.js', async () => {
|
|
|
16
16
|
getInstallationInfo: vi.fn(),
|
|
17
17
|
};
|
|
18
18
|
});
|
|
19
|
+
const mockGetPackageJson = vi.hoisted(() => vi.fn());
|
|
20
|
+
vi.mock('@google/gemini-cli-core', async (importOriginal) => {
|
|
21
|
+
const actual = await importOriginal();
|
|
22
|
+
return {
|
|
23
|
+
...actual,
|
|
24
|
+
getPackageJson: mockGetPackageJson,
|
|
25
|
+
};
|
|
26
|
+
});
|
|
19
27
|
vi.mock('./updateEventEmitter.js', async (importOriginal) => importOriginal());
|
|
20
28
|
const mockGetInstallationInfo = vi.mocked(getInstallationInfo);
|
|
21
29
|
describe('handleAutoUpdate', () => {
|
|
@@ -28,6 +36,10 @@ describe('handleAutoUpdate', () => {
|
|
|
28
36
|
vi.stubEnv('SANDBOX', '');
|
|
29
37
|
mockSpawn = vi.fn();
|
|
30
38
|
vi.clearAllMocks();
|
|
39
|
+
mockGetPackageJson.mockResolvedValue({
|
|
40
|
+
name: '@google/gemini-cli',
|
|
41
|
+
version: '2.0.0',
|
|
42
|
+
});
|
|
31
43
|
vi.spyOn(updateEventEmitter, 'emit');
|
|
32
44
|
mockUpdateInfo = {
|
|
33
45
|
update: {
|
|
@@ -209,7 +221,7 @@ describe('handleAutoUpdate', () => {
|
|
|
209
221
|
...mockUpdateInfo,
|
|
210
222
|
update: {
|
|
211
223
|
...mockUpdateInfo.update,
|
|
212
|
-
latest: '1.
|
|
224
|
+
latest: '1.66.0-rc1',
|
|
213
225
|
},
|
|
214
226
|
};
|
|
215
227
|
await new Promise((resolve) => {
|
|
@@ -227,7 +239,7 @@ describe('handleAutoUpdate', () => {
|
|
|
227
239
|
handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', false, mockSpawn);
|
|
228
240
|
});
|
|
229
241
|
expect(updateEventEmitter.emit).toHaveBeenCalledWith('update-failed', {
|
|
230
|
-
message: 'Automatic update failed. Please try updating manually:\n\nnpm i -g @machina.ai/cell-cli@1.
|
|
242
|
+
message: 'Automatic update failed. Please try updating manually:\n\nnpm i -g @machina.ai/cell-cli@1.66.0-rc1',
|
|
231
243
|
});
|
|
232
244
|
});
|
|
233
245
|
it('should emit "update-failed" when the spawn function throws an error', async () => {
|
|
@@ -296,10 +308,189 @@ describe('handleAutoUpdate', () => {
|
|
|
296
308
|
isGlobal: false,
|
|
297
309
|
packageManager: PackageManager.NPM,
|
|
298
310
|
});
|
|
311
|
+
updateEventEmitter.once('update-success', () => {
|
|
312
|
+
resolve();
|
|
313
|
+
});
|
|
299
314
|
// Simulate successful execution
|
|
300
315
|
setTimeout(() => {
|
|
301
316
|
mockChildProcess.emit('close', 0);
|
|
317
|
+
}, 0);
|
|
318
|
+
handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', false, mockSpawn);
|
|
319
|
+
});
|
|
320
|
+
expect(updateEventEmitter.emit).toHaveBeenCalledWith('update-success', {
|
|
321
|
+
message: 'Update successful! The new version will be used on your next run.',
|
|
322
|
+
});
|
|
323
|
+
});
|
|
324
|
+
it('should not emit "update-success" when the active binary is not updated due to PATH shadowing', async () => {
|
|
325
|
+
mockGetPackageJson.mockResolvedValue({
|
|
326
|
+
name: '@google/gemini-cli',
|
|
327
|
+
version: '1.0.0',
|
|
328
|
+
});
|
|
329
|
+
await new Promise((resolve) => {
|
|
330
|
+
mockGetInstallationInfo.mockReturnValue({
|
|
331
|
+
updateCommand: 'npm i -g @google/gemini-cli@latest',
|
|
332
|
+
updateMessage: 'This is an additional message.',
|
|
333
|
+
isGlobal: true,
|
|
334
|
+
packageManager: PackageManager.NPM,
|
|
335
|
+
});
|
|
336
|
+
updateEventEmitter.once('update-failed', () => {
|
|
337
|
+
resolve();
|
|
338
|
+
});
|
|
339
|
+
// Simulate child process completing successfully (code 0)
|
|
340
|
+
setTimeout(() => {
|
|
341
|
+
mockChildProcess.emit('close', 0);
|
|
342
|
+
}, 0);
|
|
343
|
+
handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', false, mockSpawn);
|
|
344
|
+
});
|
|
345
|
+
// Due to PATH shadowing / prefix mismatch, process exit code 0 does not mean
|
|
346
|
+
// the active binary was updated. handleAutoUpdate should emit update-failed with warning.
|
|
347
|
+
expect(updateEventEmitter.emit).not.toHaveBeenCalledWith('update-success', expect.anything());
|
|
348
|
+
expect(updateEventEmitter.emit).toHaveBeenCalledWith('update-failed', expect.objectContaining({
|
|
349
|
+
message: expect.stringContaining('shadowed by another installation in your PATH'),
|
|
350
|
+
}));
|
|
351
|
+
});
|
|
352
|
+
it('should emit "update-success" when package version cannot be determined (graceful fallback)', async () => {
|
|
353
|
+
mockGetPackageJson.mockResolvedValue(undefined);
|
|
354
|
+
await new Promise((resolve) => {
|
|
355
|
+
mockGetInstallationInfo.mockReturnValue({
|
|
356
|
+
updateCommand: 'npm i -g @google/gemini-cli@latest',
|
|
357
|
+
updateMessage: 'This is an additional message.',
|
|
358
|
+
isGlobal: true,
|
|
359
|
+
packageManager: PackageManager.NPM,
|
|
360
|
+
});
|
|
361
|
+
updateEventEmitter.once('update-success', () => {
|
|
362
|
+
resolve();
|
|
363
|
+
});
|
|
364
|
+
setTimeout(() => {
|
|
365
|
+
mockChildProcess.emit('close', 0);
|
|
366
|
+
}, 0);
|
|
367
|
+
handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', false, mockSpawn);
|
|
368
|
+
});
|
|
369
|
+
expect(updateEventEmitter.emit).toHaveBeenCalledWith('update-success', {
|
|
370
|
+
message: 'Update successful! The new version will be used on your next run.',
|
|
371
|
+
});
|
|
372
|
+
});
|
|
373
|
+
it('should emit "update-success" when getPackageJson throws (graceful fallback)', async () => {
|
|
374
|
+
mockGetPackageJson.mockRejectedValue(new Error('File read error'));
|
|
375
|
+
await new Promise((resolve) => {
|
|
376
|
+
mockGetInstallationInfo.mockReturnValue({
|
|
377
|
+
updateCommand: 'npm i -g @google/gemini-cli@latest',
|
|
378
|
+
updateMessage: 'This is an additional message.',
|
|
379
|
+
isGlobal: true,
|
|
380
|
+
packageManager: PackageManager.NPM,
|
|
381
|
+
});
|
|
382
|
+
updateEventEmitter.once('update-success', () => {
|
|
383
|
+
resolve();
|
|
384
|
+
});
|
|
385
|
+
setTimeout(() => {
|
|
386
|
+
mockChildProcess.emit('close', 0);
|
|
387
|
+
}, 0);
|
|
388
|
+
handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', false, mockSpawn);
|
|
389
|
+
});
|
|
390
|
+
expect(updateEventEmitter.emit).toHaveBeenCalledWith('update-success', {
|
|
391
|
+
message: 'Update successful! The new version will be used on your next run.',
|
|
392
|
+
});
|
|
393
|
+
});
|
|
394
|
+
it('should use pre-resolved CLI path and verify even if path resolution was relative or custom', async () => {
|
|
395
|
+
mockGetPackageJson.mockImplementation(async (cwd) => {
|
|
396
|
+
if (cwd.includes('custom-bin')) {
|
|
397
|
+
return { name: '@google/gemini-cli', version: '1.0.0' };
|
|
398
|
+
}
|
|
399
|
+
return { name: '@google/gemini-cli', version: '2.0.0' };
|
|
400
|
+
});
|
|
401
|
+
const originalArgv1 = process.argv[1];
|
|
402
|
+
process.argv[1] = '/tmp/custom-bin/gemini';
|
|
403
|
+
try {
|
|
404
|
+
await new Promise((resolve) => {
|
|
405
|
+
mockGetInstallationInfo.mockReturnValue({
|
|
406
|
+
updateCommand: 'npm i -g @google/gemini-cli@latest',
|
|
407
|
+
updateMessage: 'This is an additional message.',
|
|
408
|
+
isGlobal: true,
|
|
409
|
+
packageManager: PackageManager.NPM,
|
|
410
|
+
});
|
|
411
|
+
updateEventEmitter.once('update-failed', () => {
|
|
412
|
+
resolve();
|
|
413
|
+
});
|
|
414
|
+
setTimeout(() => {
|
|
415
|
+
mockChildProcess.emit('close', 0);
|
|
416
|
+
}, 0);
|
|
417
|
+
handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', false, mockSpawn);
|
|
418
|
+
});
|
|
419
|
+
expect(updateEventEmitter.emit).toHaveBeenCalledWith('update-failed', expect.objectContaining({
|
|
420
|
+
message: expect.stringContaining('shadowed by another installation in your PATH'),
|
|
421
|
+
}));
|
|
422
|
+
}
|
|
423
|
+
finally {
|
|
424
|
+
process.argv[1] = originalArgv1;
|
|
425
|
+
}
|
|
426
|
+
});
|
|
427
|
+
it('should not fail verification if package name differs from expected CLI package (parent monorepo fallback)', async () => {
|
|
428
|
+
// Parent package has an older version (1.0.0), but belongs to a different package name
|
|
429
|
+
mockGetPackageJson.mockResolvedValue({
|
|
430
|
+
name: 'root-monorepo',
|
|
431
|
+
version: '1.0.0',
|
|
432
|
+
});
|
|
433
|
+
await new Promise((resolve) => {
|
|
434
|
+
mockGetInstallationInfo.mockReturnValue({
|
|
435
|
+
updateCommand: 'npm i -g @google/gemini-cli@latest',
|
|
436
|
+
updateMessage: 'This is an additional message.',
|
|
437
|
+
isGlobal: true,
|
|
438
|
+
packageManager: PackageManager.NPM,
|
|
439
|
+
});
|
|
440
|
+
updateEventEmitter.once('update-success', () => {
|
|
441
|
+
resolve();
|
|
442
|
+
});
|
|
443
|
+
setTimeout(() => {
|
|
444
|
+
mockChildProcess.emit('close', 0);
|
|
445
|
+
}, 0);
|
|
446
|
+
handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', false, mockSpawn);
|
|
447
|
+
});
|
|
448
|
+
// Since package name does not match @google/gemini-cli, it should not falsely treat it as an outdated CLI package
|
|
449
|
+
expect(updateEventEmitter.emit).toHaveBeenCalledWith('update-success', {
|
|
450
|
+
message: 'Update successful! The new version will be used on your next run.',
|
|
451
|
+
});
|
|
452
|
+
});
|
|
453
|
+
it('should fail verification when package name matches but version is outdated', async () => {
|
|
454
|
+
mockGetPackageJson.mockResolvedValue({
|
|
455
|
+
name: '@google/gemini-cli',
|
|
456
|
+
version: '1.0.0',
|
|
457
|
+
});
|
|
458
|
+
await new Promise((resolve) => {
|
|
459
|
+
mockGetInstallationInfo.mockReturnValue({
|
|
460
|
+
updateCommand: 'npm i -g @google/gemini-cli@latest',
|
|
461
|
+
updateMessage: 'This is an additional message.',
|
|
462
|
+
isGlobal: true,
|
|
463
|
+
packageManager: PackageManager.NPM,
|
|
464
|
+
});
|
|
465
|
+
updateEventEmitter.once('update-failed', () => {
|
|
302
466
|
resolve();
|
|
467
|
+
});
|
|
468
|
+
setTimeout(() => {
|
|
469
|
+
mockChildProcess.emit('close', 0);
|
|
470
|
+
}, 0);
|
|
471
|
+
handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', false, mockSpawn);
|
|
472
|
+
});
|
|
473
|
+
expect(updateEventEmitter.emit).toHaveBeenCalledWith('update-failed', expect.objectContaining({
|
|
474
|
+
message: expect.stringContaining('shadowed by another installation in your PATH'),
|
|
475
|
+
}));
|
|
476
|
+
});
|
|
477
|
+
it('should not fail verification if parent package.json is nameless', async () => {
|
|
478
|
+
// Nameless package.json in parent directory should not trigger false failure
|
|
479
|
+
mockGetPackageJson.mockResolvedValue({
|
|
480
|
+
version: '1.0.0',
|
|
481
|
+
});
|
|
482
|
+
await new Promise((resolve) => {
|
|
483
|
+
mockGetInstallationInfo.mockReturnValue({
|
|
484
|
+
updateCommand: 'npm i -g @google/gemini-cli@latest',
|
|
485
|
+
updateMessage: 'This is an additional message.',
|
|
486
|
+
isGlobal: true,
|
|
487
|
+
packageManager: PackageManager.NPM,
|
|
488
|
+
});
|
|
489
|
+
updateEventEmitter.once('update-success', () => {
|
|
490
|
+
resolve();
|
|
491
|
+
});
|
|
492
|
+
setTimeout(() => {
|
|
493
|
+
mockChildProcess.emit('close', 0);
|
|
303
494
|
}, 0);
|
|
304
495
|
handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', false, mockSpawn);
|
|
305
496
|
});
|
|
@@ -307,6 +498,93 @@ describe('handleAutoUpdate', () => {
|
|
|
307
498
|
message: 'Update successful! The new version will be used on your next run.',
|
|
308
499
|
});
|
|
309
500
|
});
|
|
501
|
+
it('should not fail verification if info.update.name is missing', async () => {
|
|
502
|
+
mockGetPackageJson.mockResolvedValue({
|
|
503
|
+
name: '@google/gemini-cli',
|
|
504
|
+
version: '1.0.0',
|
|
505
|
+
});
|
|
506
|
+
const infoWithoutName = {
|
|
507
|
+
...mockUpdateInfo,
|
|
508
|
+
update: {
|
|
509
|
+
...mockUpdateInfo.update,
|
|
510
|
+
// @ts-expect-error intentionally undefined name for test
|
|
511
|
+
name: undefined,
|
|
512
|
+
},
|
|
513
|
+
};
|
|
514
|
+
await new Promise((resolve) => {
|
|
515
|
+
mockGetInstallationInfo.mockReturnValue({
|
|
516
|
+
updateCommand: 'npm i -g @google/gemini-cli@latest',
|
|
517
|
+
updateMessage: 'This is an additional message.',
|
|
518
|
+
isGlobal: true,
|
|
519
|
+
packageManager: PackageManager.NPM,
|
|
520
|
+
});
|
|
521
|
+
updateEventEmitter.once('update-success', () => {
|
|
522
|
+
resolve();
|
|
523
|
+
});
|
|
524
|
+
setTimeout(() => {
|
|
525
|
+
mockChildProcess.emit('close', 0);
|
|
526
|
+
}, 0);
|
|
527
|
+
handleAutoUpdate(infoWithoutName, mockSettings, '/root', false, mockSpawn);
|
|
528
|
+
});
|
|
529
|
+
expect(updateEventEmitter.emit).toHaveBeenCalledWith('update-success', {
|
|
530
|
+
message: 'Update successful! The new version will be used on your next run.',
|
|
531
|
+
});
|
|
532
|
+
});
|
|
533
|
+
it('should skip update and not spawn process if latest version is invalid semver', () => {
|
|
534
|
+
const maliciousUpdateInfo = {
|
|
535
|
+
...mockUpdateInfo,
|
|
536
|
+
update: {
|
|
537
|
+
...mockUpdateInfo.update,
|
|
538
|
+
latest: '2.0.0; touch /tmp/pwned',
|
|
539
|
+
},
|
|
540
|
+
};
|
|
541
|
+
handleAutoUpdate(maliciousUpdateInfo, mockSettings, '/root', false, mockSpawn);
|
|
542
|
+
expect(mockSpawn).not.toHaveBeenCalled();
|
|
543
|
+
expect(updateEventEmitter.emit).not.toHaveBeenCalledWith('update-success', expect.anything());
|
|
544
|
+
});
|
|
545
|
+
it('should skip update and not spawn process if latest version is missing or empty', () => {
|
|
546
|
+
const emptyLatestUpdateInfo = {
|
|
547
|
+
...mockUpdateInfo,
|
|
548
|
+
update: {
|
|
549
|
+
...mockUpdateInfo.update,
|
|
550
|
+
latest: '',
|
|
551
|
+
},
|
|
552
|
+
};
|
|
553
|
+
handleAutoUpdate(emptyLatestUpdateInfo, mockSettings, '/root', false, mockSpawn);
|
|
554
|
+
expect(mockSpawn).not.toHaveBeenCalled();
|
|
555
|
+
expect(updateEventEmitter.emit).not.toHaveBeenCalledWith('update-success', expect.anything());
|
|
556
|
+
});
|
|
557
|
+
it('should include resolved binary path in update-failed message when verification fails', async () => {
|
|
558
|
+
mockGetPackageJson.mockResolvedValue({
|
|
559
|
+
name: '@google/gemini-cli',
|
|
560
|
+
version: '1.0.0',
|
|
561
|
+
});
|
|
562
|
+
const originalArgv1 = process.argv[1];
|
|
563
|
+
process.argv[1] = '/custom/bin/gemini';
|
|
564
|
+
try {
|
|
565
|
+
await new Promise((resolve) => {
|
|
566
|
+
mockGetInstallationInfo.mockReturnValue({
|
|
567
|
+
updateCommand: 'npm i -g @google/gemini-cli@latest',
|
|
568
|
+
updateMessage: 'This is an additional message.',
|
|
569
|
+
isGlobal: true,
|
|
570
|
+
packageManager: PackageManager.NPM,
|
|
571
|
+
});
|
|
572
|
+
updateEventEmitter.once('update-failed', () => {
|
|
573
|
+
resolve();
|
|
574
|
+
});
|
|
575
|
+
setTimeout(() => {
|
|
576
|
+
mockChildProcess.emit('close', 0);
|
|
577
|
+
}, 0);
|
|
578
|
+
handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', false, mockSpawn);
|
|
579
|
+
});
|
|
580
|
+
expect(updateEventEmitter.emit).toHaveBeenCalledWith('update-failed', expect.objectContaining({
|
|
581
|
+
message: expect.stringMatching(/active binary \(.*custom.bin.gemini\) was not updated/),
|
|
582
|
+
}));
|
|
583
|
+
}
|
|
584
|
+
finally {
|
|
585
|
+
process.argv[1] = originalArgv1;
|
|
586
|
+
}
|
|
587
|
+
});
|
|
310
588
|
it('should suppress update if isSandboxEnabled is true', () => {
|
|
311
589
|
handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', true, mockSpawn);
|
|
312
590
|
expect(updateEventEmitter.emit).toHaveBeenCalledWith('update-info', {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleAutoUpdate.test.js","sourceRoot":"","sources":["../../../src/utils/handleAutoUpdate.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"handleAutoUpdate.test.js","sourceRoot":"","sources":["../../../src/utils/handleAutoUpdate.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
/**
|
|
7
|
+
* Returns true when the given Node.js version (e.g. "v24.22.1") includes the
|
|
8
|
+
* CVE-2026-111497 fix. Lines without a fix (20, 23, 25) are vulnerable.
|
|
9
|
+
*/
|
|
10
|
+
export declare function isNode2ShellPatched(version: string): boolean;
|
|
11
|
+
export declare function getNode2ShellMessage(version: string): string;
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
/**
|
|
7
|
+
* First release of each supported Node.js line that fixes CVE-2026-111497
|
|
8
|
+
* (Node2Shell, an RCE in the bundled Brotli decoder). Keep in sync with
|
|
9
|
+
* `engines.node` in package.json.
|
|
10
|
+
*/
|
|
11
|
+
const PATCHED_RELEASES = [
|
|
12
|
+
[22, 23, 4],
|
|
13
|
+
[24, 22, 1],
|
|
14
|
+
[26, 12, 1],
|
|
15
|
+
];
|
|
16
|
+
/**
|
|
17
|
+
* Returns true when the given Node.js version (e.g. "v24.22.1") includes the
|
|
18
|
+
* CVE-2026-111497 fix. Lines without a fix (20, 23, 25) are vulnerable.
|
|
19
|
+
*/
|
|
20
|
+
export function isNode2ShellPatched(version) {
|
|
21
|
+
const match = /^v?(\d+)\.(\d+)\.(\d+)/.exec(version);
|
|
22
|
+
if (!match) {
|
|
23
|
+
return false;
|
|
24
|
+
}
|
|
25
|
+
const [major, minor, patch] = match.slice(1).map(Number);
|
|
26
|
+
const lastFixedMajor = PATCHED_RELEASES[PATCHED_RELEASES.length - 1][0];
|
|
27
|
+
if (major > lastFixedMajor) {
|
|
28
|
+
return true;
|
|
29
|
+
}
|
|
30
|
+
const fixed = PATCHED_RELEASES.find(([m]) => m === major);
|
|
31
|
+
if (!fixed) {
|
|
32
|
+
return false;
|
|
33
|
+
}
|
|
34
|
+
const [, fixedMinor, fixedPatch] = fixed;
|
|
35
|
+
return minor > fixedMinor || (minor === fixedMinor && patch >= fixedPatch);
|
|
36
|
+
}
|
|
37
|
+
export function getNode2ShellMessage(version) {
|
|
38
|
+
return (`Cell CLI cannot run on Node.js ${version}: it is vulnerable to ` +
|
|
39
|
+
'CVE-2026-111497 (Node2Shell, remote code execution).\n' +
|
|
40
|
+
'Upgrade Node.js to 22.23.4, 24.22.1, 26.12.1 or later.\n');
|
|
41
|
+
}
|
|
42
|
+
//# sourceMappingURL=nodeVersion.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nodeVersion.js","sourceRoot":"","sources":["../../../src/utils/nodeVersion.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;GAIG;AACH,MAAM,gBAAgB,GAA4C;IAChE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACX,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACX,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;CACZ,CAAC;AAEF;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAe;IACjD,MAAM,KAAK,GAAG,wBAAwB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACrD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAEzD,MAAM,cAAc,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACxE,IAAI,KAAK,GAAG,cAAc,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC;IACzC,OAAO,KAAK,GAAG,UAAU,IAAI,CAAC,KAAK,KAAK,UAAU,IAAI,KAAK,IAAI,UAAU,CAAC,CAAC;AAC7E,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,OAAe;IAClD,OAAO,CACL,kCAAkC,OAAO,wBAAwB;QACjE,wDAAwD;QACxD,0DAA0D,CAC3D,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect } from 'vitest';
|
|
7
|
+
import { isNode2ShellPatched } from './nodeVersion.js';
|
|
8
|
+
describe('isNode2ShellPatched', () => {
|
|
9
|
+
it.each([
|
|
10
|
+
'v22.23.4',
|
|
11
|
+
'v22.24.0',
|
|
12
|
+
'v24.22.1',
|
|
13
|
+
'v24.23.0',
|
|
14
|
+
'v26.12.1',
|
|
15
|
+
'v26.13.0',
|
|
16
|
+
'v27.0.0',
|
|
17
|
+
])('accepts patched version %s', (version) => {
|
|
18
|
+
expect(isNode2ShellPatched(version)).toBe(true);
|
|
19
|
+
});
|
|
20
|
+
it.each([
|
|
21
|
+
'v18.20.8',
|
|
22
|
+
'v20.19.5',
|
|
23
|
+
'v22.23.3',
|
|
24
|
+
'v22.9.0',
|
|
25
|
+
'v23.11.1',
|
|
26
|
+
'v24.22.0',
|
|
27
|
+
'v24.9.0',
|
|
28
|
+
'v25.9.0',
|
|
29
|
+
'v26.12.0',
|
|
30
|
+
'not-a-version',
|
|
31
|
+
])('rejects vulnerable version %s', (version) => {
|
|
32
|
+
expect(isNode2ShellPatched(version)).toBe(false);
|
|
33
|
+
});
|
|
34
|
+
});
|
|
35
|
+
//# sourceMappingURL=nodeVersion.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nodeVersion.test.js","sourceRoot":"","sources":["../../../src/utils/nodeVersion.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,EAAE,CAAC,IAAI,CAAC;QACN,UAAU;QACV,UAAU;QACV,UAAU;QACV,UAAU;QACV,UAAU;QACV,UAAU;QACV,SAAS;KACV,CAAC,CAAC,4BAA4B,EAAE,CAAC,OAAO,EAAE,EAAE;QAC3C,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,IAAI,CAAC;QACN,UAAU;QACV,UAAU;QACV,UAAU;QACV,SAAS;QACT,UAAU;QACV,UAAU;QACV,SAAS;QACT,SAAS;QACT,UAAU;QACV,eAAe;KAChB,CAAC,CAAC,+BAA+B,EAAE,CAAC,OAAO,EAAE,EAAE;QAC9C,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -3,6 +3,29 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
+
import type { ChildProcess } from 'node:child_process';
|
|
7
|
+
/**
|
|
8
|
+
* Signals intercepted by the parent process when supervising a child process.
|
|
9
|
+
* On POSIX platforms, all of these signals are forwarded to the child process
|
|
10
|
+
* so signals sent directly to the parent PID (e.g., by process supervisors)
|
|
11
|
+
* reach the child. On Windows (`win32`), `SIGINT` and `SIGQUIT` are intercepted
|
|
12
|
+
* on the parent without calling `child.kill()` to avoid abrupt termination via
|
|
13
|
+
* `TerminateProcess`.
|
|
14
|
+
*/
|
|
15
|
+
export declare const FORWARDED_SIGNALS: readonly NodeJS.Signals[];
|
|
16
|
+
/**
|
|
17
|
+
* Registers signal listeners on the parent process to forward termination and
|
|
18
|
+
* user signals to the spawned child process, returning a cleanup function to
|
|
19
|
+
* remove the registered listeners.
|
|
20
|
+
*/
|
|
21
|
+
export declare function setupSignalForwarding(child: ChildProcess): () => void;
|
|
22
|
+
/**
|
|
23
|
+
* Handles the `close` event of a supervised child process by cleaning up signal
|
|
24
|
+
* forwarders, resuming `process.stdin`, and either re-raising the child's
|
|
25
|
+
* termination signal on the parent process (with a fallback timeout) or
|
|
26
|
+
* resolving with the child's exit code.
|
|
27
|
+
*/
|
|
28
|
+
export declare function handleChildProcessClose(code: number | null, signal: NodeJS.Signals | null, removeForwarders: () => void, resolve: (exitCode: number) => void): void;
|
|
6
29
|
/**
|
|
7
30
|
* Exit code used to signal that the CLI should be relaunched.
|
|
8
31
|
*/
|
|
@@ -5,6 +5,78 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { runExitCleanup } from './cleanup.js';
|
|
7
7
|
import { waitForUpdateCompletion } from './handleAutoUpdate.js';
|
|
8
|
+
/**
|
|
9
|
+
* Signals intercepted by the parent process when supervising a child process.
|
|
10
|
+
* On POSIX platforms, all of these signals are forwarded to the child process
|
|
11
|
+
* so signals sent directly to the parent PID (e.g., by process supervisors)
|
|
12
|
+
* reach the child. On Windows (`win32`), `SIGINT` and `SIGQUIT` are intercepted
|
|
13
|
+
* on the parent without calling `child.kill()` to avoid abrupt termination via
|
|
14
|
+
* `TerminateProcess`.
|
|
15
|
+
*/
|
|
16
|
+
export const FORWARDED_SIGNALS = [
|
|
17
|
+
'SIGTERM',
|
|
18
|
+
'SIGHUP',
|
|
19
|
+
'SIGINT',
|
|
20
|
+
'SIGQUIT',
|
|
21
|
+
'SIGUSR1',
|
|
22
|
+
'SIGUSR2',
|
|
23
|
+
];
|
|
24
|
+
/**
|
|
25
|
+
* Registers signal listeners on the parent process to forward termination and
|
|
26
|
+
* user signals to the spawned child process, returning a cleanup function to
|
|
27
|
+
* remove the registered listeners.
|
|
28
|
+
*/
|
|
29
|
+
export function setupSignalForwarding(child) {
|
|
30
|
+
const forwarders = new Map();
|
|
31
|
+
for (const sig of FORWARDED_SIGNALS) {
|
|
32
|
+
const handler = () => {
|
|
33
|
+
if (process.platform === 'win32' &&
|
|
34
|
+
(sig === 'SIGINT' || sig === 'SIGQUIT')) {
|
|
35
|
+
// Do not forward terminal-generated signals on Windows to avoid abrupt parent termination.
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
try {
|
|
39
|
+
child.kill(sig);
|
|
40
|
+
}
|
|
41
|
+
catch {
|
|
42
|
+
// Child may already be gone
|
|
43
|
+
}
|
|
44
|
+
};
|
|
45
|
+
forwarders.set(sig, handler);
|
|
46
|
+
process.on(sig, handler);
|
|
47
|
+
}
|
|
48
|
+
return () => {
|
|
49
|
+
for (const [sig, handler] of forwarders) {
|
|
50
|
+
process.off(sig, handler);
|
|
51
|
+
}
|
|
52
|
+
forwarders.clear();
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
/**
|
|
56
|
+
* Handles the `close` event of a supervised child process by cleaning up signal
|
|
57
|
+
* forwarders, resuming `process.stdin`, and either re-raising the child's
|
|
58
|
+
* termination signal on the parent process (with a fallback timeout) or
|
|
59
|
+
* resolving with the child's exit code.
|
|
60
|
+
*/
|
|
61
|
+
export function handleChildProcessClose(code, signal, removeForwarders, resolve) {
|
|
62
|
+
removeForwarders();
|
|
63
|
+
// Resume stdin before the parent process exits.
|
|
64
|
+
process.stdin.resume();
|
|
65
|
+
if (signal) {
|
|
66
|
+
try {
|
|
67
|
+
process.kill(process.pid, signal);
|
|
68
|
+
}
|
|
69
|
+
catch {
|
|
70
|
+
resolve(1);
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
setTimeout(() => {
|
|
74
|
+
resolve(1);
|
|
75
|
+
}, 100);
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
resolve(code ?? 1);
|
|
79
|
+
}
|
|
8
80
|
/**
|
|
9
81
|
* Exit code used to signal that the CLI should be relaunched.
|
|
10
82
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processUtils.js","sourceRoot":"","sources":["../../../src/utils/processUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"processUtils.js","sourceRoot":"","sources":["../../../src/utils/processUtils.ts"],"names":[],"mappings":"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"}
|