@machina.ai/cell-cli 1.20.2-rc1 → 1.25.0-rc3

package/dist/src/zed-integration/fileSystemService.test.js

@@ -6,11 +6,11 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { AcpFileSystemService } from './fileSystemService.js';
 describe('AcpFileSystemService', () => {
-    let mockClient;
+    let mockConnection;
     let mockFallback;
     let service;
     beforeEach(() => {
-        mockClient = {
+        mockConnection = {
             requestPermission: vi.fn(),
             sessionUpdate: vi.fn(),
             writeTextFile: vi.fn(),
@@ -19,23 +19,20 @@ describe('AcpFileSystemService', () => {
         mockFallback = {
             readTextFile: vi.fn(),
             writeTextFile: vi.fn(),
-            findFiles: vi.fn(),
         };
     });
     describe('readTextFile', () => {
         it.each([
             {
                 capability: true,
-                desc: 'client if capability exists',
+                desc: 'connection if capability exists',
                 setup: () => {
-                    mockClient.readTextFile.mockResolvedValue({ content: 'content' });
+                    mockConnection.readTextFile.mockResolvedValue({ content: 'content' });
                 },
                 verify: () => {
-                    expect(mockClient.readTextFile).toHaveBeenCalledWith({
+                    expect(mockConnection.readTextFile).toHaveBeenCalledWith({
                         path: '/path/to/file',
                         sessionId: 'session-1',
-                        line: null,
-                        limit: null,
                     });
                     expect(mockFallback.readTextFile).not.toHaveBeenCalled();
                 },
@@ -48,11 +45,11 @@ describe('AcpFileSystemService', () => {
                 },
                 verify: () => {
                     expect(mockFallback.readTextFile).toHaveBeenCalledWith('/path/to/file');
-                    expect(mockClient.readTextFile).not.toHaveBeenCalled();
+                    expect(mockConnection.readTextFile).not.toHaveBeenCalled();
                 },
             },
         ])('should use $desc', async ({ capability, setup, verify }) => {
-            service = new AcpFileSystemService(mockClient, 'session-1', { readTextFile: capability, writeTextFile: true }, mockFallback);
+            service = new AcpFileSystemService(mockConnection, 'session-1', { readTextFile: capability, writeTextFile: true }, mockFallback);
             setup();
             const result = await service.readTextFile('/path/to/file');
             expect(result).toBe('content');
@@ -63,9 +60,9 @@ describe('AcpFileSystemService', () => {
         it.each([
             {
                 capability: true,
-                desc: 'client if capability exists',
+                desc: 'connection if capability exists',
                 verify: () => {
-                    expect(mockClient.writeTextFile).toHaveBeenCalledWith({
+                    expect(mockConnection.writeTextFile).toHaveBeenCalledWith({
                         path: '/path/to/file',
                         content: 'content',
                         sessionId: 'session-1',
@@ -78,21 +75,14 @@ describe('AcpFileSystemService', () => {
                 desc: 'fallback if capability missing',
                 verify: () => {
                     expect(mockFallback.writeTextFile).toHaveBeenCalledWith('/path/to/file', 'content');
-                    expect(mockClient.writeTextFile).not.toHaveBeenCalled();
+                    expect(mockConnection.writeTextFile).not.toHaveBeenCalled();
                 },
             },
         ])('should use $desc', async ({ capability, verify }) => {
-            service = new AcpFileSystemService(mockClient, 'session-1', { writeTextFile: capability, readTextFile: true }, mockFallback);
+            service = new AcpFileSystemService(mockConnection, 'session-1', { writeTextFile: capability, readTextFile: true }, mockFallback);
             await service.writeTextFile('/path/to/file', 'content');
             verify();
         });
     });
-    it('should always use fallback for findFiles', () => {
-        service = new AcpFileSystemService(mockClient, 'session-1', { readTextFile: true, writeTextFile: true }, mockFallback);
-        mockFallback.findFiles.mockReturnValue(['file1', 'file2']);
-        const result = service.findFiles('pattern', ['/path']);
-        expect(mockFallback.findFiles).toHaveBeenCalledWith('pattern', ['/path']);
-        expect(result).toEqual(['file1', 'file2']);
-    });
 });
 //# sourceMappingURL=fileSystemService.test.js.map

package/dist/src/zed-integration/fileSystemService.test.js.map

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

package/dist/src/zed-integration/zedIntegration.d.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import type { Config, GeminiChat } from '@google/gemini-cli-core';
-import * as acp from './acp.js';
+import * as acp from '@agentclientprotocol/sdk';
 import type { LoadedSettings } from '../config/settings.js';
 import type { CliArgs } from '../config/config.js';
 export declare function runZedIntegration(config: Config, settings: LoadedSettings, argv: CliArgs): Promise<void>;
@@ -12,10 +12,10 @@ export declare class GeminiAgent {
     private config;
     private settings;
     private argv;
-    private client;
+    private connection;
     private sessions;
     private clientCapabilities;
-    constructor(config: Config, settings: LoadedSettings, argv: CliArgs, client: acp.Client);
+    constructor(config: Config, settings: LoadedSettings, argv: CliArgs, connection: acp.AgentSideConnection);
     initialize(args: acp.InitializeRequest): Promise<acp.InitializeResponse>;
     authenticate({ methodId }: acp.AuthenticateRequest): Promise<void>;
     newSession({ cwd, mcpServers, }: acp.NewSessionRequest): Promise<acp.NewSessionResponse>;
@@ -28,9 +28,9 @@ export declare class Session {
     private readonly id;
     private readonly chat;
     private readonly config;
-    private readonly client;
+    private readonly connection;
     private pendingPrompt;
-    constructor(id: string, chat: GeminiChat, config: Config, client: acp.Client);
+    constructor(id: string, chat: GeminiChat, config: Config, connection: acp.AgentSideConnection);
     cancelPendingPrompt(): Promise<void>;
     prompt(params: acp.PromptRequest): Promise<acp.PromptResponse>;
     private sendUpdate;

package/dist/src/zed-integration/zedIntegration.js

@@ -3,8 +3,8 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { AuthType, logToolCall, convertToFunctionResponse, ToolConfirmationOutcome, clearCachedCredentialFile, isNodeError, getErrorMessage, isWithinRoot, getErrorStatus, MCPServerConfig, DiscoveredMCPTool, StreamEventType, ToolCallEvent, debugLogger, ReadManyFilesTool, getEffectiveModel, createWorkingStdio, startupProfiler, } from '@google/gemini-cli-core';
-import * as acp from './acp.js';
+import { AuthType, logToolCall, convertToFunctionResponse, ToolConfirmationOutcome, clearCachedCredentialFile, isNodeError, getErrorMessage, isWithinRoot, getErrorStatus, MCPServerConfig, DiscoveredMCPTool, StreamEventType, ToolCallEvent, debugLogger, ReadManyFilesTool, resolveModel, createWorkingStdio, startupProfiler, } from '@google/gemini-cli-core';
+import * as acp from '@agentclientprotocol/sdk';
 import { AcpFileSystemService } from './fileSystemService.js';
 import { Readable, Writable } from 'node:stream';
 import { SettingScope } from '../config/settings.js';
@@ -17,20 +17,21 @@ export async function runZedIntegration(config, settings, argv) {
     const { stdout: workingStdout } = createWorkingStdio();
     const stdout = Writable.toWeb(workingStdout);
     const stdin = Readable.toWeb(process.stdin);
-    new acp.AgentSideConnection((client) => new GeminiAgent(config, settings, argv, client), stdout, stdin);
+    const stream = acp.ndJsonStream(stdout, stdin);
+    new acp.AgentSideConnection((connection) => new GeminiAgent(config, settings, argv, connection), stream);
 }
 export class GeminiAgent {
     config;
     settings;
     argv;
-    client;
+    connection;
     sessions = new Map();
     clientCapabilities;
-    constructor(config, settings, argv, client) {
+    constructor(config, settings, argv, connection) {
         this.config = config;
         this.settings = settings;
         this.argv = argv;
-        this.client = client;
+        this.connection = connection;
     }
     async initialize(args) {
         this.clientCapabilities = args.clientCapabilities;
@@ -61,12 +62,23 @@ export class GeminiAgent {
                     audio: true,
                     embeddedContext: true,
                 },
+                mcpCapabilities: {
+                    http: true,
+                    sse: true,
+                },
             },
         };
     }
     async authenticate({ methodId }) {
         const method = z.nativeEnum(AuthType).parse(methodId);
-        await clearCachedCredentialFile();
+        const selectedAuthType = this.settings.merged.security?.auth?.selectedType;
+        // Only clear credentials when switching to a different auth method
+        if (selectedAuthType && selectedAuthType !== method) {
+            await clearCachedCredentialFile();
+        }
+        // Refresh auth with the requested method
+        // This will reuse existing credentials if they're valid,
+        // or perform new authentication if needed
         await this.config.refreshAuth(method);
         this.settings.setValue(SettingScope.User, 'security.auth.selectedType', method);
     }
@@ -87,12 +99,12 @@ export class GeminiAgent {
             throw acp.RequestError.authRequired();
         }
         if (this.clientCapabilities?.fs) {
-            const acpFileSystemService = new AcpFileSystemService(this.client, sessionId, this.clientCapabilities.fs, config.getFileSystemService());
+            const acpFileSystemService = new AcpFileSystemService(this.connection, sessionId, this.clientCapabilities.fs, config.getFileSystemService());
             config.setFileSystemService(acpFileSystemService);
         }
         const geminiClient = config.getGeminiClient();
         const chat = await geminiClient.startChat();
-        const session = new Session(sessionId, chat, config, this.client);
+        const session = new Session(sessionId, chat, config, this.connection);
         this.sessions.set(sessionId, session);
         return {
             sessionId,
@@ -100,15 +112,31 @@ export class GeminiAgent {
     }
     async newSessionConfig(sessionId, cwd, mcpServers) {
         const mergedMcpServers = { ...this.settings.merged.mcpServers };
-        for (const { command, args, env: rawEnv, name } of mcpServers) {
-            const env = {};
-            for (const { name: envName, value } of rawEnv) {
-                env[envName] = value;
+        for (const server of mcpServers) {
+            if ('type' in server &&
+                (server.type === 'sse' || server.type === 'http')) {
+                // HTTP or SSE MCP server
+                const headers = Object.fromEntries(server.headers.map(({ name, value }) => [name, value]));
+                mergedMcpServers[server.name] = new MCPServerConfig(undefined, // command
+                undefined, // args
+                undefined, // env
+                undefined, // cwd
+                server.type === 'sse', // isSse
+                server.type === 'sse' ? server.url : undefined, // url (sse)
+                server.type === 'http' ? server.url : undefined, // httpUrl
+                headers);
+            }
+            else if ('command' in server) {
+                // Stdio MCP server
+                const env = {};
+                for (const { name: envName, value } of server.env) {
+                    env[envName] = value;
+                }
+                mergedMcpServers[server.name] = new MCPServerConfig(server.command, server.args, env, cwd);
             }
-            mergedMcpServers[name] = new MCPServerConfig(command, args, env, cwd);
         }
         const settings = { ...this.settings.merged, mcpServers: mergedMcpServers };
-        const config = await loadCliConfig(settings, sessionId, this.argv, cwd);
+        const config = await loadCliConfig(settings, sessionId, this.argv, { cwd });
         await config.initialize();
         startupProfiler.flush(config);
         return config;
@@ -132,13 +160,13 @@ export class Session {
     id;
     chat;
     config;
-    client;
+    connection;
     pendingPrompt = null;
-    constructor(id, chat, config, client) {
+    constructor(id, chat, config, connection) {
         this.id = id;
         this.chat = chat;
         this.config = config;
-        this.client = client;
+        this.connection = connection;
     }
     async cancelPendingPrompt() {
         if (!this.pendingPrompt) {
@@ -162,7 +190,7 @@ export class Session {
             }
             const functionCalls = [];
             try {
-                const model = getEffectiveModel(this.config.isInFallbackMode(), this.config.getModel(), this.config.getPreviewFeatures());
+                const model = resolveModel(this.config.getModel(), this.config.getPreviewFeatures());
                 const responseStream = await chat.sendMessageStream({ model }, nextMessage?.parts ?? [], promptId, pendingSend.signal);
                 nextMessage = null;
                 for await (const resp of responseStream) {
@@ -181,6 +209,7 @@ export class Session {
                                 type: 'text',
                                 text: part.text,
                             };
+                            // eslint-disable-next-line @typescript-eslint/no-floating-promises
                             this.sendUpdate({
                                 sessionUpdate: part.thought
                                     ? 'agent_thought_chunk'
@@ -223,11 +252,11 @@ export class Session {
             sessionId: this.id,
             update,
         };
-        await this.client.sessionUpdate(params);
+        await this.connection.sessionUpdate(params);
     }
     async runTool(abortSignal, promptId, fc) {
         const callId = fc.id ?? `${fc.name}-${Date.now()}`;
-        const args = (fc.args ?? {});
+        const args = fc.args ?? {};
         const startTime = Date.now();
         const errorResponse = (error) => {
             const durationMs = Date.now() - startTime;
@@ -277,7 +306,7 @@ export class Session {
                         kind: tool.kind,
                     },
                 };
-                const output = await this.client.requestPermission(params);
+                const output = await this.connection.requestPermission(params);
                 const outcome = output.outcome.outcome === 'cancelled'
                     ? ToolConfirmationOutcome.Cancel
                     : z
@@ -289,6 +318,7 @@ export class Session {
                         return errorResponse(new Error(`Tool "${fc.name}" was canceled by the user.`));
                     case ToolConfirmationOutcome.ProceedOnce:
                     case ToolConfirmationOutcome.ProceedAlways:
+                    case ToolConfirmationOutcome.ProceedAlwaysAndSave:
                     case ToolConfirmationOutcome.ProceedAlwaysServer:
                     case ToolConfirmationOutcome.ProceedAlwaysTool:
                     case ToolConfirmationOutcome.ModifyWithEditor:
@@ -322,7 +352,7 @@ export class Session {
             logToolCall(this.config, new ToolCallEvent(undefined, fc.name ?? '', args, durationMs, true, promptId, typeof tool !== 'undefined' && tool instanceof DiscoveredMCPTool
                 ? 'mcp'
                 : 'native'));
-            return convertToFunctionResponse(fc.name, callId, toolResult.llmContent);
+            return convertToFunctionResponse(fc.name, callId, toolResult.llmContent, this.config.getActiveModel());
         }
         catch (e) {
             const error = e instanceof Error ? e : new Error(String(e));
@@ -388,7 +418,7 @@ export class Session {
         const contentLabelsForDisplay = [];
         const ignoredPaths = [];
         const toolRegistry = this.config.getToolRegistry();
-        const readManyFilesTool = new ReadManyFilesTool(this.config);
+        const readManyFilesTool = new ReadManyFilesTool(this.config, this.config.getMessageBus());
         const globTool = toolRegistry.getTool('glob');
         if (!readManyFilesTool) {
             throw new Error('Error: read_many_files tool not found.');

package/dist/src/zed-integration/zedIntegration.js.map

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

package/dist/src/zed-integration/zedIntegration.test.js

@@ -5,7 +5,7 @@
  */
 import { describe, it, expect, vi, beforeEach, afterEach, } from 'vitest';
 import { GeminiAgent, Session } from './zedIntegration.js';
-import * as acp from './acp.js';
+import * as acp from '@agentclientprotocol/sdk';
 import { AuthType, ToolConfirmationOutcome, StreamEventType, isWithinRoot, ReadManyFilesTool, } from '@google/gemini-cli-core';
 import { SettingScope } from '../config/settings.js';
 import { loadCliConfig } from '../config/config.js';
@@ -56,7 +56,7 @@ describe('GeminiAgent', () => {
     let mockConfig;
     let mockSettings;
     let mockArgv;
-    let mockClient;
+    let mockConnection;
     let agent;
     beforeEach(() => {
         mockConfig = {
@@ -67,6 +67,11 @@ describe('GeminiAgent', () => {
             getGeminiClient: vi.fn().mockReturnValue({
                 startChat: vi.fn().mockResolvedValue({}),
             }),
+            getMessageBus: vi.fn().mockReturnValue({
+                publish: vi.fn(),
+                subscribe: vi.fn(),
+                unsubscribe: vi.fn(),
+            }),
         };
         mockSettings = {
             merged: {
@@ -76,11 +81,11 @@ describe('GeminiAgent', () => {
             setValue: vi.fn(),
         };
         mockArgv = {};
-        mockClient = {
+        mockConnection = {
             sessionUpdate: vi.fn(),
         };
         loadCliConfig.mockResolvedValue(mockConfig);
-        agent = new GeminiAgent(mockConfig, mockSettings, mockArgv, mockClient);
+        agent = new GeminiAgent(mockConfig, mockSettings, mockArgv, mockConnection);
     });
     it('should initialize correctly', async () => {
         const response = await agent.initialize({
@@ -89,7 +94,7 @@ describe('GeminiAgent', () => {
         });
         expect(response.protocolVersion).toBe(acp.PROTOCOL_VERSION);
         expect(response.authMethods).toHaveLength(3);
-        expect(response.agentCapabilities.loadSession).toBe(false);
+        expect(response.agentCapabilities?.loadSession).toBe(false);
     });
     it('should authenticate correctly', async () => {
         await agent.authenticate({
@@ -129,7 +134,7 @@ describe('GeminiAgent', () => {
                     env: { KEY: 'VALUE' },
                 }),
             }),
-        }), 'test-session-id', mockArgv, '/tmp');
+        }), 'test-session-id', mockArgv, { cwd: '/tmp' });
     });
     it('should handle authentication failure gracefully', async () => {
         mockConfig.refreshAuth.mockRejectedValue(new Error('Auth failed'));
@@ -144,7 +149,7 @@ describe('GeminiAgent', () => {
         debugSpy.mockRestore();
     });
     it('should initialize file system service if client supports it', async () => {
-        agent = new GeminiAgent(mockConfig, mockSettings, mockArgv, mockClient);
+        agent = new GeminiAgent(mockConfig, mockSettings, mockArgv, mockConnection);
         await agent.initialize({
             clientCapabilities: { fs: { readTextFile: true, writeTextFile: true } },
             protocolVersion: 1,
@@ -185,10 +190,11 @@ describe('GeminiAgent', () => {
 describe('Session', () => {
     let mockChat;
     let mockConfig;
-    let mockClient;
+    let mockConnection;
     let session;
     let mockToolRegistry;
     let mockTool;
+    let mockMessageBus;
     beforeEach(() => {
         mockChat = {
             sendMessageStream: vi.fn(),
@@ -206,8 +212,12 @@ describe('Session', () => {
         mockToolRegistry = {
             getTool: vi.fn().mockReturnValue(mockTool),
         };
+        mockMessageBus = {
+            publish: vi.fn(),
+            subscribe: vi.fn(),
+            unsubscribe: vi.fn(),
+        };
         mockConfig = {
-            isInFallbackMode: vi.fn().mockReturnValue(false),
             getModel: vi.fn().mockReturnValue('gemini-pro'),
             getPreviewFeatures: vi.fn().mockReturnValue({}),
             getToolRegistry: vi.fn().mockReturnValue(mockToolRegistry),
@@ -218,13 +228,14 @@ describe('Session', () => {
             getTargetDir: vi.fn().mockReturnValue('/tmp'),
             getEnableRecursiveFileSearch: vi.fn().mockReturnValue(false),
             getDebugMode: vi.fn().mockReturnValue(false),
+            getMessageBus: vi.fn().mockReturnValue(mockMessageBus),
         };
-        mockClient = {
+        mockConnection = {
             sessionUpdate: vi.fn(),
             requestPermission: vi.fn(),
             sendNotification: vi.fn(),
         };
-        session = new Session('session-1', mockChat, mockConfig, mockClient);
+        session = new Session('session-1', mockChat, mockConfig, mockConnection);
     });
     afterEach(() => {
         vi.clearAllMocks();
@@ -244,7 +255,7 @@ describe('Session', () => {
             prompt: [{ type: 'text', text: 'Hi' }],
         });
         expect(mockChat.sendMessageStream).toHaveBeenCalled();
-        expect(mockClient.sessionUpdate).toHaveBeenCalledWith({
+        expect(mockConnection.sessionUpdate).toHaveBeenCalledWith({
             sessionId: 'session-1',
             update: {
                 sessionUpdate: 'agent_message_chunk',
@@ -279,13 +290,13 @@ describe('Session', () => {
         });
         expect(mockToolRegistry.getTool).toHaveBeenCalledWith('test_tool');
         expect(mockTool.build).toHaveBeenCalledWith({ foo: 'bar' });
-        expect(mockClient.sessionUpdate).toHaveBeenCalledWith(expect.objectContaining({
+        expect(mockConnection.sessionUpdate).toHaveBeenCalledWith(expect.objectContaining({
             update: expect.objectContaining({
                 sessionUpdate: 'tool_call',
                 status: 'in_progress',
             }),
         }));
-        expect(mockClient.sessionUpdate).toHaveBeenCalledWith(expect.objectContaining({
+        expect(mockConnection.sessionUpdate).toHaveBeenCalledWith(expect.objectContaining({
             update: expect.objectContaining({
                 sessionUpdate: 'tool_call_update',
                 status: 'completed',
@@ -304,7 +315,7 @@ describe('Session', () => {
             shouldConfirmExecute: vi.fn().mockResolvedValue(confirmationDetails),
             execute: vi.fn().mockResolvedValue({ llmContent: 'Tool Result' }),
         });
-        mockClient.requestPermission.mockResolvedValue({
+        mockConnection.requestPermission.mockResolvedValue({
             outcome: {
                 outcome: 'selected',
                 optionId: ToolConfirmationOutcome.ProceedOnce,
@@ -331,7 +342,7 @@ describe('Session', () => {
             sessionId: 'session-1',
             prompt: [{ type: 'text', text: 'Call tool' }],
         });
-        expect(mockClient.requestPermission).toHaveBeenCalled();
+        expect(mockConnection.requestPermission).toHaveBeenCalled();
         expect(confirmationDetails.onConfirm).toHaveBeenCalledWith(ToolConfirmationOutcome.ProceedOnce);
     });
     it('should handle tool call cancellation by user', async () => {
@@ -345,7 +356,7 @@ describe('Session', () => {
             shouldConfirmExecute: vi.fn().mockResolvedValue(confirmationDetails),
             execute: vi.fn().mockResolvedValue({ llmContent: 'Tool Result' }),
         });
-        mockClient.requestPermission.mockResolvedValue({
+        mockConnection.requestPermission.mockResolvedValue({
             outcome: { outcome: 'cancelled' },
         });
         const stream1 = createMockStream([
@@ -508,7 +519,7 @@ describe('Session', () => {
             sessionId: 'session-1',
             prompt: [{ type: 'text', text: 'Call tool' }],
         });
-        expect(mockClient.sessionUpdate).toHaveBeenCalledWith(expect.objectContaining({
+        expect(mockConnection.sessionUpdate).toHaveBeenCalledWith(expect.objectContaining({
             update: expect.objectContaining({
                 sessionUpdate: 'tool_call_update',
                 status: 'failed',