ds-harness-remote 0.5.7 → 0.5.10
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/adapter.d.ts +1 -1
- package/dist/acp/adapter.d.ts.map +1 -1
- package/dist/acp/adapters/antigravity/transcript-loader.d.ts.map +1 -1
- package/dist/acp/adapters/antigravity/transcript-loader.js +4 -1
- package/dist/acp/adapters/antigravity/transcript-loader.js.map +1 -1
- package/dist/acp/adapters/claude-history.d.ts +3 -0
- package/dist/acp/adapters/claude-history.d.ts.map +1 -0
- package/dist/acp/adapters/claude-history.js +118 -0
- package/dist/acp/adapters/claude-history.js.map +1 -0
- package/dist/acp/adapters/claude-process.d.ts +21 -0
- package/dist/acp/adapters/claude-process.d.ts.map +1 -0
- package/dist/acp/adapters/claude-process.js +147 -0
- package/dist/acp/adapters/claude-process.js.map +1 -0
- package/dist/acp/adapters/cursor-process.d.ts +9 -4
- package/dist/acp/adapters/cursor-process.d.ts.map +1 -1
- package/dist/acp/adapters/cursor-process.js +31 -3
- package/dist/acp/adapters/cursor-process.js.map +1 -1
- package/dist/acp/adapters/opencode-process.d.ts +67 -0
- package/dist/acp/adapters/opencode-process.d.ts.map +1 -0
- package/dist/acp/adapters/opencode-process.js +272 -0
- package/dist/acp/adapters/opencode-process.js.map +1 -0
- package/dist/acp/adapters/opencode.d.ts +8 -0
- package/dist/acp/adapters/opencode.d.ts.map +1 -0
- package/dist/acp/adapters/opencode.js +8 -0
- package/dist/acp/adapters/opencode.js.map +1 -0
- package/dist/acp/adapters/pi-process.d.ts +42 -0
- package/dist/acp/adapters/pi-process.d.ts.map +1 -0
- package/dist/acp/adapters/pi-process.js +410 -0
- package/dist/acp/adapters/pi-process.js.map +1 -0
- package/dist/acp/gateway.d.ts +10 -0
- package/dist/acp/gateway.d.ts.map +1 -1
- package/dist/acp/gateway.js +344 -103
- package/dist/acp/gateway.js.map +1 -1
- package/dist/acp/method-policy.d.ts +19 -19
- package/dist/acp/method-policy.js +5 -5
- package/dist/acp/method-policy.js.map +1 -1
- package/dist/acp/pi-tool-result.d.ts +9 -0
- package/dist/acp/pi-tool-result.d.ts.map +1 -0
- package/dist/acp/pi-tool-result.js +22 -0
- package/dist/acp/pi-tool-result.js.map +1 -0
- package/dist/acp/virtual-catalog.d.ts +50 -0
- package/dist/acp/virtual-catalog.d.ts.map +1 -0
- package/dist/acp/virtual-catalog.js +103 -0
- package/dist/acp/virtual-catalog.js.map +1 -0
- package/dist/acp/virtual-contract.d.ts +165 -0
- package/dist/acp/virtual-contract.d.ts.map +1 -0
- package/dist/acp/virtual-contract.js +216 -0
- package/dist/acp/virtual-contract.js.map +1 -0
- package/dist/acp/virtual-event-carrier.d.ts +50 -0
- package/dist/acp/virtual-event-carrier.d.ts.map +1 -0
- package/dist/acp/virtual-event-carrier.js +222 -0
- package/dist/acp/virtual-event-carrier.js.map +1 -0
- package/dist/acp/virtual-harness.d.ts +13 -112
- package/dist/acp/virtual-harness.d.ts.map +1 -1
- package/dist/acp/virtual-harness.js +129 -911
- package/dist/acp/virtual-harness.js.map +1 -1
- package/dist/acp/virtual-live.d.ts +78 -0
- package/dist/acp/virtual-live.d.ts.map +1 -0
- package/dist/acp/virtual-live.js +513 -0
- package/dist/acp/virtual-live.js.map +1 -0
- package/dist/acp/workspace-tools.js +2 -2
- package/dist/acp/workspace-tools.js.map +1 -1
- package/dist/acp.d.ts.map +1 -1
- package/dist/acp.js +1 -0
- package/dist/acp.js.map +1 -1
- package/dist/client/header.d.ts +10 -0
- package/dist/client/header.d.ts.map +1 -0
- package/dist/client/header.js +169 -0
- package/dist/client/header.js.map +1 -0
- package/dist/client/icons.d.ts +3 -0
- package/dist/client/icons.d.ts.map +1 -0
- package/dist/client/icons.js +3 -0
- package/dist/client/icons.js.map +1 -0
- package/dist/client/navigation.d.ts +5 -0
- package/dist/client/navigation.d.ts.map +1 -0
- package/dist/client/navigation.js +30 -0
- package/dist/client/navigation.js.map +1 -0
- package/dist/client/presentation.d.ts +17 -0
- package/dist/client/presentation.d.ts.map +1 -0
- package/dist/client/presentation.js +208 -0
- package/dist/client/presentation.js.map +1 -0
- package/dist/client/progress.d.ts +10 -0
- package/dist/client/progress.d.ts.map +1 -0
- package/dist/client/progress.js +82 -0
- package/dist/client/progress.js.map +1 -0
- package/dist/client/settings.d.ts +10 -0
- package/dist/client/settings.d.ts.map +1 -0
- package/dist/client/settings.js +335 -0
- package/dist/client/settings.js.map +1 -0
- package/dist/client/shell.d.ts +6 -0
- package/dist/client/shell.d.ts.map +1 -0
- package/dist/client/shell.js +128 -0
- package/dist/client/shell.js.map +1 -0
- package/dist/client/types.d.ts +264 -0
- package/dist/client/types.d.ts.map +1 -0
- package/dist/client/types.js +2 -0
- package/dist/client/types.js.map +1 -0
- package/dist/client/workspaces.d.ts +11 -0
- package/dist/client/workspaces.d.ts.map +1 -0
- package/dist/client/workspaces.js +1179 -0
- package/dist/client/workspaces.js.map +1 -0
- package/dist/client-capabilities.d.ts +6 -0
- package/dist/client-capabilities.d.ts.map +1 -0
- package/dist/client-capabilities.js +88 -0
- package/dist/client-capabilities.js.map +1 -0
- package/dist/client-codex-streams.d.ts +23 -0
- package/dist/client-codex-streams.d.ts.map +1 -0
- package/dist/client-codex-streams.js +156 -0
- package/dist/client-codex-streams.js.map +1 -0
- package/dist/client-connection.d.ts +38 -0
- package/dist/client-connection.d.ts.map +1 -0
- package/dist/client-connection.js +210 -0
- package/dist/client-connection.js.map +1 -0
- package/dist/client-control.d.ts +48 -0
- package/dist/client-control.d.ts.map +1 -0
- package/dist/client-control.js +273 -0
- package/dist/client-control.js.map +1 -0
- package/dist/client-locale.d.ts +8 -0
- package/dist/client-locale.d.ts.map +1 -1
- package/dist/client-locale.js +16 -0
- package/dist/client-locale.js.map +1 -1
- package/dist/client-runtime-contract.d.ts +161 -0
- package/dist/client-runtime-contract.d.ts.map +1 -0
- package/dist/client-runtime-contract.js +127 -0
- package/dist/client-runtime-contract.js.map +1 -0
- package/dist/client-runtime.d.ts +24 -126
- package/dist/client-runtime.d.ts.map +1 -1
- package/dist/client-runtime.js +171 -867
- package/dist/client-runtime.js.map +1 -1
- package/dist/client-secure-transport.d.ts +1 -0
- package/dist/client-secure-transport.d.ts.map +1 -1
- package/dist/client-secure-transport.js +35 -16
- package/dist/client-secure-transport.js.map +1 -1
- package/dist/client-workspace-queries.d.ts +12 -0
- package/dist/client-workspace-queries.d.ts.map +1 -0
- package/dist/client-workspace-queries.js +66 -0
- package/dist/client-workspace-queries.js.map +1 -0
- package/dist/client.d.ts.map +1 -1
- package/dist/client.github.js +2091 -1896
- package/dist/client.js +2091 -1896
- package/dist/client.js.map +1 -1
- package/dist/codex/domain.d.ts.map +1 -1
- package/dist/codex/domain.js +67 -46
- package/dist/codex/domain.js.map +1 -1
- package/dist/codex/method-policy.d.ts +9 -9
- package/dist/codex/virtual-catalog.d.ts +90 -0
- package/dist/codex/virtual-catalog.d.ts.map +1 -0
- package/dist/codex/virtual-catalog.js +317 -0
- package/dist/codex/virtual-catalog.js.map +1 -0
- package/dist/codex/virtual-contract.d.ts +96 -0
- package/dist/codex/virtual-contract.d.ts.map +1 -0
- package/dist/codex/virtual-contract.js +192 -0
- package/dist/codex/virtual-contract.js.map +1 -0
- package/dist/codex/virtual-event-carrier.d.ts +52 -0
- package/dist/codex/virtual-event-carrier.d.ts.map +1 -0
- package/dist/codex/virtual-event-carrier.js +212 -0
- package/dist/codex/virtual-event-carrier.js.map +1 -0
- package/dist/codex/virtual-harness.d.ts +16 -117
- package/dist/codex/virtual-harness.d.ts.map +1 -1
- package/dist/codex/virtual-harness.js +123 -1909
- package/dist/codex/virtual-harness.js.map +1 -1
- package/dist/codex/virtual-history.d.ts +74 -0
- package/dist/codex/virtual-history.d.ts.map +1 -0
- package/dist/codex/virtual-history.js +546 -0
- package/dist/codex/virtual-history.js.map +1 -0
- package/dist/codex/virtual-live.d.ts +75 -0
- package/dist/codex/virtual-live.d.ts.map +1 -0
- package/dist/codex/virtual-live.js +563 -0
- package/dist/codex/virtual-live.js.map +1 -0
- package/dist/codex/virtual-values.d.ts +29 -0
- package/dist/codex/virtual-values.d.ts.map +1 -0
- package/dist/codex/virtual-values.js +75 -0
- package/dist/codex/virtual-values.js.map +1 -0
- package/dist/config.js +4 -4
- package/dist/config.js.map +1 -1
- package/dist/control-runtime.js +2 -2
- package/dist/control-runtime.js.map +1 -1
- package/dist/harness-remote-bridge.d.ts +2 -1
- package/dist/harness-remote-bridge.d.ts.map +1 -1
- package/dist/harness-remote-bridge.js +13 -5
- package/dist/harness-remote-bridge.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +23304 -15332
- package/dist/index.js.map +4 -4
- package/dist/plugin-route-dispatcher.d.ts +2 -2
- package/dist/plugin-route-dispatcher.d.ts.map +1 -1
- package/dist/plugin-route-dispatcher.js +2 -2
- package/dist/plugin-route-dispatcher.js.map +1 -1
- package/dist/remote-terminal-controller.d.ts +90 -0
- package/dist/remote-terminal-controller.d.ts.map +1 -0
- package/dist/remote-terminal-controller.js +494 -0
- package/dist/remote-terminal-controller.js.map +1 -0
- package/dist/remote-terminal-provider.d.ts +46 -0
- package/dist/remote-terminal-provider.d.ts.map +1 -0
- package/dist/remote-terminal-provider.js +147 -0
- package/dist/remote-terminal-provider.js.map +1 -0
- package/dist/remote-typert-gateway.js +7 -1
- package/dist/remote-typert-gateway.js.map +1 -1
- package/dist/server-api.d.ts +3 -0
- package/dist/server-api.d.ts.map +1 -1
- package/dist/server-api.js +24 -9
- package/dist/server-api.js.map +1 -1
- package/dist/server-connection.d.ts +1 -0
- package/dist/server-connection.d.ts.map +1 -1
- package/dist/server-connection.js +8 -1
- package/dist/server-connection.js.map +1 -1
- package/dist/service.d.ts +1 -1
- package/dist/service.d.ts.map +1 -1
- package/dist/service.js +15 -8
- package/dist/service.js.map +1 -1
- package/dist/terminal-carrier-compat.d.ts +14 -0
- package/dist/terminal-carrier-compat.d.ts.map +1 -0
- package/dist/terminal-carrier-compat.js +259 -0
- package/dist/terminal-carrier-compat.js.map +1 -0
- package/dist/terminal-policy.d.ts +6 -0
- package/dist/terminal-policy.d.ts.map +1 -1
- package/dist/terminal-policy.js +24 -6
- package/dist/terminal-policy.js.map +1 -1
- package/dist/typert-gateway-contract.d.ts +6 -1
- package/dist/typert-gateway-contract.d.ts.map +1 -1
- package/dist/typert-gateway-switch.d.ts +2 -1
- package/dist/typert-gateway-switch.d.ts.map +1 -1
- package/dist/typert-gateway-switch.js +39 -18
- package/dist/typert-gateway-switch.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.d.ts.map +1 -1
- package/dist/version.js +1 -1
- package/dist/version.js.map +1 -1
- package/dist/workspace-bridge.d.ts +6 -89
- package/dist/workspace-bridge.d.ts.map +1 -1
- package/dist/workspace-bridge.js +37 -294
- package/dist/workspace-bridge.js.map +1 -1
- package/dsh-plugin.json +1 -1
- package/package.json +24 -20
|
@@ -0,0 +1,410 @@
|
|
|
1
|
+
import { CursorAcpClient, CursorAcpError } from './cursor-process.js';
|
|
2
|
+
import { piToolResult } from '../pi-tool-result.js';
|
|
3
|
+
/** pi itself is NOT ACP. Each session uses the published pi-acp wrapper. */
|
|
4
|
+
export class PiAcpClient {
|
|
5
|
+
binary;
|
|
6
|
+
logger;
|
|
7
|
+
options;
|
|
8
|
+
factory;
|
|
9
|
+
catalog;
|
|
10
|
+
clients = new Map();
|
|
11
|
+
starting = new Set();
|
|
12
|
+
inbound = new Set();
|
|
13
|
+
unavailable = new Set();
|
|
14
|
+
closed = false;
|
|
15
|
+
all = new Set();
|
|
16
|
+
callbacks = new Map();
|
|
17
|
+
nextCallback = 0;
|
|
18
|
+
configurations = new Map();
|
|
19
|
+
busy = new Set();
|
|
20
|
+
loading = new Map();
|
|
21
|
+
historyBusy = false;
|
|
22
|
+
constructor(binary, logger, options = {}, factory = () => new CursorAcpClient(binary, logger, undefined, { ...options, args: options.args ?? [], authenticationMethod: null })) {
|
|
23
|
+
this.binary = binary;
|
|
24
|
+
this.logger = logger;
|
|
25
|
+
this.options = options;
|
|
26
|
+
this.factory = factory;
|
|
27
|
+
}
|
|
28
|
+
async start() {
|
|
29
|
+
this.catalog = await this.create();
|
|
30
|
+
this.catalog.onUnavailable(code => { for (const handler of this.unavailable)
|
|
31
|
+
handler(code); });
|
|
32
|
+
}
|
|
33
|
+
isReady() { return !this.closed && this.catalog?.isReady() === true; }
|
|
34
|
+
async create(history = false) {
|
|
35
|
+
if (this.closed)
|
|
36
|
+
throw new CursorAcpError('ACP_CLOSED', 'PI ACP is closed.');
|
|
37
|
+
if (this.all.size >= (history ? 32 : 31))
|
|
38
|
+
throw new CursorAcpError('ACP_PROCESS_LIMIT', 'Too many PI ACP sessions are active.');
|
|
39
|
+
const client = this.factory();
|
|
40
|
+
this.starting.add(client);
|
|
41
|
+
this.all.add(client);
|
|
42
|
+
try {
|
|
43
|
+
await client.start();
|
|
44
|
+
if (this.closed)
|
|
45
|
+
throw new CursorAcpError('ACP_CLOSED', 'PI ACP is closed.');
|
|
46
|
+
return client;
|
|
47
|
+
}
|
|
48
|
+
catch (error) {
|
|
49
|
+
await this.dispose(client);
|
|
50
|
+
throw error;
|
|
51
|
+
}
|
|
52
|
+
finally {
|
|
53
|
+
this.starting.delete(client);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
async call(method, params, timeoutMs) {
|
|
57
|
+
const p = params;
|
|
58
|
+
if (method === 'session/load' && typeof p.sessionId === 'string') {
|
|
59
|
+
const previous = this.loading.get(p.sessionId);
|
|
60
|
+
if (previous)
|
|
61
|
+
return previous;
|
|
62
|
+
const promise = this.callOnce(method, params, timeoutMs);
|
|
63
|
+
this.loading.set(p.sessionId, promise);
|
|
64
|
+
try {
|
|
65
|
+
return await promise;
|
|
66
|
+
}
|
|
67
|
+
finally {
|
|
68
|
+
this.loading.delete(p.sessionId);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
return this.callOnce(method, params, timeoutMs);
|
|
72
|
+
}
|
|
73
|
+
async callOnce(method, params, timeoutMs) {
|
|
74
|
+
const p = params;
|
|
75
|
+
if (method === 'session/list')
|
|
76
|
+
return this.catalog.call(method, params, timeoutMs);
|
|
77
|
+
if (method === 'session/new' || method === 'session/load') {
|
|
78
|
+
const known = typeof p.sessionId === 'string' ? this.clients.get(p.sessionId) : undefined;
|
|
79
|
+
// Loading a live session must not restart or cancel an in-flight turn.
|
|
80
|
+
if (known)
|
|
81
|
+
return { sessionId: p.sessionId };
|
|
82
|
+
const client = await this.create();
|
|
83
|
+
let boundId = typeof p.sessionId === 'string' ? p.sessionId : undefined;
|
|
84
|
+
const queued = [];
|
|
85
|
+
let replaying = method === 'session/load';
|
|
86
|
+
const replayConfiguration = {};
|
|
87
|
+
const receive = (message) => {
|
|
88
|
+
// Initial load replays history, not a live turn. Keep only configuration
|
|
89
|
+
// state and reject callbacks before this wrapper has a committed session.
|
|
90
|
+
if (replaying) {
|
|
91
|
+
if (message.kind === 'request') {
|
|
92
|
+
void client.respondError(message.id, -32600, 'PI session is not loaded.').catch(() => undefined);
|
|
93
|
+
}
|
|
94
|
+
else if (message.params?.sessionId === boundId) {
|
|
95
|
+
this.updateConfiguration(boundId, message, replayConfiguration);
|
|
96
|
+
}
|
|
97
|
+
return;
|
|
98
|
+
}
|
|
99
|
+
const incomingId = message.params?.sessionId;
|
|
100
|
+
if (!boundId) {
|
|
101
|
+
if (queued.length < 200)
|
|
102
|
+
queued.push(message);
|
|
103
|
+
return;
|
|
104
|
+
}
|
|
105
|
+
if (incomingId !== boundId)
|
|
106
|
+
return;
|
|
107
|
+
this.updateConfiguration(boundId, message);
|
|
108
|
+
if (message.kind === 'request') {
|
|
109
|
+
const id = `pi-callback:${++this.nextCallback}`;
|
|
110
|
+
this.callbacks.set(id, { client, id: message.id });
|
|
111
|
+
message = { ...message, id };
|
|
112
|
+
}
|
|
113
|
+
for (const handler of this.inbound)
|
|
114
|
+
handler(message);
|
|
115
|
+
};
|
|
116
|
+
client.onInbound(receive);
|
|
117
|
+
client.onUnavailable(() => {
|
|
118
|
+
if (boundId && this.clients.get(boundId) === client) {
|
|
119
|
+
this.clients.delete(boundId);
|
|
120
|
+
this.configurations.delete(boundId);
|
|
121
|
+
}
|
|
122
|
+
void this.dispose(client).catch(() => undefined);
|
|
123
|
+
});
|
|
124
|
+
try {
|
|
125
|
+
const result = await client.call(method, params, timeoutMs);
|
|
126
|
+
const id = method === 'session/load' ? p.sessionId : result.sessionId;
|
|
127
|
+
if (typeof id !== 'string' || !/^[A-Za-z0-9_-]{1,240}$/.test(id) || this.clients.has(id) || this.closed
|
|
128
|
+
|| (method === 'session/load' && typeof result.sessionId === 'string' && result.sessionId !== id))
|
|
129
|
+
throw new CursorAcpError('ACP_INVALID_SESSION', 'PI returned an invalid session.');
|
|
130
|
+
this.clients.set(id, client);
|
|
131
|
+
const config = { ...result };
|
|
132
|
+
for (const key of ['models', 'modes']) {
|
|
133
|
+
if (replayConfiguration[key])
|
|
134
|
+
config[key] = { ...config[key], ...replayConfiguration[key] };
|
|
135
|
+
}
|
|
136
|
+
this.configurations.set(id, config);
|
|
137
|
+
boundId = id;
|
|
138
|
+
replaying = false;
|
|
139
|
+
for (const message of queued)
|
|
140
|
+
receive(message);
|
|
141
|
+
return { ...result, sessionId: id };
|
|
142
|
+
}
|
|
143
|
+
catch (error) {
|
|
144
|
+
await this.dispose(client);
|
|
145
|
+
throw error;
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
const client = this.clients.get(String(p.sessionId));
|
|
149
|
+
if (!client)
|
|
150
|
+
throw new CursorAcpError('ACP_SESSION_NOT_LOADED', 'Load the PI session before using it.');
|
|
151
|
+
const id = String(p.sessionId);
|
|
152
|
+
if (method === 'dsh/sessionModels')
|
|
153
|
+
return this.models(id);
|
|
154
|
+
if (method === 'dsh/selectModel') {
|
|
155
|
+
if (this.busy.has(id))
|
|
156
|
+
throw new CursorAcpError('PROMPT_IN_PROGRESS', 'Stop the PI reply before changing its model.');
|
|
157
|
+
const config = this.configurations.get(id);
|
|
158
|
+
if (!config?.models?.availableModels?.some((item) => item.modelId === p.model)
|
|
159
|
+
|| (p.reasoningEffort !== undefined && !config?.modes?.availableModes?.some((item) => item.id === p.reasoningEffort))) {
|
|
160
|
+
throw new CursorAcpError('INVALID_MESSAGE', 'The PI model or thinking level is not available.');
|
|
161
|
+
}
|
|
162
|
+
this.busy.add(id);
|
|
163
|
+
try {
|
|
164
|
+
const modelResult = await client.call('session/set_config_option', { sessionId: id, configId: 'model', value: p.model });
|
|
165
|
+
this.updateConfiguration(id, { kind: 'notification', method: 'session/update', params: { update: { sessionUpdate: 'config_option_update', configOptions: modelResult.configOptions } } });
|
|
166
|
+
if (p.reasoningEffort !== undefined) {
|
|
167
|
+
if (!this.configurations.get(id)?.modes?.availableModes?.some((item) => item.id === p.reasoningEffort))
|
|
168
|
+
throw new CursorAcpError('INVALID_MESSAGE', 'The selected model does not support this thinking level.');
|
|
169
|
+
const thinkingResult = await client.call('session/set_config_option', { sessionId: id, configId: 'thought_level', value: p.reasoningEffort });
|
|
170
|
+
this.updateConfiguration(id, { kind: 'notification', method: 'session/update', params: { update: { sessionUpdate: 'config_option_update', configOptions: thinkingResult.configOptions } } });
|
|
171
|
+
}
|
|
172
|
+
return { selected: this.models(id).current };
|
|
173
|
+
}
|
|
174
|
+
finally {
|
|
175
|
+
this.busy.delete(id);
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
if (method === 'session/prompt') {
|
|
179
|
+
if (this.busy.has(id))
|
|
180
|
+
throw new CursorAcpError('PROMPT_IN_PROGRESS', 'The PI session is busy.');
|
|
181
|
+
this.busy.add(id);
|
|
182
|
+
try {
|
|
183
|
+
return await client.call(method, params, timeoutMs);
|
|
184
|
+
}
|
|
185
|
+
finally {
|
|
186
|
+
this.busy.delete(id);
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
return client.call(method, params, timeoutMs);
|
|
190
|
+
}
|
|
191
|
+
updateConfiguration(id, message, initial) {
|
|
192
|
+
if (message.method !== 'session/update')
|
|
193
|
+
return;
|
|
194
|
+
const update = message.params.update;
|
|
195
|
+
const config = initial ?? this.configurations.get(id);
|
|
196
|
+
if (!update || !config)
|
|
197
|
+
return;
|
|
198
|
+
if (update.sessionUpdate === 'current_mode_update' && typeof update.currentModeId === 'string')
|
|
199
|
+
config.modes = { ...config.modes, currentModeId: update.currentModeId };
|
|
200
|
+
if (update.sessionUpdate === 'config_option_update' && Array.isArray(update.configOptions)) {
|
|
201
|
+
for (const option of update.configOptions) {
|
|
202
|
+
if (option.type !== 'select' || !Array.isArray(option.options))
|
|
203
|
+
continue;
|
|
204
|
+
if (option.id === 'model')
|
|
205
|
+
config.models = { currentModelId: option.currentValue,
|
|
206
|
+
availableModels: option.options.map((item) => ({ modelId: item.value, name: item.name })) };
|
|
207
|
+
if (option.id === 'thought_level')
|
|
208
|
+
config.modes = { currentModeId: option.currentValue,
|
|
209
|
+
availableModes: option.options.map((item) => ({ id: item.value, name: item.name })) };
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
models(id) {
|
|
214
|
+
const config = this.configurations.get(id);
|
|
215
|
+
const modes = config?.modes;
|
|
216
|
+
return { current: { provider: 'pi', model: config?.models?.currentModelId ?? '', reasoningEffort: modes?.currentModeId },
|
|
217
|
+
routable: true, failures: [], groups: [{ id: 'pi', name: 'PI', models: (config?.models?.availableModels ?? []).map((model) => ({
|
|
218
|
+
id: model.modelId, name: model.name, ...(modes?.availableModes?.length ? { reasoning: { efforts: modes.availableModes.map((mode) => ({ id: mode.id, name: mode.name })), defaultEffort: modes.currentModeId } } : {}),
|
|
219
|
+
})) }] };
|
|
220
|
+
}
|
|
221
|
+
/** A separate wrapper prevents history reads from interrupting active sessions. */
|
|
222
|
+
async history(sessionId, cwd) {
|
|
223
|
+
if (this.historyBusy)
|
|
224
|
+
throw new CursorAcpError('ACP_PROCESS_LIMIT', 'A PI history read is already in progress.');
|
|
225
|
+
this.historyBusy = true;
|
|
226
|
+
let client;
|
|
227
|
+
try {
|
|
228
|
+
client = await this.create(true);
|
|
229
|
+
}
|
|
230
|
+
catch (error) {
|
|
231
|
+
this.historyBusy = false;
|
|
232
|
+
throw error;
|
|
233
|
+
}
|
|
234
|
+
const updates = [];
|
|
235
|
+
let bytes = 0;
|
|
236
|
+
let count = 0;
|
|
237
|
+
client.onInbound(message => {
|
|
238
|
+
if (message.kind !== 'notification' || message.method !== 'session/update' || message.params?.sessionId !== sessionId)
|
|
239
|
+
return;
|
|
240
|
+
count++;
|
|
241
|
+
bytes += Buffer.byteLength(JSON.stringify(message));
|
|
242
|
+
if (bytes <= 8 * 1024 * 1024 && count <= 10000)
|
|
243
|
+
updates.push(message);
|
|
244
|
+
});
|
|
245
|
+
try {
|
|
246
|
+
const result = await client.call('session/load', { sessionId, cwd, mcpServers: [] });
|
|
247
|
+
const loadedId = result?.sessionId;
|
|
248
|
+
if (loadedId !== undefined && loadedId !== sessionId)
|
|
249
|
+
throw new CursorAcpError('ACP_INVALID_SESSION', 'PI returned an invalid history session.');
|
|
250
|
+
if (bytes > 8 * 1024 * 1024 || count > 10000)
|
|
251
|
+
throw new CursorAcpError('ACP_HISTORY_TOO_LARGE', 'PI history exceeds the transfer limit.');
|
|
252
|
+
return historyEvents(updates, sessionId);
|
|
253
|
+
}
|
|
254
|
+
finally {
|
|
255
|
+
try {
|
|
256
|
+
await this.dispose(client);
|
|
257
|
+
}
|
|
258
|
+
finally {
|
|
259
|
+
this.historyBusy = false;
|
|
260
|
+
}
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
async respond(id, result) {
|
|
264
|
+
const pending = this.callbacks.get(String(id));
|
|
265
|
+
if (!pending)
|
|
266
|
+
throw new CursorAcpError('ACP_CALLBACK_NOT_FOUND', 'The PI callback is unavailable.');
|
|
267
|
+
this.callbacks.delete(String(id));
|
|
268
|
+
await pending.client.respond(pending.id, result);
|
|
269
|
+
}
|
|
270
|
+
async respondError(id, code, message) {
|
|
271
|
+
const pending = this.callbacks.get(String(id));
|
|
272
|
+
if (!pending)
|
|
273
|
+
return;
|
|
274
|
+
this.callbacks.delete(String(id));
|
|
275
|
+
await pending.client.respondError(pending.id, code, message);
|
|
276
|
+
}
|
|
277
|
+
onInbound(handler) { this.inbound.add(handler); return () => this.inbound.delete(handler); }
|
|
278
|
+
onUnavailable(handler) { this.unavailable.add(handler); return () => this.unavailable.delete(handler); }
|
|
279
|
+
async dispose(client) {
|
|
280
|
+
await client.close();
|
|
281
|
+
this.all.delete(client);
|
|
282
|
+
for (const [key, pending] of this.callbacks)
|
|
283
|
+
if (pending.client === client)
|
|
284
|
+
this.callbacks.delete(key);
|
|
285
|
+
}
|
|
286
|
+
async close() {
|
|
287
|
+
this.closed = true;
|
|
288
|
+
const clients = this.all;
|
|
289
|
+
await Promise.all([...clients].map(client => this.dispose(client)));
|
|
290
|
+
this.clients.clear();
|
|
291
|
+
this.all.clear();
|
|
292
|
+
this.callbacks.clear();
|
|
293
|
+
}
|
|
294
|
+
}
|
|
295
|
+
// pi-acp 0.0.34 does not replay original timestamps/IDs, thinking, or tool
|
|
296
|
+
// arguments. Use deterministic projection IDs and an unknown (epoch) time rather
|
|
297
|
+
// than presenting the time of this history read as the time of the conversation.
|
|
298
|
+
function historyEvents(messages, sessionId) {
|
|
299
|
+
const events = [];
|
|
300
|
+
const tools = new Map();
|
|
301
|
+
let turn = 0;
|
|
302
|
+
let step = 1;
|
|
303
|
+
let afterTools = false;
|
|
304
|
+
let pending;
|
|
305
|
+
const push = (type, data, surface = false) => events.push({ type: 'event', event: {
|
|
306
|
+
type, seq: events.length, time: 0, data, ...(surface ? { surfaceOp: 'append' } : {}),
|
|
307
|
+
} });
|
|
308
|
+
const id = () => `pi-history:${sessionId}:${events.length}`;
|
|
309
|
+
const flushMessage = () => {
|
|
310
|
+
if (!pending)
|
|
311
|
+
return;
|
|
312
|
+
const message = { id: id(), role: pending.role, content: pending.content };
|
|
313
|
+
if (pending.role === 'user')
|
|
314
|
+
push('user/message', { ...message, source: { kind: 'user' } }, true);
|
|
315
|
+
else
|
|
316
|
+
push('assistant/message', { turn, step, message: { ...message, source: { kind: 'model', provider: 'pi', model: '' } }, stream: [] }, true);
|
|
317
|
+
pending = undefined;
|
|
318
|
+
};
|
|
319
|
+
const result = (tool) => {
|
|
320
|
+
if (tool.emitted || !tool.terminal)
|
|
321
|
+
return;
|
|
322
|
+
tool.emitted = true;
|
|
323
|
+
push('tool/result', { turn, step, message: { id: id(), role: 'user', source: { kind: 'tool', callId: tool.id }, content: [{
|
|
324
|
+
type: 'tool-result', toolCallId: tool.id, content: tool.output, ...(tool.failed ? { isError: true } : {}),
|
|
325
|
+
}] } }, true);
|
|
326
|
+
};
|
|
327
|
+
const flushTools = () => { for (const tool of tools.values())
|
|
328
|
+
result(tool); };
|
|
329
|
+
const endTurn = () => {
|
|
330
|
+
flushMessage();
|
|
331
|
+
flushTools();
|
|
332
|
+
if (turn) {
|
|
333
|
+
push('step/end', { turn, step });
|
|
334
|
+
push('turn/end', { turn, reason: { kind: 'completed' } });
|
|
335
|
+
}
|
|
336
|
+
tools.clear();
|
|
337
|
+
afterTools = false;
|
|
338
|
+
};
|
|
339
|
+
for (const message of messages) {
|
|
340
|
+
const params = message.params;
|
|
341
|
+
if (message.kind !== 'notification' || message.method !== 'session/update' || params?.sessionId !== sessionId)
|
|
342
|
+
continue;
|
|
343
|
+
const update = params.update;
|
|
344
|
+
if (!update)
|
|
345
|
+
continue;
|
|
346
|
+
const kind = update.sessionUpdate;
|
|
347
|
+
if (kind === 'user_message_chunk' || kind === 'agent_message_chunk' || kind === 'agent_thought_chunk') {
|
|
348
|
+
if (update.content?.type !== 'text' || typeof update.content.text !== 'string')
|
|
349
|
+
continue;
|
|
350
|
+
const role = kind === 'user_message_chunk' ? 'user' : 'assistant';
|
|
351
|
+
if (role === 'user' && pending?.role !== 'user') {
|
|
352
|
+
endTurn();
|
|
353
|
+
turn++;
|
|
354
|
+
step = 1;
|
|
355
|
+
push('turn/start', { turn });
|
|
356
|
+
push('step/start', { turn, step });
|
|
357
|
+
}
|
|
358
|
+
else if (!turn) {
|
|
359
|
+
turn++;
|
|
360
|
+
push('turn/start', { turn });
|
|
361
|
+
push('step/start', { turn, step });
|
|
362
|
+
}
|
|
363
|
+
if (pending && pending.role !== role)
|
|
364
|
+
flushMessage();
|
|
365
|
+
flushTools();
|
|
366
|
+
if (role === 'assistant' && afterTools) {
|
|
367
|
+
push('step/end', { turn, step });
|
|
368
|
+
step++;
|
|
369
|
+
push('step/start', { turn, step });
|
|
370
|
+
afterTools = false;
|
|
371
|
+
}
|
|
372
|
+
pending ??= { role, content: [] };
|
|
373
|
+
const type = kind === 'agent_thought_chunk' ? 'reasoning' : 'text';
|
|
374
|
+
const previous = pending.content.at(-1);
|
|
375
|
+
if (previous?.type === type)
|
|
376
|
+
previous.text += update.content.text;
|
|
377
|
+
else
|
|
378
|
+
pending.content.push({ type, text: update.content.text });
|
|
379
|
+
}
|
|
380
|
+
else if ((kind === 'tool_call' || kind === 'tool_call_update') && typeof update.toolCallId === 'string') {
|
|
381
|
+
flushMessage();
|
|
382
|
+
afterTools = true;
|
|
383
|
+
if (!turn) {
|
|
384
|
+
turn++;
|
|
385
|
+
push('turn/start', { turn });
|
|
386
|
+
push('step/start', { turn, step });
|
|
387
|
+
}
|
|
388
|
+
let tool = tools.get(update.toolCallId);
|
|
389
|
+
if (!tool) {
|
|
390
|
+
tool = { id: update.toolCallId, name: typeof update.title === 'string' ? update.title : 'tool', input: update.rawInput,
|
|
391
|
+
output: [], failed: false, terminal: false, emitted: false };
|
|
392
|
+
tools.set(tool.id, tool);
|
|
393
|
+
push('tool/call', { turn, step, callId: tool.id, name: tool.name,
|
|
394
|
+
arguments: typeof tool.input === 'string' ? tool.input : JSON.stringify(tool.input ?? {}) });
|
|
395
|
+
}
|
|
396
|
+
const decoded = piToolResult(update);
|
|
397
|
+
if (decoded.content.length)
|
|
398
|
+
tool.output = decoded.content;
|
|
399
|
+
tool.failed ||= decoded.isError;
|
|
400
|
+
tool.terminal ||= update.status === 'completed' || update.status === 'failed';
|
|
401
|
+
// Published load emits a provisional completed tool_call followed by the
|
|
402
|
+
// authoritative tool_call_update (which can be failed and hold all output).
|
|
403
|
+
if (kind === 'tool_call_update')
|
|
404
|
+
result(tool);
|
|
405
|
+
}
|
|
406
|
+
}
|
|
407
|
+
endTurn();
|
|
408
|
+
return events;
|
|
409
|
+
}
|
|
410
|
+
//# sourceMappingURL=pi-process.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pi-process.js","sourceRoot":"","sources":["../../../src/acp/adapters/pi-process.ts"],"names":[],"mappings":"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"}
|
package/dist/acp/gateway.d.ts
CHANGED
|
@@ -38,9 +38,15 @@ export declare class AcpRemoteGateway {
|
|
|
38
38
|
/** Catch-up buffer for turns that finish while the Client is reconnecting. */
|
|
39
39
|
private readonly recentFrames;
|
|
40
40
|
/** Per-prompt live updates; attached to prompt_completed when streaming was lossy. */
|
|
41
|
+
private readonly promptsInProgress;
|
|
42
|
+
private readonly cancelledSessions;
|
|
43
|
+
/** Identity fences asynchronous Pi preparation from a later retry of the same session. */
|
|
44
|
+
private readonly preparingPrompts;
|
|
41
45
|
private readonly turnCatchUp;
|
|
42
46
|
private startPromise?;
|
|
43
47
|
private readonly startingClients;
|
|
48
|
+
/** Desired configuration is saved immediately; unfinished cleanup must remain retryable. */
|
|
49
|
+
private readonly pendingReconfiguration;
|
|
44
50
|
constructor(config: ResolvedAcpConfig, logger: SafeLogger, createAcp?: AcpFactory, restartDelaysMs?: readonly number[], terminalEnabled?: () => boolean, terminalSpawner?: RemoteTerminalSpawner | undefined);
|
|
45
51
|
/** Only implemented adapters are advertised; registry entries never select an adapter by executable name. */
|
|
46
52
|
enabledBackends(): string[];
|
|
@@ -94,6 +100,10 @@ export declare class AcpRemoteGateway {
|
|
|
94
100
|
private callUpstream;
|
|
95
101
|
private requireSessionAccess;
|
|
96
102
|
private requireSessionOwner;
|
|
103
|
+
private captureCatalogClient;
|
|
104
|
+
private listCatalogSessions;
|
|
105
|
+
private piSessionCwd;
|
|
106
|
+
private catalogSessionCwd;
|
|
97
107
|
private requireExistingDirectory;
|
|
98
108
|
private listDirectory;
|
|
99
109
|
private disposeInstance;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["../../src/acp/gateway.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,KAAK,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAO1G,OAAO,KAAK,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAA;AAC/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AACxE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAG/C,OAAO,EAIL,KAAK,aAAa,EACnB,MAAM,8BAA8B,CAAA;
|
|
1
|
+
{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["../../src/acp/gateway.ts"],"names":[],"mappings":"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"}
|