@coralai/sps-cli 0.25.2 → 0.26.1
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/README-CN.md +59 -9
- package/README.md +99 -67
- package/dist/commands/acpCommand.d.ts.map +1 -1
- package/dist/commands/acpCommand.js +2 -19
- package/dist/commands/acpCommand.js.map +1 -1
- package/dist/commands/doctor.d.ts.map +1 -1
- package/dist/commands/doctor.js +3 -13
- package/dist/commands/doctor.js.map +1 -1
- package/dist/commands/logs.d.ts.map +1 -1
- package/dist/commands/logs.js +58 -2
- package/dist/commands/logs.js.map +1 -1
- package/dist/commands/monitorTick.d.ts.map +1 -1
- package/dist/commands/monitorTick.js +2 -3
- package/dist/commands/monitorTick.js.map +1 -1
- package/dist/commands/reset.d.ts.map +1 -1
- package/dist/commands/reset.js +4 -0
- package/dist/commands/reset.js.map +1 -1
- package/dist/commands/tick.d.ts.map +1 -1
- package/dist/commands/tick.js +3 -4
- package/dist/commands/tick.js.map +1 -1
- package/dist/commands/workerDashboard.d.ts.map +1 -1
- package/dist/commands/workerDashboard.js +55 -95
- package/dist/commands/workerDashboard.js.map +1 -1
- package/dist/core/config.d.ts +8 -7
- package/dist/core/config.d.ts.map +1 -1
- package/dist/core/config.js +15 -7
- package/dist/core/config.js.map +1 -1
- package/dist/core/config.test.js +23 -5
- package/dist/core/config.test.js.map +1 -1
- package/dist/core/sessionLiveness.d.ts +0 -1
- package/dist/core/sessionLiveness.d.ts.map +1 -1
- package/dist/core/sessionLiveness.js +7 -15
- package/dist/core/sessionLiveness.js.map +1 -1
- package/dist/core/state.d.ts +4 -5
- package/dist/core/state.d.ts.map +1 -1
- package/dist/core/state.js +0 -1
- package/dist/core/state.js.map +1 -1
- package/dist/core/state.test.js +0 -1
- package/dist/core/state.test.js.map +1 -1
- package/dist/engines/CloseoutEngine.js +1 -1
- package/dist/engines/CloseoutEngine.js.map +1 -1
- package/dist/engines/ExecutionEngine.d.ts +1 -1
- package/dist/engines/ExecutionEngine.js +3 -3
- package/dist/engines/ExecutionEngine.js.map +1 -1
- package/dist/engines/MonitorEngine.d.ts +4 -7
- package/dist/engines/MonitorEngine.d.ts.map +1 -1
- package/dist/engines/MonitorEngine.js +10 -68
- package/dist/engines/MonitorEngine.js.map +1 -1
- package/dist/interfaces/ACPClient.d.ts +10 -0
- package/dist/interfaces/ACPClient.d.ts.map +1 -1
- package/dist/main.js +1 -1
- package/dist/main.js.map +1 -1
- package/dist/manager/completion-judge.d.ts.map +1 -1
- package/dist/manager/completion-judge.js +7 -0
- package/dist/manager/completion-judge.js.map +1 -1
- package/dist/manager/integration-queue.d.ts +1 -1
- package/dist/manager/integration-queue.d.ts.map +1 -1
- package/dist/manager/runtime-coordinator.js +1 -1
- package/dist/manager/runtime-coordinator.js.map +1 -1
- package/dist/manager/worker-manager-impl.d.ts +9 -1
- package/dist/manager/worker-manager-impl.d.ts.map +1 -1
- package/dist/manager/worker-manager-impl.js +74 -8
- package/dist/manager/worker-manager-impl.js.map +1 -1
- package/dist/manager/worker-manager.d.ts +4 -4
- package/dist/manager/worker-manager.d.ts.map +1 -1
- package/dist/providers/ACPWorkerRuntime.d.ts.map +1 -1
- package/dist/providers/ACPWorkerRuntime.js +5 -0
- package/dist/providers/ACPWorkerRuntime.js.map +1 -1
- package/dist/providers/LocalACPClient.d.ts +1 -2
- package/dist/providers/LocalACPClient.d.ts.map +1 -1
- package/dist/providers/LocalACPClient.js +7 -22
- package/dist/providers/LocalACPClient.js.map +1 -1
- package/dist/providers/adapters/AcpSdkAdapter.d.ts +14 -0
- package/dist/providers/adapters/AcpSdkAdapter.d.ts.map +1 -0
- package/dist/providers/adapters/AcpSdkAdapter.js +270 -0
- package/dist/providers/adapters/AcpSdkAdapter.js.map +1 -0
- package/dist/providers/adapters/acp-fs-handlers.d.ts +26 -0
- package/dist/providers/adapters/acp-fs-handlers.d.ts.map +1 -0
- package/dist/providers/adapters/acp-fs-handlers.js +52 -0
- package/dist/providers/adapters/acp-fs-handlers.js.map +1 -0
- package/dist/providers/adapters/acp-fs-handlers.test.d.ts +2 -0
- package/dist/providers/adapters/acp-fs-handlers.test.d.ts.map +1 -0
- package/dist/providers/adapters/acp-fs-handlers.test.js +65 -0
- package/dist/providers/adapters/acp-fs-handlers.test.js.map +1 -0
- package/dist/providers/adapters/acp-permissions.d.ts +35 -0
- package/dist/providers/adapters/acp-permissions.d.ts.map +1 -0
- package/dist/providers/adapters/acp-permissions.js +69 -0
- package/dist/providers/adapters/acp-permissions.js.map +1 -0
- package/dist/providers/adapters/acp-permissions.test.d.ts +2 -0
- package/dist/providers/adapters/acp-permissions.test.d.ts.map +1 -0
- package/dist/providers/adapters/acp-permissions.test.js +88 -0
- package/dist/providers/adapters/acp-permissions.test.js.map +1 -0
- package/dist/providers/adapters/acp-session-accumulator.d.ts +23 -0
- package/dist/providers/adapters/acp-session-accumulator.d.ts.map +1 -0
- package/dist/providers/adapters/acp-session-accumulator.js +99 -0
- package/dist/providers/adapters/acp-session-accumulator.js.map +1 -0
- package/dist/providers/adapters/acp-session-accumulator.test.d.ts +2 -0
- package/dist/providers/adapters/acp-session-accumulator.test.d.ts.map +1 -0
- package/dist/providers/adapters/acp-session-accumulator.test.js +73 -0
- package/dist/providers/adapters/acp-session-accumulator.test.js.map +1 -0
- package/dist/providers/adapters/acp-terminal-manager.d.ts +56 -0
- package/dist/providers/adapters/acp-terminal-manager.d.ts.map +1 -0
- package/dist/providers/adapters/acp-terminal-manager.js +118 -0
- package/dist/providers/adapters/acp-terminal-manager.js.map +1 -0
- package/dist/providers/adapters/acp-terminal-manager.test.d.ts +2 -0
- package/dist/providers/adapters/acp-terminal-manager.test.d.ts.map +1 -0
- package/dist/providers/adapters/acp-terminal-manager.test.js +71 -0
- package/dist/providers/adapters/acp-terminal-manager.test.js.map +1 -0
- package/dist/providers/registry.d.ts +0 -2
- package/dist/providers/registry.d.ts.map +1 -1
- package/dist/providers/registry.js +0 -26
- package/dist/providers/registry.js.map +1 -1
- package/package.json +4 -2
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { resolvePermission, inferToolKind } from './acp-permissions.js';
|
|
3
|
+
function makeParams(kind, title, options) {
|
|
4
|
+
return {
|
|
5
|
+
sessionId: 'test-session',
|
|
6
|
+
toolCall: {
|
|
7
|
+
toolCallId: 'tc-1',
|
|
8
|
+
title: title ?? 'Test tool',
|
|
9
|
+
kind: kind ?? undefined,
|
|
10
|
+
status: 'pending',
|
|
11
|
+
},
|
|
12
|
+
options: options ?? [
|
|
13
|
+
{ optionId: 'allow', kind: 'allow_once', name: 'Allow' },
|
|
14
|
+
{ optionId: 'reject', kind: 'reject_once', name: 'Reject' },
|
|
15
|
+
],
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
describe('resolvePermission', () => {
|
|
19
|
+
it('approve-all: selects allow_once', () => {
|
|
20
|
+
const result = resolvePermission(makeParams('edit'), 'approve-all');
|
|
21
|
+
expect(result.outcome).toEqual({ outcome: 'selected', optionId: 'allow' });
|
|
22
|
+
});
|
|
23
|
+
it('approve-all: selects first option if no allow_once', () => {
|
|
24
|
+
const params = makeParams('edit', 'Test', [
|
|
25
|
+
{ optionId: 'custom', kind: 'reject_once', name: 'Custom' },
|
|
26
|
+
]);
|
|
27
|
+
const result = resolvePermission(params, 'approve-all');
|
|
28
|
+
expect(result.outcome).toEqual({ outcome: 'selected', optionId: 'custom' });
|
|
29
|
+
});
|
|
30
|
+
it('deny-all: selects reject_once', () => {
|
|
31
|
+
const result = resolvePermission(makeParams('edit'), 'deny-all');
|
|
32
|
+
expect(result.outcome).toEqual({ outcome: 'selected', optionId: 'reject' });
|
|
33
|
+
});
|
|
34
|
+
it('deny-all: cancels if no reject option', () => {
|
|
35
|
+
const params = makeParams('edit', 'Test', [
|
|
36
|
+
{ optionId: 'allow', kind: 'allow_once', name: 'Allow' },
|
|
37
|
+
]);
|
|
38
|
+
const result = resolvePermission(params, 'deny-all');
|
|
39
|
+
expect(result.outcome).toEqual({ outcome: 'cancelled' });
|
|
40
|
+
});
|
|
41
|
+
it('approve-reads: auto-approves read kind', () => {
|
|
42
|
+
const result = resolvePermission(makeParams('read'), 'approve-reads');
|
|
43
|
+
expect(result.outcome).toEqual({ outcome: 'selected', optionId: 'allow' });
|
|
44
|
+
});
|
|
45
|
+
it('approve-reads: auto-approves search kind', () => {
|
|
46
|
+
const result = resolvePermission(makeParams('search'), 'approve-reads');
|
|
47
|
+
expect(result.outcome).toEqual({ outcome: 'selected', optionId: 'allow' });
|
|
48
|
+
});
|
|
49
|
+
it('approve-reads: auto-approves non-read kind (SPS unattended)', () => {
|
|
50
|
+
const result = resolvePermission(makeParams('edit'), 'approve-reads');
|
|
51
|
+
expect(result.outcome).toEqual({ outcome: 'selected', optionId: 'allow' });
|
|
52
|
+
});
|
|
53
|
+
it('cancels when options array is empty', () => {
|
|
54
|
+
const params = makeParams('edit', 'Test', []);
|
|
55
|
+
const result = resolvePermission(params, 'approve-all');
|
|
56
|
+
expect(result.outcome).toEqual({ outcome: 'cancelled' });
|
|
57
|
+
});
|
|
58
|
+
});
|
|
59
|
+
describe('inferToolKind', () => {
|
|
60
|
+
it('returns toolCall.kind when set', () => {
|
|
61
|
+
expect(inferToolKind({ toolCall: { kind: 'edit' } })).toBe('edit');
|
|
62
|
+
});
|
|
63
|
+
it('infers read from title', () => {
|
|
64
|
+
expect(inferToolKind({ toolCall: { title: 'Read src/main.ts' } })).toBe('read');
|
|
65
|
+
});
|
|
66
|
+
it('infers search from grep', () => {
|
|
67
|
+
expect(inferToolKind({ toolCall: { title: 'grep -i "pattern"' } })).toBe('search');
|
|
68
|
+
});
|
|
69
|
+
it('infers edit from write', () => {
|
|
70
|
+
expect(inferToolKind({ toolCall: { title: 'Write result.txt' } })).toBe('edit');
|
|
71
|
+
});
|
|
72
|
+
it('infers execute from bash/run', () => {
|
|
73
|
+
expect(inferToolKind({ toolCall: { title: 'Run npm test' } })).toBe('execute');
|
|
74
|
+
});
|
|
75
|
+
it('infers delete from remove', () => {
|
|
76
|
+
expect(inferToolKind({ toolCall: { title: 'Remove old files' } })).toBe('delete');
|
|
77
|
+
});
|
|
78
|
+
it('infers fetch from http', () => {
|
|
79
|
+
expect(inferToolKind({ toolCall: { title: 'fetch https://api.com' } })).toBe('fetch');
|
|
80
|
+
});
|
|
81
|
+
it('returns other for unknown title', () => {
|
|
82
|
+
expect(inferToolKind({ toolCall: { title: 'Do something' } })).toBe('other');
|
|
83
|
+
});
|
|
84
|
+
it('returns undefined when no kind and no title', () => {
|
|
85
|
+
expect(inferToolKind({ toolCall: {} })).toBeUndefined();
|
|
86
|
+
});
|
|
87
|
+
});
|
|
88
|
+
//# sourceMappingURL=acp-permissions.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"acp-permissions.test.js","sourceRoot":"","sources":["../../../src/providers/adapters/acp-permissions.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
interface SessionUpdate {
|
|
2
|
+
sessionUpdate: string;
|
|
3
|
+
[key: string]: unknown;
|
|
4
|
+
}
|
|
5
|
+
export declare class SessionUpdateAccumulator {
|
|
6
|
+
private textChunks;
|
|
7
|
+
private toolCalls;
|
|
8
|
+
private logFile;
|
|
9
|
+
stopReason: string | null;
|
|
10
|
+
hasPendingPermission: boolean;
|
|
11
|
+
lastUpdateAt: string | null;
|
|
12
|
+
/** Set a log file path — events will be appended as human-readable lines. */
|
|
13
|
+
setLogFile(path: string): void;
|
|
14
|
+
reset(): void;
|
|
15
|
+
handleUpdate(update: SessionUpdate): void;
|
|
16
|
+
/** Recent text output, capped to maxChars (replaces capturePaneText). */
|
|
17
|
+
getRecentText(maxChars?: number): string;
|
|
18
|
+
/** Count of non-terminal (pending/in_progress) tool calls. */
|
|
19
|
+
get activeToolCalls(): number;
|
|
20
|
+
private appendLog;
|
|
21
|
+
}
|
|
22
|
+
export {};
|
|
23
|
+
//# sourceMappingURL=acp-session-accumulator.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"acp-session-accumulator.d.ts","sourceRoot":"","sources":["../../../src/providers/adapters/acp-session-accumulator.ts"],"names":[],"mappings":"AAUA,UAAU,aAAa;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,qBAAa,wBAAwB;IACnC,OAAO,CAAC,UAAU,CAAgB;IAClC,OAAO,CAAC,SAAS,CAAsE;IACvF,OAAO,CAAC,OAAO,CAAuB;IAEtC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAQ;IACjC,oBAAoB,UAAS;IAC7B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAQ;IAEnC,6EAA6E;IAC7E,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAK9B,KAAK,IAAI,IAAI;IAQb,YAAY,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;IA8CzC,yEAAyE;IACzE,aAAa,CAAC,QAAQ,SAAO,GAAG,MAAM;IAKtC,8DAA8D;IAC9D,IAAI,eAAe,IAAI,MAAM,CAM5B;IAED,OAAO,CAAC,SAAS;CAIlB"}
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* ACP Session Update Accumulator
|
|
3
|
+
*
|
|
4
|
+
* Collects session/update notifications from the ACP agent process.
|
|
5
|
+
* Provides structured state for inspectRun() without terminal scraping.
|
|
6
|
+
* Optionally writes events to a log file for `sps logs` compatibility.
|
|
7
|
+
*/
|
|
8
|
+
import { appendFileSync, mkdirSync } from 'node:fs';
|
|
9
|
+
import { dirname } from 'node:path';
|
|
10
|
+
export class SessionUpdateAccumulator {
|
|
11
|
+
textChunks = [];
|
|
12
|
+
toolCalls = new Map();
|
|
13
|
+
logFile = null;
|
|
14
|
+
stopReason = null;
|
|
15
|
+
hasPendingPermission = false;
|
|
16
|
+
lastUpdateAt = null;
|
|
17
|
+
/** Set a log file path — events will be appended as human-readable lines. */
|
|
18
|
+
setLogFile(path) {
|
|
19
|
+
this.logFile = path;
|
|
20
|
+
try {
|
|
21
|
+
mkdirSync(dirname(path), { recursive: true });
|
|
22
|
+
}
|
|
23
|
+
catch { /* exists */ }
|
|
24
|
+
}
|
|
25
|
+
reset() {
|
|
26
|
+
this.textChunks = [];
|
|
27
|
+
this.toolCalls.clear();
|
|
28
|
+
this.stopReason = null;
|
|
29
|
+
this.hasPendingPermission = false;
|
|
30
|
+
this.lastUpdateAt = null;
|
|
31
|
+
}
|
|
32
|
+
handleUpdate(update) {
|
|
33
|
+
this.lastUpdateAt = new Date().toISOString();
|
|
34
|
+
const ts = this.lastUpdateAt.slice(11, 23); // HH:mm:ss.SSS
|
|
35
|
+
switch (update.sessionUpdate) {
|
|
36
|
+
case 'agent_message_chunk': {
|
|
37
|
+
const content = update.content;
|
|
38
|
+
if (content?.type === 'text' && content.text) {
|
|
39
|
+
this.textChunks.push(content.text);
|
|
40
|
+
this.appendLog(`${ts} [assistant] ${content.text}`);
|
|
41
|
+
}
|
|
42
|
+
break;
|
|
43
|
+
}
|
|
44
|
+
case 'tool_call': {
|
|
45
|
+
const id = update.toolCallId;
|
|
46
|
+
const title = update.title ?? '';
|
|
47
|
+
const kind = update.kind ?? 'other';
|
|
48
|
+
const status = update.status ?? 'pending';
|
|
49
|
+
this.toolCalls.set(id, { title, kind, status });
|
|
50
|
+
this.appendLog(`${ts} [tool:${kind}] ${title} (${status})`);
|
|
51
|
+
break;
|
|
52
|
+
}
|
|
53
|
+
case 'tool_call_update': {
|
|
54
|
+
const id = update.toolCallId;
|
|
55
|
+
const existing = this.toolCalls.get(id);
|
|
56
|
+
const status = update.status ?? existing?.status ?? 'unknown';
|
|
57
|
+
if (existing) {
|
|
58
|
+
existing.status = status;
|
|
59
|
+
}
|
|
60
|
+
this.appendLog(`${ts} [tool_update] ${id} → ${status}`);
|
|
61
|
+
break;
|
|
62
|
+
}
|
|
63
|
+
case 'usage_update': {
|
|
64
|
+
const used = update.used;
|
|
65
|
+
const size = update.size;
|
|
66
|
+
if (used != null && size != null) {
|
|
67
|
+
this.appendLog(`${ts} [usage] ${used}/${size} tokens`);
|
|
68
|
+
}
|
|
69
|
+
break;
|
|
70
|
+
}
|
|
71
|
+
default:
|
|
72
|
+
// plan, agent_thought_chunk, available_commands_update, etc.
|
|
73
|
+
break;
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
/** Recent text output, capped to maxChars (replaces capturePaneText). */
|
|
77
|
+
getRecentText(maxChars = 4000) {
|
|
78
|
+
const full = this.textChunks.join('');
|
|
79
|
+
return full.length > maxChars ? full.slice(-maxChars) : full;
|
|
80
|
+
}
|
|
81
|
+
/** Count of non-terminal (pending/in_progress) tool calls. */
|
|
82
|
+
get activeToolCalls() {
|
|
83
|
+
let count = 0;
|
|
84
|
+
for (const tc of this.toolCalls.values()) {
|
|
85
|
+
if (tc.status !== 'completed' && tc.status !== 'failed')
|
|
86
|
+
count++;
|
|
87
|
+
}
|
|
88
|
+
return count;
|
|
89
|
+
}
|
|
90
|
+
appendLog(line) {
|
|
91
|
+
if (!this.logFile)
|
|
92
|
+
return;
|
|
93
|
+
try {
|
|
94
|
+
appendFileSync(this.logFile, line + '\n');
|
|
95
|
+
}
|
|
96
|
+
catch { /* best effort */ }
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
//# sourceMappingURL=acp-session-accumulator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"acp-session-accumulator.js","sourceRoot":"","sources":["../../../src/providers/adapters/acp-session-accumulator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"acp-session-accumulator.test.d.ts","sourceRoot":"","sources":["../../../src/providers/adapters/acp-session-accumulator.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { SessionUpdateAccumulator } from './acp-session-accumulator.js';
|
|
3
|
+
describe('SessionUpdateAccumulator', () => {
|
|
4
|
+
it('accumulates agent_message_chunk text', () => {
|
|
5
|
+
const acc = new SessionUpdateAccumulator();
|
|
6
|
+
acc.handleUpdate({ sessionUpdate: 'agent_message_chunk', content: { type: 'text', text: 'Hello ' } });
|
|
7
|
+
acc.handleUpdate({ sessionUpdate: 'agent_message_chunk', content: { type: 'text', text: 'World' } });
|
|
8
|
+
expect(acc.getRecentText()).toBe('Hello World');
|
|
9
|
+
});
|
|
10
|
+
it('tracks tool_call lifecycle', () => {
|
|
11
|
+
const acc = new SessionUpdateAccumulator();
|
|
12
|
+
acc.handleUpdate({
|
|
13
|
+
sessionUpdate: 'tool_call',
|
|
14
|
+
toolCallId: 'tc-1',
|
|
15
|
+
title: 'Read file',
|
|
16
|
+
kind: 'read',
|
|
17
|
+
status: 'pending',
|
|
18
|
+
});
|
|
19
|
+
expect(acc.activeToolCalls).toBe(1);
|
|
20
|
+
acc.handleUpdate({
|
|
21
|
+
sessionUpdate: 'tool_call_update',
|
|
22
|
+
toolCallId: 'tc-1',
|
|
23
|
+
status: 'completed',
|
|
24
|
+
});
|
|
25
|
+
expect(acc.activeToolCalls).toBe(0);
|
|
26
|
+
});
|
|
27
|
+
it('tracks multiple tool calls', () => {
|
|
28
|
+
const acc = new SessionUpdateAccumulator();
|
|
29
|
+
acc.handleUpdate({ sessionUpdate: 'tool_call', toolCallId: 'tc-1', title: 'A', kind: 'read', status: 'pending' });
|
|
30
|
+
acc.handleUpdate({ sessionUpdate: 'tool_call', toolCallId: 'tc-2', title: 'B', kind: 'edit', status: 'pending' });
|
|
31
|
+
expect(acc.activeToolCalls).toBe(2);
|
|
32
|
+
acc.handleUpdate({ sessionUpdate: 'tool_call_update', toolCallId: 'tc-1', status: 'completed' });
|
|
33
|
+
expect(acc.activeToolCalls).toBe(1);
|
|
34
|
+
acc.handleUpdate({ sessionUpdate: 'tool_call_update', toolCallId: 'tc-2', status: 'failed' });
|
|
35
|
+
expect(acc.activeToolCalls).toBe(0);
|
|
36
|
+
});
|
|
37
|
+
it('truncates getRecentText to maxChars', () => {
|
|
38
|
+
const acc = new SessionUpdateAccumulator();
|
|
39
|
+
acc.handleUpdate({ sessionUpdate: 'agent_message_chunk', content: { type: 'text', text: 'A'.repeat(5000) } });
|
|
40
|
+
expect(acc.getRecentText(100).length).toBe(100);
|
|
41
|
+
});
|
|
42
|
+
it('updates lastUpdateAt on every event', () => {
|
|
43
|
+
const acc = new SessionUpdateAccumulator();
|
|
44
|
+
expect(acc.lastUpdateAt).toBeNull();
|
|
45
|
+
acc.handleUpdate({ sessionUpdate: 'agent_message_chunk', content: { type: 'text', text: 'hi' } });
|
|
46
|
+
expect(acc.lastUpdateAt).toBeDefined();
|
|
47
|
+
expect(typeof acc.lastUpdateAt).toBe('string');
|
|
48
|
+
});
|
|
49
|
+
it('reset clears all state', () => {
|
|
50
|
+
const acc = new SessionUpdateAccumulator();
|
|
51
|
+
acc.handleUpdate({ sessionUpdate: 'agent_message_chunk', content: { type: 'text', text: 'hi' } });
|
|
52
|
+
acc.handleUpdate({ sessionUpdate: 'tool_call', toolCallId: 'tc-1', title: 'X', kind: 'read', status: 'pending' });
|
|
53
|
+
acc.stopReason = 'end_turn';
|
|
54
|
+
acc.hasPendingPermission = true;
|
|
55
|
+
acc.reset();
|
|
56
|
+
expect(acc.getRecentText()).toBe('');
|
|
57
|
+
expect(acc.activeToolCalls).toBe(0);
|
|
58
|
+
expect(acc.stopReason).toBeNull();
|
|
59
|
+
expect(acc.hasPendingPermission).toBe(false);
|
|
60
|
+
expect(acc.lastUpdateAt).toBeNull();
|
|
61
|
+
});
|
|
62
|
+
it('ignores non-text content in agent_message_chunk', () => {
|
|
63
|
+
const acc = new SessionUpdateAccumulator();
|
|
64
|
+
acc.handleUpdate({ sessionUpdate: 'agent_message_chunk', content: { type: 'image', source: {} } });
|
|
65
|
+
expect(acc.getRecentText()).toBe('');
|
|
66
|
+
});
|
|
67
|
+
it('handles unknown sessionUpdate types gracefully', () => {
|
|
68
|
+
const acc = new SessionUpdateAccumulator();
|
|
69
|
+
acc.handleUpdate({ sessionUpdate: 'usage_update', used: 100, size: 200000 });
|
|
70
|
+
expect(acc.lastUpdateAt).toBeDefined(); // still updates timestamp
|
|
71
|
+
});
|
|
72
|
+
});
|
|
73
|
+
//# sourceMappingURL=acp-session-accumulator.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"acp-session-accumulator.test.js","sourceRoot":"","sources":["../../../src/providers/adapters/acp-session-accumulator.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import type { PermissionMode } from './acp-permissions.js';
|
|
2
|
+
interface CreateTerminalRequest {
|
|
3
|
+
sessionId: string;
|
|
4
|
+
command: string;
|
|
5
|
+
args?: string[];
|
|
6
|
+
env?: Array<{
|
|
7
|
+
name: string;
|
|
8
|
+
value: string;
|
|
9
|
+
}>;
|
|
10
|
+
cwd?: string;
|
|
11
|
+
outputByteLimit?: number;
|
|
12
|
+
}
|
|
13
|
+
interface TerminalOutputRequest {
|
|
14
|
+
sessionId: string;
|
|
15
|
+
terminalId: string;
|
|
16
|
+
}
|
|
17
|
+
interface WaitForTerminalExitRequest {
|
|
18
|
+
sessionId: string;
|
|
19
|
+
terminalId: string;
|
|
20
|
+
}
|
|
21
|
+
interface KillTerminalRequest {
|
|
22
|
+
sessionId: string;
|
|
23
|
+
terminalId: string;
|
|
24
|
+
}
|
|
25
|
+
interface ReleaseTerminalRequest {
|
|
26
|
+
sessionId: string;
|
|
27
|
+
terminalId: string;
|
|
28
|
+
}
|
|
29
|
+
interface ExitStatus {
|
|
30
|
+
exitCode: number | null;
|
|
31
|
+
signal: string | null;
|
|
32
|
+
}
|
|
33
|
+
export declare class TerminalManager {
|
|
34
|
+
private readonly cwd;
|
|
35
|
+
private readonly permissionMode;
|
|
36
|
+
private readonly terminals;
|
|
37
|
+
constructor(opts: {
|
|
38
|
+
cwd: string;
|
|
39
|
+
permissionMode: PermissionMode;
|
|
40
|
+
});
|
|
41
|
+
createTerminal(params: CreateTerminalRequest): Promise<{
|
|
42
|
+
terminalId: string;
|
|
43
|
+
}>;
|
|
44
|
+
terminalOutput(params: TerminalOutputRequest): Promise<{
|
|
45
|
+
output: string;
|
|
46
|
+
truncated: boolean;
|
|
47
|
+
exitStatus?: ExitStatus;
|
|
48
|
+
}>;
|
|
49
|
+
waitForTerminalExit(params: WaitForTerminalExitRequest): Promise<ExitStatus>;
|
|
50
|
+
killTerminal(params: KillTerminalRequest): Promise<Record<string, never>>;
|
|
51
|
+
releaseTerminal(params: ReleaseTerminalRequest): Promise<Record<string, never>>;
|
|
52
|
+
private killProcess;
|
|
53
|
+
private getTerminal;
|
|
54
|
+
}
|
|
55
|
+
export {};
|
|
56
|
+
//# sourceMappingURL=acp-terminal-manager.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"acp-terminal-manager.d.ts","sourceRoot":"","sources":["../../../src/providers/adapters/acp-terminal-manager.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAK3D,UAAU,qBAAqB;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC7C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,UAAU,qBAAqB;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,0BAA0B;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,mBAAmB;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,sBAAsB;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,UAAU;IAClB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAqBD,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAsC;gBAEpD,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,cAAc,CAAA;KAAE;IAK3D,cAAc,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IA+C9E,cAAc,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC;QAC3D,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,OAAO,CAAC;QACnB,UAAU,CAAC,EAAE,UAAU,CAAC;KACzB,CAAC;IAYI,mBAAmB,CAAC,MAAM,EAAE,0BAA0B,GAAG,OAAO,CAAC,UAAU,CAAC;IAI5E,YAAY,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAKzE,eAAe,CAAC,MAAM,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAQvE,WAAW;IAYzB,OAAO,CAAC,WAAW;CAKpB"}
|
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* ACP Terminal Manager — aligned with OpenClaw/acpx TerminalManager
|
|
3
|
+
*
|
|
4
|
+
* Handles terminal/create, output, wait_for_exit, kill, release ACP Client callbacks.
|
|
5
|
+
* Spawns subprocesses, captures stdout+stderr with byte-limit truncation, graceful kill.
|
|
6
|
+
*/
|
|
7
|
+
import { spawn } from 'node:child_process';
|
|
8
|
+
import { randomUUID } from 'node:crypto';
|
|
9
|
+
const DEFAULT_OUTPUT_LIMIT_BYTES = 1024 * 1024; // 1MB
|
|
10
|
+
const KILL_GRACE_MS = 5_000;
|
|
11
|
+
function envArrayToRecord(env) {
|
|
12
|
+
if (!env)
|
|
13
|
+
return {};
|
|
14
|
+
const record = {};
|
|
15
|
+
for (const { name, value } of env) {
|
|
16
|
+
record[name] = value;
|
|
17
|
+
}
|
|
18
|
+
return record;
|
|
19
|
+
}
|
|
20
|
+
export class TerminalManager {
|
|
21
|
+
cwd;
|
|
22
|
+
permissionMode;
|
|
23
|
+
terminals = new Map();
|
|
24
|
+
constructor(opts) {
|
|
25
|
+
this.cwd = opts.cwd;
|
|
26
|
+
this.permissionMode = opts.permissionMode;
|
|
27
|
+
}
|
|
28
|
+
async createTerminal(params) {
|
|
29
|
+
if (this.permissionMode === 'deny-all') {
|
|
30
|
+
throw new Error('Permission denied for terminal/create (deny-all)');
|
|
31
|
+
}
|
|
32
|
+
const outputByteLimit = params.outputByteLimit ?? DEFAULT_OUTPUT_LIMIT_BYTES;
|
|
33
|
+
const proc = spawn(params.command, params.args ?? [], {
|
|
34
|
+
cwd: params.cwd ?? this.cwd,
|
|
35
|
+
env: { ...process.env, ...envArrayToRecord(params.env) },
|
|
36
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
37
|
+
});
|
|
38
|
+
let resolveExit;
|
|
39
|
+
const exitPromise = new Promise((r) => { resolveExit = r; });
|
|
40
|
+
const terminal = {
|
|
41
|
+
process: proc,
|
|
42
|
+
output: Buffer.alloc(0),
|
|
43
|
+
truncated: false,
|
|
44
|
+
outputByteLimit,
|
|
45
|
+
exitCode: undefined,
|
|
46
|
+
signal: undefined,
|
|
47
|
+
exitPromise,
|
|
48
|
+
};
|
|
49
|
+
const appendOutput = (chunk) => {
|
|
50
|
+
terminal.output = Buffer.concat([terminal.output, chunk]);
|
|
51
|
+
if (terminal.output.length > terminal.outputByteLimit) {
|
|
52
|
+
terminal.output = terminal.output.subarray(-terminal.outputByteLimit);
|
|
53
|
+
terminal.truncated = true;
|
|
54
|
+
}
|
|
55
|
+
};
|
|
56
|
+
proc.stdout.on('data', appendOutput);
|
|
57
|
+
proc.stderr.on('data', appendOutput);
|
|
58
|
+
proc.once('exit', (code, signal) => {
|
|
59
|
+
terminal.exitCode = code;
|
|
60
|
+
terminal.signal = signal;
|
|
61
|
+
resolveExit({ exitCode: code ?? null, signal: signal ?? null });
|
|
62
|
+
});
|
|
63
|
+
const terminalId = randomUUID();
|
|
64
|
+
this.terminals.set(terminalId, terminal);
|
|
65
|
+
return { terminalId };
|
|
66
|
+
}
|
|
67
|
+
async terminalOutput(params) {
|
|
68
|
+
const terminal = this.getTerminal(params.terminalId);
|
|
69
|
+
const hasExit = terminal.exitCode !== undefined || terminal.signal !== undefined;
|
|
70
|
+
return {
|
|
71
|
+
output: terminal.output.toString('utf-8'),
|
|
72
|
+
truncated: terminal.truncated,
|
|
73
|
+
exitStatus: hasExit
|
|
74
|
+
? { exitCode: terminal.exitCode ?? null, signal: terminal.signal ?? null }
|
|
75
|
+
: undefined,
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
async waitForTerminalExit(params) {
|
|
79
|
+
return this.getTerminal(params.terminalId).exitPromise;
|
|
80
|
+
}
|
|
81
|
+
async killTerminal(params) {
|
|
82
|
+
await this.killProcess(this.getTerminal(params.terminalId));
|
|
83
|
+
return {};
|
|
84
|
+
}
|
|
85
|
+
async releaseTerminal(params) {
|
|
86
|
+
const terminal = this.terminals.get(params.terminalId);
|
|
87
|
+
if (!terminal)
|
|
88
|
+
return {};
|
|
89
|
+
await this.killProcess(terminal);
|
|
90
|
+
this.terminals.delete(params.terminalId);
|
|
91
|
+
return {};
|
|
92
|
+
}
|
|
93
|
+
async killProcess(terminal) {
|
|
94
|
+
if (terminal.exitCode !== undefined)
|
|
95
|
+
return;
|
|
96
|
+
try {
|
|
97
|
+
terminal.process.kill('SIGTERM');
|
|
98
|
+
}
|
|
99
|
+
catch { /* already dead */ }
|
|
100
|
+
const exited = await Promise.race([
|
|
101
|
+
terminal.exitPromise.then(() => true),
|
|
102
|
+
new Promise((r) => setTimeout(() => r(false), KILL_GRACE_MS)),
|
|
103
|
+
]);
|
|
104
|
+
if (!exited) {
|
|
105
|
+
try {
|
|
106
|
+
terminal.process.kill('SIGKILL');
|
|
107
|
+
}
|
|
108
|
+
catch { /* noop */ }
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
getTerminal(id) {
|
|
112
|
+
const terminal = this.terminals.get(id);
|
|
113
|
+
if (!terminal)
|
|
114
|
+
throw new Error(`Unknown terminal: ${id}`);
|
|
115
|
+
return terminal;
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
//# sourceMappingURL=acp-terminal-manager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"acp-terminal-manager.js","sourceRoot":"","sources":["../../../src/providers/adapters/acp-terminal-manager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,KAAK,EAAqB,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,MAAM,0BAA0B,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,MAAM;AACtD,MAAM,aAAa,GAAG,KAAK,CAAC;AA8C5B,SAAS,gBAAgB,CAAC,GAA4C;IACpE,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,CAAC;IACpB,MAAM,MAAM,GAA2B,EAAE,CAAC;IAC1C,KAAK,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,GAAG,EAAE,CAAC;QAClC,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;IACvB,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,OAAO,eAAe;IACT,GAAG,CAAS;IACZ,cAAc,CAAiB;IAC/B,SAAS,GAAG,IAAI,GAAG,EAA2B,CAAC;IAEhE,YAAY,IAAqD;QAC/D,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACpB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,MAA6B;QAChD,IAAI,IAAI,CAAC,cAAc,KAAK,UAAU,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACtE,CAAC;QAED,MAAM,eAAe,GAAG,MAAM,CAAC,eAAe,IAAI,0BAA0B,CAAC;QAC7E,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE,EAAE;YACpD,GAAG,EAAE,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG;YAC3B,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;YACxD,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;SAClC,CAAC,CAAC;QAEH,IAAI,WAAqC,CAAC;QAC1C,MAAM,WAAW,GAAG,IAAI,OAAO,CAAa,CAAC,CAAC,EAAE,EAAE,GAAG,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAEzE,MAAM,QAAQ,GAAoB;YAChC,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YACvB,SAAS,EAAE,KAAK;YAChB,eAAe;YACf,QAAQ,EAAE,SAAS;YACnB,MAAM,EAAE,SAAS;YACjB,WAAW;SACZ,CAAC;QAEF,MAAM,YAAY,GAAG,CAAC,KAAa,EAAE,EAAE;YACrC,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;YAC1D,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,GAAG,QAAQ,CAAC,eAAe,EAAE,CAAC;gBACtD,QAAQ,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;gBACtE,QAAQ,CAAC,SAAS,GAAG,IAAI,CAAC;YAC5B,CAAC;QACH,CAAC,CAAC;QAEF,IAAI,CAAC,MAAO,CAAC,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QACtC,IAAI,CAAC,MAAO,CAAC,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAEtC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YACjC,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC;YACzB,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC;YACzB,WAAW,CAAC,EAAE,QAAQ,EAAE,IAAI,IAAI,IAAI,EAAE,MAAM,EAAE,MAAM,IAAI,IAAI,EAAE,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,UAAU,EAAE,CAAC;QAChC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACzC,OAAO,EAAE,UAAU,EAAE,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,MAA6B;QAKhD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACrD,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,MAAM,KAAK,SAAS,CAAC;QACjF,OAAO;YACL,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;YACzC,SAAS,EAAE,QAAQ,CAAC,SAAS;YAC7B,UAAU,EAAE,OAAO;gBACjB,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,IAAI,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,IAAI,IAAI,EAAE;gBAC1E,CAAC,CAAC,SAAS;SACd,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,MAAkC;QAC1D,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAA2B;QAC5C,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;QAC5D,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,MAA8B;QAClD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACvD,IAAI,CAAC,QAAQ;YAAE,OAAO,EAAE,CAAC;QACzB,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACjC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACzC,OAAO,EAAE,CAAC;IACZ,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,QAAyB;QACjD,IAAI,QAAQ,CAAC,QAAQ,KAAK,SAAS;YAAE,OAAO;QAC5C,IAAI,CAAC;YAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;YAChC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;YACrC,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,aAAa,CAAC,CAAC;SACrE,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,IAAI,CAAC;gBAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;IAEO,WAAW,CAAC,EAAU;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACxC,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC;QAC1D,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"acp-terminal-manager.test.d.ts","sourceRoot":"","sources":["../../../src/providers/adapters/acp-terminal-manager.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { TerminalManager } from './acp-terminal-manager.js';
|
|
3
|
+
describe('TerminalManager', () => {
|
|
4
|
+
describe('createTerminal', () => {
|
|
5
|
+
it('creates terminal and returns terminalId', async () => {
|
|
6
|
+
const tm = new TerminalManager({ cwd: '/tmp', permissionMode: 'approve-all' });
|
|
7
|
+
const result = await tm.createTerminal({ sessionId: 's1', command: 'echo', args: ['hello'] });
|
|
8
|
+
expect(result.terminalId).toBeDefined();
|
|
9
|
+
expect(typeof result.terminalId).toBe('string');
|
|
10
|
+
await tm.releaseTerminal({ sessionId: 's1', terminalId: result.terminalId });
|
|
11
|
+
});
|
|
12
|
+
it('denies in deny-all mode', async () => {
|
|
13
|
+
const tm = new TerminalManager({ cwd: '/tmp', permissionMode: 'deny-all' });
|
|
14
|
+
await expect(tm.createTerminal({ sessionId: 's1', command: 'echo', args: ['hello'] })).rejects.toThrow('denied');
|
|
15
|
+
});
|
|
16
|
+
});
|
|
17
|
+
describe('terminalOutput', () => {
|
|
18
|
+
it('captures stdout', async () => {
|
|
19
|
+
const tm = new TerminalManager({ cwd: '/tmp', permissionMode: 'approve-all' });
|
|
20
|
+
const { terminalId } = await tm.createTerminal({ sessionId: 's1', command: 'echo', args: ['hello world'] });
|
|
21
|
+
// Wait for process to finish
|
|
22
|
+
await tm.waitForTerminalExit({ sessionId: 's1', terminalId });
|
|
23
|
+
const output = await tm.terminalOutput({ sessionId: 's1', terminalId });
|
|
24
|
+
expect(output.output).toContain('hello world');
|
|
25
|
+
expect(output.truncated).toBe(false);
|
|
26
|
+
expect(output.exitStatus?.exitCode).toBe(0);
|
|
27
|
+
await tm.releaseTerminal({ sessionId: 's1', terminalId });
|
|
28
|
+
});
|
|
29
|
+
});
|
|
30
|
+
describe('waitForTerminalExit', () => {
|
|
31
|
+
it('returns exit code', async () => {
|
|
32
|
+
const tm = new TerminalManager({ cwd: '/tmp', permissionMode: 'approve-all' });
|
|
33
|
+
const { terminalId } = await tm.createTerminal({ sessionId: 's1', command: 'true' });
|
|
34
|
+
const result = await tm.waitForTerminalExit({ sessionId: 's1', terminalId });
|
|
35
|
+
expect(result.exitCode).toBe(0);
|
|
36
|
+
await tm.releaseTerminal({ sessionId: 's1', terminalId });
|
|
37
|
+
});
|
|
38
|
+
it('captures non-zero exit code', async () => {
|
|
39
|
+
const tm = new TerminalManager({ cwd: '/tmp', permissionMode: 'approve-all' });
|
|
40
|
+
const { terminalId } = await tm.createTerminal({ sessionId: 's1', command: 'false' });
|
|
41
|
+
const result = await tm.waitForTerminalExit({ sessionId: 's1', terminalId });
|
|
42
|
+
expect(result.exitCode).toBe(1);
|
|
43
|
+
await tm.releaseTerminal({ sessionId: 's1', terminalId });
|
|
44
|
+
});
|
|
45
|
+
});
|
|
46
|
+
describe('killTerminal', () => {
|
|
47
|
+
it('kills running process', async () => {
|
|
48
|
+
const tm = new TerminalManager({ cwd: '/tmp', permissionMode: 'approve-all' });
|
|
49
|
+
const { terminalId } = await tm.createTerminal({ sessionId: 's1', command: 'sleep', args: ['60'] });
|
|
50
|
+
await tm.killTerminal({ sessionId: 's1', terminalId });
|
|
51
|
+
const output = await tm.terminalOutput({ sessionId: 's1', terminalId });
|
|
52
|
+
expect(output.exitStatus).toBeDefined();
|
|
53
|
+
await tm.releaseTerminal({ sessionId: 's1', terminalId });
|
|
54
|
+
});
|
|
55
|
+
});
|
|
56
|
+
describe('releaseTerminal', () => {
|
|
57
|
+
it('releases and removes terminal', async () => {
|
|
58
|
+
const tm = new TerminalManager({ cwd: '/tmp', permissionMode: 'approve-all' });
|
|
59
|
+
const { terminalId } = await tm.createTerminal({ sessionId: 's1', command: 'echo', args: ['hi'] });
|
|
60
|
+
await tm.waitForTerminalExit({ sessionId: 's1', terminalId });
|
|
61
|
+
await tm.releaseTerminal({ sessionId: 's1', terminalId });
|
|
62
|
+
// Second release is a no-op
|
|
63
|
+
await tm.releaseTerminal({ sessionId: 's1', terminalId });
|
|
64
|
+
});
|
|
65
|
+
it('throws for unknown terminal on output', async () => {
|
|
66
|
+
const tm = new TerminalManager({ cwd: '/tmp', permissionMode: 'approve-all' });
|
|
67
|
+
await expect(tm.terminalOutput({ sessionId: 's1', terminalId: 'nonexistent' })).rejects.toThrow('Unknown terminal');
|
|
68
|
+
});
|
|
69
|
+
});
|
|
70
|
+
});
|
|
71
|
+
//# sourceMappingURL=acp-terminal-manager.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"acp-terminal-manager.test.js","sourceRoot":"","sources":["../../../src/providers/adapters/acp-terminal-manager.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
import type { ProjectConfig } from '../core/config.js';
|
|
2
2
|
import type { TaskBackend } from '../interfaces/TaskBackend.js';
|
|
3
|
-
import type { WorkerProvider } from '../interfaces/WorkerProvider.js';
|
|
4
3
|
import type { RepoBackend } from '../interfaces/RepoBackend.js';
|
|
5
4
|
import type { Notifier } from '../interfaces/Notifier.js';
|
|
6
5
|
import type { AgentRuntime } from '../interfaces/AgentRuntime.js';
|
|
7
6
|
import { ProjectContext } from '../core/context.js';
|
|
8
7
|
export declare function createTaskBackend(config: ProjectConfig): TaskBackend;
|
|
9
|
-
export declare function createWorkerProvider(config: ProjectConfig): WorkerProvider;
|
|
10
8
|
export declare function createRepoBackend(config: ProjectConfig): RepoBackend;
|
|
11
9
|
export declare function createNotifier(config: ProjectConfig): Notifier;
|
|
12
10
|
export declare function createAgentRuntime(ctx: ProjectContext): AgentRuntime;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/providers/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/providers/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAMlE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,aAAa,GAAG,WAAW,CAOpE;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,aAAa,GAAG,WAAW,CAEpE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,aAAa,GAAG,QAAQ,CAE9D;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,cAAc,GAAG,YAAY,CAEpE"}
|