MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-03-20 19:11:23 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use official ACP SDK and support HTTP/SSE based MCP servers (#13856)

Browse Source
This commit is contained in:
Steffen Deusch
2025-12-17 00:28:27 +01:00
committed by GitHub
parent cc52839f19
commit ba100642e3
11 changed files with 120 additions and 1420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
packages/cli/src/zed-integration/zedIntegration.test.ts
View File

@@ -15,7 +15,7 @@ import {
type Mocked,
} from 'vitest';
import { GeminiAgent, Session } from './zedIntegration.js';
import * as acp from './acp.js';
import * as acp from '@agentclientprotocol/sdk';
import {
AuthType,
ToolConfirmationOutcome,
@@ -85,7 +85,7 @@ describe('GeminiAgent', () => {
let mockConfig: Mocked<Awaited<ReturnType<typeof loadCliConfig>>>;
let mockSettings: Mocked<LoadedSettings>;
let mockArgv: CliArgs;
let mockClient: Mocked<acp.Client>;
let mockConnection: Mocked<acp.AgentSideConnection>;
let agent: GeminiAgent;
beforeEach(() => {
@@ -106,13 +106,13 @@ describe('GeminiAgent', () => {
setValue: vi.fn(),
} as unknown as Mocked<LoadedSettings>;
mockArgv = {} as unknown as CliArgs;
mockClient = {
mockConnection = {
sessionUpdate: vi.fn(),
} as unknown as Mocked<acp.Client>;
} as unknown as Mocked<acp.AgentSideConnection>;
(loadCliConfig as unknown as Mock).mockResolvedValue(mockConfig);
agent = new GeminiAgent(mockConfig, mockSettings, mockArgv, mockClient);
agent = new GeminiAgent(mockConfig, mockSettings, mockArgv, mockConnection);
});
it('should initialize correctly', async () => {
@@ -123,7 +123,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 () => {
@@ -202,7 +202,7 @@ describe('GeminiAgent', () => {
});
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,
@@ -257,7 +257,7 @@ describe('GeminiAgent', () => {
describe('Session', () => {
let mockChat: Mocked<GeminiChat>;
let mockConfig: Mocked<Config>;
let mockClient: Mocked<acp.Client>;
let mockConnection: Mocked<acp.AgentSideConnection>;
let session: Session;
let mockToolRegistry: { getTool: Mock };
let mockTool: { kind: string; build: Mock };
@@ -292,13 +292,13 @@ describe('Session', () => {
getEnableRecursiveFileSearch: vi.fn().mockReturnValue(false),
getDebugMode: vi.fn().mockReturnValue(false),
} as unknown as Mocked<Config>;
mockClient = {
mockConnection = {
sessionUpdate: vi.fn(),
requestPermission: vi.fn(),
sendNotification: vi.fn(),
} as unknown as Mocked<acp.Client>;
} as unknown as Mocked<acp.AgentSideConnection>;
session = new Session('session-1', mockChat, mockConfig, mockClient);
session = new Session('session-1', mockChat, mockConfig, mockConnection);
});
afterEach(() => {
@@ -322,7 +322,7 @@ describe('Session', () => {
});
expect(mockChat.sendMessageStream).toHaveBeenCalled();
expect(mockClient.sessionUpdate).toHaveBeenCalledWith({
expect(mockConnection.sessionUpdate).toHaveBeenCalledWith({
sessionId: 'session-1',
update: {
sessionUpdate: 'agent_message_chunk',
@@ -361,7 +361,7 @@ describe('Session', () => {
expect(mockToolRegistry.getTool).toHaveBeenCalledWith('test_tool');
expect(mockTool.build).toHaveBeenCalledWith({ foo: 'bar' });
expect(mockClient.sessionUpdate).toHaveBeenCalledWith(
expect(mockConnection.sessionUpdate).toHaveBeenCalledWith(
expect.objectContaining({
update: expect.objectContaining({
sessionUpdate: 'tool_call',
@@ -369,7 +369,7 @@ describe('Session', () => {
}),
}),
);
expect(mockClient.sessionUpdate).toHaveBeenCalledWith(
expect(mockConnection.sessionUpdate).toHaveBeenCalledWith(
expect.objectContaining({
update: expect.objectContaining({
sessionUpdate: 'tool_call_update',
@@ -392,7 +392,7 @@ describe('Session', () => {
execute: vi.fn().mockResolvedValue({ llmContent: 'Tool Result' }),
});
mockClient.requestPermission.mockResolvedValue({
mockConnection.requestPermission.mockResolvedValue({
outcome: {
outcome: 'selected',
optionId: ToolConfirmationOutcome.ProceedOnce,
@@ -423,7 +423,7 @@ describe('Session', () => {
prompt: [{ type: 'text', text: 'Call tool' }],
});
expect(mockClient.requestPermission).toHaveBeenCalled();
expect(mockConnection.requestPermission).toHaveBeenCalled();
expect(confirmationDetails.onConfirm).toHaveBeenCalledWith(
ToolConfirmationOutcome.ProceedOnce,
);
@@ -441,7 +441,7 @@ describe('Session', () => {
execute: vi.fn().mockResolvedValue({ llmContent: 'Tool Result' }),
});
mockClient.requestPermission.mockResolvedValue({
mockConnection.requestPermission.mockResolvedValue({
outcome: { outcome: 'cancelled' },
});
@@ -635,7 +635,7 @@ describe('Session', () => {
prompt: [{ type: 'text', text: 'Call tool' }],
});
expect(mockClient.sessionUpdate).toHaveBeenCalledWith(
expect(mockConnection.sessionUpdate).toHaveBeenCalledWith(
expect.objectContaining({
update: expect.objectContaining({
sessionUpdate: 'tool_call_update',