agent-gear 1.1.6 → 1.1.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/acp/bridge.d.ts +13 -0
- package/dist/acp/bridge.d.ts.map +1 -1
- package/dist/acp/bridge.js +125 -3
- package/dist/acp/bridge.js.map +1 -1
- package/dist/acp/bridge.test.js +130 -7
- package/dist/acp/bridge.test.js.map +1 -1
- package/dist/acp/prober.d.ts +24 -0
- package/dist/acp/prober.d.ts.map +1 -0
- package/dist/acp/prober.js +53 -0
- package/dist/acp/prober.js.map +1 -0
- package/dist/acp/prober.test.d.ts +2 -0
- package/dist/acp/prober.test.d.ts.map +1 -0
- package/dist/acp/prober.test.js +94 -0
- package/dist/acp/prober.test.js.map +1 -0
- package/dist/acp/spawner.js +4 -4
- package/dist/acp/spawner.js.map +1 -1
- package/dist/acp/sync-bridge.d.ts +2 -0
- package/dist/acp/sync-bridge.d.ts.map +1 -1
- package/dist/acp/sync-bridge.js +6 -0
- package/dist/acp/sync-bridge.js.map +1 -1
- package/dist/commands/mcp-proxy.d.ts +10 -0
- package/dist/commands/mcp-proxy.d.ts.map +1 -1
- package/dist/commands/mcp-proxy.js +78 -24
- package/dist/commands/mcp-proxy.js.map +1 -1
- package/dist/socketio-client.d.ts.map +1 -1
- package/dist/socketio-client.js +57 -3
- package/dist/socketio-client.js.map +1 -1
- package/package.json +1 -1
- package/src/acp/bridge.test.ts +159 -7
- package/src/acp/bridge.ts +152 -3
- package/src/acp/prober.test.ts +107 -0
- package/src/acp/prober.ts +73 -0
- package/src/acp/spawner.ts +4 -4
- package/src/acp/sync-bridge.ts +8 -0
- package/src/commands/mcp-proxy.ts +91 -28
- package/src/socketio-client.ts +72 -3
- package/tests/acp-bridge.test.ts +119 -0
- package/tests/acp-spawner.test.ts +28 -1
- package/tests/acp-wire-elicitation.test.ts +158 -0
- package/tests/acp-wire-mcp.test.ts +114 -0
- package/tests/commands/mcp-proxy-dispatcher.test.ts +117 -0
- package/tests/fixtures/fake-acp-agent.mjs +122 -0
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { homedir } from 'os';
|
|
2
|
+
import { acpDetector } from './detector.js';
|
|
3
|
+
import { AcpSpawner } from './spawner.js';
|
|
4
|
+
import { AcpSessionBridge } from './bridge.js';
|
|
5
|
+
/**
|
|
6
|
+
* 空实例探测:临时拉起指定 ACP 工具进程(initialize + session/new),
|
|
7
|
+
* 收集 Mode/模型选项后立即关闭。用于配置阶段动态获取可选选项,
|
|
8
|
+
* 避免用户手填 modeId/modelId。
|
|
9
|
+
*
|
|
10
|
+
* 探测会话不与服务端交互:bridge 发出的 socket 事件全部丢弃。
|
|
11
|
+
* 任一环节失败(CLI 不存在 / 需要认证 / 超时)都会 reject,由调用方降级处理。
|
|
12
|
+
*/
|
|
13
|
+
export async function probeAcpServerOptions(serverType, timeoutMs = 20000) {
|
|
14
|
+
const sessionId = `probe-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
|
|
15
|
+
const config = acpDetector.getSpawnerConfig(serverType);
|
|
16
|
+
const cwd = homedir();
|
|
17
|
+
const spawner = new AcpSpawner({ sessionId, cwd, command: config.command, args: config.args });
|
|
18
|
+
const noopSocket = { emit: () => false };
|
|
19
|
+
const bridge = new AcpSessionBridge(noopSocket, { sessionId, cwd }, spawner);
|
|
20
|
+
return new Promise((resolve, reject) => {
|
|
21
|
+
let settled = false;
|
|
22
|
+
const timer = setTimeout(() => {
|
|
23
|
+
finish(() => reject(new Error(`probe timeout after ${timeoutMs}ms: ${serverType}`)));
|
|
24
|
+
}, timeoutMs);
|
|
25
|
+
const cleanup = () => {
|
|
26
|
+
clearTimeout(timer);
|
|
27
|
+
bridge.stop().catch(() => { });
|
|
28
|
+
spawner.stop();
|
|
29
|
+
};
|
|
30
|
+
const finish = (fn) => {
|
|
31
|
+
if (settled)
|
|
32
|
+
return;
|
|
33
|
+
settled = true;
|
|
34
|
+
cleanup();
|
|
35
|
+
fn();
|
|
36
|
+
};
|
|
37
|
+
bridge.on('acp:initialized', (payload) => {
|
|
38
|
+
finish(() => resolve({
|
|
39
|
+
modes: payload.modes ?? [],
|
|
40
|
+
availableModels: payload.availableModels ?? [],
|
|
41
|
+
currentModeId: payload.currentModeId ?? null,
|
|
42
|
+
currentModelId: payload.currentModelId ?? null,
|
|
43
|
+
}));
|
|
44
|
+
});
|
|
45
|
+
bridge.on('acp:stopped', (payload) => {
|
|
46
|
+
finish(() => reject(new Error(payload.error ?? `ACP process stopped during probe: ${payload.reason}`)));
|
|
47
|
+
});
|
|
48
|
+
bridge.start().catch((error) => {
|
|
49
|
+
finish(() => reject(error instanceof Error ? error : new Error(String(error))));
|
|
50
|
+
});
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
//# sourceMappingURL=prober.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prober.js","sourceRoot":"","sources":["../../src/acp/prober.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prober.test.d.ts","sourceRoot":"","sources":["../../src/acp/prober.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
2
|
+
const { mockNewSession, mockInitialize } = vi.hoisted(() => {
|
|
3
|
+
const mockNewSession = vi.fn().mockResolvedValue({ sessionId: 'acp-probe-1' });
|
|
4
|
+
const mockInitialize = vi.fn().mockResolvedValue({ protocolVersion: 1 });
|
|
5
|
+
return { mockNewSession, mockInitialize };
|
|
6
|
+
});
|
|
7
|
+
vi.mock('@agentclientprotocol/sdk', () => ({
|
|
8
|
+
ndJsonStream: vi.fn(() => ({})),
|
|
9
|
+
ClientSideConnection: vi.fn(function () {
|
|
10
|
+
return {
|
|
11
|
+
initialize: mockInitialize,
|
|
12
|
+
newSession: mockNewSession,
|
|
13
|
+
prompt: vi.fn().mockResolvedValue({ stopReason: 'end_turn' }),
|
|
14
|
+
cancel: vi.fn().mockResolvedValue(undefined),
|
|
15
|
+
closeSession: vi.fn().mockResolvedValue({}),
|
|
16
|
+
setSessionMode: vi.fn().mockResolvedValue({}),
|
|
17
|
+
setSessionConfigOption: vi.fn().mockResolvedValue({}),
|
|
18
|
+
};
|
|
19
|
+
}),
|
|
20
|
+
}));
|
|
21
|
+
const mockSpawnerStop = vi.fn();
|
|
22
|
+
vi.mock('./spawner.js', () => ({
|
|
23
|
+
AcpSpawner: vi.fn(function () {
|
|
24
|
+
return {
|
|
25
|
+
start: vi.fn(),
|
|
26
|
+
stop: mockSpawnerStop,
|
|
27
|
+
isRunning: vi.fn().mockReturnValue(true),
|
|
28
|
+
stdin: new WritableStream(),
|
|
29
|
+
stdout: new ReadableStream(),
|
|
30
|
+
closed: Promise.resolve(),
|
|
31
|
+
};
|
|
32
|
+
}),
|
|
33
|
+
}));
|
|
34
|
+
import { probeAcpServerOptions } from './prober.js';
|
|
35
|
+
describe('probeAcpServerOptions', () => {
|
|
36
|
+
beforeEach(() => {
|
|
37
|
+
vi.clearAllMocks();
|
|
38
|
+
});
|
|
39
|
+
afterEach(() => {
|
|
40
|
+
vi.restoreAllMocks();
|
|
41
|
+
});
|
|
42
|
+
it('session/new 返回 modes + configOptions 时提取 Mode/模型选项并关闭进程', async () => {
|
|
43
|
+
mockInitialize.mockResolvedValue({ protocolVersion: 1 });
|
|
44
|
+
mockNewSession.mockResolvedValue({
|
|
45
|
+
sessionId: 'acp-probe-1',
|
|
46
|
+
modes: {
|
|
47
|
+
availableModes: [
|
|
48
|
+
{ id: 'code', name: 'Code', description: '编码模式' },
|
|
49
|
+
{ id: 'ask', name: 'Ask' },
|
|
50
|
+
],
|
|
51
|
+
currentModeId: 'code',
|
|
52
|
+
},
|
|
53
|
+
configOptions: [
|
|
54
|
+
{
|
|
55
|
+
id: 'model',
|
|
56
|
+
name: 'Model',
|
|
57
|
+
category: 'model',
|
|
58
|
+
type: 'select',
|
|
59
|
+
currentValue: 'gpt-5',
|
|
60
|
+
options: [
|
|
61
|
+
{ value: 'gpt-5', name: 'GPT-5' },
|
|
62
|
+
{ value: 'claude-4', name: 'Claude 4' },
|
|
63
|
+
],
|
|
64
|
+
},
|
|
65
|
+
],
|
|
66
|
+
});
|
|
67
|
+
const result = await probeAcpServerOptions('opencode');
|
|
68
|
+
expect(result.modes).toEqual([
|
|
69
|
+
{ id: 'code', name: 'Code', description: '编码模式' },
|
|
70
|
+
{ id: 'ask', name: 'Ask', description: undefined },
|
|
71
|
+
]);
|
|
72
|
+
expect(result.currentModeId).toBe('code');
|
|
73
|
+
expect(result.availableModels).toEqual([
|
|
74
|
+
{ id: 'gpt-5', name: 'GPT-5' },
|
|
75
|
+
{ id: 'claude-4', name: 'Claude 4' },
|
|
76
|
+
]);
|
|
77
|
+
expect(result.currentModelId).toBe('gpt-5');
|
|
78
|
+
expect(mockSpawnerStop).toHaveBeenCalled();
|
|
79
|
+
});
|
|
80
|
+
it('Agent 无 modes/models 时返回空数组而非失败', async () => {
|
|
81
|
+
mockNewSession.mockResolvedValue({ sessionId: 'acp-probe-2' });
|
|
82
|
+
const result = await probeAcpServerOptions('opencode');
|
|
83
|
+
expect(result.modes).toEqual([]);
|
|
84
|
+
expect(result.availableModels).toEqual([]);
|
|
85
|
+
expect(result.currentModeId).toBeNull();
|
|
86
|
+
expect(result.currentModelId).toBeNull();
|
|
87
|
+
});
|
|
88
|
+
it('initialize 失败时 reject 并关闭进程', async () => {
|
|
89
|
+
mockInitialize.mockRejectedValueOnce(new Error('handshake failed'));
|
|
90
|
+
await expect(probeAcpServerOptions('opencode')).rejects.toThrow('handshake failed');
|
|
91
|
+
expect(mockSpawnerStop).toHaveBeenCalled();
|
|
92
|
+
});
|
|
93
|
+
});
|
|
94
|
+
//# sourceMappingURL=prober.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prober.test.js","sourceRoot":"","sources":["../../src/acp/prober.test.ts"],"names":[],"mappings":"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"}
|
package/dist/acp/spawner.js
CHANGED
|
@@ -19,7 +19,7 @@ export class AcpSpawner {
|
|
|
19
19
|
}
|
|
20
20
|
start() {
|
|
21
21
|
const cmd = this.resolveCommand();
|
|
22
|
-
console.log(`Starting ACP server
|
|
22
|
+
console.log(`Starting ACP server: session=${this.sessionId} cmd=${cmd} args=${JSON.stringify(this.args)} cwd=${this.cwd}`);
|
|
23
23
|
mkdirSync(this.cwd, { recursive: true });
|
|
24
24
|
const spawnOptions = {
|
|
25
25
|
cwd: this.cwd,
|
|
@@ -30,15 +30,15 @@ export class AcpSpawner {
|
|
|
30
30
|
}
|
|
31
31
|
this.process = spawn(cmd, this.args, spawnOptions);
|
|
32
32
|
this.process.stderr?.on('data', (data) => {
|
|
33
|
-
console.error(`ACP stderr: ${data.toString()}`);
|
|
33
|
+
console.error(`ACP stderr (session=${this.sessionId}): ${data.toString()}`);
|
|
34
34
|
});
|
|
35
35
|
this.process.on('exit', (code, signal) => {
|
|
36
|
-
console.log(`ACP process exited
|
|
36
|
+
console.log(`ACP process exited: session=${this.sessionId} code=${code} signal=${signal} cmd=${cmd} args=${JSON.stringify(this.args)}`);
|
|
37
37
|
this.process = null;
|
|
38
38
|
this.resolveClosed?.();
|
|
39
39
|
});
|
|
40
40
|
this.process.on('error', (error) => {
|
|
41
|
-
console.error(
|
|
41
|
+
console.error(`ACP process error (session=${this.sessionId}, cmd=${cmd}):`, error);
|
|
42
42
|
});
|
|
43
43
|
}
|
|
44
44
|
get stdin() {
|
package/dist/acp/spawner.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawner.js","sourceRoot":"","sources":["../../src/acp/spawner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,YAAY,EAAwC,MAAM,eAAe,CAAC;AAC1F,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAS9B,MAAM,OAAO,UAAU;IACb,OAAO,GAAwB,IAAI,CAAC;IACpC,SAAS,CAAS;IAClB,GAAG,CAAS;IACZ,OAAO,CAAS;IAChB,IAAI,CAAW;IACf,aAAa,GAAwB,IAAI,CAAC;IAC1C,OAAO,CAAgB;IAE/B,YAAY,OAA0B;QACpC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,UAAU,CAAC;QAC7C,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;QACpC,IAAI,CAAC,OAAO,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,GAAG,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7E,CAAC;IAED,KAAK;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"spawner.js","sourceRoot":"","sources":["../../src/acp/spawner.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,5 +20,7 @@ export declare class AcpSyncBridge implements acp.Client {
|
|
|
20
20
|
disconnect(sessionId?: string): Promise<void>;
|
|
21
21
|
sessionUpdate(params: acp.SessionNotification): Promise<void>;
|
|
22
22
|
requestPermission(): Promise<acp.RequestPermissionResponse>;
|
|
23
|
+
unstable_createElicitation(): Promise<acp.CreateElicitationResponse>;
|
|
24
|
+
unstable_completeElicitation(): Promise<void>;
|
|
23
25
|
}
|
|
24
26
|
//# sourceMappingURL=sync-bridge.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-bridge.d.ts","sourceRoot":"","sources":["../../src/acp/sync-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAsB1C,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,CAAC;CACb;AAED,qBAAa,aAAc,YAAW,GAAG,CAAC,MAAM;IAC9C,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,UAAU,CAAyC;IAC3D,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,YAAY,CAAsC;gBAE9C,OAAO,EAAE,oBAAoB,EAAE,OAAO,CAAC,EAAE,UAAU;IAOzD,OAAO,CAAC,SAAS,GAAE,MAA2B,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBpE,cAAc,IAAI,OAAO;IAInB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;IAOpF,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO/C,WAAW,CACf,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,SAAS,GAAE,MAAgC,GAC1C,OAAO,CAAC;QACT,MAAM,EAAE,GAAG,CAAC,mBAAmB,CAAC;QAChC,OAAO,EAAE,GAAG,CAAC,mBAAmB,EAAE,CAAC;KACpC,CAAC;IAuBI,UAAU,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO7C,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7D,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"sync-bridge.d.ts","sourceRoot":"","sources":["../../src/acp/sync-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAsB1C,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,CAAC;CACb;AAED,qBAAa,aAAc,YAAW,GAAG,CAAC,MAAM;IAC9C,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,UAAU,CAAyC;IAC3D,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,YAAY,CAAsC;gBAE9C,OAAO,EAAE,oBAAoB,EAAE,OAAO,CAAC,EAAE,UAAU;IAOzD,OAAO,CAAC,SAAS,GAAE,MAA2B,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBpE,cAAc,IAAI,OAAO;IAInB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;IAOpF,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO/C,WAAW,CACf,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,SAAS,GAAE,MAAgC,GAC1C,OAAO,CAAC;QACT,MAAM,EAAE,GAAG,CAAC,mBAAmB,CAAC;QAChC,OAAO,EAAE,GAAG,CAAC,mBAAmB,EAAE,CAAC;KACpC,CAAC;IAuBI,UAAU,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO7C,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7D,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC;IAI3D,0BAA0B,IAAI,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC;IAIpE,4BAA4B,IAAI,OAAO,CAAC,IAAI,CAAC;CAGpD"}
|
package/dist/acp/sync-bridge.js
CHANGED
|
@@ -85,5 +85,11 @@ export class AcpSyncBridge {
|
|
|
85
85
|
async requestPermission() {
|
|
86
86
|
return { outcome: { outcome: 'cancelled' } };
|
|
87
87
|
}
|
|
88
|
+
async unstable_createElicitation() {
|
|
89
|
+
return { action: 'cancel' };
|
|
90
|
+
}
|
|
91
|
+
async unstable_completeElicitation() {
|
|
92
|
+
// no-op
|
|
93
|
+
}
|
|
88
94
|
}
|
|
89
95
|
//# sourceMappingURL=sync-bridge.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-bridge.js","sourceRoot":"","sources":["../../src/acp/sync-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAC/B,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAClC,MAAM,uBAAuB,GAAG,OAAO,CAAC;AAExC,KAAK,UAAU,WAAW,CACxB,OAAmB,EACnB,EAAU,EACV,OAAe;IAEf,IAAI,KAAoC,CAAC;IACzC,MAAM,YAAY,GAAG,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;QACpD,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IACH,IAAI,CAAC;QACH,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;IACrD,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,KAAM,CAAC,CAAC;IACvB,CAAC;AACH,CAAC;AAMD,MAAM,OAAO,aAAa;IAChB,OAAO,CAAa;IACpB,UAAU,GAAoC,IAAI,CAAC;IACnD,OAAO,GAA8B,EAAE,CAAC;IACxC,YAAY,GAAiC,IAAI,CAAC;IAE1D,YAAY,OAA6B,EAAE,OAAoB;QAC7D,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,IAAI,UAAU,CAAC;YACvC,SAAS,EAAE,QAAQ,IAAI,CAAC,GAAG,EAAE,EAAE;YAC/B,GAAG,EAAE,OAAO,CAAC,GAAG;SACjB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,YAAoB,kBAAkB;QAClD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACrB,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACzE,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,CAAC,oBAAoB,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAEnE,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YAChD,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QACH,WAAW,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAE5B,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;YAC7C,eAAe,EAAE,oBAAoB;YACrC,kBAAkB,EAAE,EAAE;YACtB,UAAU,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE;SACrD,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,WAAW,CAC9B,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,EACxC,SAAS,EACT,+BAA+B,SAAS,IAAI,CAC7C,CAAC;QACF,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,iBAAiB,IAAI,IAAI,CAAC;IACvD,CAAC;IAED,cAAc;QACZ,OAAO,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,mBAAmB,EAAE,MAAM,CAAC,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAW,EAAE,MAAsB;QACpD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,SAAiB;QACnC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACpD,CAAC;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,WAAW,CACf,SAAiB,EACjB,GAAW,EACX,YAAoB,uBAAuB;QAK3C,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAElB,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YAChD,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QACH,WAAW,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAE5B,MAAM,MAAM,GAAG,MAAM,WAAW,CAC9B,OAAO,CAAC,IAAI,CAAC;YACX,IAAI,CAAC,UAAW,CAAC,WAAW,CAAC;gBAC3B,GAAG;gBACH,SAAS;gBACT,UAAU,EAAE,EAAE;aACf,CAAC;YACF,WAAW;SACZ,CAAC,EACF,SAAS,EACT,oCAAoC,SAAS,IAAI,CAClD,CAAC;QACF,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,SAAkB;QACjC,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACrE,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,MAA+B;QACjD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,OAAO,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,CAAC;IAC/C,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"sync-bridge.js","sourceRoot":"","sources":["../../src/acp/sync-bridge.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,18 @@
|
|
|
1
|
+
import { ChildProcess } from 'child_process';
|
|
1
2
|
interface McpProxyOptions {
|
|
2
3
|
server: string;
|
|
3
4
|
key: string;
|
|
4
5
|
command: string;
|
|
5
6
|
}
|
|
7
|
+
interface JsonRpcRequest {
|
|
8
|
+
jsonrpc?: string;
|
|
9
|
+
id?: unknown;
|
|
10
|
+
method?: string;
|
|
11
|
+
[key: string]: unknown;
|
|
12
|
+
}
|
|
13
|
+
export declare function createStdioDispatcher(child: ChildProcess): {
|
|
14
|
+
forward(request: JsonRpcRequest): Promise<unknown>;
|
|
15
|
+
};
|
|
6
16
|
export declare function startMcpRegistration(options: McpProxyOptions): Promise<void>;
|
|
7
17
|
export {};
|
|
8
18
|
//# sourceMappingURL=mcp-proxy.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-proxy.d.ts","sourceRoot":"","sources":["../../src/commands/mcp-proxy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mcp-proxy.d.ts","sourceRoot":"","sources":["../../src/commands/mcp-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,YAAY,EAAE,MAAM,eAAe,CAAC;AAGpD,UAAU,eAAe;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,cAAc;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAeD,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,YAAY;qBA4CpC,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;EAoBrD;AAED,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CA+FlF"}
|
|
@@ -1,5 +1,79 @@
|
|
|
1
1
|
import { spawn } from 'child_process';
|
|
2
2
|
import { io as ioClient } from 'socket.io-client';
|
|
3
|
+
const FORWARD_TIMEOUT_MS = 30_000;
|
|
4
|
+
// JSON-RPC notifications have no id and MUST NOT be waited on: per the MCP
|
|
5
|
+
// spec the server never responds to them. Waiting would stall every hop of
|
|
6
|
+
// the forward chain for the full timeout.
|
|
7
|
+
function isNotification(request) {
|
|
8
|
+
return request.id === undefined || request.id === null;
|
|
9
|
+
}
|
|
10
|
+
// Persistent line-buffered JSON-RPC dispatcher over a child process' stdio.
|
|
11
|
+
// Responses are matched to requests by id, so chunked responses (a single
|
|
12
|
+
// 'data' event is NOT guaranteed to contain exactly one complete JSON
|
|
13
|
+
// message) and concurrent in-flight requests are handled correctly.
|
|
14
|
+
export function createStdioDispatcher(child) {
|
|
15
|
+
let buffer = '';
|
|
16
|
+
const pending = new Map();
|
|
17
|
+
child.stdout?.on('data', (data) => {
|
|
18
|
+
buffer += data.toString();
|
|
19
|
+
let idx;
|
|
20
|
+
while ((idx = buffer.indexOf('\n')) >= 0) {
|
|
21
|
+
const line = buffer.slice(0, idx).trim();
|
|
22
|
+
buffer = buffer.slice(idx + 1);
|
|
23
|
+
if (!line)
|
|
24
|
+
continue;
|
|
25
|
+
let msg;
|
|
26
|
+
try {
|
|
27
|
+
msg = JSON.parse(line);
|
|
28
|
+
}
|
|
29
|
+
catch {
|
|
30
|
+
console.error(`[MCP proxy] ignoring non-JSON line from child: ${line.slice(0, 200)}`);
|
|
31
|
+
continue;
|
|
32
|
+
}
|
|
33
|
+
const entry = pending.get(msg.id);
|
|
34
|
+
if (!entry) {
|
|
35
|
+
console.error(`[MCP proxy] ignoring response with unknown id: ${JSON.stringify(msg.id)}`);
|
|
36
|
+
continue;
|
|
37
|
+
}
|
|
38
|
+
clearTimeout(entry.timeout);
|
|
39
|
+
pending.delete(msg.id);
|
|
40
|
+
console.log(`[MCP proxy] response: method=${entry.method} id=${JSON.stringify(msg.id)}${msg.error ? ` error=${msg.error.message}` : ''}`);
|
|
41
|
+
entry.resolve(msg);
|
|
42
|
+
}
|
|
43
|
+
});
|
|
44
|
+
const rejectAll = (reason) => {
|
|
45
|
+
for (const [, entry] of pending) {
|
|
46
|
+
clearTimeout(entry.timeout);
|
|
47
|
+
entry.reject(reason);
|
|
48
|
+
}
|
|
49
|
+
pending.clear();
|
|
50
|
+
};
|
|
51
|
+
child.on('exit', (code) => {
|
|
52
|
+
console.log(`[MCP proxy] MCP command exited with code ${code}, rejecting ${pending.size} pending request(s)`);
|
|
53
|
+
rejectAll(new Error(`MCP command exited with code ${code}`));
|
|
54
|
+
});
|
|
55
|
+
return {
|
|
56
|
+
forward(request) {
|
|
57
|
+
const method = request.method ?? '(unknown)';
|
|
58
|
+
if (isNotification(request)) {
|
|
59
|
+
// Fire-and-forget: deliver the notification (e.g. notifications/initialized
|
|
60
|
+
// completes the MCP handshake) but do not wait for a response.
|
|
61
|
+
console.log(`[MCP proxy] forwarding notification: method=${method}`);
|
|
62
|
+
child.stdin?.write(JSON.stringify(request) + '\n');
|
|
63
|
+
return Promise.resolve(null);
|
|
64
|
+
}
|
|
65
|
+
console.log(`[MCP proxy] forwarding request: method=${method} id=${JSON.stringify(request.id)}`);
|
|
66
|
+
return new Promise((resolve, reject) => {
|
|
67
|
+
const timeout = setTimeout(() => {
|
|
68
|
+
pending.delete(request.id);
|
|
69
|
+
reject(new Error(`Request timeout waiting for ${method}`));
|
|
70
|
+
}, FORWARD_TIMEOUT_MS);
|
|
71
|
+
pending.set(request.id, { resolve, reject, timeout, method });
|
|
72
|
+
child.stdin?.write(JSON.stringify(request) + '\n');
|
|
73
|
+
});
|
|
74
|
+
},
|
|
75
|
+
};
|
|
76
|
+
}
|
|
3
77
|
export async function startMcpRegistration(options) {
|
|
4
78
|
const { server, key, command } = options;
|
|
5
79
|
console.log(`Registering MCP proxy with server ${server}...`);
|
|
@@ -30,9 +104,6 @@ export async function startMcpRegistration(options) {
|
|
|
30
104
|
child.on('error', (err) => {
|
|
31
105
|
console.error('Failed to start MCP command:', err.message);
|
|
32
106
|
});
|
|
33
|
-
child.on('exit', (code) => {
|
|
34
|
-
console.log(`MCP command exited with code ${code}`);
|
|
35
|
-
});
|
|
36
107
|
// 3. Establish WebSocket connection
|
|
37
108
|
const socket = ioClient(`${server}/mcp-proxy`, {
|
|
38
109
|
transports: ['websocket'],
|
|
@@ -49,17 +120,19 @@ export async function startMcpRegistration(options) {
|
|
|
49
120
|
console.error(`Proxy error: ${data.code} - ${data.message}`);
|
|
50
121
|
});
|
|
51
122
|
// 4. Bridge requests
|
|
123
|
+
const dispatcher = createStdioDispatcher(child);
|
|
52
124
|
socket.on('proxy:request', async (data) => {
|
|
53
125
|
try {
|
|
54
|
-
const response = await
|
|
126
|
+
const response = await dispatcher.forward(data.request);
|
|
55
127
|
socket.emit('proxy:response', { requestId: data.requestId, response });
|
|
56
128
|
}
|
|
57
129
|
catch (err) {
|
|
130
|
+
console.error(`[MCP proxy] forward failed: method=${data.request?.method} id=${JSON.stringify(data.request?.id)} error=${err.message}`);
|
|
58
131
|
socket.emit('proxy:response', {
|
|
59
132
|
requestId: data.requestId,
|
|
60
133
|
response: {
|
|
61
134
|
jsonrpc: '2.0',
|
|
62
|
-
id: data.request.id,
|
|
135
|
+
id: data.request.id ?? null,
|
|
63
136
|
error: { code: -32603, message: err.message },
|
|
64
137
|
},
|
|
65
138
|
});
|
|
@@ -83,23 +156,4 @@ export async function startMcpRegistration(options) {
|
|
|
83
156
|
process.on('SIGINT', shutdown);
|
|
84
157
|
process.on('SIGTERM', shutdown);
|
|
85
158
|
}
|
|
86
|
-
function forwardToChild(child, request) {
|
|
87
|
-
return new Promise((resolve, reject) => {
|
|
88
|
-
const timeout = setTimeout(() => {
|
|
89
|
-
reject(new Error('Request timeout'));
|
|
90
|
-
}, 30000);
|
|
91
|
-
const onData = (data) => {
|
|
92
|
-
clearTimeout(timeout);
|
|
93
|
-
child.stdout?.removeListener('data', onData);
|
|
94
|
-
try {
|
|
95
|
-
resolve(JSON.parse(data.toString()));
|
|
96
|
-
}
|
|
97
|
-
catch {
|
|
98
|
-
reject(new Error('Invalid JSON response from MCP command'));
|
|
99
|
-
}
|
|
100
|
-
};
|
|
101
|
-
child.stdout?.on('data', onData);
|
|
102
|
-
child.stdin?.write(JSON.stringify(request) + '\n');
|
|
103
|
-
});
|
|
104
|
-
}
|
|
105
159
|
//# sourceMappingURL=mcp-proxy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-proxy.js","sourceRoot":"","sources":["../../src/commands/mcp-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAgB,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,EAAE,IAAI,QAAQ,EAAU,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"mcp-proxy.js","sourceRoot":"","sources":["../../src/commands/mcp-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAgB,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,EAAE,IAAI,QAAQ,EAAU,MAAM,kBAAkB,CAAC;AAe1D,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAElC,2EAA2E;AAC3E,2EAA2E;AAC3E,0CAA0C;AAC1C,SAAS,cAAc,CAAC,OAAuB;IAC7C,OAAO,OAAO,CAAC,EAAE,KAAK,SAAS,IAAI,OAAO,CAAC,EAAE,KAAK,IAAI,CAAC;AACzD,CAAC;AAED,4EAA4E;AAC5E,0EAA0E;AAC1E,sEAAsE;AACtE,oEAAoE;AACpE,MAAM,UAAU,qBAAqB,CAAC,KAAmB;IACvD,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,MAAM,OAAO,GAAG,IAAI,GAAG,EAA4H,CAAC;IAEpJ,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;QACxC,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC1B,IAAI,GAAG,CAAC;QACR,OAAO,CAAC,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YACzC,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;YAC/B,IAAI,CAAC,IAAI;gBAAE,SAAS;YACpB,IAAI,GAAmD,CAAC;YACxD,IAAI,CAAC;gBACH,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,CAAC,KAAK,CAAC,kDAAkD,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;gBACtF,SAAS;YACX,CAAC;YACD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAClC,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,CAAC,kDAAkD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;gBAC1F,SAAS;YACX,CAAC;YACD,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC5B,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,gCAAgC,KAAK,CAAC,MAAM,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC1I,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,CAAC,MAAa,EAAE,EAAE;QAClC,KAAK,MAAM,CAAC,EAAE,KAAK,CAAC,IAAI,OAAO,EAAE,CAAC;YAChC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC5B,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC;QACD,OAAO,CAAC,KAAK,EAAE,CAAC;IAClB,CAAC,CAAC;IAEF,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;QACxB,OAAO,CAAC,GAAG,CAAC,4CAA4C,IAAI,eAAe,OAAO,CAAC,IAAI,qBAAqB,CAAC,CAAC;QAC9G,SAAS,CAAC,IAAI,KAAK,CAAC,gCAAgC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,OAAO,CAAC,OAAuB;YAC7B,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,WAAW,CAAC;YAC7C,IAAI,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC5B,4EAA4E;gBAC5E,+DAA+D;gBAC/D,OAAO,CAAC,GAAG,CAAC,+CAA+C,MAAM,EAAE,CAAC,CAAC;gBACrE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;gBACnD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,0CAA0C,MAAM,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YACjG,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrC,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;oBAC9B,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;oBAC3B,MAAM,CAAC,IAAI,KAAK,CAAC,+BAA+B,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC7D,CAAC,EAAE,kBAAkB,CAAC,CAAC;gBACvB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;gBAC9D,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,OAAwB;IACjE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAEzC,OAAO,CAAC,GAAG,CAAC,qCAAqC,MAAM,KAAK,CAAC,CAAC;IAE9D,0BAA0B;IAC1B,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,MAAM,yBAAyB,EAAE;QAC/D,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;YACnB,GAAG;YACH,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,SAAS;YAC3C,OAAO;YACP,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,SAAS;SAClD,CAAC;KACH,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAS,CAAC;IAC5C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QACpD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,uBAAuB,MAAM,CAAC,OAAO,YAAY,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAEhF,yBAAyB;IACzB,MAAM,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1C,OAAO,CAAC,GAAG,CAAC,+BAA+B,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEpE,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE;QAC7B,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;QAC/B,KAAK,EAAE,IAAI;KACZ,CAAC,CAAC;IAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;QACxB,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,oCAAoC;IACpC,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,MAAM,YAAY,EAAE;QAC7C,UAAU,EAAE,CAAC,WAAW,CAAC;QACzB,WAAW,EAAE,IAAI;KAClB,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;QACxB,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;QACtD,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,IAA2C,EAAE,EAAE;QAC5E,OAAO,CAAC,GAAG,CAAC,8CAA8C,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,IAAuC,EAAE,EAAE;QACnE,OAAO,CAAC,KAAK,CAAC,gBAAgB,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,qBAAqB;IACrB,MAAM,UAAU,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,CAAC,EAAE,CAAC,eAAe,EAAE,KAAK,EAAE,IAAoD,EAAE,EAAE;QACxF,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACxD,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;QACzE,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,OAAO,CAAC,KAAK,CAAC,sCAAsC,IAAI,CAAC,OAAO,EAAE,MAAM,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YACxI,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE;gBAC5B,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,QAAQ,EAAE;oBACR,OAAO,EAAE,KAAK;oBACd,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,IAAI;oBAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE;iBAC9C;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,eAAe;IACf,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAG,EAAE;QACzC,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC,EAAE,KAAK,CAAC,CAAC;IAEV,aAAa;IACb,MAAM,QAAQ,GAAG,GAAG,EAAE;QACpB,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;QAC1C,aAAa,CAAC,iBAAiB,CAAC,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QAC7D,KAAK,CAAC,IAAI,EAAE,CAAC;QACb,MAAM,CAAC,UAAU,EAAE,CAAC;QACpB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC;IAEF,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC/B,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;AAClC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socketio-client.d.ts","sourceRoot":"","sources":["../src/socketio-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"socketio-client.d.ts","sourceRoot":"","sources":["../src/socketio-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAiM3E,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAChC,MAAM,CA+oBR;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAE/C"}
|
package/dist/socketio-client.js
CHANGED
|
@@ -6,6 +6,7 @@ import { homedir } from 'os';
|
|
|
6
6
|
import { Heartbeat } from './heartbeat.js';
|
|
7
7
|
import { clearConfigKey, getResumeTokenFromConfig, saveResumeTokenToConfig, clearResumeTokenFromConfig } from './config.js';
|
|
8
8
|
import { acpDetector } from './acp/detector.js';
|
|
9
|
+
import { probeAcpServerOptions } from './acp/prober.js';
|
|
9
10
|
import { AcpSpawner } from './acp/spawner.js';
|
|
10
11
|
import { AcpSessionBridge } from './acp/bridge.js';
|
|
11
12
|
import { AcpSyncBridge } from './acp/sync-bridge.js';
|
|
@@ -16,10 +17,23 @@ import { gatewayManager } from './gateway.js';
|
|
|
16
17
|
const CONTROLLER_VERSION = '1.1.1';
|
|
17
18
|
const acpBridges = new Map();
|
|
18
19
|
const permissionRequestBridge = new Map();
|
|
20
|
+
const elicitationRequestBridge = new Map();
|
|
19
21
|
function createSpawner(serverType, sessionId, cwd) {
|
|
20
22
|
const config = acpDetector.getSpawnerConfig(serverType);
|
|
21
23
|
return new AcpSpawner({ sessionId, cwd, command: config.command, args: config.args });
|
|
22
24
|
}
|
|
25
|
+
// Summarize the MCP configuration of an acp:start/acp:resume payload for logs,
|
|
26
|
+
// without leaking the endpoint token.
|
|
27
|
+
function describeMcpConfig(data) {
|
|
28
|
+
const parts = [];
|
|
29
|
+
if (data.mcpServers && data.mcpServers.length > 0) {
|
|
30
|
+
parts.push(`mcpServers=${data.mcpServers.length}`);
|
|
31
|
+
}
|
|
32
|
+
if (data.mcpEndpoint) {
|
|
33
|
+
parts.push(`mcpEndpoint(url=${data.mcpEndpoint.url}, serverNames=${JSON.stringify(data.mcpEndpoint.serverNames ?? null)})`);
|
|
34
|
+
}
|
|
35
|
+
return parts.length > 0 ? `mcp=[${parts.join(' ')}]` : 'mcp=[none]';
|
|
36
|
+
}
|
|
23
37
|
export function connectToServer(endpoint, key, options) {
|
|
24
38
|
const socket = createSocketIOClient(endpoint, {
|
|
25
39
|
transports: ['websocket'],
|
|
@@ -82,20 +96,47 @@ export function connectToServer(endpoint, key, options) {
|
|
|
82
96
|
servers,
|
|
83
97
|
});
|
|
84
98
|
});
|
|
99
|
+
// 空实例探测:拉起指定工具的临时会话,收集 Mode/模型选项后关闭
|
|
100
|
+
socket.on('acp:probe-options', async (data) => {
|
|
101
|
+
console.log(`[ACP ctrl] acp:probe-options received: requestId=${data.requestId} serverType=${data.serverType}`);
|
|
102
|
+
try {
|
|
103
|
+
const options = await probeAcpServerOptions(data.serverType);
|
|
104
|
+
console.log(`[ACP ctrl] probe-options success: serverType=${data.serverType} modes=${options.modes.length} models=${options.availableModels.length}`);
|
|
105
|
+
socket.emit('acp:probe-options:result', {
|
|
106
|
+
requestId: data.requestId,
|
|
107
|
+
serverType: data.serverType,
|
|
108
|
+
success: true,
|
|
109
|
+
...options,
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
catch (error) {
|
|
113
|
+
console.warn(`[ACP ctrl] probe-options failed: serverType=${data.serverType} error=${error.message}`);
|
|
114
|
+
socket.emit('acp:probe-options:result', {
|
|
115
|
+
requestId: data.requestId,
|
|
116
|
+
serverType: data.serverType,
|
|
117
|
+
success: false,
|
|
118
|
+
error: error.message,
|
|
119
|
+
});
|
|
120
|
+
}
|
|
121
|
+
});
|
|
85
122
|
socket.on('acp:start', async (data) => {
|
|
86
|
-
console.log(`[ACP ctrl] acp:start received: requestId=${data.requestId} sessionId=${data.sessionId} serverType=${data.serverType} cwd=${data.cwd}`);
|
|
123
|
+
console.log(`[ACP ctrl] acp:start received: requestId=${data.requestId} sessionId=${data.sessionId} serverType=${data.serverType} cwd=${data.cwd} ${describeMcpConfig(data)}`);
|
|
87
124
|
try {
|
|
88
125
|
const spawner = createSpawner(data.serverType, data.sessionId, data.cwd);
|
|
89
126
|
const bridge = new AcpSessionBridge(socket, {
|
|
90
127
|
sessionId: data.sessionId,
|
|
91
128
|
cwd: data.cwd,
|
|
92
129
|
mcpServers: data.mcpServers,
|
|
130
|
+
mcpEndpoint: data.mcpEndpoint,
|
|
93
131
|
additionalDirectories: data.additionalDirectories,
|
|
94
132
|
}, spawner);
|
|
95
133
|
acpBridges.set(data.sessionId, bridge);
|
|
96
134
|
bridge.on('permission:sent', (requestId) => {
|
|
97
135
|
permissionRequestBridge.set(requestId, bridge);
|
|
98
136
|
});
|
|
137
|
+
bridge.on('elicitation:sent', (requestId) => {
|
|
138
|
+
elicitationRequestBridge.set(requestId, bridge);
|
|
139
|
+
});
|
|
99
140
|
const onInitialized = (payload) => {
|
|
100
141
|
if (payload.sessionId !== data.sessionId)
|
|
101
142
|
return;
|
|
@@ -134,7 +175,7 @@ export function connectToServer(endpoint, key, options) {
|
|
|
134
175
|
bridge.off('acp:initialized', onInitialized);
|
|
135
176
|
bridge.off('acp:stopped', onStopped);
|
|
136
177
|
acpBridges.delete(data.sessionId);
|
|
137
|
-
console.log(`[ACP ctrl] emitting acp:start:result: requestId=${data.requestId} sessionId=${data.sessionId} success=false`);
|
|
178
|
+
console.log(`[ACP ctrl] emitting acp:start:result: requestId=${data.requestId} sessionId=${data.sessionId} success=false reason=${payload.reason} error=${payload.error ?? 'n/a'}`);
|
|
138
179
|
socket.emit('acp:start:result', {
|
|
139
180
|
requestId: data.requestId,
|
|
140
181
|
sessionId: data.sessionId,
|
|
@@ -158,18 +199,22 @@ export function connectToServer(endpoint, key, options) {
|
|
|
158
199
|
}
|
|
159
200
|
});
|
|
160
201
|
socket.on('acp:resume', async (data) => {
|
|
161
|
-
console.log(`[ACP ctrl] acp:resume received: requestId=${data.requestId} sessionId=${data.sessionId} serverType=${data.serverType} externalSessionId=${data.externalSessionId}`);
|
|
202
|
+
console.log(`[ACP ctrl] acp:resume received: requestId=${data.requestId} sessionId=${data.sessionId} serverType=${data.serverType} externalSessionId=${data.externalSessionId} ${describeMcpConfig(data)}`);
|
|
162
203
|
try {
|
|
163
204
|
const spawner = createSpawner(data.serverType, data.sessionId, data.cwd);
|
|
164
205
|
const bridge = new AcpSessionBridge(socket, {
|
|
165
206
|
sessionId: data.sessionId,
|
|
166
207
|
cwd: data.cwd,
|
|
208
|
+
mcpEndpoint: data.mcpEndpoint,
|
|
167
209
|
additionalDirectories: data.additionalDirectories,
|
|
168
210
|
}, spawner);
|
|
169
211
|
acpBridges.set(data.sessionId, bridge);
|
|
170
212
|
bridge.on('permission:sent', (requestId) => {
|
|
171
213
|
permissionRequestBridge.set(requestId, bridge);
|
|
172
214
|
});
|
|
215
|
+
bridge.on('elicitation:sent', (requestId) => {
|
|
216
|
+
elicitationRequestBridge.set(requestId, bridge);
|
|
217
|
+
});
|
|
173
218
|
const onInitialized = (payload) => {
|
|
174
219
|
if (payload.sessionId !== data.sessionId)
|
|
175
220
|
return;
|
|
@@ -203,6 +248,7 @@ export function connectToServer(endpoint, key, options) {
|
|
|
203
248
|
bridge.off('acp:initialized', onInitialized);
|
|
204
249
|
bridge.off('acp:stopped', onStopped);
|
|
205
250
|
acpBridges.delete(data.sessionId);
|
|
251
|
+
console.log(`[ACP ctrl] emitting acp:resume:result: requestId=${data.requestId} sessionId=${data.sessionId} success=false reason=${payload.reason} error=${payload.error ?? 'n/a'}`);
|
|
206
252
|
socket.emit('acp:resume:result', {
|
|
207
253
|
requestId: data.requestId,
|
|
208
254
|
sessionId: data.sessionId,
|
|
@@ -582,11 +628,19 @@ export function connectToServer(endpoint, key, options) {
|
|
|
582
628
|
bridge.handlePermissionResponse(data.requestId, data.outcome);
|
|
583
629
|
}
|
|
584
630
|
});
|
|
631
|
+
socket.on('acp:elicitation:response', (data) => {
|
|
632
|
+
const bridge = elicitationRequestBridge.get(data.requestId);
|
|
633
|
+
if (bridge) {
|
|
634
|
+
elicitationRequestBridge.delete(data.requestId);
|
|
635
|
+
bridge.handleElicitationResponse(data.requestId, data.action, data.content);
|
|
636
|
+
}
|
|
637
|
+
});
|
|
585
638
|
socket.on('disconnect', (reason) => {
|
|
586
639
|
console.log(`Disconnected: ${reason}`);
|
|
587
640
|
heartbeat.stop();
|
|
588
641
|
gatewayManager.closeAll();
|
|
589
642
|
permissionRequestBridge.clear();
|
|
643
|
+
elicitationRequestBridge.clear();
|
|
590
644
|
});
|
|
591
645
|
socket.on('connect_error', (err) => {
|
|
592
646
|
console.error(`Connection error: ${err.message}`);
|