Skip to content

refactor: optimize ACP connection architecture and improve cross-platform compatibility #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 21, 2025
Merged

refactor: optimize ACP connection architecture and improve cross-platform compatibility #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3abbd6c
refactor: optimize ACP connection architecture and improve cross-plat…
Sep 20, 2025
69037ad
feat: update version to 1.2.4
Sep 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "AionUi",
"productName": "AionUi",
"version": "1.2.3",
"version": "1.2.4",
"description": "Transform your command-line AI agent into a modern, efficient AI Chat interface.",
"main": ".webpack/main",
"scripts": {
Expand Down
183 changes: 63 additions & 120 deletions src/agent/acp/AcpConnection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { JSONRPC_VERSION } from '@/common/acpTypes';
import type { AcpBackend, AcpMessage, AcpNotification, AcpPermissionRequest, AcpRequest, AcpResponse, AcpSessionUpdate } from '@/common/acpTypes';
import type { ChildProcess } from 'child_process';
import type { ChildProcess, SpawnOptions } from 'child_process';
import { spawn } from 'child_process';

interface PendingRequest {
Expand Down Expand Up @@ -35,6 +35,48 @@ export class AcpConnection {
public onEndTurn: () => void = () => {}; // Handler for end_turn messages
public onFileOperation: (operation: { method: string; path: string; content?: string; sessionId: string }) => void = () => {};

// 通用的spawn配置生成方法
private createGenericSpawnConfig(backend: string, cliPath: string, workingDir: string) {
const isWindows = process.platform === 'win32';
const env = {
...process.env,
};

let spawnCommand: string;
let spawnArgs: string[];

if (cliPath.startsWith('npx ')) {
// For "npx @package/name", split into command and arguments
const parts = cliPath.split(' ');
spawnCommand = isWindows ? 'npx.cmd' : 'npx';
spawnArgs = [...parts.slice(1), '--experimental-acp'];
} else {
// For regular paths like '/usr/local/bin/cli'
spawnCommand = cliPath;
spawnArgs = ['--experimental-acp'];
}

const options: SpawnOptions = {
cwd: workingDir,
stdio: ['pipe', 'pipe', 'pipe'],
env,
shell: isWindows,
};

return {
command: spawnCommand,
args: spawnArgs,
options,
};
}

// 通用的后端连接方法
private async connectGenericBackend(backend: 'gemini' | 'qwen' | 'iflow', cliPath: string, workingDir: string): Promise<void> {
const config = this.createGenericSpawnConfig(backend, cliPath, workingDir);
this.child = spawn(config.command, config.args, config.options);
await this.setupChildProcessHandlers(backend);
}

async connect(backend: AcpBackend, cliPath?: string, workingDir: string = process.cwd()): Promise<void> {
if (this.child) {
this.disconnect();
Expand All @@ -48,15 +90,12 @@ export class AcpConnection {
break;

case 'gemini':
await this.connectGemini(cliPath, workingDir);
break;

case 'qwen':
await this.connectQwen(cliPath, workingDir);
break;

case 'iflow':
await this.connectIflow(cliPath, workingDir);
if (!cliPath) {
throw new Error(`${backend} CLI path is required for ${backend} backend`);
}
await this.connectGenericBackend(backend, cliPath, workingDir);
break;

default:
Expand Down Expand Up @@ -84,116 +123,12 @@ export class AcpConnection {
cwd: workingDir,
stdio: ['pipe', 'pipe', 'pipe'],
env: cleanEnv,
shell: isWindows,
});

await this.setupChildProcessHandlers('claude');
}

private async connectGemini(cliPath?: string, workingDir: string = process.cwd()): Promise<void> {
if (!cliPath) {
throw new Error('Gemini CLI path is required for gemini backend');
}

// Clean environment - let Gemini CLI handle its own authentication
const env: Record<string, string | undefined> = {
...process.env,
};

// Handle npx command format properly
let spawnCommand: string;
let spawnArgs: string[];

if (cliPath.startsWith('npx ')) {
// For "npx @google/gemini-cli", split into command and arguments
const parts = cliPath.split(' ');
const isWindows = process.platform === 'win32';
spawnCommand = isWindows ? 'npx.cmd' : 'npx'; // Use npx.cmd on Windows
spawnArgs = [...parts.slice(1), '--experimental-acp']; // ['@google/gemini-cli', '--experimental-acp']
} else {
// For regular paths like '/usr/local/bin/gemini'
spawnCommand = cliPath;
spawnArgs = ['--experimental-acp'];
}

this.child = spawn(spawnCommand, spawnArgs, {
cwd: workingDir,
stdio: ['pipe', 'pipe', 'pipe'],
env,
});

await this.setupChildProcessHandlers('gemini');
}

private async connectQwen(cliPath?: string, workingDir: string = process.cwd()): Promise<void> {
if (!cliPath) {
throw new Error('Qwen Code CLI path is required for qwen backend');
}

// Clean environment - let Qwen CLI handle its own authentication
const env: Record<string, string | undefined> = {
...process.env,
};

// Handle command format
let spawnCommand: string;
let spawnArgs: string[];

if (cliPath.startsWith('npx ')) {
// For "npx @qwen-code/qwen-code", split into command and arguments
const parts = cliPath.split(' ');
const isWindows = process.platform === 'win32';
spawnCommand = isWindows ? 'npx.cmd' : 'npx'; // Use npx.cmd on Windows
spawnArgs = [...parts.slice(1), '--experimental-acp']; // ['@qwen-code/qwen-code', '--experimental-acp']
} else {
// For regular paths like '/usr/local/bin/qwen'
spawnCommand = cliPath;
spawnArgs = ['--experimental-acp'];
}

this.child = spawn(spawnCommand, spawnArgs, {
cwd: workingDir,
stdio: ['pipe', 'pipe', 'pipe'],
env,
});

await this.setupChildProcessHandlers('qwen');
}

private async connectIflow(cliPath?: string, workingDir: string = process.cwd()): Promise<void> {
if (!cliPath) {
throw new Error('iFlow CLI path is required for iflow backend');
}

// Clean environment - let iFlow CLI handle its own authentication
const env: Record<string, string | undefined> = {
...process.env,
};

// Handle command format
let spawnCommand: string;
let spawnArgs: string[];

if (cliPath.startsWith('npx ')) {
// For "npx iflow", split into command and arguments
const parts = cliPath.split(' ');
const isWindows = process.platform === 'win32';
spawnCommand = isWindows ? 'npx.cmd' : 'npx'; // Use npx.cmd on Windows
spawnArgs = [...parts.slice(1), '--experimental-acp']; // ['iflow', '--experimental-acp']
} else {
// For regular paths like '/usr/local/bin/iflow'
spawnCommand = cliPath;
spawnArgs = ['--experimental-acp'];
}

this.child = spawn(spawnCommand, spawnArgs, {
cwd: workingDir,
stdio: ['pipe', 'pipe', 'pipe'],
env,
});

await this.setupChildProcessHandlers('iflow');
}

private async setupChildProcessHandlers(backend: string): Promise<void> {
let spawnError: Error | null = null;

Expand Down Expand Up @@ -253,8 +188,8 @@ export class AcpConnection {
this.initialize(),
new Promise((_, reject) =>
setTimeout(() => {
reject(new Error('Initialize timeout after 20 seconds'));
}, 20000)
reject(new Error('Initialize timeout after 60 seconds'));
}, 60000)
),
]);
}
Expand All @@ -270,7 +205,7 @@ export class AcpConnection {

return new Promise((resolve, reject) => {
// Use longer timeout for session/prompt requests as they involve LLM processing
const timeoutDuration = method === 'session/prompt' ? 120000 : 15000; // 2 minutes for prompts, 15s for others
const timeoutDuration = method === 'session/prompt' ? 120000 : 60000; // 2 minutes for prompts, 1 minute for others
const startTime = Date.now();

const createTimeoutHandler = () => {
Expand Down Expand Up @@ -369,17 +304,25 @@ export class AcpConnection {

private sendMessage(message: AcpRequest | AcpNotification): void {
if (this.child?.stdin) {
const jsonString = JSON.stringify(message) + '\n';
this.child.stdin.write(jsonString);
const jsonString = JSON.stringify(message);
// Windows 可能需要 \r\n 换行符
const lineEnding = process.platform === 'win32' ? '\r\n' : '\n';
const fullMessage = jsonString + lineEnding;

this.child.stdin.write(fullMessage);
} else {
// Child process not available, cannot send message
}
}

private sendResponseMessage(response: AcpResponse): void {
if (this.child?.stdin) {
const jsonString = JSON.stringify(response) + '\n';
this.child.stdin.write(jsonString);
const jsonString = JSON.stringify(response);
// Windows 可能需要 \r\n 换行符
const lineEnding = process.platform === 'win32' ? '\r\n' : '\n';
const fullMessage = jsonString + lineEnding;

this.child.stdin.write(fullMessage);
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/agent/acp/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ export class AcpAgent {
this.connection.connect(this.extra.backend, this.extra.cliPath, this.extra.workspace),
new Promise((_, reject) =>
setTimeout(() => {
reject(new Error('Connection timeout after 30 seconds'));
}, 30000)
reject(new Error('Connection timeout after 70 seconds'));
}, 70000)
),
]);
this.emitStatusMessage('connected', `Connected to ${this.extra.backend} ACP server`);
Expand Down Expand Up @@ -244,7 +244,7 @@ export class AcpAgent {
this.pendingPermissions.delete(requestId);
reject(new Error('Permission request timed out'));
}
}, 30000);
}, 70000);
});
}

Expand Down Expand Up @@ -503,7 +503,7 @@ export class AcpAgent {

const loginProcess = spawn(command, args, {
stdio: 'pipe', // 避免干扰用户界面
timeout: 30000,
timeout: 70000,
});

await new Promise<void>((resolve, reject) => {
Expand Down