agent-gear 1.0.2 → 1.0.4
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/detector.d.ts +5 -0
- package/dist/acp/detector.d.ts.map +1 -1
- package/dist/acp/detector.js +24 -6
- package/dist/acp/detector.js.map +1 -1
- package/dist/acp/spawner.d.ts +2 -0
- package/dist/acp/spawner.d.ts.map +1 -1
- package/dist/acp/spawner.js +38 -4
- package/dist/acp/spawner.js.map +1 -1
- package/dist/index.js +0 -0
- package/dist/socketio-client.d.ts.map +1 -1
- package/dist/socketio-client.js +29 -7
- package/dist/socketio-client.js.map +1 -1
- package/package.json +5 -1
- package/src/acp/detector.ts +25 -8
- package/src/acp/spawner.ts +38 -5
- package/src/socketio-client.ts +32 -7
- package/tests/acp-detector.test.ts +61 -13
- package/tests/acp-spawner.test.ts +96 -1
- package/tests/socketio-client.test.ts +120 -2
package/dist/acp/detector.d.ts
CHANGED
|
@@ -6,6 +6,11 @@ interface AcpServerInfo {
|
|
|
6
6
|
export declare class AcpDetector {
|
|
7
7
|
detect(): Promise<AcpServerInfo[]>;
|
|
8
8
|
private detectOpenCode;
|
|
9
|
+
private detectGitHubCopilot;
|
|
10
|
+
getSpawnerConfig(serverType: string): {
|
|
11
|
+
command: string;
|
|
12
|
+
args: string[];
|
|
13
|
+
};
|
|
9
14
|
private parseVersion;
|
|
10
15
|
}
|
|
11
16
|
export declare const acpDetector: AcpDetector;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"detector.d.ts","sourceRoot":"","sources":["../../src/acp/detector.ts"],"names":[],"mappings":"AAKA,UAAU,aAAa;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,WAAW;IAChB,MAAM,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"detector.d.ts","sourceRoot":"","sources":["../../src/acp/detector.ts"],"names":[],"mappings":"AAKA,UAAU,aAAa;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,WAAW;IAChB,MAAM,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;YAQ1B,cAAc;YAUd,mBAAmB;IAUjC,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,EAAE,CAAA;KAAE;IAUzE,OAAO,CAAC,YAAY;CAIrB;AAED,eAAO,MAAM,WAAW,aAAoB,CAAC"}
|
package/dist/acp/detector.js
CHANGED
|
@@ -3,11 +3,11 @@ import { promisify } from 'util';
|
|
|
3
3
|
const execAsync = promisify(exec);
|
|
4
4
|
export class AcpDetector {
|
|
5
5
|
async detect() {
|
|
6
|
-
const
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
return
|
|
6
|
+
const [opencode, copilot] = await Promise.all([
|
|
7
|
+
this.detectOpenCode(),
|
|
8
|
+
this.detectGitHubCopilot(),
|
|
9
|
+
]);
|
|
10
|
+
return [opencode, copilot];
|
|
11
11
|
}
|
|
12
12
|
async detectOpenCode() {
|
|
13
13
|
try {
|
|
@@ -19,8 +19,26 @@ export class AcpDetector {
|
|
|
19
19
|
return { type: 'opencode', available: false };
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
|
+
async detectGitHubCopilot() {
|
|
23
|
+
try {
|
|
24
|
+
const { stdout } = await execAsync('copilot --version');
|
|
25
|
+
const version = this.parseVersion(stdout);
|
|
26
|
+
return { type: 'github_copilot', available: true, version };
|
|
27
|
+
}
|
|
28
|
+
catch {
|
|
29
|
+
return { type: 'github_copilot', available: false };
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
getSpawnerConfig(serverType) {
|
|
33
|
+
switch (serverType) {
|
|
34
|
+
case 'github_copilot':
|
|
35
|
+
return { command: 'copilot', args: ['--acp', '--stdio'] };
|
|
36
|
+
case 'opencode':
|
|
37
|
+
default:
|
|
38
|
+
return { command: 'opencode', args: ['acp'] };
|
|
39
|
+
}
|
|
40
|
+
}
|
|
22
41
|
parseVersion(output) {
|
|
23
|
-
// Try to extract version from output
|
|
24
42
|
const match = output.match(/(\d+\.\d+\.\d+)/);
|
|
25
43
|
return match ? match[1] : 'unknown';
|
|
26
44
|
}
|
package/dist/acp/detector.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"detector.js","sourceRoot":"","sources":["../../src/acp/detector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAEjC,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AAQlC,MAAM,OAAO,WAAW;IACtB,KAAK,CAAC,MAAM;QACV,MAAM,
|
|
1
|
+
{"version":3,"file":"detector.js","sourceRoot":"","sources":["../../src/acp/detector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAEjC,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AAQlC,MAAM,OAAO,WAAW;IACtB,KAAK,CAAC,MAAM;QACV,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC5C,IAAI,CAAC,cAAc,EAAE;YACrB,IAAI,CAAC,mBAAmB,EAAE;SAC3B,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7B,CAAC;IAEO,KAAK,CAAC,cAAc;QAC1B,IAAI,CAAC;YACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,aAAa,CAAC,CAAC;YAClD,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAC1C,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QACxD,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;QAChD,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,mBAAmB;QAC/B,IAAI,CAAC;YACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,mBAAmB,CAAC,CAAC;YACxD,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAC1C,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAC9D,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;QACtD,CAAC;IACH,CAAC;IAED,gBAAgB,CAAC,UAAkB;QACjC,QAAQ,UAAU,EAAE,CAAC;YACnB,KAAK,gBAAgB;gBACnB,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;YAC5D,KAAK,UAAU,CAAC;YAChB;gBACE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;QAClD,CAAC;IACH,CAAC;IAEO,YAAY,CAAC,MAAc;QACjC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC9C,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACtC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC"}
|
package/dist/acp/spawner.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawner.d.ts","sourceRoot":"","sources":["../../src/acp/spawner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"spawner.d.ts","sourceRoot":"","sources":["../../src/acp/spawner.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,IAAI,CAAW;IACvB,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,OAAO,CAAgB;gBAEnB,OAAO,EAAE,iBAAiB;IAQtC,KAAK,IAAI,IAAI;IA8Bb,IAAI,KAAK,IAAI,cAAc,CAG1B;IAED,IAAI,MAAM,IAAI,cAAc,CAAC,UAAU,CAAC,CAGvC;IAED,IAAI,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAE1B;IAED,IAAI,IAAI,IAAI;IAmBZ,SAAS,IAAI,OAAO;IAIpB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,qBAAqB;IAc7B,OAAO,CAAC,kBAAkB;CAW3B"}
|
package/dist/acp/spawner.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { spawn, execFileSync } from 'child_process';
|
|
2
2
|
import { Writable, Readable } from 'node:stream';
|
|
3
3
|
import { existsSync, mkdirSync } from 'fs';
|
|
4
|
+
import { platform } from 'os';
|
|
4
5
|
export class AcpSpawner {
|
|
5
6
|
process = null;
|
|
6
7
|
sessionId;
|
|
@@ -20,10 +21,14 @@ export class AcpSpawner {
|
|
|
20
21
|
const cmd = this.resolveCommand();
|
|
21
22
|
console.log(`Starting ACP server ${cmd}`);
|
|
22
23
|
mkdirSync(this.cwd, { recursive: true });
|
|
23
|
-
|
|
24
|
+
const spawnOptions = {
|
|
24
25
|
cwd: this.cwd,
|
|
25
26
|
stdio: ['pipe', 'pipe', 'pipe'],
|
|
26
|
-
}
|
|
27
|
+
};
|
|
28
|
+
if (platform() === 'win32') {
|
|
29
|
+
spawnOptions.shell = true;
|
|
30
|
+
}
|
|
31
|
+
this.process = spawn(cmd, this.args, spawnOptions);
|
|
27
32
|
this.process.stderr?.on('data', (data) => {
|
|
28
33
|
console.error(`ACP stderr: ${data.toString()}`);
|
|
29
34
|
});
|
|
@@ -50,7 +55,17 @@ export class AcpSpawner {
|
|
|
50
55
|
return this._closed;
|
|
51
56
|
}
|
|
52
57
|
stop() {
|
|
53
|
-
if (this.process)
|
|
58
|
+
if (!this.process)
|
|
59
|
+
return;
|
|
60
|
+
if (platform() === 'win32') {
|
|
61
|
+
this.process.kill();
|
|
62
|
+
setTimeout(() => {
|
|
63
|
+
if (this.process) {
|
|
64
|
+
this.process.kill();
|
|
65
|
+
}
|
|
66
|
+
}, 5000);
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
54
69
|
this.process.kill('SIGTERM');
|
|
55
70
|
setTimeout(() => {
|
|
56
71
|
if (this.process) {
|
|
@@ -63,8 +78,27 @@ export class AcpSpawner {
|
|
|
63
78
|
return this.process !== null;
|
|
64
79
|
}
|
|
65
80
|
resolveCommand() {
|
|
66
|
-
if (this.command.includes('/'))
|
|
81
|
+
if (this.command.includes('\\') || this.command.includes('/'))
|
|
67
82
|
return this.command;
|
|
83
|
+
return platform() === 'win32' ? this.resolveWindowsCommand() : this.resolveUnixCommand();
|
|
84
|
+
}
|
|
85
|
+
resolveWindowsCommand() {
|
|
86
|
+
try {
|
|
87
|
+
const result = execFileSync('where', [this.command], { encoding: 'utf8', timeout: 1000 });
|
|
88
|
+
const firstMatch = result.trim().split('\n')[0]?.trim();
|
|
89
|
+
if (firstMatch)
|
|
90
|
+
return firstMatch;
|
|
91
|
+
}
|
|
92
|
+
catch { /* not found via where */ }
|
|
93
|
+
const pathext = (process.env.PATHEXT || '.COM;.EXE;.BAT;.CMD').split(';');
|
|
94
|
+
for (const ext of pathext) {
|
|
95
|
+
const candidate = this.command + ext.toLowerCase();
|
|
96
|
+
if (existsSync(candidate))
|
|
97
|
+
return candidate;
|
|
98
|
+
}
|
|
99
|
+
return this.command;
|
|
100
|
+
}
|
|
101
|
+
resolveUnixCommand() {
|
|
68
102
|
const candidates = [this.command, `/usr/bin/${this.command}`, `/usr/local/bin/${this.command}`];
|
|
69
103
|
for (const cmd of candidates) {
|
|
70
104
|
try {
|
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,
|
|
1
|
+
{"version":3,"file":"spawner.js","sourceRoot":"","sources":["../../src/acp/spawner.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
File without changes
|
|
@@ -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;AA2I3E,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAChC,MAAM,CAgbR;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAE/C"}
|
package/dist/socketio-client.js
CHANGED
|
@@ -1,18 +1,23 @@
|
|
|
1
1
|
import { io as createSocketIOClient } from 'socket.io-client';
|
|
2
|
-
import { hostname } from 'os';
|
|
3
|
-
import { readdir } from 'fs/promises';
|
|
2
|
+
import { hostname, platform } from 'os';
|
|
3
|
+
import { readdir, access } from 'fs/promises';
|
|
4
4
|
import { join } from 'path';
|
|
5
5
|
import { homedir } from 'os';
|
|
6
6
|
import { Heartbeat } from './heartbeat.js';
|
|
7
7
|
import { clearConfigKey } from './config.js';
|
|
8
8
|
import { acpDetector } from './acp/detector.js';
|
|
9
|
+
import { AcpSpawner } from './acp/spawner.js';
|
|
9
10
|
import { AcpSessionBridge } from './acp/bridge.js';
|
|
10
11
|
import { AcpSyncBridge } from './acp/sync-bridge.js';
|
|
11
12
|
import { gitHandler } from './git-handler.js';
|
|
12
13
|
import { worktreeHandler } from './worktree-handler.js';
|
|
13
14
|
import { fsHandler } from './fs-handler.js';
|
|
14
|
-
const CONTROLLER_VERSION = '1.0.
|
|
15
|
+
const CONTROLLER_VERSION = '1.0.4';
|
|
15
16
|
const acpBridges = new Map();
|
|
17
|
+
function createSpawner(serverType, sessionId, cwd) {
|
|
18
|
+
const config = acpDetector.getSpawnerConfig(serverType);
|
|
19
|
+
return new AcpSpawner({ sessionId, cwd, command: config.command, args: config.args });
|
|
20
|
+
}
|
|
16
21
|
export function connectToServer(endpoint, key, options) {
|
|
17
22
|
const socket = createSocketIOClient(endpoint, {
|
|
18
23
|
transports: ['websocket'],
|
|
@@ -66,13 +71,14 @@ export function connectToServer(endpoint, key, options) {
|
|
|
66
71
|
});
|
|
67
72
|
});
|
|
68
73
|
socket.on('acp:start', async (data) => {
|
|
69
|
-
console.log(`[ACP ctrl] acp:start received: requestId=${data.requestId} sessionId=${data.sessionId} cwd=${data.cwd}`);
|
|
74
|
+
console.log(`[ACP ctrl] acp:start received: requestId=${data.requestId} sessionId=${data.sessionId} serverType=${data.serverType} cwd=${data.cwd}`);
|
|
70
75
|
try {
|
|
76
|
+
const spawner = createSpawner(data.serverType, data.sessionId, data.cwd);
|
|
71
77
|
const bridge = new AcpSessionBridge(socket, {
|
|
72
78
|
sessionId: data.sessionId,
|
|
73
79
|
cwd: data.cwd,
|
|
74
80
|
mcpServers: data.mcpServers,
|
|
75
|
-
});
|
|
81
|
+
}, spawner);
|
|
76
82
|
acpBridges.set(data.sessionId, bridge);
|
|
77
83
|
const onInitialized = (payload) => {
|
|
78
84
|
if (payload.sessionId !== data.sessionId)
|
|
@@ -128,12 +134,13 @@ export function connectToServer(endpoint, key, options) {
|
|
|
128
134
|
}
|
|
129
135
|
});
|
|
130
136
|
socket.on('acp:resume', async (data) => {
|
|
131
|
-
console.log(`[ACP ctrl] acp:resume received: requestId=${data.requestId} sessionId=${data.sessionId} externalSessionId=${data.externalSessionId}`);
|
|
137
|
+
console.log(`[ACP ctrl] acp:resume received: requestId=${data.requestId} sessionId=${data.sessionId} serverType=${data.serverType} externalSessionId=${data.externalSessionId}`);
|
|
132
138
|
try {
|
|
139
|
+
const spawner = createSpawner(data.serverType, data.sessionId, data.cwd);
|
|
133
140
|
const bridge = new AcpSessionBridge(socket, {
|
|
134
141
|
sessionId: data.sessionId,
|
|
135
142
|
cwd: data.cwd,
|
|
136
|
-
});
|
|
143
|
+
}, spawner);
|
|
137
144
|
acpBridges.set(data.sessionId, bridge);
|
|
138
145
|
const onInitialized = (payload) => {
|
|
139
146
|
if (payload.sessionId !== data.sessionId)
|
|
@@ -339,6 +346,21 @@ export function connectToServer(endpoint, key, options) {
|
|
|
339
346
|
console.log(`FS browse requested: requestId=${data.requestId} path=${data.path}`);
|
|
340
347
|
try {
|
|
341
348
|
const targetPath = data.path || homedir();
|
|
349
|
+
// On Windows, listing '/' should return available drive letters
|
|
350
|
+
if ((data.path === '/' || data.path === '') && platform() === 'win32') {
|
|
351
|
+
const drives = [];
|
|
352
|
+
for (let i = 65; i <= 90; i++) {
|
|
353
|
+
const letter = String.fromCharCode(i);
|
|
354
|
+
const drivePath = `${letter}:\\`;
|
|
355
|
+
try {
|
|
356
|
+
await access(drivePath);
|
|
357
|
+
drives.push({ name: `${letter}:`, path: drivePath, isDirectory: true });
|
|
358
|
+
}
|
|
359
|
+
catch { /* drive not available */ }
|
|
360
|
+
}
|
|
361
|
+
socket.emit('fs:browse:result', { requestId: data.requestId, entries: drives });
|
|
362
|
+
return;
|
|
363
|
+
}
|
|
342
364
|
const entries = await readdir(targetPath, { withFileTypes: true });
|
|
343
365
|
const result = entries
|
|
344
366
|
.filter((entry) => !entry.name.startsWith('.'))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socketio-client.js","sourceRoot":"","sources":["../src/socketio-client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"socketio-client.js","sourceRoot":"","sources":["../src/socketio-client.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "agent-gear",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.4",
|
|
4
4
|
"description": "ZeroAsh Agent Gear - Agent controller daemon",
|
|
5
|
+
"repository": {
|
|
6
|
+
"type": "git",
|
|
7
|
+
"url": "git+https://github.com/Deliay/z-agent-gear.git"
|
|
8
|
+
},
|
|
5
9
|
"main": "dist/index.js",
|
|
6
10
|
"bin": {
|
|
7
11
|
"agent-gear": "dist/index.js"
|
package/src/acp/detector.ts
CHANGED
|
@@ -11,13 +11,11 @@ interface AcpServerInfo {
|
|
|
11
11
|
|
|
12
12
|
export class AcpDetector {
|
|
13
13
|
async detect(): Promise<AcpServerInfo[]> {
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
return servers;
|
|
14
|
+
const [opencode, copilot] = await Promise.all([
|
|
15
|
+
this.detectOpenCode(),
|
|
16
|
+
this.detectGitHubCopilot(),
|
|
17
|
+
]);
|
|
18
|
+
return [opencode, copilot];
|
|
21
19
|
}
|
|
22
20
|
|
|
23
21
|
private async detectOpenCode(): Promise<AcpServerInfo> {
|
|
@@ -30,8 +28,27 @@ export class AcpDetector {
|
|
|
30
28
|
}
|
|
31
29
|
}
|
|
32
30
|
|
|
31
|
+
private async detectGitHubCopilot(): Promise<AcpServerInfo> {
|
|
32
|
+
try {
|
|
33
|
+
const { stdout } = await execAsync('copilot --version');
|
|
34
|
+
const version = this.parseVersion(stdout);
|
|
35
|
+
return { type: 'github_copilot', available: true, version };
|
|
36
|
+
} catch {
|
|
37
|
+
return { type: 'github_copilot', available: false };
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
getSpawnerConfig(serverType: string): { command: string; args: string[] } {
|
|
42
|
+
switch (serverType) {
|
|
43
|
+
case 'github_copilot':
|
|
44
|
+
return { command: 'copilot', args: ['--acp', '--stdio'] };
|
|
45
|
+
case 'opencode':
|
|
46
|
+
default:
|
|
47
|
+
return { command: 'opencode', args: ['acp'] };
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
|
|
33
51
|
private parseVersion(output: string): string {
|
|
34
|
-
// Try to extract version from output
|
|
35
52
|
const match = output.match(/(\d+\.\d+\.\d+)/);
|
|
36
53
|
return match ? match[1] : 'unknown';
|
|
37
54
|
}
|
package/src/acp/spawner.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { spawn, execFileSync, type ChildProcess } from 'child_process';
|
|
1
|
+
import { spawn, execFileSync, type ChildProcess, type SpawnOptions } from 'child_process';
|
|
2
2
|
import { Writable, Readable } from 'node:stream';
|
|
3
3
|
import { existsSync, mkdirSync } from 'fs';
|
|
4
|
+
import { platform } from 'os';
|
|
4
5
|
|
|
5
6
|
export interface AcpProcessOptions {
|
|
6
7
|
sessionId: string;
|
|
@@ -30,10 +31,16 @@ export class AcpSpawner {
|
|
|
30
31
|
const cmd = this.resolveCommand();
|
|
31
32
|
console.log(`Starting ACP server ${cmd}`)
|
|
32
33
|
mkdirSync(this.cwd, { recursive: true });
|
|
33
|
-
|
|
34
|
+
|
|
35
|
+
const spawnOptions: SpawnOptions = {
|
|
34
36
|
cwd: this.cwd,
|
|
35
37
|
stdio: ['pipe', 'pipe', 'pipe'],
|
|
36
|
-
}
|
|
38
|
+
};
|
|
39
|
+
if (platform() === 'win32') {
|
|
40
|
+
spawnOptions.shell = true;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
this.process = spawn(cmd, this.args, spawnOptions);
|
|
37
44
|
|
|
38
45
|
this.process.stderr?.on('data', (data: Buffer) => {
|
|
39
46
|
console.error(`ACP stderr: ${data.toString()}`);
|
|
@@ -65,7 +72,15 @@ export class AcpSpawner {
|
|
|
65
72
|
}
|
|
66
73
|
|
|
67
74
|
stop(): void {
|
|
68
|
-
if (this.process)
|
|
75
|
+
if (!this.process) return;
|
|
76
|
+
if (platform() === 'win32') {
|
|
77
|
+
this.process.kill();
|
|
78
|
+
setTimeout(() => {
|
|
79
|
+
if (this.process) {
|
|
80
|
+
this.process.kill();
|
|
81
|
+
}
|
|
82
|
+
}, 5000);
|
|
83
|
+
} else {
|
|
69
84
|
this.process.kill('SIGTERM');
|
|
70
85
|
setTimeout(() => {
|
|
71
86
|
if (this.process) {
|
|
@@ -80,7 +95,25 @@ export class AcpSpawner {
|
|
|
80
95
|
}
|
|
81
96
|
|
|
82
97
|
private resolveCommand(): string {
|
|
83
|
-
if (this.command.includes('/')) return this.command;
|
|
98
|
+
if (this.command.includes('\\') || this.command.includes('/')) return this.command;
|
|
99
|
+
return platform() === 'win32' ? this.resolveWindowsCommand() : this.resolveUnixCommand();
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
private resolveWindowsCommand(): string {
|
|
103
|
+
try {
|
|
104
|
+
const result = execFileSync('where', [this.command], { encoding: 'utf8', timeout: 1000 });
|
|
105
|
+
const firstMatch = result.trim().split('\n')[0]?.trim();
|
|
106
|
+
if (firstMatch) return firstMatch;
|
|
107
|
+
} catch { /* not found via where */ }
|
|
108
|
+
const pathext = (process.env.PATHEXT || '.COM;.EXE;.BAT;.CMD').split(';');
|
|
109
|
+
for (const ext of pathext) {
|
|
110
|
+
const candidate = this.command + ext.toLowerCase();
|
|
111
|
+
if (existsSync(candidate)) return candidate;
|
|
112
|
+
}
|
|
113
|
+
return this.command;
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
private resolveUnixCommand(): string {
|
|
84
117
|
const candidates = [this.command, `/usr/bin/${this.command}`, `/usr/local/bin/${this.command}`];
|
|
85
118
|
for (const cmd of candidates) {
|
|
86
119
|
try {
|
package/src/socketio-client.ts
CHANGED
|
@@ -1,20 +1,26 @@
|
|
|
1
1
|
import { io as createSocketIOClient, type Socket } from 'socket.io-client';
|
|
2
|
-
import { hostname } from 'os';
|
|
3
|
-
import { readdir } from 'fs/promises';
|
|
2
|
+
import { hostname, platform } from 'os';
|
|
3
|
+
import { readdir, access } from 'fs/promises';
|
|
4
4
|
import { join } from 'path';
|
|
5
5
|
import { homedir } from 'os';
|
|
6
6
|
import { Heartbeat } from './heartbeat.js';
|
|
7
7
|
import { clearConfigKey, saveKeyToConfig, saveEndpointToConfig } from './config.js';
|
|
8
8
|
import { acpDetector } from './acp/detector.js';
|
|
9
|
+
import { AcpSpawner } from './acp/spawner.js';
|
|
9
10
|
import { AcpSessionBridge } from './acp/bridge.js';
|
|
10
11
|
import { AcpSyncBridge } from './acp/sync-bridge.js';
|
|
11
12
|
import { gitHandler } from './git-handler.js';
|
|
12
13
|
import { worktreeHandler } from './worktree-handler.js';
|
|
13
14
|
import { fsHandler } from './fs-handler.js';
|
|
14
15
|
|
|
15
|
-
const CONTROLLER_VERSION = '1.0.
|
|
16
|
+
const CONTROLLER_VERSION = '1.0.4';
|
|
16
17
|
const acpBridges = new Map<string, AcpSessionBridge>();
|
|
17
18
|
|
|
19
|
+
function createSpawner(serverType: string, sessionId: string, cwd: string): AcpSpawner {
|
|
20
|
+
const config = acpDetector.getSpawnerConfig(serverType);
|
|
21
|
+
return new AcpSpawner({ sessionId, cwd, command: config.command, args: config.args });
|
|
22
|
+
}
|
|
23
|
+
|
|
18
24
|
interface RegisteredPayload {
|
|
19
25
|
controllerId: string;
|
|
20
26
|
}
|
|
@@ -67,6 +73,7 @@ interface AcpResumePayload {
|
|
|
67
73
|
requestId: string;
|
|
68
74
|
sessionId: string;
|
|
69
75
|
externalSessionId: string;
|
|
76
|
+
serverType: string;
|
|
70
77
|
cwd: string;
|
|
71
78
|
}
|
|
72
79
|
|
|
@@ -195,14 +202,15 @@ export function connectToServer(
|
|
|
195
202
|
});
|
|
196
203
|
|
|
197
204
|
socket.on('acp:start', async (data: AcpStartPayload) => {
|
|
198
|
-
console.log(`[ACP ctrl] acp:start received: requestId=${data.requestId} sessionId=${data.sessionId} cwd=${data.cwd}`);
|
|
205
|
+
console.log(`[ACP ctrl] acp:start received: requestId=${data.requestId} sessionId=${data.sessionId} serverType=${data.serverType} cwd=${data.cwd}`);
|
|
199
206
|
|
|
200
207
|
try {
|
|
208
|
+
const spawner = createSpawner(data.serverType, data.sessionId, data.cwd);
|
|
201
209
|
const bridge = new AcpSessionBridge(socket, {
|
|
202
210
|
sessionId: data.sessionId,
|
|
203
211
|
cwd: data.cwd,
|
|
204
212
|
mcpServers: data.mcpServers,
|
|
205
|
-
});
|
|
213
|
+
}, spawner);
|
|
206
214
|
|
|
207
215
|
acpBridges.set(data.sessionId, bridge);
|
|
208
216
|
|
|
@@ -256,13 +264,14 @@ export function connectToServer(
|
|
|
256
264
|
});
|
|
257
265
|
|
|
258
266
|
socket.on('acp:resume', async (data: AcpResumePayload) => {
|
|
259
|
-
console.log(`[ACP ctrl] acp:resume received: requestId=${data.requestId} sessionId=${data.sessionId} externalSessionId=${data.externalSessionId}`);
|
|
267
|
+
console.log(`[ACP ctrl] acp:resume received: requestId=${data.requestId} sessionId=${data.sessionId} serverType=${data.serverType} externalSessionId=${data.externalSessionId}`);
|
|
260
268
|
|
|
261
269
|
try {
|
|
270
|
+
const spawner = createSpawner(data.serverType, data.sessionId, data.cwd);
|
|
262
271
|
const bridge = new AcpSessionBridge(socket, {
|
|
263
272
|
sessionId: data.sessionId,
|
|
264
273
|
cwd: data.cwd,
|
|
265
|
-
});
|
|
274
|
+
}, spawner);
|
|
266
275
|
|
|
267
276
|
acpBridges.set(data.sessionId, bridge);
|
|
268
277
|
|
|
@@ -477,6 +486,22 @@ export function connectToServer(
|
|
|
477
486
|
console.log(`FS browse requested: requestId=${data.requestId} path=${data.path}`);
|
|
478
487
|
try {
|
|
479
488
|
const targetPath = data.path || homedir();
|
|
489
|
+
|
|
490
|
+
// On Windows, listing '/' should return available drive letters
|
|
491
|
+
if ((data.path === '/' || data.path === '') && platform() === 'win32') {
|
|
492
|
+
const drives: Array<{ name: string; path: string; isDirectory: boolean }> = [];
|
|
493
|
+
for (let i = 65; i <= 90; i++) {
|
|
494
|
+
const letter = String.fromCharCode(i);
|
|
495
|
+
const drivePath = `${letter}:\\`;
|
|
496
|
+
try {
|
|
497
|
+
await access(drivePath);
|
|
498
|
+
drives.push({ name: `${letter}:`, path: drivePath, isDirectory: true });
|
|
499
|
+
} catch { /* drive not available */ }
|
|
500
|
+
}
|
|
501
|
+
socket.emit('fs:browse:result', { requestId: data.requestId, entries: drives });
|
|
502
|
+
return;
|
|
503
|
+
}
|
|
504
|
+
|
|
480
505
|
const entries = await readdir(targetPath, { withFileTypes: true });
|
|
481
506
|
const result = entries
|
|
482
507
|
.filter((entry) => !entry.name.startsWith('.'))
|
|
@@ -7,16 +7,16 @@ vi.mock('child_process', () => ({
|
|
|
7
7
|
import { AcpDetector } from '../../src/acp/detector.js';
|
|
8
8
|
import { exec } from 'child_process';
|
|
9
9
|
|
|
10
|
-
function
|
|
11
|
-
vi.mocked(exec).
|
|
10
|
+
function mockExecSuccessOnce(stdout: string) {
|
|
11
|
+
vi.mocked(exec).mockImplementationOnce((...args: unknown[]) => {
|
|
12
12
|
const cb = args.find((a) => typeof a === 'function') as ((err: null, result: { stdout: string; stderr: string }) => void) | undefined;
|
|
13
13
|
if (cb) cb(null, { stdout, stderr: '' });
|
|
14
14
|
return {} as any;
|
|
15
15
|
});
|
|
16
16
|
}
|
|
17
17
|
|
|
18
|
-
function
|
|
19
|
-
vi.mocked(exec).
|
|
18
|
+
function mockExecFailureOnce() {
|
|
19
|
+
vi.mocked(exec).mockImplementationOnce((...args: unknown[]) => {
|
|
20
20
|
const cb = args.find((a) => typeof a === 'function') as ((err: Error) => void) | undefined;
|
|
21
21
|
if (cb) cb(new Error('command not found'));
|
|
22
22
|
return {} as any;
|
|
@@ -32,39 +32,87 @@ describe('AcpDetector', () => {
|
|
|
32
32
|
});
|
|
33
33
|
|
|
34
34
|
describe('detect', () => {
|
|
35
|
-
it('should detect opencode when available', async () => {
|
|
36
|
-
|
|
35
|
+
it('should detect opencode and github_copilot when both available', async () => {
|
|
36
|
+
mockExecSuccessOnce('opencode v1.2.3\n');
|
|
37
|
+
mockExecSuccessOnce('copilot 1.0.0\n');
|
|
37
38
|
|
|
38
39
|
const result = await detector.detect();
|
|
39
40
|
|
|
40
|
-
expect(result).toHaveLength(
|
|
41
|
+
expect(result).toHaveLength(2);
|
|
41
42
|
expect(result[0]).toEqual({ type: 'opencode', available: true, version: '1.2.3' });
|
|
42
|
-
expect(
|
|
43
|
+
expect(result[1]).toEqual({ type: 'github_copilot', available: true, version: '1.0.0' });
|
|
43
44
|
});
|
|
44
45
|
|
|
45
|
-
it('should detect
|
|
46
|
-
|
|
46
|
+
it('should detect as unavailable when command fails', async () => {
|
|
47
|
+
mockExecFailureOnce();
|
|
48
|
+
mockExecFailureOnce();
|
|
47
49
|
|
|
48
50
|
const result = await detector.detect();
|
|
49
51
|
|
|
50
|
-
expect(result).toHaveLength(
|
|
52
|
+
expect(result).toHaveLength(2);
|
|
51
53
|
expect(result[0]).toEqual({ type: 'opencode', available: false });
|
|
54
|
+
expect(result[1]).toEqual({ type: 'github_copilot', available: false });
|
|
52
55
|
});
|
|
53
56
|
|
|
54
57
|
it('should parse version with different formats', async () => {
|
|
55
|
-
|
|
58
|
+
mockExecSuccessOnce('OpenCode version 2.0.1\n');
|
|
59
|
+
mockExecSuccessOnce('copilot 3.0.0\n');
|
|
56
60
|
|
|
57
61
|
const result = await detector.detect();
|
|
58
62
|
|
|
59
63
|
expect(result[0].version).toBe('2.0.1');
|
|
64
|
+
expect(result[1].version).toBe('3.0.0');
|
|
60
65
|
});
|
|
61
66
|
|
|
62
67
|
it('should return unknown version when format not recognized', async () => {
|
|
63
|
-
|
|
68
|
+
mockExecSuccessOnce('some output without version\n');
|
|
69
|
+
mockExecSuccessOnce('copilot output\n');
|
|
64
70
|
|
|
65
71
|
const result = await detector.detect();
|
|
66
72
|
|
|
67
73
|
expect(result[0].version).toBe('unknown');
|
|
74
|
+
expect(result[1].version).toBe('unknown');
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
it('should detect only opencode when copilot fails', async () => {
|
|
78
|
+
mockExecSuccessOnce('opencode v1.2.3\n');
|
|
79
|
+
mockExecFailureOnce();
|
|
80
|
+
|
|
81
|
+
const result = await detector.detect();
|
|
82
|
+
|
|
83
|
+
expect(result).toHaveLength(2);
|
|
84
|
+
expect(result[0]).toEqual({ type: 'opencode', available: true, version: '1.2.3' });
|
|
85
|
+
expect(result[1]).toEqual({ type: 'github_copilot', available: false });
|
|
86
|
+
});
|
|
87
|
+
|
|
88
|
+
it('should detect only copilot when opencode fails', async () => {
|
|
89
|
+
mockExecFailureOnce();
|
|
90
|
+
mockExecSuccessOnce('copilot 1.0.0\n');
|
|
91
|
+
|
|
92
|
+
const result = await detector.detect();
|
|
93
|
+
|
|
94
|
+
expect(result).toHaveLength(2);
|
|
95
|
+
expect(result[0]).toEqual({ type: 'opencode', available: false });
|
|
96
|
+
expect(result[1]).toEqual({ type: 'github_copilot', available: true, version: '1.0.0' });
|
|
97
|
+
});
|
|
98
|
+
|
|
99
|
+
|
|
100
|
+
});
|
|
101
|
+
|
|
102
|
+
describe('getSpawnerConfig', () => {
|
|
103
|
+
it('should return opencode spawner config', () => {
|
|
104
|
+
const config = detector.getSpawnerConfig('opencode');
|
|
105
|
+
expect(config).toEqual({ command: 'opencode', args: ['acp'] });
|
|
106
|
+
});
|
|
107
|
+
|
|
108
|
+
it('should return github_copilot spawner config', () => {
|
|
109
|
+
const config = detector.getSpawnerConfig('github_copilot');
|
|
110
|
+
expect(config).toEqual({ command: 'copilot', args: ['--acp', '--stdio'] });
|
|
111
|
+
});
|
|
112
|
+
|
|
113
|
+
it('should return opencode as default for unknown serverType', () => {
|
|
114
|
+
const config = detector.getSpawnerConfig('unknown_server');
|
|
115
|
+
expect(config).toEqual({ command: 'opencode', args: ['acp'] });
|
|
68
116
|
});
|
|
69
117
|
});
|
|
70
118
|
});
|
|
@@ -2,14 +2,25 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
|
2
2
|
import { EventEmitter } from 'events';
|
|
3
3
|
import { Writable, Readable } from 'node:stream';
|
|
4
4
|
import type { ChildProcess } from 'child_process';
|
|
5
|
+
import * as os from 'os';
|
|
6
|
+
|
|
7
|
+
vi.mock('os', () => ({
|
|
8
|
+
platform: vi.fn(() => 'linux'),
|
|
9
|
+
}));
|
|
5
10
|
|
|
6
11
|
vi.mock('child_process', () => ({
|
|
7
12
|
spawn: vi.fn(),
|
|
8
13
|
execFileSync: vi.fn(() => '/usr/bin/opencode'),
|
|
9
14
|
}));
|
|
10
15
|
|
|
16
|
+
vi.mock('fs', async (importOriginal) => {
|
|
17
|
+
const actual = await importOriginal<typeof import('fs')>();
|
|
18
|
+
return { ...actual, existsSync: vi.fn(() => false), mkdirSync: vi.fn() };
|
|
19
|
+
});
|
|
20
|
+
|
|
11
21
|
import { AcpSpawner } from '../../src/acp/spawner.js';
|
|
12
|
-
import { spawn } from 'child_process';
|
|
22
|
+
import { spawn, execFileSync } from 'child_process';
|
|
23
|
+
import { existsSync } from 'fs';
|
|
13
24
|
|
|
14
25
|
function createMockChildProcess(): ChildProcess & EventEmitter {
|
|
15
26
|
const proc = new EventEmitter() as ChildProcess & EventEmitter;
|
|
@@ -146,4 +157,88 @@ describe('AcpSpawner', () => {
|
|
|
146
157
|
await vi.waitFor(() => expect(resolved).toBe(true));
|
|
147
158
|
});
|
|
148
159
|
});
|
|
160
|
+
|
|
161
|
+
describe('Windows platform', () => {
|
|
162
|
+
beforeEach(() => {
|
|
163
|
+
vi.mocked(os.platform).mockReturnValue('win32');
|
|
164
|
+
vi.mocked(execFileSync).mockReset();
|
|
165
|
+
vi.mocked(existsSync).mockReset();
|
|
166
|
+
vi.mocked(spawn).mockClear();
|
|
167
|
+
});
|
|
168
|
+
|
|
169
|
+
afterEach(() => {
|
|
170
|
+
vi.mocked(os.platform).mockReturnValue('linux');
|
|
171
|
+
});
|
|
172
|
+
|
|
173
|
+
describe('resolveCommand', () => {
|
|
174
|
+
it('should use `where` instead of `which`', () => {
|
|
175
|
+
vi.mocked(execFileSync).mockReturnValue('C:\\npm\\copilot.cmd\r\n');
|
|
176
|
+
const sp = new AcpSpawner({ sessionId: 's', cwd: 'C:\\project', command: 'copilot', args: ['--acp', '--stdio'] });
|
|
177
|
+
sp.start();
|
|
178
|
+
expect(execFileSync).toHaveBeenCalledWith('where', ['copilot'], { encoding: 'utf8', timeout: 1000 });
|
|
179
|
+
});
|
|
180
|
+
|
|
181
|
+
it('should return full path from `where`', () => {
|
|
182
|
+
vi.mocked(execFileSync).mockReturnValue('C:\\Users\\ash\\AppData\\Roaming\\npm\\copilot.cmd\r\n');
|
|
183
|
+
const sp = new AcpSpawner({ sessionId: 's', cwd: 'C:\\project', command: 'copilot', args: ['--acp', '--stdio'] });
|
|
184
|
+
sp.start();
|
|
185
|
+
expect(spawn).toHaveBeenCalledWith(
|
|
186
|
+
'C:\\Users\\ash\\AppData\\Roaming\\npm\\copilot.cmd',
|
|
187
|
+
['--acp', '--stdio'],
|
|
188
|
+
expect.objectContaining({ shell: true }),
|
|
189
|
+
);
|
|
190
|
+
});
|
|
191
|
+
|
|
192
|
+
it('should fall back to PATHEXT check when `where` fails', () => {
|
|
193
|
+
vi.mocked(execFileSync).mockImplementation(() => { throw new Error('not found'); });
|
|
194
|
+
vi.mocked(existsSync).mockImplementation((p: string) => p === 'copilot.cmd');
|
|
195
|
+
const sp = new AcpSpawner({ sessionId: 's', cwd: 'C:\\project', command: 'copilot' });
|
|
196
|
+
sp.start();
|
|
197
|
+
expect(spawn).toHaveBeenCalledWith('copilot.cmd', expect.any(Array), expect.objectContaining({ shell: true }));
|
|
198
|
+
});
|
|
199
|
+
|
|
200
|
+
it('should return bare command as last resort', () => {
|
|
201
|
+
vi.mocked(execFileSync).mockImplementation(() => { throw new Error('not found'); });
|
|
202
|
+
vi.mocked(existsSync).mockReturnValue(false);
|
|
203
|
+
const sp = new AcpSpawner({ sessionId: 's', cwd: 'C:\\project', command: 'copilot' });
|
|
204
|
+
sp.start();
|
|
205
|
+
expect(spawn).toHaveBeenCalledWith('copilot', expect.any(Array), expect.objectContaining({ shell: true }));
|
|
206
|
+
});
|
|
207
|
+
});
|
|
208
|
+
|
|
209
|
+
describe('start', () => {
|
|
210
|
+
it('should spawn with shell: true', () => {
|
|
211
|
+
vi.mocked(execFileSync).mockReturnValue('C:\\npm\\copilot.cmd\r\n');
|
|
212
|
+
const sp = new AcpSpawner({ sessionId: 's', cwd: 'C:\\project', command: 'copilot' });
|
|
213
|
+
sp.start();
|
|
214
|
+
expect(spawn).toHaveBeenCalledWith(
|
|
215
|
+
expect.any(String),
|
|
216
|
+
expect.any(Array),
|
|
217
|
+
expect.objectContaining({ shell: true }),
|
|
218
|
+
);
|
|
219
|
+
});
|
|
220
|
+
});
|
|
221
|
+
|
|
222
|
+
describe('stop', () => {
|
|
223
|
+
it('should call kill() without signal on Windows', () => {
|
|
224
|
+
const sp = new AcpSpawner({ sessionId: 's', cwd: 'C:\\project', command: 'copilot' });
|
|
225
|
+
vi.mocked(execFileSync).mockReturnValue('C:\\npm\\copilot.cmd\r\n');
|
|
226
|
+
sp.start();
|
|
227
|
+
sp.stop();
|
|
228
|
+
expect(mockProcess.kill).toHaveBeenCalledWith();
|
|
229
|
+
expect(mockProcess.kill).not.toHaveBeenCalledWith('SIGTERM');
|
|
230
|
+
});
|
|
231
|
+
|
|
232
|
+
it('should call kill() again after 5s on Windows', () => {
|
|
233
|
+
const sp = new AcpSpawner({ sessionId: 's', cwd: 'C:\\project', command: 'copilot' });
|
|
234
|
+
vi.mocked(execFileSync).mockReturnValue('C:\\npm\\copilot.cmd\r\n');
|
|
235
|
+
sp.start();
|
|
236
|
+
sp.stop();
|
|
237
|
+
expect(mockProcess.kill).toHaveBeenCalledTimes(1);
|
|
238
|
+
vi.advanceTimersByTime(5000);
|
|
239
|
+
expect(mockProcess.kill).toHaveBeenCalledTimes(2);
|
|
240
|
+
expect(mockProcess.kill).not.toHaveBeenCalledWith('SIGKILL');
|
|
241
|
+
});
|
|
242
|
+
});
|
|
243
|
+
});
|
|
149
244
|
});
|
|
@@ -25,11 +25,25 @@ vi.mock('../src/config.js', () => ({
|
|
|
25
25
|
|
|
26
26
|
vi.mock('os', () => ({
|
|
27
27
|
hostname: vi.fn().mockReturnValue('test-machine'),
|
|
28
|
+
platform: vi.fn(() => 'linux'),
|
|
29
|
+
homedir: vi.fn(() => '/home/user'),
|
|
28
30
|
}));
|
|
29
31
|
|
|
32
|
+
vi.mock('fs/promises', () => ({
|
|
33
|
+
readdir: vi.fn(),
|
|
34
|
+
access: vi.fn(),
|
|
35
|
+
}));
|
|
36
|
+
|
|
37
|
+
vi.mock('path', async (importOriginal) => {
|
|
38
|
+
const actual = await importOriginal<typeof import('path')>();
|
|
39
|
+
return actual;
|
|
40
|
+
});
|
|
41
|
+
|
|
30
42
|
import { connectToServer, unregister } from '../src/socketio-client.js';
|
|
31
43
|
import { io } from 'socket.io-client';
|
|
32
44
|
import { clearConfigKey } from '../src/config.js';
|
|
45
|
+
import * as os from 'os';
|
|
46
|
+
import { readdir, access } from 'fs/promises';
|
|
33
47
|
|
|
34
48
|
function createMockSocket() {
|
|
35
49
|
const handlers: Record<string, (...args: unknown[]) => void> = {};
|
|
@@ -87,7 +101,7 @@ describe('SocketIO Client', () => {
|
|
|
87
101
|
expect(mockSocket.emit).toHaveBeenCalledWith('register', {
|
|
88
102
|
key: 'zag_k_1_abc123',
|
|
89
103
|
hostname: 'my-machine',
|
|
90
|
-
version: '1.0.
|
|
104
|
+
version: '1.0.4',
|
|
91
105
|
});
|
|
92
106
|
});
|
|
93
107
|
|
|
@@ -102,7 +116,7 @@ describe('SocketIO Client', () => {
|
|
|
102
116
|
expect(mockSocket.emit).toHaveBeenCalledWith('register', {
|
|
103
117
|
key: 'zag_k_1_abc123',
|
|
104
118
|
hostname: 'test-machine',
|
|
105
|
-
version: '1.0.
|
|
119
|
+
version: '1.0.4',
|
|
106
120
|
});
|
|
107
121
|
});
|
|
108
122
|
|
|
@@ -193,4 +207,108 @@ describe('SocketIO Client', () => {
|
|
|
193
207
|
expect(mockSocket.emit).toHaveBeenCalledWith('unregister', { reason: 'user_detach' });
|
|
194
208
|
});
|
|
195
209
|
});
|
|
210
|
+
|
|
211
|
+
describe('fs:browse', () => {
|
|
212
|
+
it('should list drives on Windows when path is /', async () => {
|
|
213
|
+
vi.mocked(os.platform).mockReturnValue('win32');
|
|
214
|
+
vi.mocked(access).mockImplementation(async (p: string) => {
|
|
215
|
+
if (p === 'C:\\' || p === 'D:\\') return;
|
|
216
|
+
throw new Error('not found');
|
|
217
|
+
});
|
|
218
|
+
|
|
219
|
+
const mockSocket = createMockSocket();
|
|
220
|
+
vi.mocked(io).mockReturnValue(mockSocket as never);
|
|
221
|
+
|
|
222
|
+
connectToServer('http://localhost:4001', 'zag_k_1_abc123');
|
|
223
|
+
mockSocket._trigger('connect');
|
|
224
|
+
mockSocket._trigger('registered', { controllerId: 'ctrl-1' });
|
|
225
|
+
|
|
226
|
+
mockSocket._trigger('fs:browse', { requestId: 'req-1', path: '/' });
|
|
227
|
+
await vi.waitFor(() => {
|
|
228
|
+
expect(mockSocket.emit).toHaveBeenCalledWith('fs:browse:result', {
|
|
229
|
+
requestId: 'req-1',
|
|
230
|
+
entries: [
|
|
231
|
+
{ name: 'C:', path: 'C:\\', isDirectory: true },
|
|
232
|
+
{ name: 'D:', path: 'D:\\', isDirectory: true },
|
|
233
|
+
],
|
|
234
|
+
});
|
|
235
|
+
});
|
|
236
|
+
});
|
|
237
|
+
|
|
238
|
+
it('should list drives on Windows when path is empty string', async () => {
|
|
239
|
+
vi.mocked(os.platform).mockReturnValue('win32');
|
|
240
|
+
vi.mocked(access).mockImplementation(async (p: string) => {
|
|
241
|
+
if (p === 'C:\\') return;
|
|
242
|
+
throw new Error('not found');
|
|
243
|
+
});
|
|
244
|
+
|
|
245
|
+
const mockSocket = createMockSocket();
|
|
246
|
+
vi.mocked(io).mockReturnValue(mockSocket as never);
|
|
247
|
+
|
|
248
|
+
connectToServer('http://localhost:4001', 'zag_k_1_abc123');
|
|
249
|
+
mockSocket._trigger('connect');
|
|
250
|
+
mockSocket._trigger('registered', { controllerId: 'ctrl-1' });
|
|
251
|
+
|
|
252
|
+
mockSocket._trigger('fs:browse', { requestId: 'req-2', path: '' });
|
|
253
|
+
await vi.waitFor(() => {
|
|
254
|
+
expect(mockSocket.emit).toHaveBeenCalledWith('fs:browse:result', {
|
|
255
|
+
requestId: 'req-2',
|
|
256
|
+
entries: [
|
|
257
|
+
{ name: 'C:', path: 'C:\\', isDirectory: true },
|
|
258
|
+
],
|
|
259
|
+
});
|
|
260
|
+
});
|
|
261
|
+
});
|
|
262
|
+
|
|
263
|
+
it('should NOT list drives on Linux when path is /', async () => {
|
|
264
|
+
vi.mocked(os.platform).mockReturnValue('linux');
|
|
265
|
+
vi.mocked(readdir).mockResolvedValue([
|
|
266
|
+
{ name: 'home', isDirectory: () => true },
|
|
267
|
+
{ name: 'usr', isDirectory: () => true },
|
|
268
|
+
] as never);
|
|
269
|
+
|
|
270
|
+
const mockSocket = createMockSocket();
|
|
271
|
+
vi.mocked(io).mockReturnValue(mockSocket as never);
|
|
272
|
+
|
|
273
|
+
connectToServer('http://localhost:4001', 'zag_k_1_abc123');
|
|
274
|
+
mockSocket._trigger('connect');
|
|
275
|
+
mockSocket._trigger('registered', { controllerId: 'ctrl-1' });
|
|
276
|
+
|
|
277
|
+
mockSocket._trigger('fs:browse', { requestId: 'req-3', path: '/' });
|
|
278
|
+
await vi.waitFor(() => {
|
|
279
|
+
expect(mockSocket.emit).toHaveBeenCalledWith('fs:browse:result', {
|
|
280
|
+
requestId: 'req-3',
|
|
281
|
+
entries: [
|
|
282
|
+
{ name: 'home', path: '/home', isDirectory: true },
|
|
283
|
+
{ name: 'usr', path: '/usr', isDirectory: true },
|
|
284
|
+
],
|
|
285
|
+
});
|
|
286
|
+
});
|
|
287
|
+
});
|
|
288
|
+
|
|
289
|
+
it('should skip unavailable drives on Windows', async () => {
|
|
290
|
+
vi.mocked(os.platform).mockReturnValue('win32');
|
|
291
|
+
vi.mocked(access).mockImplementation(async (p: string) => {
|
|
292
|
+
if (p === 'C:\\') return;
|
|
293
|
+
throw new Error('not found');
|
|
294
|
+
});
|
|
295
|
+
|
|
296
|
+
const mockSocket = createMockSocket();
|
|
297
|
+
vi.mocked(io).mockReturnValue(mockSocket as never);
|
|
298
|
+
|
|
299
|
+
connectToServer('http://localhost:4001', 'zag_k_1_abc123');
|
|
300
|
+
mockSocket._trigger('connect');
|
|
301
|
+
mockSocket._trigger('registered', { controllerId: 'ctrl-1' });
|
|
302
|
+
|
|
303
|
+
mockSocket._trigger('fs:browse', { requestId: 'req-4', path: '/' });
|
|
304
|
+
await vi.waitFor(() => {
|
|
305
|
+
expect(mockSocket.emit).toHaveBeenCalledWith('fs:browse:result', {
|
|
306
|
+
requestId: 'req-4',
|
|
307
|
+
entries: [
|
|
308
|
+
{ name: 'C:', path: 'C:\\', isDirectory: true },
|
|
309
|
+
],
|
|
310
|
+
});
|
|
311
|
+
});
|
|
312
|
+
});
|
|
313
|
+
});
|
|
196
314
|
});
|