@machina.ai/cell-cli 1.16.0-rc1 → 1.18.4-rc1

package/dist/src/commands/mcp/add.js

@@ -5,6 +5,7 @@
  */
 import { loadSettings, SettingScope } from '../../config/settings.js';
 import { debugLogger } from '@google/gemini-cli-core';
+import { exitCli } from '../utils.js';
 async function addMcpServer(name, commandOrUrl, args, options) {
     const { scope, transport, env, header, timeout, trust, description, includeTools, excludeTools, } = options;
     const settings = loadSettings(process.cwd());
@@ -169,6 +170,7 @@ export const addCommand = {
             includeTools: argv['includeTools'],
             excludeTools: argv['excludeTools'],
         });
+        await exitCli();
     },
 };
 //# sourceMappingURL=add.js.map

package/dist/src/commands/mcp/add.js.map

@@ -1 +1 @@
-{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../src/commands/mcp/add.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../src/commands/mcp/add.ts"],"names":[],"mappings":"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"}

package/dist/src/commands/mcp/add.test.js

@@ -7,6 +7,10 @@ import { describe, it, expect, vi } from 'vitest';
 import yargs, {} from 'yargs';
 import { addCommand } from './add.js';
 import { loadSettings, SettingScope } from '../../config/settings.js';
+import { debugLogger } from '@google/gemini-cli-core';
+vi.mock('../utils.js', () => ({
+    exitCli: vi.fn(),
+}));
 vi.mock('fs/promises', () => ({
     readFile: vi.fn(),
     writeFile: vi.fn(),
@@ -35,12 +39,16 @@ describe('mcp add command', () => {
     let parser;
     let mockSetValue;
     let mockConsoleError;
+    let debugLoggerErrorSpy;
     beforeEach(() => {
         vi.resetAllMocks();
         const yargsInstance = yargs([]).command(addCommand);
         parser = yargsInstance;
         mockSetValue = vi.fn();
         mockConsoleError = vi.fn();
+        debugLoggerErrorSpy = vi
+            .spyOn(debugLogger, 'error')
+            .mockImplementation(() => { });
         vi.spyOn(console, 'error').mockImplementation(mockConsoleError);
         mockedLoadSettings.mockReturnValue({
             forScope: () => ({ settings: {} }),
@@ -154,7 +162,7 @@ describe('mcp add command', () => {
                     throw new Error('process.exit called');
                 }));
                 await expect(parser.parseAsync(`add ${serverName} ${command}`)).rejects.toThrow('process.exit called');
-                expect(mockConsoleError).toHaveBeenCalledWith('Error: Please use --scope user to edit settings in the home directory.');
+                expect(debugLoggerErrorSpy).toHaveBeenCalledWith('Error: Please use --scope user to edit settings in the home directory.');
                 expect(mockProcessExit).toHaveBeenCalledWith(1);
                 expect(mockSetValue).not.toHaveBeenCalled();
             });
@@ -165,14 +173,14 @@ describe('mcp add command', () => {
                     throw new Error('process.exit called');
                 }));
                 await expect(parser.parseAsync(`add --scope project ${serverName} ${command}`)).rejects.toThrow('process.exit called');
-                expect(mockConsoleError).toHaveBeenCalledWith('Error: Please use --scope user to edit settings in the home directory.');
+                expect(debugLoggerErrorSpy).toHaveBeenCalledWith('Error: Please use --scope user to edit settings in the home directory.');
                 expect(mockProcessExit).toHaveBeenCalledWith(1);
                 expect(mockSetValue).not.toHaveBeenCalled();
             });
             it('should use user scope when --scope=user is used', async () => {
                 await parser.parseAsync(`add --scope user ${serverName} ${command}`);
                 expect(mockSetValue).toHaveBeenCalledWith(SettingScope.User, 'mcpServers', expect.any(Object));
-                expect(mockConsoleError).not.toHaveBeenCalled();
+                expect(debugLoggerErrorSpy).not.toHaveBeenCalled();
             });
         });
         describe('when in a subdirectory of home (not a project)', () => {

package/dist/src/commands/mcp/add.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"add.test.js","sourceRoot":"","sources":["../../../../src/commands/mcp/add.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"add.test.js","sourceRoot":"","sources":["../../../../src/commands/mcp/add.test.ts"],"names":[],"mappings":"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"}

package/dist/src/commands/mcp/list.js

@@ -9,6 +9,7 @@ import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { ExtensionManager } from '../../config/extension-manager.js';
 import { requestConsentNonInteractive } from '../../config/extensions/consent.js';
 import { promptForSetting } from '../../config/extensions/extensionSettings.js';
+import { exitCli } from '../utils.js';
 const COLOR_GREEN = '\u001b[32m';
 const COLOR_YELLOW = '\u001b[33m';
 const COLOR_RED = '\u001b[31m';
@@ -115,6 +116,7 @@ export const listCommand = {
     describe: 'List all configured MCP servers',
     handler: async () => {
         await listMcpServers();
+        await exitCli();
     },
 };
 //# sourceMappingURL=list.js.map

package/dist/src/commands/mcp/list.js.map

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/mcp/list.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/mcp/list.ts"],"names":[],"mappings":"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"}

package/dist/src/commands/mcp/list.test.js

@@ -36,15 +36,12 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
         })),
         CELL_DIR: '.cell-cli',
         getErrorMessage: (e) => e instanceof Error ? e.message : String(e),
-        debugLogger: {
-            log: vi.fn(),
-            warn: vi.fn(),
-            error: vi.fn(),
-            debug: vi.fn(),
-        },
     };
 });
 vi.mock('@modelcontextprotocol/sdk/client/index.js');
+vi.mock('../utils.js', () => ({
+    exitCli: vi.fn(),
+}));
 const mockedGetUserExtensionsDir = ExtensionStorage.getUserExtensionsDir;
 const mockedLoadSettings = loadSettings;
 const mockedCreateTransport = createTransport;
@@ -56,6 +53,7 @@ describe('mcp list command', () => {
     let mockTransport;
     beforeEach(() => {
         vi.resetAllMocks();
+        vi.spyOn(debugLogger, 'log').mockImplementation(() => { });
         mockTransport = { close: vi.fn() };
         mockClient = {
             connect: vi.fn(),

package/dist/src/commands/mcp/list.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"list.test.js","sourceRoot":"","sources":["../../../../src/commands/mcp/list.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"list.test.js","sourceRoot":"","sources":["../../../../src/commands/mcp/list.test.ts"],"names":[],"mappings":"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"}

package/dist/src/commands/mcp/remove.js

@@ -5,6 +5,7 @@
  */
 import { loadSettings, SettingScope } from '../../config/settings.js';
 import { debugLogger } from '@google/gemini-cli-core';
+import { exitCli } from '../utils.js';
 async function removeMcpServer(name, options) {
     const { scope } = options;
     const settingsScope = scope === 'user' ? SettingScope.User : SettingScope.Workspace;
@@ -40,6 +41,7 @@ export const removeCommand = {
         await removeMcpServer(argv['name'], {
             scope: argv['scope'],
         });
+        await exitCli();
     },
 };
 //# sourceMappingURL=remove.js.map

package/dist/src/commands/mcp/remove.js.map

@@ -1 +1 @@
-{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../../src/commands/mcp/remove.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,KAAK,UAAU,eAAe,CAC5B,IAAY,EACZ,OAEC;IAED,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAC1B,MAAM,aAAa,GACjB,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC;IAChE,MAAM,QAAQ,GAAG,YAAY,EAAE,CAAC;IAEhC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC;IACnE,MAAM,UAAU,GAAG,gBAAgB,CAAC,UAAU,IAAI,EAAE,CAAC;IAErD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,WAAW,CAAC,GAAG,CAAC,WAAW,IAAI,kBAAkB,KAAK,YAAY,CAAC,CAAC;QACpE,OAAO;IACT,CAAC;IAED,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;IAExB,QAAQ,CAAC,QAAQ,CAAC,aAAa,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IAE3D,WAAW,CAAC,GAAG,CAAC,WAAW,IAAI,kBAAkB,KAAK,YAAY,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAkB;IAC1C,OAAO,EAAE,eAAe;IACxB,QAAQ,EAAE,iBAAiB;IAC3B,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,KAAK;SACF,KAAK,CAAC,2CAA2C,CAAC;SAClD,UAAU,CAAC,MAAM,EAAE;QAClB,QAAQ,EAAE,oBAAoB;QAC9B,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,IAAI;KACnB,CAAC;SACD,MAAM,CAAC,OAAO,EAAE;QACf,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,uCAAuC;QACjD,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,SAAS;QAClB,OAAO,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC;KAC7B,CAAC;IACN,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,MAAM,eAAe,CAAC,IAAI,CAAC,MAAM,CAAW,EAAE;YAC5C,KAAK,EAAE,IAAI,CAAC,OAAO,CAAW;SAC/B,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
+{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../../src/commands/mcp/remove.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,KAAK,UAAU,eAAe,CAC5B,IAAY,EACZ,OAEC;IAED,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAC1B,MAAM,aAAa,GACjB,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC;IAChE,MAAM,QAAQ,GAAG,YAAY,EAAE,CAAC;IAEhC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC;IACnE,MAAM,UAAU,GAAG,gBAAgB,CAAC,UAAU,IAAI,EAAE,CAAC;IAErD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,WAAW,CAAC,GAAG,CAAC,WAAW,IAAI,kBAAkB,KAAK,YAAY,CAAC,CAAC;QACpE,OAAO;IACT,CAAC;IAED,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;IAExB,QAAQ,CAAC,QAAQ,CAAC,aAAa,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IAE3D,WAAW,CAAC,GAAG,CAAC,WAAW,IAAI,kBAAkB,KAAK,YAAY,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAkB;IAC1C,OAAO,EAAE,eAAe;IACxB,QAAQ,EAAE,iBAAiB;IAC3B,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,KAAK;SACF,KAAK,CAAC,2CAA2C,CAAC;SAClD,UAAU,CAAC,MAAM,EAAE;QAClB,QAAQ,EAAE,oBAAoB;QAC9B,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,IAAI;KACnB,CAAC;SACD,MAAM,CAAC,OAAO,EAAE;QACf,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,uCAAuC;QACjD,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,SAAS;QAClB,OAAO,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC;KAC7B,CAAC;IACN,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,MAAM,eAAe,CAAC,IAAI,CAAC,MAAM,CAAW,EAAE;YAC5C,KAAK,EAAE,IAAI,CAAC,OAAO,CAAW;SAC/B,CAAC,CAAC;QACH,MAAM,OAAO,EAAE,CAAC;IAClB,CAAC;CACF,CAAC"}

package/dist/src/commands/mcp/remove.test.js

@@ -10,11 +10,14 @@ import { removeCommand } from './remove.js';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as os from 'node:os';
-import { CELL_DIR } from '@google/gemini-cli-core';
+import { CELL_DIR, debugLogger } from '@google/gemini-cli-core';
 vi.mock('fs/promises', () => ({
     readFile: vi.fn(),
     writeFile: vi.fn(),
 }));
+vi.mock('../utils.js', () => ({
+    exitCli: vi.fn(),
+}));
 describe('mcp remove command', () => {
     describe('unit tests with mocks', () => {
         let parser;
@@ -44,10 +47,13 @@ describe('mcp remove command', () => {
             expect(mockSetValue).toHaveBeenCalledWith(SettingScope.Workspace, 'mcpServers', {});
         });
         it('should show a message if server not found', async () => {
-            const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+            const debugLogSpy = vi
+                .spyOn(debugLogger, 'log')
+                .mockImplementation(() => { });
             await parser.parseAsync('remove non-existent-server');
             expect(mockSetValue).not.toHaveBeenCalled();
-            expect(consoleSpy).toHaveBeenCalledWith('Server "non-existent-server" not found in project settings.');
+            expect(debugLogSpy).toHaveBeenCalledWith('Server "non-existent-server" not found in project settings.');
+            debugLogSpy.mockRestore();
         });
     });
     describe('integration tests with real file I/O', () => {
@@ -86,13 +92,15 @@ describe('mcp remove command', () => {
         }
       }`;
             fs.writeFileSync(settingsPath, originalContent, 'utf-8');
-            const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+            const debugLogSpy = vi
+                .spyOn(debugLogger, 'log')
+                .mockImplementation(() => { });
             await parser.parseAsync('remove server-to-remove');
             const updatedContent = fs.readFileSync(settingsPath, 'utf-8');
             expect(updatedContent).toContain('"server-to-keep"');
             expect(updatedContent).not.toContain('"server-to-remove"');
-            expect(consoleSpy).toHaveBeenCalledWith('Server "server-to-remove" removed from project settings.');
-            consoleSpy.mockRestore();
+            expect(debugLogSpy).toHaveBeenCalledWith('Server "server-to-remove" removed from project settings.');
+            debugLogSpy.mockRestore();
         });
         it('should preserve comments when removing a server', async () => {
             const originalContent = `{
@@ -110,14 +118,16 @@ describe('mcp remove command', () => {
         }
       }`;
             fs.writeFileSync(settingsPath, originalContent, 'utf-8');
-            const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+            const debugLogSpy = vi
+                .spyOn(debugLogger, 'log')
+                .mockImplementation(() => { });
             await parser.parseAsync('remove oldServer');
             const updatedContent = fs.readFileSync(settingsPath, 'utf-8');
             expect(updatedContent).toContain('// Server to keep');
             expect(updatedContent).toContain('"context7"');
             expect(updatedContent).not.toContain('"oldServer"');
             expect(updatedContent).toContain('// Server to remove');
-            consoleSpy.mockRestore();
+            debugLogSpy.mockRestore();
         });
         it('should handle removing the only server', async () => {
             const originalContent = `{
@@ -129,13 +139,15 @@ describe('mcp remove command', () => {
         }
       }`;
             fs.writeFileSync(settingsPath, originalContent, 'utf-8');
-            const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+            const debugLogSpy = vi
+                .spyOn(debugLogger, 'log')
+                .mockImplementation(() => { });
             await parser.parseAsync('remove only-server');
             const updatedContent = fs.readFileSync(settingsPath, 'utf-8');
             expect(updatedContent).toContain('"mcpServers"');
             expect(updatedContent).not.toContain('"only-server"');
             expect(updatedContent).toMatch(/"mcpServers"\s*:\s*\{\s*\}/);
-            consoleSpy.mockRestore();
+            debugLogSpy.mockRestore();
         });
         it('should preserve other settings when removing a server', async () => {
             // Create settings file with other settings
@@ -159,7 +171,9 @@ describe('mcp remove command', () => {
         }
       }`;
             fs.writeFileSync(settingsPath, originalContent, 'utf-8');
-            const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+            const debugLogSpy = vi
+                .spyOn(debugLogger, 'log')
+                .mockImplementation(() => { });
             await parser.parseAsync('remove server1');
             const updatedContent = fs.readFileSync(settingsPath, 'utf-8');
             expect(updatedContent).toContain('"model"');
@@ -168,7 +182,7 @@ describe('mcp remove command', () => {
             expect(updatedContent).toContain('"ui"');
             expect(updatedContent).toContain('"theme": "dark"');
             expect(updatedContent).not.toContain('"server1"');
-            consoleSpy.mockRestore();
+            debugLogSpy.mockRestore();
         });
     });
 });

package/dist/src/commands/mcp/remove.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"remove.test.js","sourceRoot":"","sources":["../../../../src/commands/mcp/remove.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"remove.test.js","sourceRoot":"","sources":["../../../../src/commands/mcp/remove.test.ts"],"names":[],"mappings":"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"}

package/dist/src/commands/mcp.js

@@ -6,10 +6,12 @@
 import { addCommand } from './mcp/add.js';
 import { removeCommand } from './mcp/remove.js';
 import { listCommand } from './mcp/list.js';
+import { initializeOutputListenersAndFlush } from '../gemini.js';
 export const mcpCommand = {
     command: 'mcp',
     describe: 'Manage MCP servers',
     builder: (yargs) => yargs
+        .middleware(() => initializeOutputListenersAndFlush())
         .command(addCommand)
         .command(removeCommand)
         .command(listCommand)

package/dist/src/commands/mcp.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../../src/commands/mcp.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,CAAC,MAAM,UAAU,GAAkB;IACvC,OAAO,EAAE,KAAK;IACd,QAAQ,EAAE,oBAAoB;IAC9B,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CACvB,KAAK;SACF,OAAO,CAAC,UAAU,CAAC;SACnB,OAAO,CAAC,aAAa,CAAC;SACtB,OAAO,CAAC,WAAW,CAAC;SACpB,aAAa,CAAC,CAAC,EAAE,kDAAkD,CAAC;SACpE,OAAO,CAAC,KAAK,CAAC;IACnB,OAAO,EAAE,GAAG,EAAE;QACZ,kEAAkE;QAClE,6CAA6C;IAC/C,CAAC;CACF,CAAC"}
+{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../../src/commands/mcp.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,iCAAiC,EAAE,MAAM,cAAc,CAAC;AAEjE,MAAM,CAAC,MAAM,UAAU,GAAkB;IACvC,OAAO,EAAE,KAAK;IACd,QAAQ,EAAE,oBAAoB;IAC9B,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CACvB,KAAK;SACF,UAAU,CAAC,GAAG,EAAE,CAAC,iCAAiC,EAAE,CAAC;SACrD,OAAO,CAAC,UAAU,CAAC;SACnB,OAAO,CAAC,aAAa,CAAC;SACtB,OAAO,CAAC,WAAW,CAAC;SACpB,aAAa,CAAC,CAAC,EAAE,kDAAkD,CAAC;SACpE,OAAO,CAAC,KAAK,CAAC;IACnB,OAAO,EAAE,GAAG,EAAE;QACZ,kEAAkE;QAClE,6CAA6C;IAC/C,CAAC;CACF,CAAC"}

package/dist/src/commands/mcp.test.js

@@ -47,6 +47,7 @@ describe('mcp command', () => {
             command: vi.fn().mockReturnThis(),
             demandCommand: vi.fn().mockReturnThis(),
             version: vi.fn().mockReturnThis(),
+            middleware: vi.fn().mockReturnThis(),
         };
         mcpCommand.builder(mockYargs);
         expect(mockYargs.command).toHaveBeenCalledTimes(3);

package/dist/src/commands/mcp.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.test.js","sourceRoot":"","sources":["../../../src/commands/mcp.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp.test.js","sourceRoot":"","sources":["../../../src/commands/mcp.test.ts"],"names":[],"mappings":"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"}

package/dist/src/commands/utils.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export declare function exitCli(exitCode?: number): Promise<void>;

package/dist/src/commands/utils.js

@@ -0,0 +1,11 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { runExitCleanup } from '../utils/cleanup.js';
+export async function exitCli(exitCode = 0) {
+    await runExitCleanup();
+    process.exit(exitCode);
+}
+//# sourceMappingURL=utils.js.map

package/dist/src/commands/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,QAAQ,GAAG,CAAC;IACxC,MAAM,cAAc,EAAE,CAAC;IACvB,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACzB,CAAC"}

package/dist/src/config/config.d.ts

@@ -5,6 +5,7 @@
  */
 import { Config } from '@google/gemini-cli-core';
 import type { Settings } from './settings.js';
+import { RESUME_LATEST } from '../utils/sessionUtils.js';
 export interface CliArgs {
     query: string | undefined;
     model: string | undefined;
@@ -19,7 +20,7 @@ export interface CliArgs {
     experimentalAcp: boolean | undefined;
     extensions: string[] | undefined;
     listExtensions: boolean | undefined;
-    resume: string | 'latest' | undefined;
+    resume: string | typeof RESUME_LATEST | undefined;
     listSessions: boolean | undefined;
     deleteSession: string | undefined;
     includeDirectories: string[] | undefined;

package/dist/src/config/config.js

@@ -14,11 +14,13 @@ import { getCliVersion } from '../utils/version.js';
 import { loadSandboxConfig } from './sandboxConfig.js';
 import { resolvePath } from '../utils/resolvePath.js';
 import { appEvents } from '../utils/events.js';
+import { RESUME_LATEST } from '../utils/sessionUtils.js';
 import { isWorkspaceTrusted } from './trustedFolders.js';
 import { createPolicyEngineConfig } from './policy.js';
 import { ExtensionManager } from './extension-manager.js';
 import { requestConsentNonInteractive } from './extensions/consent.js';
 import { promptForSetting } from './extensions/extensionSettings.js';
+import { runExitCleanup } from '../utils/cleanup.js';
 export async function parseArguments(settings) {
     const rawArgv = hideBin(process.argv);
     const yargsInstance = yargs(rawArgv)
@@ -120,7 +122,7 @@ export async function parseArguments(settings) {
             // When --resume not passed at all: this `coerce` function is not called at all, and
             //   `yargsInstance.argv.resume` is undefined.
             if (value === '') {
-                return 'latest';
+                return RESUME_LATEST;
             }
             return value;
         },
@@ -167,12 +169,14 @@ export async function parseArguments(settings) {
         description: 'Path to a file to record model responses for testing.',
         hidden: true,
     })
-        .deprecateOption('prompt', 'Use the positional prompt instead. This flag will be removed in a future version.')
+        .deprecateOption('prompt', 'Use the positional prompt instead. This flag will be removed in a future version.'))
+        // Register MCP subcommands
+        .command(mcpCommand)
         // Ensure validation flows through .fail() for clean UX
-        .fail((msg, err, yargs) => {
-        debugLogger.error(msg || err?.message || 'Unknown error');
-        yargs.showHelp();
-        process.exit(1);
+        .fail((msg, err) => {
+        if (err)
+            throw err;
+        throw new Error(msg);
     })
         .check((argv) => {
         // The 'query' positional can be a string (for one arg) or string[] (for multiple).
@@ -187,16 +191,18 @@ export async function parseArguments(settings) {
         if (argv['prompt'] && argv['promptInteractive']) {
             return 'Cannot use both --prompt (-p) and --prompt-interactive (-i) together';
         }
-        if (argv.resume && !argv.prompt && !process.stdin.isTTY) {
+        if (argv['resume'] && !argv['prompt'] && !process.stdin.isTTY) {
             throw new Error('When resuming a session, you must provide a message via --prompt (-p) or stdin');
         }
-        if (argv.yolo && argv['approvalMode']) {
+        if (argv['yolo'] && argv['approvalMode']) {
             return 'Cannot use both --yolo (-y) and --approval-mode together. Use --approval-mode=yolo instead.';
         }
+        if (argv['outputFormat'] &&
+            !['text', 'json', 'stream-json'].includes(argv['outputFormat'])) {
+            return `Invalid values:\n  Argument: output-format, Given: "${argv['outputFormat']}", Choices: "text", "json", "stream-json"`;
+        }
         return true;
-    }))
-        // Register MCP subcommands
-        .command(mcpCommand);
+    });
     if (settings?.experimental?.extensionManagement ?? true) {
         yargsInstance.command(extensionsCommand);
     }
@@ -206,15 +212,23 @@ export async function parseArguments(settings) {
         .help()
         .alias('h', 'help')
         .strict()
-        .demandCommand(0, 0); // Allow base command to run with no subcommands
+        .demandCommand(0, 0) // Allow base command to run with no subcommands
+        .exitProcess(false);
     yargsInstance.wrap(yargsInstance.terminalWidth());
-    const result = await yargsInstance.parse();
-    // If yargs handled --help/--version it will have exited; nothing to do here.
-    // Handle case where MCP subcommands are executed - they should exit the process
-    // and not return to main CLI logic
-    if (result._.length > 0 &&
-        (result._[0] === 'mcp' || result._[0] === 'extensions')) {
-        // MCP commands handle their own execution and process exit
+    let result;
+    try {
+        result = await yargsInstance.parse();
+    }
+    catch (e) {
+        const msg = e instanceof Error ? e.message : String(e);
+        debugLogger.error(msg);
+        yargsInstance.showHelp();
+        await runExitCleanup();
+        process.exit(1);
+    }
+    // Handle help and version flags manually since we disabled exitProcess
+    if (result['help'] || result['version']) {
+        await runExitCleanup();
         process.exit(0);
     }
     // Normalize query args: handle both quoted "@path file" and unquoted @path file
@@ -320,9 +334,7 @@ export async function loadCliConfig(settings, sessionId, argv, cwd = process.cwd
     });
     await extensionManager.loadExtensions();
     // Call the (now wrapper) loadHierarchicalGeminiMemory which calls the server's version
-    const { memoryContent, fileCount, filePaths } = await loadServerHierarchicalMemory(cwd, settings.context?.loadMemoryFromIncludeDirectories
-        ? includeDirectories
-        : [], debugMode, fileService, extensionManager, trustedFolder, memoryImportFormat, memoryFileFiltering, settings.context?.discoveryMaxDirs);
+    const { memoryContent, fileCount, filePaths } = await loadServerHierarchicalMemory(cwd, [], debugMode, fileService, extensionManager, trustedFolder, memoryImportFormat, memoryFileFiltering, settings.context?.discoveryMaxDirs);
     const question = argv.promptInteractive || argv.prompt || '';
     // Determine approval mode with backward compatibility
     let approvalMode;
@@ -383,10 +395,11 @@ export async function loadCliConfig(settings, sessionId, argv, cwd = process.cwd
     // Interactive mode: explicit -i flag or (TTY + no args + no -p flag)
     const hasQuery = !!argv.query;
     const interactive = !!argv.promptInteractive ||
+        !!argv.experimentalAcp ||
         (process.stdin.isTTY && !hasQuery && !argv.prompt);
     // In non-interactive mode, exclude tools that require a prompt.
     const extraExcludes = [];
-    if (!interactive && !argv.experimentalAcp) {
+    if (!interactive) {
         const defaultExcludes = [
             SHELL_TOOL_NAME,
             EDIT_TOOL_NAME,