linkshell-cli 0.3.23 → 0.3.25
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/cli/src/index.js +0 -0
- package/dist/cli/src/runtime/acp/acp-client.d.ts +4 -0
- package/dist/cli/src/runtime/acp/acp-client.js +17 -20
- package/dist/cli/src/runtime/acp/acp-client.js.map +1 -1
- package/dist/cli/src/runtime/acp/agent-workspace.js +1 -0
- package/dist/cli/src/runtime/acp/agent-workspace.js.map +1 -1
- package/dist/cli/src/runtime/acp/codex-rpc-bridge.d.ts +5 -0
- package/dist/cli/src/runtime/acp/codex-rpc-bridge.js +53 -0
- package/dist/cli/src/runtime/acp/codex-rpc-bridge.js.map +1 -1
- package/dist/cli/src/runtime/acp/json-rpc.d.ts +13 -4
- package/dist/cli/src/runtime/acp/json-rpc.js +25 -9
- package/dist/cli/src/runtime/acp/json-rpc.js.map +1 -1
- package/dist/cli/tsconfig.tsbuildinfo +1 -1
- package/dist/shared-protocol/src/index.d.ts +56 -84
- package/dist/shared-protocol/src/index.js +3 -11
- package/dist/shared-protocol/src/index.js.map +1 -1
- package/package.json +12 -12
- package/src/runtime/acp/acp-client.ts +20 -14
- package/src/runtime/acp/agent-workspace.ts +1 -0
- package/src/runtime/acp/codex-rpc-bridge.ts +59 -0
- package/src/runtime/acp/json-rpc.ts +34 -11
|
@@ -9,6 +9,7 @@ export declare class CodexRpcBridge {
|
|
|
9
9
|
private candidateIndex;
|
|
10
10
|
private startupTimer;
|
|
11
11
|
private queuedMessages;
|
|
12
|
+
private inFlightRequests;
|
|
12
13
|
constructor(input: {
|
|
13
14
|
command?: string;
|
|
14
15
|
commandCandidates?: AgentCommandConfig[];
|
|
@@ -26,4 +27,8 @@ export declare class CodexRpcBridge {
|
|
|
26
27
|
private flushQueued;
|
|
27
28
|
private failQueued;
|
|
28
29
|
private emitError;
|
|
30
|
+
private handleTransportStderr;
|
|
31
|
+
private rememberRequest;
|
|
32
|
+
private forgetRequest;
|
|
33
|
+
private failInFlight;
|
|
29
34
|
}
|
|
@@ -11,6 +11,7 @@ export class CodexRpcBridge {
|
|
|
11
11
|
candidateIndex = 0;
|
|
12
12
|
startupTimer;
|
|
13
13
|
queuedMessages = [];
|
|
14
|
+
inFlightRequests = new Map();
|
|
14
15
|
constructor(input) {
|
|
15
16
|
this.input = input;
|
|
16
17
|
}
|
|
@@ -21,6 +22,7 @@ export class CodexRpcBridge {
|
|
|
21
22
|
this.queuedMessages.push(jsonMessage);
|
|
22
23
|
return;
|
|
23
24
|
}
|
|
25
|
+
this.rememberRequest(jsonMessage);
|
|
24
26
|
this.transport?.send(jsonMessage);
|
|
25
27
|
}
|
|
26
28
|
stop() {
|
|
@@ -34,6 +36,7 @@ export class CodexRpcBridge {
|
|
|
34
36
|
this.transportReady = false;
|
|
35
37
|
this.starting = false;
|
|
36
38
|
this.queuedMessages = [];
|
|
39
|
+
this.inFlightRequests.clear();
|
|
37
40
|
this.stopping = false;
|
|
38
41
|
}
|
|
39
42
|
ensureTransport() {
|
|
@@ -60,12 +63,17 @@ export class CodexRpcBridge {
|
|
|
60
63
|
this.starting = true;
|
|
61
64
|
this.transportReady = false;
|
|
62
65
|
this.transport = new JsonRpcStdioTransport(config.command, config.framing, () => { }, () => ({}), (message) => this.handleTransportExit(message), (message) => {
|
|
66
|
+
this.forgetRequest(message);
|
|
63
67
|
this.input.send(createEnvelope({
|
|
64
68
|
type: "agent.codex.rpc",
|
|
65
69
|
hostDeviceId: this.input.hostDeviceId,
|
|
66
70
|
payload: message,
|
|
67
71
|
}));
|
|
68
72
|
return true;
|
|
73
|
+
}, {
|
|
74
|
+
includeJsonrpc: false,
|
|
75
|
+
verbose: this.input.verbose,
|
|
76
|
+
onStderrData: (message) => this.handleTransportStderr(message),
|
|
69
77
|
});
|
|
70
78
|
this.transport.start(this.input.cwd);
|
|
71
79
|
if (this.input.verbose) {
|
|
@@ -98,11 +106,13 @@ export class CodexRpcBridge {
|
|
|
98
106
|
return;
|
|
99
107
|
}
|
|
100
108
|
this.failQueued(message);
|
|
109
|
+
this.failInFlight(message);
|
|
101
110
|
this.emitError(message);
|
|
102
111
|
}
|
|
103
112
|
flushQueued() {
|
|
104
113
|
const messages = this.queuedMessages.splice(0);
|
|
105
114
|
for (const message of messages) {
|
|
115
|
+
this.rememberRequest(message);
|
|
106
116
|
this.transport?.send(message);
|
|
107
117
|
}
|
|
108
118
|
}
|
|
@@ -136,5 +146,48 @@ export class CodexRpcBridge {
|
|
|
136
146
|
},
|
|
137
147
|
}));
|
|
138
148
|
}
|
|
149
|
+
handleTransportStderr(message) {
|
|
150
|
+
if (this.input.verbose) {
|
|
151
|
+
process.stderr.write(`[agent:codex-rpc] stderr ignored while app-server is running: ${message}\n`);
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
rememberRequest(message) {
|
|
155
|
+
if (!isJsonRpcRequest(message))
|
|
156
|
+
return;
|
|
157
|
+
this.inFlightRequests.set(message.id, message);
|
|
158
|
+
}
|
|
159
|
+
forgetRequest(message) {
|
|
160
|
+
if (!isJsonRpcResponse(message))
|
|
161
|
+
return;
|
|
162
|
+
this.inFlightRequests.delete(message.id);
|
|
163
|
+
}
|
|
164
|
+
failInFlight(message) {
|
|
165
|
+
const requests = [...this.inFlightRequests.values()];
|
|
166
|
+
this.inFlightRequests.clear();
|
|
167
|
+
for (const item of requests) {
|
|
168
|
+
if (!isJsonRpcRequest(item))
|
|
169
|
+
continue;
|
|
170
|
+
this.input.send(createEnvelope({
|
|
171
|
+
type: "agent.codex.rpc",
|
|
172
|
+
hostDeviceId: this.input.hostDeviceId,
|
|
173
|
+
payload: {
|
|
174
|
+
jsonrpc: "2.0",
|
|
175
|
+
id: item.id,
|
|
176
|
+
error: { code: -32000, message },
|
|
177
|
+
},
|
|
178
|
+
}));
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
function isJsonRpcRequest(message) {
|
|
183
|
+
return "id" in message &&
|
|
184
|
+
"method" in message &&
|
|
185
|
+
(typeof message.id === "string" || typeof message.id === "number") &&
|
|
186
|
+
typeof message.method === "string";
|
|
187
|
+
}
|
|
188
|
+
function isJsonRpcResponse(message) {
|
|
189
|
+
return "id" in message &&
|
|
190
|
+
(typeof message.id === "string" || typeof message.id === "number") &&
|
|
191
|
+
("result" in message || "error" in message);
|
|
139
192
|
}
|
|
140
193
|
//# sourceMappingURL=codex-rpc-bridge.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-rpc-bridge.js","sourceRoot":"","sources":["../../../../../src/runtime/acp/codex-rpc-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,qBAAqB,EAAuB,MAAM,eAAe,CAAC;AAC3E,OAAO,EAAE,6BAA6B,EAA2B,MAAM,wBAAwB,CAAC;AAEhG,MAAM,4BAA4B,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"codex-rpc-bridge.js","sourceRoot":"","sources":["../../../../../src/runtime/acp/codex-rpc-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,qBAAqB,EAAuB,MAAM,eAAe,CAAC;AAC3E,OAAO,EAAE,6BAA6B,EAA2B,MAAM,wBAAwB,CAAC;AAEhG,MAAM,4BAA4B,GAAG,GAAG,CAAC;AAIzC,MAAM,OAAO,cAAc;IAWN;IAVX,SAAS,CAAoC;IAC7C,cAAc,GAAG,KAAK,CAAC;IACvB,QAAQ,GAAG,KAAK,CAAC;IACjB,QAAQ,GAAG,KAAK,CAAC;IACjB,cAAc,GAAG,CAAC,CAAC;IACnB,YAAY,CAA4C;IACxD,cAAc,GAAqB,EAAE,CAAC;IACtC,gBAAgB,GAAG,IAAI,GAAG,EAA6B,CAAC;IAEhE,YACmB,KAOhB;QAPgB,UAAK,GAAL,KAAK,CAOrB;IACA,CAAC;IAEJ,IAAI,CAAC,OAAgB;QACnB,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,MAAM,WAAW,GAAG,OAAyB,CAAC;QAC9C,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACtC,OAAO;QACT,CAAC;QACD,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QAClC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACpC,CAAC;IAED,IAAI;QACF,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAChC,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;QAChC,CAAC;QACD,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;QAC9B,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;IACxB,CAAC;IAEO,eAAe;QACrB,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO;QAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC5C,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAC9D,CAAC;QACD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAC3C,CAAC;IAEO,iBAAiB;QACvB,OAAO,IAAI,CAAC,KAAK,CAAC,iBAAiB,IAAI,6BAA6B,CAAC;YACnE,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;SAC5B,CAAC,CAAC;IACL,CAAC;IAEO,cAAc,CAAC,KAAa;QAClC,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC,KAAK,CAAC,CAAC;QAC/C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,IAAI,CAAC,UAAU,CAAC,0CAA0C,CAAC,CAAC;YAC5D,OAAO;QACT,CAAC;QACD,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAC5B,IAAI,CAAC,SAAS,GAAG,IAAI,qBAAqB,CACxC,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,OAAO,EACd,GAAG,EAAE,GAAE,CAAC,EACR,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EACV,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAC9C,CAAC,OAAO,EAAE,EAAE;YACV,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YAC5B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;gBAC7B,IAAI,EAAE,iBAAiB;gBACvB,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;gBACrC,OAAO,EAAE,OAAO;aACjB,CAAC,CAAC,CAAC;YACJ,OAAO,IAAI,CAAC;QACd,CAAC,EACD;YACE,cAAc,EAAE,KAAK;YACrB,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;YAC3B,YAAY,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC;SAC/D,CACF,CAAC;QACF,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACvB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC;QACxE,CAAC;QACD,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE;YAClC,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;YAC9B,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;YAC3B,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;YACtB,IAAI,CAAC,WAAW,EAAE,CAAC;QACrB,CAAC,EAAE,4BAA4B,CAAC,CAAC;IACnC,CAAC;IAEO,mBAAmB,CAAC,OAAe;QACzC,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO;QAC1B,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAChC,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;QAChC,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC;QACrC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC;QAC1C,IAAI,CAAC,QAAQ,IAAI,SAAS,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC,MAAM,EAAE,CAAC;YAC7D,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;gBACvB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,OAAO,kBAAkB,CAAC,CAAC;YACvE,CAAC;YACD,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;YAC/B,OAAO;QACT,CAAC;QACD,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACzB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC3B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAC1B,CAAC;IAEO,WAAW;QACjB,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC/C,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YAC9B,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAEO,UAAU,CAAC,OAAe;QAChC,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC7C,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;YAC1B,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,EAAE,KAAK,SAAS,IAAI,IAAI,CAAC,EAAE,KAAK,IAAI;gBAAE,SAAS;YAC3E,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;gBAC7B,IAAI,EAAE,iBAAiB;gBACvB,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;gBACrC,OAAO,EAAE;oBACP,OAAO,EAAE,KAAK;oBACd,EAAE,EAAE,IAAI,CAAC,EAAE;oBACX,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE;iBACjC;aACF,CAAC,CAAC,CAAC;QACN,CAAC;QACD,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACvB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,OAAO,IAAI,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;IAEO,SAAS,CAAC,OAAe;QAC/B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;YAC7B,IAAI,EAAE,iBAAiB;YACvB,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;YACrC,OAAO,EAAE;gBACP,OAAO,EAAE,KAAK;gBACd,EAAE,EAAE,2BAA2B;gBAC/B,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE;aACjC;SACF,CAAC,CAAC,CAAC;IACN,CAAC;IAEO,qBAAqB,CAAC,OAAe;QAC3C,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACvB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,iEAAiE,OAAO,IAAI,CAAC,CAAC;QACrG,CAAC;IACH,CAAC;IAEO,eAAe,CAAC,OAAuB;QAC7C,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;YAAE,OAAO;QACvC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAEO,aAAa,CAAC,OAAuB;QAC3C,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC;YAAE,OAAO;QACxC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC3C,CAAC;IAEO,YAAY,CAAC,OAAe;QAClC,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC;QACrD,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;QAC9B,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;YAC5B,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC;gBAAE,SAAS;YACtC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;gBAC7B,IAAI,EAAE,iBAAiB;gBACvB,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;gBACrC,OAAO,EAAE;oBACP,OAAO,EAAE,KAAK;oBACd,EAAE,EAAE,IAAI,CAAC,EAAE;oBACX,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE;iBACjC;aACF,CAAC,CAAC,CAAC;QACN,CAAC;IACH,CAAC;CACF;AAED,SAAS,gBAAgB,CAAC,OAAuB;IAC/C,OAAO,IAAI,IAAI,OAAO;QACpB,QAAQ,IAAI,OAAO;QACnB,CAAC,OAAO,OAAO,CAAC,EAAE,KAAK,QAAQ,IAAI,OAAO,OAAO,CAAC,EAAE,KAAK,QAAQ,CAAC;QAClE,OAAO,OAAO,CAAC,MAAM,KAAK,QAAQ,CAAC;AACvC,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAuB;IAChD,OAAO,IAAI,IAAI,OAAO;QACpB,CAAC,OAAO,OAAO,CAAC,EAAE,KAAK,QAAQ,IAAI,OAAO,OAAO,CAAC,EAAE,KAAK,QAAQ,CAAC;QAClE,CAAC,QAAQ,IAAI,OAAO,IAAI,OAAO,IAAI,OAAO,CAAC,CAAC;AAChD,CAAC"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import type { AgentFraming } from "./provider-resolver.js";
|
|
2
2
|
export interface JsonRpcRequest {
|
|
3
|
-
jsonrpc
|
|
3
|
+
jsonrpc?: "2.0";
|
|
4
4
|
id: number | string;
|
|
5
5
|
method: string;
|
|
6
6
|
params?: unknown;
|
|
7
7
|
}
|
|
8
8
|
export interface JsonRpcResponse {
|
|
9
|
-
jsonrpc
|
|
9
|
+
jsonrpc?: "2.0";
|
|
10
10
|
id: number | string;
|
|
11
11
|
result?: unknown;
|
|
12
12
|
error?: {
|
|
@@ -16,11 +16,16 @@ export interface JsonRpcResponse {
|
|
|
16
16
|
};
|
|
17
17
|
}
|
|
18
18
|
export interface JsonRpcNotification {
|
|
19
|
-
jsonrpc
|
|
19
|
+
jsonrpc?: "2.0";
|
|
20
20
|
method: string;
|
|
21
21
|
params?: unknown;
|
|
22
22
|
}
|
|
23
23
|
export type JsonRpcMessage = JsonRpcRequest | JsonRpcResponse | JsonRpcNotification;
|
|
24
|
+
interface JsonRpcTransportOptions {
|
|
25
|
+
includeJsonrpc?: boolean;
|
|
26
|
+
verbose?: boolean;
|
|
27
|
+
onStderrData?: (message: string) => void;
|
|
28
|
+
}
|
|
24
29
|
export declare class JsonRpcStdioTransport {
|
|
25
30
|
private readonly command;
|
|
26
31
|
private readonly framing;
|
|
@@ -28,18 +33,22 @@ export declare class JsonRpcStdioTransport {
|
|
|
28
33
|
private readonly onRequest;
|
|
29
34
|
private readonly onExit;
|
|
30
35
|
private readonly onMessage?;
|
|
36
|
+
private readonly options;
|
|
31
37
|
private child;
|
|
32
38
|
private nextId;
|
|
33
39
|
private pending;
|
|
34
40
|
private buffer;
|
|
35
|
-
constructor(command: string, framing: AgentFraming, onNotification: (method: string, params: unknown) => void, onRequest: (method: string, params: unknown) => Promise<unknown> | unknown, onExit: (message: string) => void, onMessage?: ((message: JsonRpcMessage) => boolean | void) | undefined);
|
|
41
|
+
constructor(command: string, framing: AgentFraming, onNotification: (method: string, params: unknown) => void, onRequest: (method: string, params: unknown) => Promise<unknown> | unknown, onExit: (message: string) => void, onMessage?: ((message: JsonRpcMessage) => boolean | void) | undefined, options?: JsonRpcTransportOptions);
|
|
36
42
|
start(cwd: string): void;
|
|
37
43
|
request(method: string, params?: unknown, timeoutMs?: number | null): Promise<unknown>;
|
|
38
44
|
notify(method: string, params?: unknown): void;
|
|
39
45
|
send(message: JsonRpcMessage): void;
|
|
40
46
|
stop(): void;
|
|
47
|
+
private normalizeOutgoing;
|
|
48
|
+
private withJsonrpc;
|
|
41
49
|
private write;
|
|
42
50
|
private read;
|
|
43
51
|
private dispatch;
|
|
44
52
|
private failAll;
|
|
45
53
|
}
|
|
54
|
+
export {};
|
|
@@ -6,17 +6,19 @@ export class JsonRpcStdioTransport {
|
|
|
6
6
|
onRequest;
|
|
7
7
|
onExit;
|
|
8
8
|
onMessage;
|
|
9
|
+
options;
|
|
9
10
|
child;
|
|
10
11
|
nextId = 1;
|
|
11
12
|
pending = new Map();
|
|
12
13
|
buffer = "";
|
|
13
|
-
constructor(command, framing, onNotification, onRequest, onExit, onMessage) {
|
|
14
|
+
constructor(command, framing, onNotification, onRequest, onExit, onMessage, options = {}) {
|
|
14
15
|
this.command = command;
|
|
15
16
|
this.framing = framing;
|
|
16
17
|
this.onNotification = onNotification;
|
|
17
18
|
this.onRequest = onRequest;
|
|
18
19
|
this.onExit = onExit;
|
|
19
20
|
this.onMessage = onMessage;
|
|
21
|
+
this.options = options;
|
|
20
22
|
}
|
|
21
23
|
start(cwd) {
|
|
22
24
|
if (this.child)
|
|
@@ -32,8 +34,10 @@ export class JsonRpcStdioTransport {
|
|
|
32
34
|
this.child.stdout.on("data", (chunk) => this.read(chunk));
|
|
33
35
|
this.child.stderr.on("data", (chunk) => {
|
|
34
36
|
const trimmed = chunk.trim();
|
|
35
|
-
if (trimmed)
|
|
37
|
+
if (trimmed) {
|
|
36
38
|
process.stderr.write(`[agent:stderr] ${trimmed}\n`);
|
|
39
|
+
this.options.onStderrData?.(trimmed);
|
|
40
|
+
}
|
|
37
41
|
});
|
|
38
42
|
this.child.on("error", (error) => this.failAll(error.message));
|
|
39
43
|
this.child.on("exit", (code, signal) => {
|
|
@@ -45,7 +49,7 @@ export class JsonRpcStdioTransport {
|
|
|
45
49
|
return Promise.reject(new Error("ACP agent is not running"));
|
|
46
50
|
}
|
|
47
51
|
const id = this.nextId++;
|
|
48
|
-
const message = {
|
|
52
|
+
const message = this.withJsonrpc({ id, method, params });
|
|
49
53
|
return new Promise((resolve, reject) => {
|
|
50
54
|
const timer = timeoutMs && timeoutMs > 0
|
|
51
55
|
? setTimeout(() => {
|
|
@@ -58,10 +62,10 @@ export class JsonRpcStdioTransport {
|
|
|
58
62
|
});
|
|
59
63
|
}
|
|
60
64
|
notify(method, params) {
|
|
61
|
-
this.write({
|
|
65
|
+
this.write(this.withJsonrpc({ method, params }));
|
|
62
66
|
}
|
|
63
67
|
send(message) {
|
|
64
|
-
this.write(message);
|
|
68
|
+
this.write(this.normalizeOutgoing(message));
|
|
65
69
|
}
|
|
66
70
|
stop() {
|
|
67
71
|
const child = this.child;
|
|
@@ -70,6 +74,16 @@ export class JsonRpcStdioTransport {
|
|
|
70
74
|
child.kill("SIGTERM");
|
|
71
75
|
this.failAll("ACP transport stopped");
|
|
72
76
|
}
|
|
77
|
+
normalizeOutgoing(message) {
|
|
78
|
+
const includeJsonrpc = this.options.includeJsonrpc ?? true;
|
|
79
|
+
if (includeJsonrpc)
|
|
80
|
+
return { jsonrpc: "2.0", ...message };
|
|
81
|
+
const { jsonrpc: _jsonrpc, ...rest } = message;
|
|
82
|
+
return rest;
|
|
83
|
+
}
|
|
84
|
+
withJsonrpc(message) {
|
|
85
|
+
return this.normalizeOutgoing(message);
|
|
86
|
+
}
|
|
73
87
|
write(message) {
|
|
74
88
|
const raw = JSON.stringify(message);
|
|
75
89
|
if (this.framing === "newline") {
|
|
@@ -111,6 +125,9 @@ export class JsonRpcStdioTransport {
|
|
|
111
125
|
message = JSON.parse(raw);
|
|
112
126
|
}
|
|
113
127
|
catch {
|
|
128
|
+
if (this.options.verbose) {
|
|
129
|
+
process.stderr.write(`[agent:rpc] ignored invalid JSON: ${raw.slice(0, 200)}\n`);
|
|
130
|
+
}
|
|
114
131
|
return;
|
|
115
132
|
}
|
|
116
133
|
if (this.onMessage?.(message)) {
|
|
@@ -132,16 +149,15 @@ export class JsonRpcStdioTransport {
|
|
|
132
149
|
}
|
|
133
150
|
if ("method" in message && "id" in message) {
|
|
134
151
|
Promise.resolve(this.onRequest(message.method, message.params))
|
|
135
|
-
.then((result) => this.write({
|
|
152
|
+
.then((result) => this.write(this.withJsonrpc({ id: message.id, result })))
|
|
136
153
|
.catch((error) => {
|
|
137
|
-
this.write({
|
|
138
|
-
jsonrpc: "2.0",
|
|
154
|
+
this.write(this.withJsonrpc({
|
|
139
155
|
id: message.id,
|
|
140
156
|
error: {
|
|
141
157
|
code: -32000,
|
|
142
158
|
message: error instanceof Error ? error.message : String(error),
|
|
143
159
|
},
|
|
144
|
-
});
|
|
160
|
+
}));
|
|
145
161
|
});
|
|
146
162
|
return;
|
|
147
163
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-rpc.js","sourceRoot":"","sources":["../../../../../src/runtime/acp/json-rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAuC,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"json-rpc.js","sourceRoot":"","sources":["../../../../../src/runtime/acp/json-rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAuC,MAAM,oBAAoB,CAAC;AA+BhF,MAAM,OAAO,qBAAqB;IAcb;IACA;IACA;IACA;IACA;IACA;IACA;IAnBX,KAAK,CAA6C;IAClD,MAAM,GAAG,CAAC,CAAC;IACX,OAAO,GAAG,IAAI,GAAG,EAOtB,CAAC;IACI,MAAM,GAAG,EAAE,CAAC;IAEpB,YACmB,OAAe,EACf,OAAqB,EACrB,cAAyD,EACzD,SAA0E,EAC1E,MAAiC,EACjC,SAAuD,EACvD,UAAmC,EAAE;QANrC,YAAO,GAAP,OAAO,CAAQ;QACf,YAAO,GAAP,OAAO,CAAc;QACrB,mBAAc,GAAd,cAAc,CAA2C;QACzD,cAAS,GAAT,SAAS,CAAiE;QAC1E,WAAM,GAAN,MAAM,CAA2B;QACjC,cAAS,GAAT,SAAS,CAA8C;QACvD,YAAO,GAAP,OAAO,CAA8B;IACrD,CAAC;IAEJ,KAAK,CAAC,GAAW;QACf,IAAI,IAAI,CAAC,KAAK;YAAE,OAAO;QACvB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE;YAC/B,GAAG;YACH,KAAK,EAAE,IAAI;YACX,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;YAC/B,GAAG,EAAE,OAAO,CAAC,GAAG;SACjB,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YAC7C,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;YAC7B,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,OAAO,IAAI,CAAC,CAAC;gBACpD,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,OAAO,CAAC,CAAC;YACvC,CAAC;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QAC/D,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YACrC,IAAI,CAAC,OAAO,CAAC,0BAA0B,IAAI,IAAI,MAAM,YAAY,MAAM,IAAI,MAAM,GAAG,CAAC,CAAC;QACxF,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,MAAc,EAAE,MAAgB,EAAE,YAA2B,MAAM;QACzE,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;YAC9C,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC,CAAC;QAC/D,CAAC;QACD,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QACzB,MAAM,OAAO,GAAmB,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QACzE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,KAAK,GAAG,SAAS,IAAI,SAAS,GAAG,CAAC;gBACtC,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE;oBACd,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBACxB,MAAM,CAAC,IAAI,KAAK,CAAC,0BAA0B,MAAM,EAAE,CAAC,CAAC,CAAC;gBACxD,CAAC,EAAE,SAAS,CAAC;gBACf,CAAC,CAAC,SAAS,CAAC;YACd,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;YACjD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,MAAc,EAAE,MAAgB;QACrC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,CAAC,OAAuB;QAC1B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI;QACF,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACvB,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM;YAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAClD,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;IACxC,CAAC;IAEO,iBAAiB,CAA2B,OAAU;QAC5D,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,IAAI,IAAI,CAAC;QAC3D,IAAI,cAAc;YAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,OAAO,EAAO,CAAC;QAC/D,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;QAC/C,OAAO,IAAS,CAAC;IACnB,CAAC;IAEO,WAAW,CAA2B,OAAU;QACtD,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;IAEO,KAAK,CAAC,OAAuB;QACnC,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACpC,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAC/B,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC;YACpC,OAAO;QACT,CAAC;QACD,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,mBAAmB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC;IAC7F,CAAC;IAEO,IAAI,CAAC,KAAa;QACxB,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC;QACrB,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,MAAM,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;YAC/E,IAAI,kBAAkB,EAAE,CAAC;gBACvB,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;gBAClD,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBACjD,MAAM,GAAG,GAAG,SAAS,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACvF,IAAI,GAAG,GAAG,CAAC;oBAAE,OAAO;gBACpB,MAAM,MAAM,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC7C,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,GAAG,GAAG,MAAM;oBAAE,OAAO;gBAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAAC,CAAC;gBACjD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC;gBAC9C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBACnB,SAAS;YACX,CAAC;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC1C,IAAI,OAAO,GAAG,CAAC;gBAAE,OAAO;YACxB,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;YACjD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;YAC7C,IAAI,GAAG;gBAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IAEO,QAAQ,CAAC,GAAW;QAC1B,IAAI,OAAuB,CAAC;QAC5B,IAAI,CAAC;YACH,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAmB,CAAC;QAC9C,CAAC;QAAC,MAAM,CAAC;YACP,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;gBACzB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;YACnF,CAAC;YACD,OAAO;QACT,CAAC;QAED,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9B,OAAO;QACT,CAAC;QAED,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,QAAQ,IAAI,OAAO,IAAI,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC;YACnE,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC7C,IAAI,CAAC,OAAO;gBAAE,OAAO;YACrB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAChC,IAAI,OAAO,CAAC,KAAK;gBAAE,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC/C,MAAM,QAAQ,GAAG,OAA0B,CAAC;YAC5C,IAAI,QAAQ,CAAC,KAAK;gBAAE,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;;gBACjE,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACtC,OAAO;QACT,CAAC;QAED,IAAI,QAAQ,IAAI,OAAO,IAAI,IAAI,IAAI,OAAO,EAAE,CAAC;YAC3C,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;iBAC5D,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;iBAC1E,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACf,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC;oBAC1B,EAAE,EAAE,OAAO,CAAC,EAAE;oBACd,KAAK,EAAE;wBACL,IAAI,EAAE,CAAC,KAAK;wBACZ,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;qBAChE;iBACF,CAAC,CAAC,CAAC;YACN,CAAC,CAAC,CAAC;YACL,OAAO;QACT,CAAC;QAED,IAAI,QAAQ,IAAI,OAAO,EAAE,CAAC;YACxB,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;IAEO,OAAO,CAAC,OAAe;QAC7B,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACrB,KAAK,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACvC,IAAI,OAAO,CAAC,KAAK;gBAAE,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC/C,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;CACF"}
|