@machina.ai/cell-cli 1.33.0-rc1 → 1.38.1-rc1

package/dist/src/acp/commands/memory.js

@@ -0,0 +1,86 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { addMemory, listMemoryFiles, refreshMemory, showMemory, } from '@google/gemini-cli-core';
+const DEFAULT_SANITIZATION_CONFIG = {
+    allowedEnvironmentVariables: [],
+    blockedEnvironmentVariables: [],
+    enableEnvironmentVariableRedaction: false,
+};
+export class MemoryCommand {
+    name = 'memory';
+    description = 'Manage memory.';
+    subCommands = [
+        new ShowMemoryCommand(),
+        new RefreshMemoryCommand(),
+        new ListMemoryCommand(),
+        new AddMemoryCommand(),
+    ];
+    requiresWorkspace = true;
+    async execute(context, _) {
+        return new ShowMemoryCommand().execute(context, _);
+    }
+}
+export class ShowMemoryCommand {
+    name = 'memory show';
+    description = 'Shows the current memory contents.';
+    async execute(context, _) {
+        const result = showMemory(context.agentContext.config);
+        return { name: this.name, data: result.content };
+    }
+}
+export class RefreshMemoryCommand {
+    name = 'memory refresh';
+    aliases = ['memory reload'];
+    description = 'Refreshes the memory from the source.';
+    async execute(context, _) {
+        const result = await refreshMemory(context.agentContext.config);
+        return { name: this.name, data: result.content };
+    }
+}
+export class ListMemoryCommand {
+    name = 'memory list';
+    description = 'Lists the paths of the GEMINI.md files in use.';
+    async execute(context, _) {
+        const result = listMemoryFiles(context.agentContext.config);
+        return { name: this.name, data: result.content };
+    }
+}
+export class AddMemoryCommand {
+    name = 'memory add';
+    description = 'Add content to the memory.';
+    async execute(context, args) {
+        const textToAdd = args.join(' ').trim();
+        const result = addMemory(textToAdd);
+        if (result.type === 'message') {
+            return { name: this.name, data: result.content };
+        }
+        const toolRegistry = context.agentContext.toolRegistry;
+        const tool = toolRegistry.getTool(result.toolName);
+        if (tool) {
+            const abortController = new AbortController();
+            const signal = abortController.signal;
+            await context.sendMessage(`Saving memory via ${result.toolName}...`);
+            await tool.buildAndExecute(result.toolArgs, signal, undefined, {
+                shellExecutionConfig: {
+                    sanitizationConfig: DEFAULT_SANITIZATION_CONFIG,
+                    sandboxManager: context.agentContext.sandboxManager,
+                },
+            });
+            await refreshMemory(context.agentContext.config);
+            return {
+                name: this.name,
+                data: `Added memory: "${textToAdd}"`,
+            };
+        }
+        else {
+            return {
+                name: this.name,
+                data: `Error: Tool ${result.toolName} not found.`,
+            };
+        }
+    }
+}
+//# sourceMappingURL=memory.js.map

package/dist/src/acp/commands/memory.js.map

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

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

@@ -0,0 +1,18 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { Command, CommandContext, CommandExecutionResponse } from './types.js';
+export declare class RestoreCommand implements Command {
+    readonly name = "restore";
+    readonly description = "Restore to a previous checkpoint, or list available checkpoints to restore. This will reset the conversation and file history to the state it was in when the checkpoint was created";
+    readonly requiresWorkspace = true;
+    readonly subCommands: ListCheckpointsCommand[];
+    execute(context: CommandContext, args: string[]): Promise<CommandExecutionResponse>;
+}
+export declare class ListCheckpointsCommand implements Command {
+    readonly name = "restore list";
+    readonly description = "Lists all available checkpoints.";
+    execute(context: CommandContext): Promise<CommandExecutionResponse>;
+}

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

@@ -0,0 +1,141 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { getCheckpointInfoList, getToolCallDataSchema, isNodeError, performRestore, } from '@google/gemini-cli-core';
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+export class RestoreCommand {
+    name = 'restore';
+    description = 'Restore to a previous checkpoint, or list available checkpoints to restore. This will reset the conversation and file history to the state it was in when the checkpoint was created';
+    requiresWorkspace = true;
+    subCommands = [new ListCheckpointsCommand()];
+    async execute(context, args) {
+        const { agentContext: agentContext, git: gitService } = context;
+        const { config } = agentContext;
+        const argsStr = args.join(' ');
+        try {
+            if (!argsStr) {
+                return await new ListCheckpointsCommand().execute(context);
+            }
+            if (!config.getCheckpointingEnabled()) {
+                return {
+                    name: this.name,
+                    data: 'Checkpointing is not enabled. Please enable it in your settings (`general.checkpointing.enabled: true`) to use /restore.',
+                };
+            }
+            const selectedFile = argsStr.endsWith('.json')
+                ? argsStr
+                : `${argsStr}.json`;
+            const checkpointDir = config.storage.getProjectTempCheckpointsDir();
+            const filePath = path.join(checkpointDir, selectedFile);
+            let data;
+            try {
+                data = await fs.readFile(filePath, 'utf-8');
+            }
+            catch (error) {
+                if (isNodeError(error) && error.code === 'ENOENT') {
+                    return {
+                        name: this.name,
+                        data: `File not found: ${selectedFile}`,
+                    };
+                }
+                throw error;
+            }
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+            const toolCallData = JSON.parse(data);
+            const ToolCallDataSchema = getToolCallDataSchema();
+            const parseResult = ToolCallDataSchema.safeParse(toolCallData);
+            if (!parseResult.success) {
+                return {
+                    name: this.name,
+                    data: 'Checkpoint file is invalid or corrupted.',
+                };
+            }
+            const restoreResultGenerator = performRestore(parseResult.data, gitService);
+            const restoreResult = [];
+            for await (const result of restoreResultGenerator) {
+                restoreResult.push(result);
+            }
+            // Format the result nicely since Zed just dumps data
+            const formattedResult = restoreResult
+                .map((r) => {
+                if (r.type === 'message') {
+                    return `[${r.messageType.toUpperCase()}] ${r.content}`;
+                }
+                else if (r.type === 'load_history') {
+                    return `Loaded history with ${r.clientHistory.length} messages.`;
+                }
+                return `Restored: ${JSON.stringify(r)}`;
+            })
+                .join('\n');
+            return {
+                name: this.name,
+                data: formattedResult,
+            };
+        }
+        catch (error) {
+            return {
+                name: this.name,
+                data: `An unexpected error occurred during restore: ${error}`,
+            };
+        }
+    }
+}
+export class ListCheckpointsCommand {
+    name = 'restore list';
+    description = 'Lists all available checkpoints.';
+    async execute(context) {
+        const { config } = context.agentContext;
+        try {
+            if (!config.getCheckpointingEnabled()) {
+                return {
+                    name: this.name,
+                    data: 'Checkpointing is not enabled. Please enable it in your settings (`general.checkpointing.enabled: true`) to use /restore.',
+                };
+            }
+            const checkpointDir = config.storage.getProjectTempCheckpointsDir();
+            try {
+                await fs.mkdir(checkpointDir, { recursive: true });
+            }
+            catch {
+                // Ignore
+            }
+            const files = await fs.readdir(checkpointDir);
+            const jsonFiles = files.filter((file) => file.endsWith('.json'));
+            if (jsonFiles.length === 0) {
+                return { name: this.name, data: 'No checkpoints found.' };
+            }
+            const checkpointFiles = new Map();
+            for (const file of jsonFiles) {
+                const filePath = path.join(checkpointDir, file);
+                const data = await fs.readFile(filePath, 'utf-8');
+                checkpointFiles.set(file, data);
+            }
+            const checkpointInfoList = getCheckpointInfoList(checkpointFiles);
+            const formatted = checkpointInfoList
+                .map((info) => {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                const i = info;
+                const fileName = String(i['fileName'] || 'Unknown');
+                const toolName = String(i['toolName'] || 'Unknown');
+                const status = String(i['status'] || 'Unknown');
+                const timestamp = new Date(Number(i['timestamp']) || 0).toLocaleString();
+                return `- **${fileName}**: ${toolName} (Status: ${status}) [${timestamp}]`;
+            })
+                .join('\n');
+            return {
+                name: this.name,
+                data: `Available Checkpoints:\n${formatted}`,
+            };
+        }
+        catch {
+            return {
+                name: this.name,
+                data: 'An unexpected error occurred while listing checkpoints.',
+            };
+        }
+    }
+}
+//# sourceMappingURL=restore.js.map

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

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

package/dist/src/acp/commands/types.d.ts

@@ -0,0 +1,31 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { AgentLoopContext, GitService } from '@google/gemini-cli-core';
+import type { LoadedSettings } from '../../config/settings.js';
+export interface CommandContext {
+    agentContext: AgentLoopContext;
+    settings: LoadedSettings;
+    git?: GitService;
+    sendMessage: (text: string) => Promise<void>;
+}
+export interface CommandArgument {
+    readonly name: string;
+    readonly description: string;
+    readonly isRequired?: boolean;
+}
+export interface Command {
+    readonly name: string;
+    readonly aliases?: string[];
+    readonly description: string;
+    readonly arguments?: CommandArgument[];
+    readonly subCommands?: Command[];
+    readonly requiresWorkspace?: boolean;
+    execute(context: CommandContext, args: string[]): Promise<CommandExecutionResponse>;
+}
+export interface CommandExecutionResponse {
+    readonly name: string;
+    readonly data: unknown;
+}

package/dist/src/acp/commands/types.js

@@ -0,0 +1,7 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};
+//# sourceMappingURL=types.js.map

package/dist/src/acp/commands/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/acp/commands/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG"}

package/dist/src/{zed-integration → acp}/fileSystemService.d.ts

@@ -3,7 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import type { FileSystemService } from '@google/gemini-cli-core';
+import { type FileSystemService } from '@google/gemini-cli-core';
 import type * as acp from '@agentclientprotocol/sdk';
 /**
  * ACP client-based implementation of FileSystemService
@@ -13,7 +13,11 @@ export declare class AcpFileSystemService implements FileSystemService {
     private readonly sessionId;
     private readonly capabilities;
     private readonly fallback;
-    constructor(connection: acp.AgentSideConnection, sessionId: string, capabilities: acp.FileSystemCapability, fallback: FileSystemService);
+    private readonly root;
+    private readonly geminiDir;
+    constructor(connection: acp.AgentSideConnection, sessionId: string, capabilities: acp.FileSystemCapabilities, fallback: FileSystemService, root: string);
+    private shouldUseFallback;
+    private normalizeFileSystemError;
     readTextFile(filePath: string): Promise<string>;
     writeTextFile(filePath: string, content: string): Promise<void>;
 }

package/dist/src/acp/fileSystemService.js

@@ -0,0 +1,78 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { isWithinRoot } from '@google/gemini-cli-core';
+import os from 'node:os';
+import path from 'node:path';
+/**
+ * ACP client-based implementation of FileSystemService
+ */
+export class AcpFileSystemService {
+    connection;
+    sessionId;
+    capabilities;
+    fallback;
+    root;
+    geminiDir = path.join(os.homedir(), '.cell-cli');
+    constructor(connection, sessionId, capabilities, fallback, root) {
+        this.connection = connection;
+        this.sessionId = sessionId;
+        this.capabilities = capabilities;
+        this.fallback = fallback;
+        this.root = root;
+    }
+    shouldUseFallback(filePath) {
+        // Files inside the global CLI directory must always use the native file system,
+        // even if the user runs the CLI directly from their home directory (which
+        // would make the IDE's project root overlap with the global directory).
+        return (!isWithinRoot(filePath, this.root) ||
+            isWithinRoot(filePath, this.geminiDir));
+    }
+    normalizeFileSystemError(err) {
+        const errorMessage = err instanceof Error ? err.message : String(err);
+        if (errorMessage.includes('Resource not found') ||
+            errorMessage.includes('ENOENT') ||
+            errorMessage.includes('does not exist') ||
+            errorMessage.includes('No such file')) {
+            const newErr = new Error(errorMessage);
+            newErr.code = 'ENOENT';
+            throw newErr;
+        }
+        throw err;
+    }
+    async readTextFile(filePath) {
+        if (!this.capabilities.readTextFile || this.shouldUseFallback(filePath)) {
+            return this.fallback.readTextFile(filePath);
+        }
+        try {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+            const response = await this.connection.readTextFile({
+                path: filePath,
+                sessionId: this.sessionId,
+            });
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+            return response.content;
+        }
+        catch (err) {
+            this.normalizeFileSystemError(err);
+        }
+    }
+    async writeTextFile(filePath, content) {
+        if (!this.capabilities.writeTextFile || this.shouldUseFallback(filePath)) {
+            return this.fallback.writeTextFile(filePath, content);
+        }
+        try {
+            await this.connection.writeTextFile({
+                path: filePath,
+                content,
+                sessionId: this.sessionId,
+            });
+        }
+        catch (err) {
+            this.normalizeFileSystemError(err);
+        }
+    }
+}
+//# sourceMappingURL=fileSystemService.js.map

package/dist/src/acp/fileSystemService.js.map

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

package/dist/src/acp/fileSystemService.test.js

@@ -0,0 +1,162 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, afterEach, } from 'vitest';
+import { AcpFileSystemService } from './fileSystemService.js';
+import os from 'node:os';
+vi.mock('node:os', () => ({
+    default: {
+        homedir: vi.fn(),
+    },
+}));
+describe('AcpFileSystemService', () => {
+    let mockConnection;
+    let mockFallback;
+    let service;
+    beforeEach(() => {
+        mockConnection = {
+            requestPermission: vi.fn(),
+            sessionUpdate: vi.fn(),
+            writeTextFile: vi.fn(),
+            readTextFile: vi.fn(),
+        };
+        mockFallback = {
+            readTextFile: vi.fn(),
+            writeTextFile: vi.fn(),
+        };
+        vi.mocked(os.homedir).mockReturnValue('/home/user');
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    describe('readTextFile', () => {
+        it.each([
+            {
+                capability: true,
+                path: '/path/to/file',
+                desc: 'connection if capability exists and file is inside root',
+                setup: () => {
+                    mockConnection.readTextFile.mockResolvedValue({ content: 'content' });
+                },
+                verify: () => {
+                    expect(mockConnection.readTextFile).toHaveBeenCalledWith({
+                        path: '/path/to/file',
+                        sessionId: 'session-1',
+                    });
+                    expect(mockFallback.readTextFile).not.toHaveBeenCalled();
+                },
+            },
+            {
+                capability: false,
+                path: '/path/to/file',
+                desc: 'fallback if capability missing',
+                setup: () => {
+                    mockFallback.readTextFile.mockResolvedValue('content');
+                },
+                verify: () => {
+                    expect(mockFallback.readTextFile).toHaveBeenCalledWith('/path/to/file');
+                    expect(mockConnection.readTextFile).not.toHaveBeenCalled();
+                },
+            },
+            {
+                capability: true,
+                path: '/outside/file',
+                desc: 'fallback if capability exists but file is outside root',
+                setup: () => {
+                    mockFallback.readTextFile.mockResolvedValue('content');
+                },
+                verify: () => {
+                    expect(mockFallback.readTextFile).toHaveBeenCalledWith('/outside/file');
+                    expect(mockConnection.readTextFile).not.toHaveBeenCalled();
+                },
+            },
+            {
+                capability: true,
+                path: '/home/user/.cell-cli/tmp/file.md',
+                root: '/home/user',
+                desc: 'fallback if file is inside global gemini dir, even if root overlaps',
+                setup: () => {
+                    mockFallback.readTextFile.mockResolvedValue('content');
+                },
+                verify: () => {
+                    expect(mockFallback.readTextFile).toHaveBeenCalledWith('/home/user/.cell-cli/tmp/file.md');
+                    expect(mockConnection.readTextFile).not.toHaveBeenCalled();
+                },
+            },
+        ])('should use $desc', async ({ capability, path, root, setup, verify }) => {
+            service = new AcpFileSystemService(mockConnection, 'session-1', { readTextFile: capability, writeTextFile: true }, mockFallback, root || '/path/to');
+            setup();
+            const result = await service.readTextFile(path);
+            expect(result).toBe('content');
+            verify();
+        });
+        it('should throw normalized ENOENT error when readTextFile encounters "Resource not found"', async () => {
+            service = new AcpFileSystemService(mockConnection, 'session-1', { readTextFile: true, writeTextFile: true }, mockFallback, '/path/to');
+            mockConnection.readTextFile.mockRejectedValue(new Error('Resource not found for document'));
+            await expect(service.readTextFile('/path/to/missing')).rejects.toMatchObject({
+                code: 'ENOENT',
+                message: 'Resource not found for document',
+            });
+        });
+    });
+    describe('writeTextFile', () => {
+        it.each([
+            {
+                capability: true,
+                path: '/path/to/file',
+                desc: 'connection if capability exists and file is inside root',
+                verify: () => {
+                    expect(mockConnection.writeTextFile).toHaveBeenCalledWith({
+                        path: '/path/to/file',
+                        content: 'content',
+                        sessionId: 'session-1',
+                    });
+                    expect(mockFallback.writeTextFile).not.toHaveBeenCalled();
+                },
+            },
+            {
+                capability: false,
+                path: '/path/to/file',
+                desc: 'fallback if capability missing',
+                verify: () => {
+                    expect(mockFallback.writeTextFile).toHaveBeenCalledWith('/path/to/file', 'content');
+                    expect(mockConnection.writeTextFile).not.toHaveBeenCalled();
+                },
+            },
+            {
+                capability: true,
+                path: '/outside/file',
+                desc: 'fallback if capability exists but file is outside root',
+                verify: () => {
+                    expect(mockFallback.writeTextFile).toHaveBeenCalledWith('/outside/file', 'content');
+                    expect(mockConnection.writeTextFile).not.toHaveBeenCalled();
+                },
+            },
+            {
+                capability: true,
+                path: '/home/user/.cell-cli/tmp/file.md',
+                root: '/home/user',
+                desc: 'fallback if file is inside global gemini dir, even if root overlaps',
+                verify: () => {
+                    expect(mockFallback.writeTextFile).toHaveBeenCalledWith('/home/user/.cell-cli/tmp/file.md', 'content');
+                    expect(mockConnection.writeTextFile).not.toHaveBeenCalled();
+                },
+            },
+        ])('should use $desc', async ({ capability, path, root, verify }) => {
+            service = new AcpFileSystemService(mockConnection, 'session-1', { writeTextFile: capability, readTextFile: true }, mockFallback, root || '/path/to');
+            await service.writeTextFile(path, 'content');
+            verify();
+        });
+        it('should throw normalized ENOENT error when writeTextFile encounters "Resource not found"', async () => {
+            service = new AcpFileSystemService(mockConnection, 'session-1', { readTextFile: true, writeTextFile: true }, mockFallback, '/path/to');
+            mockConnection.writeTextFile.mockRejectedValue(new Error('Resource not found for directory'));
+            await expect(service.writeTextFile('/path/to/missing', 'content')).rejects.toMatchObject({
+                code: 'ENOENT',
+                message: 'Resource not found for directory',
+            });
+        });
+    });
+});
+//# sourceMappingURL=fileSystemService.test.js.map

package/dist/src/acp/fileSystemService.test.js.map

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

package/dist/src/commands/extensions/disable.js

@@ -5,8 +5,7 @@
  */
 import {} from 'yargs';
 import { loadSettings, SettingScope } from '../../config/settings.js';
-import { getErrorMessage } from '../../utils/errors.js';
-import { debugLogger } from '@google/gemini-cli-core';
+import { debugLogger, getErrorMessage } from '@google/gemini-cli-core';
 import { ExtensionManager } from '../../config/extension-manager.js';
 import { requestConsentNonInteractive } from '../../config/extensions/consent.js';
 import { promptForSetting } from '../../config/extensions/extensionSettings.js';

package/dist/src/commands/extensions/disable.js.map

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

package/dist/src/commands/extensions/disable.test.js

@@ -9,7 +9,7 @@ import {} from 'yargs';
 import { handleDisable, disableCommand } from './disable.js';
 import { ExtensionManager } from '../../config/extension-manager.js';
 import { loadSettings, SettingScope, } from '../../config/settings.js';
-import { getErrorMessage } from '../../utils/errors.js';
+import { getErrorMessage } from '@google/gemini-cli-core';
 // Mock dependencies
 const emitConsoleLog = vi.hoisted(() => vi.fn());
 const debugLogger = vi.hoisted(() => ({
@@ -28,11 +28,11 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
             emitConsoleLog,
         },
         debugLogger,
+        getErrorMessage: vi.fn(),
     };
 });
 vi.mock('../../config/extension-manager.js');
 vi.mock('../../config/settings.js');
-vi.mock('../../utils/errors.js');
 vi.mock('../../config/extensions/consent.js', () => ({
     requestConsentNonInteractive: vi.fn(),
 }));