@machina.ai/cell-cli 1.40.1-rc2 → 1.41.1-rc1

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@machina.ai/cell-cli",
-  "version": "1.40.1-rc2",
+  "version": "1.41.1-rc1",
   "description": "Cell CLI",
   "repository": {
     "type": "git",
@@ -15,11 +15,11 @@
     ""
   ],
   "config": {
-    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.40.1"
+    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.41.1"
   },
   "dependencies": {
     "@agentclientprotocol/sdk": "^0.16.1",
-    "@google/gemini-cli-core": "npm:@machina.ai/cell-cli-core@1.40.1-rc2",
+    "@google/gemini-cli-core": "npm:@machina.ai/cell-cli-core@1.41.1-rc1",
     "@google/genai": "1.30.0",
     "@iarna/toml": "^2.2.5",
     "@machina.ai/api-proxy": "1.18.4-rc0",

package/dist/src/acp/commands/restore.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/acp/commands/restore.test.js

@@ -0,0 +1,179 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { RestoreCommand, ListCheckpointsCommand } from './restore.js';
+import * as fs from 'node:fs/promises';
+import { getCheckpointInfoList, getToolCallDataSchema, isNodeError, performRestore, } from '@google/gemini-cli-core';
+vi.mock('node:fs/promises');
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        getCheckpointInfoList: vi.fn(),
+        getToolCallDataSchema: vi.fn(),
+        isNodeError: vi.fn(),
+        performRestore: vi.fn(),
+    };
+});
+describe('RestoreCommand', () => {
+    let context;
+    let restoreCommand;
+    beforeEach(() => {
+        vi.resetAllMocks();
+        restoreCommand = new RestoreCommand();
+        context = {
+            agentContext: {
+                config: {
+                    getCheckpointingEnabled: vi.fn().mockReturnValue(true),
+                    storage: {
+                        getProjectTempCheckpointsDir: vi
+                            .fn()
+                            .mockReturnValue('/tmp/checkpoints'),
+                    },
+                },
+            },
+            git: {},
+            sendMessage: vi.fn(),
+        };
+    });
+    it('delegates to list behavior when invoked without args', async () => {
+        const listExecuteSpy = vi
+            .spyOn(ListCheckpointsCommand.prototype, 'execute')
+            .mockResolvedValue({
+            name: 'restore list',
+            data: 'list data',
+        });
+        const response = await restoreCommand.execute(context, []);
+        expect(listExecuteSpy).toHaveBeenCalledWith(context);
+        expect(response).toEqual({
+            name: 'restore list',
+            data: 'list data',
+        });
+    });
+    it('returns checkpointing-disabled message when disabled', async () => {
+        context.agentContext.config.getCheckpointingEnabled.mockReturnValue(false);
+        const response = await restoreCommand.execute(context, ['checkpoint1']);
+        expect(response.data).toContain('Checkpointing is not enabled');
+    });
+    it('returns file-not-found message for missing checkpoint', async () => {
+        const error = new Error('ENOENT');
+        error.code = 'ENOENT';
+        vi.mocked(fs.readFile).mockRejectedValue(error);
+        vi.mocked(isNodeError).mockReturnValue(true);
+        const response = await restoreCommand.execute(context, ['missing']);
+        expect(response.data).toBe('File not found: missing.json');
+    });
+    it('handles checkpoint filename already ending in .json', async () => {
+        const error = new Error('ENOENT');
+        error.code = 'ENOENT';
+        vi.mocked(fs.readFile).mockRejectedValue(error);
+        vi.mocked(isNodeError).mockReturnValue(true);
+        const response = await restoreCommand.execute(context, ['existing.json']);
+        expect(response.data).toBe('File not found: existing.json');
+        expect(fs.readFile).toHaveBeenCalledWith(expect.stringContaining('existing.json'), 'utf-8');
+    });
+    it('returns invalid/corrupt checkpoint message when schema parse fails', async () => {
+        vi.mocked(fs.readFile).mockResolvedValue('{"invalid": "data"}');
+        vi.mocked(getToolCallDataSchema).mockReturnValue({
+            safeParse: vi.fn().mockReturnValue({ success: false }),
+        });
+        const response = await restoreCommand.execute(context, ['invalid']);
+        expect(response.data).toBe('Checkpoint file is invalid or corrupted.');
+    });
+    it('formats streamed restore results correctly', async () => {
+        vi.mocked(fs.readFile).mockResolvedValue('{"valid": "data"}');
+        vi.mocked(getToolCallDataSchema).mockReturnValue({
+            safeParse: vi
+                .fn()
+                .mockReturnValue({ success: true, data: { some: 'data' } }),
+        });
+        async function* mockRestoreGenerator() {
+            yield { type: 'message', messageType: 'info', content: 'Restoring...' };
+            yield { type: 'load_history', clientHistory: [{}, {}] };
+            yield { type: 'other', some: 'other' };
+        }
+        vi.mocked(performRestore).mockReturnValue(mockRestoreGenerator());
+        const response = await restoreCommand.execute(context, ['valid']);
+        expect(response.data).toContain('[INFO] Restoring...');
+        expect(response.data).toContain('Loaded history with 2 messages.');
+        expect(response.data).toContain('Restored: {"type":"other","some":"other"}');
+    });
+    it('returns generic unexpected error message for non-ENOENT failures', async () => {
+        vi.mocked(fs.readFile).mockRejectedValue(new Error('Random error'));
+        vi.mocked(isNodeError).mockReturnValue(false);
+        const response = await restoreCommand.execute(context, ['error']);
+        expect(response.data).toContain('An unexpected error occurred during restore: Error: Random error');
+    });
+});
+describe('ListCheckpointsCommand', () => {
+    let context;
+    let listCommand;
+    beforeEach(() => {
+        vi.resetAllMocks();
+        listCommand = new ListCheckpointsCommand();
+        context = {
+            agentContext: {
+                config: {
+                    getCheckpointingEnabled: vi.fn().mockReturnValue(true),
+                    storage: {
+                        getProjectTempCheckpointsDir: vi
+                            .fn()
+                            .mockReturnValue('/tmp/checkpoints'),
+                    },
+                },
+            },
+        };
+    });
+    it('returns checkpointing-disabled message when disabled', async () => {
+        context.agentContext.config.getCheckpointingEnabled.mockReturnValue(false);
+        const response = await listCommand.execute(context);
+        expect(response.data).toContain('Checkpointing is not enabled');
+    });
+    it('returns "No checkpoints found." when no .json checkpoints exist', async () => {
+        vi.mocked(fs.readdir).mockResolvedValue([
+            'not-a-checkpoint.txt',
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        ]);
+        const response = await listCommand.execute(context);
+        expect(response.data).toBe('No checkpoints found.');
+    });
+    it('ignores error when mkdir fails', async () => {
+        vi.mocked(fs.mkdir).mockRejectedValue(new Error('mkdir fail'));
+        vi.mocked(fs.readdir).mockResolvedValue([]);
+        const response = await listCommand.execute(context);
+        expect(response.data).toBe('No checkpoints found.');
+        expect(fs.mkdir).toHaveBeenCalled();
+    });
+    it('formats checkpoint summary output from checkpoint metadata', async () => {
+        vi.mocked(fs.readdir).mockResolvedValue([
+            'cp1.json',
+            'cp2.json',
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        ]);
+        vi.mocked(getCheckpointInfoList).mockReturnValue([
+            { messageId: 'id1', checkpoint: 'cp1' },
+            { messageId: 'id2', checkpoint: 'cp2' },
+        ]);
+        const response = await listCommand.execute(context);
+        expect(response.data).toContain('Available Checkpoints:');
+        // Note: The current implementation of ListCheckpointsCommand incorrectly accesses
+        // fileName, toolName, etc. which don't exist on CheckpointInfo, resulting in 'Unknown'.
+        expect(response.data).toContain('- **Unknown**: Unknown (Status: Unknown)');
+    });
+    it('handles empty checkpoint info list', async () => {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        vi.mocked(fs.readdir).mockResolvedValue(['some.json']);
+        vi.mocked(getCheckpointInfoList).mockReturnValue([]);
+        const response = await listCommand.execute(context);
+        expect(response.data).toBe('Available Checkpoints:\n');
+    });
+    it('returns generic unexpected error message on failures', async () => {
+        vi.mocked(fs.readdir).mockRejectedValue(new Error('Readdir fail'));
+        const response = await listCommand.execute(context);
+        expect(response.data).toBe('An unexpected error occurred while listing checkpoints.');
+    });
+});
+//# sourceMappingURL=restore.test.js.map

package/dist/src/acp/commands/restore.test.js.map

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

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

@@ -40,6 +40,7 @@ export async function getMcpServersFromConfig(settings) {
     const filteredResult = applyAdminAllowlist(mcpServers, adminAllowlist);
     return filteredResult;
 }
+const MCP_LIST_DEFAULT_TIMEOUT_MSEC = 5000;
 async function testMCPConnection(serverName, config, isTrusted, activeSettings) {
     // SECURITY: Only test connection if workspace is trusted or if it's a remote server.
     // stdio servers execute local commands and must never run in untrusted workspaces.
@@ -81,10 +82,19 @@ async function testMCPConnection(serverName, config, isTrusted, activeSettings)
         return MCPServerStatus.DISCONNECTED;
     }
     try {
-        // Attempt actual MCP connection with short timeout
-        await client.connect(transport, { timeout: 5000 }); // 5s timeout
-        // Test basic MCP protocol by pinging the server
-        await client.ping();
+        // Attempt actual MCP connection with timeout from config or default to 5s.
+        // We use a short default for the list command to keep it responsive.
+        const timeout = config.timeout ?? MCP_LIST_DEFAULT_TIMEOUT_MSEC;
+        await client.connect(transport, { timeout });
+        // Test basic MCP protocol by pinging the server.
+        // Ping is optional per MCP spec - some servers (e.g. Google first-party)
+        // don't implement it. A successful connect() is sufficient proof of connectivity.
+        try {
+            await client.ping({ timeout });
+        }
+        catch (e) {
+            debugLogger.debug(`MCP ping failed for ${serverName}, but connect succeeded:`, e);
+        }
         await client.close();
         return MCPServerStatus.CONNECTED;
     }

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

@@ -135,6 +135,54 @@ describe('mcp list command', () => {
         await listMcpServers();
         expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('test-server: /test/server  (stdio) - Disconnected'));
     });
+    it('should display connected status even if ping fails', async () => {
+        const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
+        mockedLoadSettings.mockReturnValue({
+            merged: {
+                ...defaultMergedSettings,
+                mcpServers: {
+                    'test-server': { command: '/test/server' },
+                },
+            },
+            isTrusted: true,
+        });
+        mockClient.connect.mockResolvedValue(undefined);
+        mockClient.ping.mockRejectedValue(new Error('Ping failed'));
+        await listMcpServers();
+        expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('test-server: /test/server  (stdio) - Connected'));
+    });
+    it('should use configured timeout for connection', async () => {
+        const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
+        mockedLoadSettings.mockReturnValue({
+            merged: {
+                ...defaultMergedSettings,
+                mcpServers: {
+                    'test-server': { command: '/test/server', timeout: 12345 },
+                },
+            },
+            isTrusted: true,
+        });
+        mockClient.connect.mockResolvedValue(undefined);
+        await listMcpServers();
+        expect(mockClient.connect).toHaveBeenCalledWith(expect.anything(), expect.objectContaining({ timeout: 12345 }));
+        expect(mockClient.ping).toHaveBeenCalledWith(expect.objectContaining({ timeout: 12345 }));
+    });
+    it('should use default timeout for connection when not configured', async () => {
+        const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
+        mockedLoadSettings.mockReturnValue({
+            merged: {
+                ...defaultMergedSettings,
+                mcpServers: {
+                    'test-server': { command: '/test/server' },
+                },
+            },
+            isTrusted: true,
+        });
+        mockClient.connect.mockResolvedValue(undefined);
+        await listMcpServers();
+        expect(mockClient.connect).toHaveBeenCalledWith(expect.anything(), expect.objectContaining({ timeout: 5000 }));
+        expect(mockClient.ping).toHaveBeenCalledWith(expect.objectContaining({ timeout: 5000 }));
+    });
     it('should merge extension servers with config servers', async () => {
         const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
         mockedLoadSettings.mockReturnValue({

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/config/config.d.ts

@@ -25,6 +25,7 @@ export interface CliArgs {
     extensions: string[] | undefined;
     listExtensions: boolean | undefined;
     resume: string | typeof RESUME_LATEST | undefined;
+    sessionId: string | undefined;
     listSessions: boolean | undefined;
     deleteSession: string | undefined;
     includeDirectories: string[] | undefined;

package/dist/src/config/config.js

@@ -13,7 +13,7 @@ import { extensionsCommand } from '../commands/extensions.js';
 import { skillsCommand } from '../commands/skills.js';
 import { hooksCommand } from '../commands/hooks.js';
 import { gemmaCommand } from '../commands/gemma.js';
-import { setGeminiMdFilename as setServerGeminiMdFilename, getCurrentGeminiMdFilename, ApprovalMode, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, FileDiscoveryService, resolveTelemetrySettings, FatalConfigError, getErrorMessage, getPty, debugLogger, loadServerHierarchicalMemory, ASK_USER_TOOL_NAME, getVersion, PREVIEW_GEMINI_MODEL_AUTO, coreEvents, GEMINI_MODEL_ALIAS_AUTO, getAdminErrorMessage, isHeadlessMode, Config, resolveToRealPath, applyAdminAllowlist, applyRequiredServers, getAdminBlockedMcpServersMessage, getProjectRootForWorktree, isGeminiWorktree, detectIdeFromEnv, generalistProfile, } from '@google/gemini-cli-core';
+import { setGeminiMdFilename as setServerGeminiMdFilename, getCurrentGeminiMdFilename, ApprovalMode, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, FileDiscoveryService, resolveTelemetrySettings, FatalConfigError, getErrorMessage, getPty, debugLogger, loadServerHierarchicalMemory, ASK_USER_TOOL_NAME, getVersion, PREVIEW_GEMINI_MODEL_AUTO, coreEvents, GEMINI_MODEL_ALIAS_AUTO, getAdminErrorMessage, isHeadlessMode, Config, resolveToRealPath, applyAdminAllowlist, applyRequiredServers, getAdminBlockedMcpServersMessage, getProjectRootForWorktree, isGeminiWorktree, detectIdeFromEnv, } from '@google/gemini-cli-core';
 import { AuthProviderKeycloak } from '@machina.ai/auth-keycloak';
 import { saveModelChange, loadSettings, isWorktreeEnabled, } from './settings.js';
 import { loadSandboxConfig } from './sandboxConfig.js';
@@ -138,6 +138,9 @@ export async function parseArguments(settings) {
         const hasPositionalQuery = Array.isArray(query)
             ? query.length > 0
             : !!query;
+        if (argv['resume'] !== undefined && argv['session-id'] !== undefined) {
+            return 'Cannot use both --resume (-r) and --session-id together';
+        }
         if (argv['prompt'] && hasPositionalQuery) {
             return 'Cannot use both a positional prompt and the --prompt (-p) flag together';
         }
@@ -287,6 +290,23 @@ export async function parseArguments(settings) {
             }
             return trimmed;
         },
+    })
+        .option('session-id', {
+        type: 'string',
+        nargs: 1,
+        description: 'Start a new session with a manually provided UUID.',
+        coerce: (value) => {
+            const trimmed = value.trim();
+            if (!trimmed) {
+                throw new Error('The --session-id option cannot be empty.');
+            }
+            if (!/^[a-zA-Z0-9-_]+$/.test(trimmed)) {
+                throw new Error('Invalid session ID "' +
+                    trimmed +
+                    '": Only alphanumeric characters, dashes, and underscores are allowed.');
+            }
+            return trimmed;
+        },
     })
         .option('list-sessions', {
         type: 'boolean',
@@ -616,7 +636,13 @@ export async function loadCliConfig(settings, sessionId, argv, options = {}) {
     });
     const policyEngineConfig = await createPolicyEngineConfig(effectiveSettings, approvalMode, workspacePoliciesDir, interactive);
     const defaultModel = PREVIEW_GEMINI_MODEL_AUTO;
-    const specifiedModel = argv.model || process.env['GEMINI_MODEL'] || settings.model?.name;
+    const rawModel = argv.model || process.env['GEMINI_MODEL'] || settings.model?.name;
+    // Ensure specifiedModel is a string (e.g. if yargs parsed multiple --model as an array)
+    const specifiedModel = Array.isArray(rawModel)
+        ? String(rawModel.at(-1) ?? '').trim() || ''
+        : rawModel === undefined
+            ? undefined
+            : String(rawModel ?? '').trim() || '';
     const resolvedModel = specifiedModel === GEMINI_MODEL_ALIAS_AUTO
         ? defaultModel
         : specifiedModel || defaultModel;
@@ -676,12 +702,17 @@ export async function loadCliConfig(settings, sessionId, argv, options = {}) {
             clientName = `acp-${ide.name}`;
         }
     }
-    const useGeneralistProfile = settings.experimental?.generalistProfile ?? false;
-    const useContextManagement = settings.experimental?.contextManagement ?? false;
+    // TODO(joshualitt): Clean this up alongside removal of the legacy config.
+    let profileSelector = undefined;
+    if (settings.experimental?.stressTestProfile) {
+        profileSelector = 'stressTestProfile';
+    }
+    else if (settings.experimental?.generalistProfile ||
+        settings.experimental?.contextManagement) {
+        profileSelector = 'generalistProfile';
+    }
     const contextManagement = {
-        ...(useGeneralistProfile ? generalistProfile : {}),
-        ...(useContextManagement ? settings?.contextManagement : {}),
-        enabled: useContextManagement || useGeneralistProfile,
+        enabled: !!profileSelector,
     };
     return new Config({
         acpMode: isAcpMode,
@@ -702,6 +733,7 @@ export async function loadCliConfig(settings, sessionId, argv, options = {}) {
         question,
         worktreeSettings,
         coreTools: settings.tools?.core || undefined,
+        experimentalContextManagementConfig: profileSelector,
         allowedTools: allowedTools.length > 0 ? allowedTools : undefined,
         policyEngineConfig,
         policyUpdateConfirmationRequest,
@@ -764,6 +796,7 @@ export async function loadCliConfig(settings, sessionId, argv, options = {}) {
         enableExtensionReloading: settings.experimental?.extensionReloading,
         enableAgents: settings.experimental?.enableAgents,
         plan: settings.general?.plan?.enabled ?? true,
+        voiceMode: settings.experimental?.voiceMode,
         tracker: settings.experimental?.taskTracker,
         directWebFetch: settings.experimental?.directWebFetch,
         planSettings: settings.general?.plan?.directory
@@ -775,6 +808,7 @@ export async function loadCliConfig(settings, sessionId, argv, options = {}) {
         experimentalJitContext,
         experimentalMemoryV2: settings.experimental?.memoryV2,
         experimentalAutoMemory: settings.experimental?.autoMemory,
+        experimentalGemma: settings.experimental?.gemma,
         contextManagement,
         modelSteering: settings.experimental?.modelSteering,
         topicUpdateNarration: settings.general?.topicUpdateNarration ??