@claudexor/acp-server 5.0.2 → 6.0.0
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/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +24 -126
- package/dist/index.js.map +1 -1
- package/dist/interaction-answers.d.ts +25 -0
- package/dist/interaction-answers.d.ts.map +1 -0
- package/dist/interaction-answers.js +220 -0
- package/dist/interaction-answers.js.map +1 -0
- package/dist/tool-update.d.ts +62 -5
- package/dist/tool-update.d.ts.map +1 -1
- package/dist/tool-update.js +73 -10
- package/dist/tool-update.js.map +1 -1
- package/package.json +3 -3
package/dist/index.d.ts
CHANGED
|
@@ -23,6 +23,7 @@ export declare class AcpServer {
|
|
|
23
23
|
private readonly opts;
|
|
24
24
|
private readonly activeRuns;
|
|
25
25
|
private readonly openToolCalls;
|
|
26
|
+
private readonly closedHandoffs;
|
|
26
27
|
constructor(opts: AcpServerOptions);
|
|
27
28
|
serve(): Promise<void>;
|
|
28
29
|
private sessionCall;
|
|
@@ -31,7 +32,6 @@ export declare class AcpServer {
|
|
|
31
32
|
private agentMessage;
|
|
32
33
|
private userMessage;
|
|
33
34
|
private forwardRunEvent;
|
|
34
|
-
private requestAnswers;
|
|
35
35
|
private dropToolCalls;
|
|
36
36
|
}
|
|
37
37
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,KAAK,QAAQ,IAAI,kBAAkB,EACnC,KAAK,QAAQ,IAAI,kBAAkB,EACpC,MAAM,aAAa,CAAC;AAUrB,OAAO,EAAgB,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,KAAK,QAAQ,IAAI,kBAAkB,EACnC,KAAK,QAAQ,IAAI,kBAAkB,EACpC,MAAM,aAAa,CAAC;AAUrB,OAAO,EAAgB,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AAK9D,eAAO,MAAM,oBAAoB,IAAuB,CAAC;AAEzD,MAAM,WAAW,WAAW;IAC1B,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAC/B,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC;IAClD,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,MAAM,QAAQ,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAC9E,MAAM,WAAW,gBAAiB,SAAQ,cAAc;IACtD,MAAM,EAAE,QAAQ,CAAC;IACjB,SAAS,EAAE;QAAE,IAAI,EAAE,kBAAkB,CAAC;QAAC,KAAK,EAAE,kBAAkB,CAAA;KAAE,CAAC;IACnE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAgBD;;kFAEkF;AAClF,qBAAa,SAAS;IAKR,OAAO,CAAC,QAAQ,CAAC,IAAI;IAJjC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAsC;IACjE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA+B;IAC7D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA2B;IAE1D,YAA6B,IAAI,EAAE,gBAAgB,EAAI;IAEjD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CA4J3B;YAEa,WAAW;IAYzB,OAAO,CAAC,iBAAiB;IAWzB,OAAO,CAAC,kBAAkB;YAMZ,YAAY;YAcZ,WAAW;YAcX,eAAe;IA6D7B,OAAO,CAAC,aAAa;CAMtB"}
|
package/dist/index.js
CHANGED
|
@@ -7,7 +7,8 @@ import { extractPromptText, renderPlanQuestions, summarizeResult, } from "./prom
|
|
|
7
7
|
import { runControlsFromMeta, validateRunControls } from "./validate.js";
|
|
8
8
|
import { terminalAuth } from "./auth.js";
|
|
9
9
|
import { attachmentInputs } from "./attachments.js";
|
|
10
|
-
import { toolResultUpdate } from "./tool-update.js";
|
|
10
|
+
import { AcpClosedHandoffs, acpToolCallId, acpToolOwner, toolResultUpdate } from "./tool-update.js";
|
|
11
|
+
import { requestInteractionAnswers } from "./interaction-answers.js";
|
|
11
12
|
export const ACP_PROTOCOL_VERSION = acp.PROTOCOL_VERSION;
|
|
12
13
|
/** Official ACP SDK projection over Claudexor's daemon-owned threads. The SDK
|
|
13
14
|
* owns parsing, protocol negotiation, cancellation, and JSON-RPC framing; this
|
|
@@ -16,6 +17,7 @@ export class AcpServer {
|
|
|
16
17
|
opts;
|
|
17
18
|
activeRuns = new Map();
|
|
18
19
|
openToolCalls = new Map();
|
|
20
|
+
closedHandoffs = new AcpClosedHandoffs();
|
|
19
21
|
constructor(opts) {
|
|
20
22
|
this.opts = opts;
|
|
21
23
|
}
|
|
@@ -119,7 +121,7 @@ export class AcpServer {
|
|
|
119
121
|
}, {
|
|
120
122
|
signal: controller.signal,
|
|
121
123
|
onEvent: (event) => void this.forwardRunEvent(client, params.sessionId, event),
|
|
122
|
-
onInteraction: (ctx) => this.
|
|
124
|
+
onInteraction: (ctx) => requestInteractionAnswers(client, params.sessionId, ctx, (text) => this.agentMessage(client, params.sessionId, text)),
|
|
123
125
|
}));
|
|
124
126
|
const summary = summarizeResult(result);
|
|
125
127
|
if (summary)
|
|
@@ -160,6 +162,8 @@ export class AcpServer {
|
|
|
160
162
|
finally {
|
|
161
163
|
if (this.activeRuns.get(params.sessionId) === controller)
|
|
162
164
|
this.activeRuns.delete(params.sessionId);
|
|
165
|
+
// The turn's run is over: its calls are never closed or refined later.
|
|
166
|
+
this.dropToolCalls(params.sessionId);
|
|
163
167
|
}
|
|
164
168
|
})
|
|
165
169
|
.onNotification(acp.methods.agent.session.cancel, async ({ params }) => {
|
|
@@ -225,6 +229,10 @@ export class AcpServer {
|
|
|
225
229
|
return;
|
|
226
230
|
const sub = String(payload["type"] ?? "");
|
|
227
231
|
const tool = payload["tool"];
|
|
232
|
+
// A call belongs to the run and try that issued it, never to a bare native id (X2).
|
|
233
|
+
const owner = acpToolOwner(event);
|
|
234
|
+
const useId = typeof tool?.["use_id"] === "string" ? tool["use_id"] : null;
|
|
235
|
+
const unnamed = `${sessionId}\0${owner}\0${String(tool?.["name"] ?? "")}`;
|
|
228
236
|
if ((sub === "message" || sub === "thinking") && typeof payload["text"] === "string") {
|
|
229
237
|
await client.notify(acp.methods.client.session.update, {
|
|
230
238
|
sessionId,
|
|
@@ -236,11 +244,9 @@ export class AcpServer {
|
|
|
236
244
|
return;
|
|
237
245
|
}
|
|
238
246
|
if (sub === "tool_call" && tool) {
|
|
239
|
-
const id =
|
|
240
|
-
if (
|
|
241
|
-
|
|
242
|
-
this.openToolCalls.set(key, [...(this.openToolCalls.get(key) ?? []), id]);
|
|
243
|
-
}
|
|
247
|
+
const id = useId === null ? `tc-${crypto.randomUUID()}` : acpToolCallId(owner, useId);
|
|
248
|
+
if (useId === null)
|
|
249
|
+
this.openToolCalls.set(unnamed, [...(this.openToolCalls.get(unnamed) ?? []), id]);
|
|
244
250
|
await client.notify(acp.methods.client.session.update, {
|
|
245
251
|
sessionId,
|
|
246
252
|
update: {
|
|
@@ -252,133 +258,25 @@ export class AcpServer {
|
|
|
252
258
|
});
|
|
253
259
|
return;
|
|
254
260
|
}
|
|
261
|
+
const update = this.closedHandoffs.refinement(sessionId, event);
|
|
262
|
+
if (update)
|
|
263
|
+
await client.notify(acp.methods.client.session.update, { sessionId, update });
|
|
255
264
|
if (sub === "tool_result" && tool) {
|
|
256
|
-
const
|
|
257
|
-
const
|
|
258
|
-
const id = typeof tool["use_id"] === "string" ? tool["use_id"] : queue?.shift();
|
|
265
|
+
const queue = this.openToolCalls.get(unnamed);
|
|
266
|
+
const id = useId === null ? queue?.shift() : acpToolCallId(owner, useId);
|
|
259
267
|
if (queue?.length === 0)
|
|
260
|
-
this.openToolCalls.delete(
|
|
268
|
+
this.openToolCalls.delete(unnamed);
|
|
261
269
|
if (!id)
|
|
262
270
|
return;
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
});
|
|
267
|
-
}
|
|
268
|
-
}
|
|
269
|
-
async requestAnswers(client, sessionId, ctx) {
|
|
270
|
-
const request = ctx?.request;
|
|
271
|
-
const runId = typeof ctx?.run_id === "string" ? ctx.run_id : "";
|
|
272
|
-
const questions = Array.isArray(request?.questions) ? request.questions : [];
|
|
273
|
-
const answers = [];
|
|
274
|
-
const unanswerable = [];
|
|
275
|
-
for (const [index, question] of questions.entries()) {
|
|
276
|
-
const rawOptions = Array.isArray(question?.options) ? question.options : [];
|
|
277
|
-
const options = rawOptions.map((option, optionIndex) => ({
|
|
278
|
-
optionId: `opt-${optionIndex + 1}`,
|
|
279
|
-
name: String(option?.label ?? `option ${optionIndex + 1}`),
|
|
280
|
-
kind: "allow_once",
|
|
281
|
-
}));
|
|
282
|
-
// Option-less (free-text) questions cannot be answered through ACP's
|
|
283
|
-
// permission mechanism (which is choice-only). NEVER silently skip them:
|
|
284
|
-
// collect them and disclose as turn text below, naming the documented
|
|
285
|
-
// answer path, and leave the interaction pending so it stays answerable.
|
|
286
|
-
if (options.length === 0) {
|
|
287
|
-
unanswerable.push(String(question?.question ?? `question ${index + 1}`));
|
|
288
|
-
continue;
|
|
289
|
-
}
|
|
290
|
-
const title = String(question?.question ?? "Question");
|
|
291
|
-
const multi = question?.multi_select === true;
|
|
292
|
-
if (multi) {
|
|
293
|
-
// Multi-select: iterate one include/skip permission round per option so
|
|
294
|
-
// the client can pick MORE THAN ONE label (a single requestPermission
|
|
295
|
-
// returns exactly one optionId and would collapse the selection).
|
|
296
|
-
const selectedLabels = [];
|
|
297
|
-
for (const option of options) {
|
|
298
|
-
const toolCallId = `${String(request?.interaction_id ?? "interaction")}:${String(question?.id ?? index)}:${option.optionId}`;
|
|
299
|
-
await client.notify(acp.methods.client.session.update, {
|
|
300
|
-
sessionId,
|
|
301
|
-
update: {
|
|
302
|
-
sessionUpdate: "tool_call",
|
|
303
|
-
toolCallId,
|
|
304
|
-
title: `${title} — include "${option.name}"?`,
|
|
305
|
-
kind: "other",
|
|
306
|
-
status: "pending",
|
|
307
|
-
},
|
|
308
|
-
});
|
|
309
|
-
const response = (await client.request(acp.methods.client.session.requestPermission, {
|
|
310
|
-
sessionId,
|
|
311
|
-
toolCall: { toolCallId, title: `${title} — include "${option.name}"?` },
|
|
312
|
-
options: [
|
|
313
|
-
{ optionId: "include", name: `Include ${option.name}`, kind: "allow_once" },
|
|
314
|
-
{ optionId: "skip", name: `Skip ${option.name}`, kind: "reject_once" },
|
|
315
|
-
],
|
|
316
|
-
}));
|
|
317
|
-
const include = response.outcome.outcome === "selected" && response.outcome.optionId === "include";
|
|
318
|
-
if (include)
|
|
319
|
-
selectedLabels.push(option.name);
|
|
320
|
-
await client.notify(acp.methods.client.session.update, {
|
|
321
|
-
sessionId,
|
|
322
|
-
update: { sessionUpdate: "tool_call_update", toolCallId, status: "completed" },
|
|
323
|
-
});
|
|
324
|
-
}
|
|
325
|
-
answers.push({
|
|
326
|
-
question_id: String(question?.id ?? ""),
|
|
327
|
-
selected_labels: selectedLabels,
|
|
328
|
-
free_text: null,
|
|
329
|
-
});
|
|
330
|
-
continue;
|
|
331
|
-
}
|
|
332
|
-
const toolCallId = `${String(request?.interaction_id ?? "interaction")}:${String(question?.id ?? index)}`;
|
|
333
|
-
await client.notify(acp.methods.client.session.update, {
|
|
334
|
-
sessionId,
|
|
335
|
-
update: {
|
|
336
|
-
sessionUpdate: "tool_call",
|
|
337
|
-
toolCallId,
|
|
338
|
-
title,
|
|
339
|
-
kind: "other",
|
|
340
|
-
status: "pending",
|
|
341
|
-
},
|
|
342
|
-
});
|
|
343
|
-
const response = (await client.request(acp.methods.client.session.requestPermission, {
|
|
344
|
-
sessionId,
|
|
345
|
-
toolCall: { toolCallId, title },
|
|
346
|
-
options,
|
|
347
|
-
}));
|
|
348
|
-
const outcome = response.outcome;
|
|
349
|
-
const selected = outcome.outcome === "selected"
|
|
350
|
-
? options.find((option) => option.optionId === outcome.optionId)
|
|
351
|
-
: undefined;
|
|
352
|
-
await client.notify(acp.methods.client.session.update, {
|
|
353
|
-
sessionId,
|
|
354
|
-
update: {
|
|
355
|
-
sessionUpdate: "tool_call_update",
|
|
356
|
-
toolCallId,
|
|
357
|
-
status: selected ? "completed" : "failed",
|
|
358
|
-
},
|
|
359
|
-
});
|
|
360
|
-
if (selected) {
|
|
361
|
-
answers.push({
|
|
362
|
-
question_id: String(question?.id ?? ""),
|
|
363
|
-
selected_labels: [selected.name],
|
|
364
|
-
free_text: null,
|
|
365
|
-
});
|
|
366
|
-
}
|
|
367
|
-
}
|
|
368
|
-
if (unanswerable.length > 0) {
|
|
369
|
-
// Honest disclosure (never a silent skip): the free-text question(s) stay
|
|
370
|
-
// pending on the run; the editor's user answers them via the CLI/API.
|
|
371
|
-
const runHint = runId ? `\`claudexor follow ${runId}\`` : "`claudexor follow <run>`";
|
|
372
|
-
const list = unanswerable.map((q, i) => `${i + 1}. ${q}`).join("\n");
|
|
373
|
-
await this.agentMessage(client, sessionId, `This run is waiting on ${unanswerable.length} free-text question(s) that ACP cannot answer inline (ACP presents choices only):\n\n${list}\n\nAnswer them with ${runHint} or POST /v2/runs/:id/interactions/:id/answer; the run stays paused until then.`);
|
|
271
|
+
this.closedHandoffs.closed(sessionId, id, tool);
|
|
272
|
+
const closing = toolResultUpdate(id, tool);
|
|
273
|
+
await client.notify(acp.methods.client.session.update, { sessionId, update: closing });
|
|
374
274
|
}
|
|
375
|
-
return answers.length > 0
|
|
376
|
-
? { interaction_id: String(request?.interaction_id ?? ""), answers }
|
|
377
|
-
: null;
|
|
378
275
|
}
|
|
379
276
|
dropToolCalls(sessionId) {
|
|
277
|
+
this.closedHandoffs.drop(sessionId);
|
|
380
278
|
for (const key of this.openToolCalls.keys()) {
|
|
381
|
-
if (key.startsWith(`${sessionId}
|
|
279
|
+
if (key.startsWith(`${sessionId}\0`))
|
|
382
280
|
this.openToolCalls.delete(key);
|
|
383
281
|
}
|
|
384
282
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EACL,QAAQ,EACR,QAAQ,GAGT,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,GAEhB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACzE,OAAO,EAAE,YAAY,EAAuB,MAAM,WAAW,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,CAAC,gBAAgB,CAAC;AA8BzD;;kFAEkF;AAClF,MAAM,OAAO,SAAS;IAIS,IAAI;IAHhB,UAAU,GAAG,IAAI,GAAG,EAA2B,CAAC;IAChD,aAAa,GAAG,IAAI,GAAG,EAAoB,CAAC;IAE7D,YAA6B,IAAsB;oBAAtB,IAAI;IAAqB,CAAC;IAEvD,KAAK,CAAC,KAAK;QACT,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,CAC7B,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAA0C,EAClF,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAA0C,CAClF,CAAC;QACF,MAAM,GAAG,GAAG,GAAG;aACZ,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,WAAW,EAAE,CAAC;aAC9C,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;YACxD,eAAe,EACb,MAAM,CAAC,eAAe,KAAK,oBAAoB;gBAC7C,CAAC,CAAC,MAAM,CAAC,eAAe;gBACxB,CAAC,CAAC,oBAAoB;YAC1B,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,WAAW,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,KAAK,EAAE;YACvF,iBAAiB,EAAE;gBACjB,WAAW,EAAE,IAAI;gBACjB,kBAAkB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE;gBACxE,mBAAmB,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;aACzD;YACD,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC;SACpF,CAAC,CAAC;aACF,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YAC7D,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACnC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE;gBAC3C,GAAG,EAAE,MAAM,CAAC,GAAG;gBACf,qBAAqB,EAAE,MAAM,CAAC,qBAAqB,IAAI,EAAE;aAC1D,CAAC,CAAC;YACH,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC;QACzC,CAAC,CAAC;aACD,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YAC9D,IAAI,MAAM,CAAC,GAAG,IAAI,IAAI;gBAAE,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;YAChF,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;gBACrC,IAAI,EAAE,oBAAoB;gBAC1B,QAAQ,EAAE,MAAM,CAAC,GAAG,IAAI,SAAS;gBACjC,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,SAAS;aACnC,CAAC,CAAkE,CAAC;YACrE,OAAO;gBACL,QAAQ,EAAE,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;oBAClD,SAAS,EAAE,OAAO,CAAC,SAAS;oBAC5B,GAAG,EAAE,OAAO,CAAC,GAAG;oBAChB,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC1D,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACvE,CAAC,CAAC;gBACH,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAChE,CAAC;QACJ,CAAC,CAAC;aACD,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE;YACtE,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACnC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACtD,yEAAyE;YACzE,yEAAyE;YACzE,uEAAuE;YACvE,oEAAoE;YACpE,sEAAsE;YACtE,qCAAqC;YACrC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC;gBACtC,IAAI,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC;oBACxB,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;gBACvE,CAAC;gBACD,IAAI,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC;oBAC9B,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC7E,CAAC;YACH,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC;aACD,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YAChE,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACnC,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YACzC,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC;aACD,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YAC/D,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC;YAC/C,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;YACrF,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACzC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACrC,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC;aACD,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE;YAChF,MAAM,QAAQ,GAAG,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnD,MAAM,UAAU,GAAG,mBAAmB,CAAC;gBACrC,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,GAAG,QAAQ;aACZ,CAAC,CAAC;YACH,IAAI,UAAU;gBAAE,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YACpD,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC1C,MAAM,IAAI,KAAK,CAAC,WAAW,MAAM,CAAC,SAAS,+BAA+B,CAAC,CAAC;YAC9E,CAAC;YACD,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;YACzC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3E,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YAClD,IAAI,CAAC;gBACH,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,WAAW,EAAE,GAAG,QAAQ,CAAC;gBACzD,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CACpC;oBACE,GAAG,WAAW;oBACd,IAAI,EAAE,sBAAsB;oBAC5B,GAAG,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAClE,SAAS,EAAE,MAAM,CAAC,SAAS;oBAC3B,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC;oBACxC,WAAW,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC;iBAC7C,EACD;oBACE,MAAM,EAAE,UAAU,CAAC,MAAM;oBACzB,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC;oBAC9E,aAAa,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC;iBAC3E,CACF,CAA4B,CAAC;gBAC9B,MAAM,OAAO,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;gBACxC,IAAI,OAAO;oBAAE,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBACxE,mGAAmG;gBACnG,MAAM,aAAa,GAAG,MAAM,CAAC,aAAsD,CAAC;gBACpF,IAAI,aAAa,EAAE,KAAK,KAAK,eAAe,EAAE,CAAC;oBAC7C,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC;wBACnD,CAAC,CAAE,MAAM,CAAC,aAAmC;wBAC7C,CAAC,CAAC,EAAE,CAAC;oBACP,MAAM,QAAQ,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;oBAChD,IAAI,QAAQ;wBAAE,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;gBAC5E,CAAC;gBACD,wEAAwE;gBACxE,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC7E,MAAM,kBAAkB,GAAG,eAAe,CAAC,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBAC1E,MAAM,YAAY,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;gBACjF,MAAM,UAAU,GAAmB,UAAU,CAAC,MAAM,CAAC,OAAO;oBAC1D,CAAC,CAAC,WAAW;oBACb,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,IAAI,IAAI,CAAC,CAAC;gBACxD,OAAO;oBACL,UAAU;oBACV,KAAK,EAAE;wBACL,SAAS,EAAE;4BACT,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,IAAI;4BAC3B,MAAM;4BACN,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,IAAI;4BACjC,YAAY;4BACZ,aAAa,EAAE,MAAM,CAAC,aAAa,IAAI,IAAI;4BAC3C,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,IAAI;4BAC/B,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,IAAI,IAAI;4BACjD,aAAa,EAAE,MAAM,CAAC,aAAa,IAAI,IAAI;yBAC5C;qBACF;iBACF,CAAC;YACJ,CAAC;oBAAS,CAAC;gBACT,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,UAAU;oBACtD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC,CAAC;aACD,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YACrE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;QAEL,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,UAAU,CAAC,MAAM,CAAC;IAC1B,CAAC;IAEO,KAAK,CAAC,WAAW,CACvB,MAAiC,EACjC,MAA+B;QAE/B,OAAO,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;YAC7B,IAAI,EAAE,iBAAiB,MAAM,EAAE;YAC/B,SAAS,EAAE,MAAM,CAAC,WAAW,CAAC;YAC9B,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC;YACvB,qBAAqB,EAAE,MAAM,CAAC,uBAAuB,CAAC;SACvD,CAAC,CAAqB,CAAC;IAC1B,CAAC;IAEO,iBAAiB,CAAC,IAAY;QACpC,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QAC7C,IAAI,CAAC;YACH,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE;gBAAE,OAAO;QAC3C,CAAC;QAAC,MAAM,CAAC;YACP,uEAAuE;YACvE,wEAAwE;QAC1E,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC/D,CAAC;IAEO,kBAAkB,CAAC,IAAY,EAAE,IAAY;QACnD,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAClE,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,oCAAoC,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,YAAY,CACxB,MAAwB,EACxB,SAAiB,EACjB,IAAY;QAEZ,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE;YACrD,SAAS;YACT,MAAM,EAAE;gBACN,aAAa,EAAE,qBAAqB;gBACpC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;aAChC;SACF,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,WAAW,CACvB,MAAwB,EACxB,SAAiB,EACjB,IAAY;QAEZ,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE;YACrD,SAAS;YACT,MAAM,EAAE;gBACN,aAAa,EAAE,oBAAoB;gBACnC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;aAChC;SACF,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,eAAe,CAC3B,MAAwB,EACxB,SAAiB,EACjB,KAAU;QAEV,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;QACvC,MAAM,OAAO,GAAG,CAAC,KAAK,EAAE,OAAO,IAAI,EAAE,CAAwB,CAAC;QAC9D,IAAI,IAAI,KAAK,iBAAiB,IAAI,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ;YACnE,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAC/D,IACE,IAAI,KAAK,iBAAiB;YAC1B,OAAO,CAAC,OAAO,EAAE,IAAI,KAAK,YAAY;YACtC,OAAO,CAAC,OAAO,EAAE,MAAM,KAAK,SAAS;YACrC,OAAO,CAAC,SAAS,EAAE,IAAI,KAAK,MAAM;YAElC,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,SAAS,EAAE,0CAA0C,CAAC,CAAC;QAC1F,IAAI,IAAI,KAAK,eAAe;YAAE,OAAO;QACrC,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1C,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAoC,CAAC;QAChE,IAAI,CAAC,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,UAAU,CAAC,IAAI,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,QAAQ,EAAE,CAAC;YACrF,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE;gBACrD,SAAS;gBACT,MAAM,EAAE;oBACN,aAAa,EAAE,GAAG,KAAK,UAAU,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,qBAAqB;oBACjF,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE;iBACjD;aACF,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,IAAI,GAAG,KAAK,WAAW,IAAI,IAAI,EAAE,CAAC;YAChC,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,MAAM,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YACjE,IAAI,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACvC,MAAM,GAAG,GAAG,GAAG,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;gBACzD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;YAC5E,CAAC;YACD,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE;gBACrD,SAAS;gBACT,MAAM,EAAE;oBACN,aAAa,EAAE,WAAW;oBAC1B,UAAU,EAAE,EAAE;oBACd,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC;oBACrC,MAAM,EAAE,aAAa;iBACtB;aACF,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,IAAI,GAAG,KAAK,aAAa,IAAI,IAAI,EAAE,CAAC;YAClC,MAAM,GAAG,GAAG,GAAG,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;YACzD,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC1C,MAAM,EAAE,GAAG,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC;YAChF,IAAI,KAAK,EAAE,MAAM,KAAK,CAAC;gBAAE,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACxD,IAAI,CAAC,EAAE;gBAAE,OAAO;YAChB,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE;gBACrD,SAAS;gBACT,MAAM,EAAE,gBAAgB,CAAC,EAAE,EAAE,IAAI,CAAC;aACnC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,cAAc,CAC1B,MAAwB,EACxB,SAAiB,EACjB,GAAQ;QAER,MAAM,OAAO,GAAG,GAAG,EAAE,OAAO,CAAC;QAC7B,MAAM,KAAK,GAAG,OAAO,GAAG,EAAE,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAChE,MAAM,SAAS,GAAU,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;QACpF,MAAM,OAAO,GAAU,EAAE,CAAC;QAC1B,MAAM,YAAY,GAAa,EAAE,CAAC;QAClC,KAAK,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC;YACpD,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5E,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,MAAW,EAAE,WAAmB,EAAE,EAAE,CAAC,CAAC;gBACpE,QAAQ,EAAE,OAAO,WAAW,GAAG,CAAC,EAAE;gBAClC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,IAAI,UAAU,WAAW,GAAG,CAAC,EAAE,CAAC;gBAC1D,IAAI,EAAE,YAAqB;aAC5B,CAAC,CAAC,CAAC;YACJ,qEAAqE;YACrE,yEAAyE;YACzE,sEAAsE;YACtE,yEAAyE;YACzE,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACzB,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,IAAI,YAAY,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;gBACzE,SAAS;YACX,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,EAAE,QAAQ,IAAI,UAAU,CAAC,CAAC;YACvD,MAAM,KAAK,GAAG,QAAQ,EAAE,YAAY,KAAK,IAAI,CAAC;YAC9C,IAAI,KAAK,EAAE,CAAC;gBACV,wEAAwE;gBACxE,sEAAsE;gBACtE,kEAAkE;gBAClE,MAAM,cAAc,GAAa,EAAE,CAAC;gBACpC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;oBAC7B,MAAM,UAAU,GAAG,GAAG,MAAM,CAAC,OAAO,EAAE,cAAc,IAAI,aAAa,CAAC,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,KAAK,CAAC,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;oBAC7H,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE;wBACrD,SAAS;wBACT,MAAM,EAAE;4BACN,aAAa,EAAE,WAAW;4BAC1B,UAAU;4BACV,KAAK,EAAE,GAAG,KAAK,eAAe,MAAM,CAAC,IAAI,IAAI;4BAC7C,IAAI,EAAE,OAAO;4BACb,MAAM,EAAE,SAAS;yBAClB;qBACF,CAAC,CAAC;oBACH,MAAM,QAAQ,GAAG,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE;wBACnF,SAAS;wBACT,QAAQ,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,KAAK,eAAe,MAAM,CAAC,IAAI,IAAI,EAAE;wBACvE,OAAO,EAAE;4BACP,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,YAAqB,EAAE;4BACpF,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,aAAsB,EAAE;yBAChF;qBACF,CAAC,CAAkC,CAAC;oBACrC,MAAM,OAAO,GACX,QAAQ,CAAC,OAAO,CAAC,OAAO,KAAK,UAAU,IAAI,QAAQ,CAAC,OAAO,CAAC,QAAQ,KAAK,SAAS,CAAC;oBACrF,IAAI,OAAO;wBAAE,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBAC9C,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE;wBACrD,SAAS;wBACT,MAAM,EAAE,EAAE,aAAa,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE;qBAC/E,CAAC,CAAC;gBACL,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC;oBACX,WAAW,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC;oBACvC,eAAe,EAAE,cAAc;oBAC/B,SAAS,EAAE,IAAI;iBAChB,CAAC,CAAC;gBACH,SAAS;YACX,CAAC;YACD,MAAM,UAAU,GAAG,GAAG,MAAM,CAAC,OAAO,EAAE,cAAc,IAAI,aAAa,CAAC,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,KAAK,CAAC,EAAE,CAAC;YAC1G,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE;gBACrD,SAAS;gBACT,MAAM,EAAE;oBACN,aAAa,EAAE,WAAW;oBAC1B,UAAU;oBACV,KAAK;oBACL,IAAI,EAAE,OAAO;oBACb,MAAM,EAAE,SAAS;iBAClB;aACF,CAAC,CAAC;YACH,MAAM,QAAQ,GAAG,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE;gBACnF,SAAS;gBACT,QAAQ,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE;gBAC/B,OAAO;aACR,CAAC,CAAkC,CAAC;YACrC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;YACjC,MAAM,QAAQ,GACZ,OAAO,CAAC,OAAO,KAAK,UAAU;gBAC5B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAA4B,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,OAAO,CAAC,QAAQ,CAAC;gBACtF,CAAC,CAAC,SAAS,CAAC;YAChB,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE;gBACrD,SAAS;gBACT,MAAM,EAAE;oBACN,aAAa,EAAE,kBAAkB;oBACjC,UAAU;oBACV,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ;iBAC1C;aACF,CAAC,CAAC;YACH,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAO,CAAC,IAAI,CAAC;oBACX,WAAW,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC;oBACvC,eAAe,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC;oBAChC,SAAS,EAAE,IAAI;iBAChB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,0EAA0E;YAC1E,sEAAsE;YACtE,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,sBAAsB,KAAK,IAAI,CAAC,CAAC,CAAC,0BAA0B,CAAC;YACrF,MAAM,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACrE,MAAM,IAAI,CAAC,YAAY,CACrB,MAAM,EACN,SAAS,EACT,0BAA0B,YAAY,CAAC,MAAM,wFAAwF,IAAI,wBAAwB,OAAO,iFAAiF,CAC1P,CAAC;QACJ,CAAC;QACD,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC;YACvB,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,OAAO,EAAE,cAAc,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE;YACpE,CAAC,CAAC,IAAI,CAAC;IACX,CAAC;IAEO,aAAa,CAAC,SAAiB;QACrC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC;YAC5C,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,SAAS,GAAG,CAAC;gBAAE,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACtE,CAAC;IACH,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EACL,QAAQ,EACR,QAAQ,GAGT,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,GAEhB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACzE,OAAO,EAAE,YAAY,EAAuB,MAAM,WAAW,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpG,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAErE,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,CAAC,gBAAgB,CAAC;AA8BzD;;kFAEkF;AAClF,MAAM,OAAO,SAAS;IAKS,IAAI;IAJhB,UAAU,GAAG,IAAI,GAAG,EAA2B,CAAC;IAChD,aAAa,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC5C,cAAc,GAAG,IAAI,iBAAiB,EAAE,CAAC;IAE1D,YAA6B,IAAsB;oBAAtB,IAAI;IAAqB,CAAC;IAEvD,KAAK,CAAC,KAAK;QACT,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,CAC7B,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAA0C,EAClF,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAA0C,CAClF,CAAC;QACF,MAAM,GAAG,GAAG,GAAG;aACZ,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,WAAW,EAAE,CAAC;aAC9C,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;YACxD,eAAe,EACb,MAAM,CAAC,eAAe,KAAK,oBAAoB;gBAC7C,CAAC,CAAC,MAAM,CAAC,eAAe;gBACxB,CAAC,CAAC,oBAAoB;YAC1B,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,WAAW,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,KAAK,EAAE;YACvF,iBAAiB,EAAE;gBACjB,WAAW,EAAE,IAAI;gBACjB,kBAAkB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE;gBACxE,mBAAmB,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;aACzD;YACD,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC;SACpF,CAAC,CAAC;aACF,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YAC7D,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACnC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE;gBAC3C,GAAG,EAAE,MAAM,CAAC,GAAG;gBACf,qBAAqB,EAAE,MAAM,CAAC,qBAAqB,IAAI,EAAE;aAC1D,CAAC,CAAC;YACH,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC;QACzC,CAAC,CAAC;aACD,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YAC9D,IAAI,MAAM,CAAC,GAAG,IAAI,IAAI;gBAAE,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;YAChF,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;gBACrC,IAAI,EAAE,oBAAoB;gBAC1B,QAAQ,EAAE,MAAM,CAAC,GAAG,IAAI,SAAS;gBACjC,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,SAAS;aACnC,CAAC,CAAkE,CAAC;YACrE,OAAO;gBACL,QAAQ,EAAE,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;oBAClD,SAAS,EAAE,OAAO,CAAC,SAAS;oBAC5B,GAAG,EAAE,OAAO,CAAC,GAAG;oBAChB,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC1D,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACvE,CAAC,CAAC;gBACH,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAChE,CAAC;QACJ,CAAC,CAAC;aACD,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE;YACtE,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACnC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACtD,yEAAyE;YACzE,yEAAyE;YACzE,uEAAuE;YACvE,oEAAoE;YACpE,sEAAsE;YACtE,qCAAqC;YACrC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC;gBACtC,IAAI,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC;oBACxB,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;gBACvE,CAAC;gBACD,IAAI,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC;oBAC9B,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC7E,CAAC;YACH,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC;aACD,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YAChE,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACnC,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YACzC,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC;aACD,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YAC/D,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC;YAC/C,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;YACrF,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACzC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACrC,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC;aACD,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE;YAChF,MAAM,QAAQ,GAAG,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnD,MAAM,UAAU,GAAG,mBAAmB,CAAC;gBACrC,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,GAAG,QAAQ;aACZ,CAAC,CAAC;YACH,IAAI,UAAU;gBAAE,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YACpD,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC1C,MAAM,IAAI,KAAK,CAAC,WAAW,MAAM,CAAC,SAAS,+BAA+B,CAAC,CAAC;YAC9E,CAAC;YACD,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;YACzC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3E,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YAClD,IAAI,CAAC;gBACH,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,WAAW,EAAE,GAAG,QAAQ,CAAC;gBACzD,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CACpC;oBACE,GAAG,WAAW;oBACd,IAAI,EAAE,sBAAsB;oBAC5B,GAAG,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAClE,SAAS,EAAE,MAAM,CAAC,SAAS;oBAC3B,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC;oBACxC,WAAW,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC;iBAC7C,EACD;oBACE,MAAM,EAAE,UAAU,CAAC,MAAM;oBACzB,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC;oBAC9E,aAAa,EAAE,CAAC,GAAG,EAAE,EAAE,CACrB,yBAAyB,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAChE,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAClD;iBACJ,CACF,CAA4B,CAAC;gBAC9B,MAAM,OAAO,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;gBACxC,IAAI,OAAO;oBAAE,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBACxE,mGAAmG;gBACnG,MAAM,aAAa,GAAG,MAAM,CAAC,aAAsD,CAAC;gBACpF,IAAI,aAAa,EAAE,KAAK,KAAK,eAAe,EAAE,CAAC;oBAC7C,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC;wBACnD,CAAC,CAAE,MAAM,CAAC,aAAmC;wBAC7C,CAAC,CAAC,EAAE,CAAC;oBACP,MAAM,QAAQ,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;oBAChD,IAAI,QAAQ;wBAAE,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;gBAC5E,CAAC;gBACD,wEAAwE;gBACxE,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC7E,MAAM,kBAAkB,GAAG,eAAe,CAAC,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBAC1E,MAAM,YAAY,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;gBACjF,MAAM,UAAU,GAAmB,UAAU,CAAC,MAAM,CAAC,OAAO;oBAC1D,CAAC,CAAC,WAAW;oBACb,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,IAAI,IAAI,CAAC,CAAC;gBACxD,OAAO;oBACL,UAAU;oBACV,KAAK,EAAE;wBACL,SAAS,EAAE;4BACT,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,IAAI;4BAC3B,MAAM;4BACN,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,IAAI;4BACjC,YAAY;4BACZ,aAAa,EAAE,MAAM,CAAC,aAAa,IAAI,IAAI;4BAC3C,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,IAAI;4BAC/B,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,IAAI,IAAI;4BACjD,aAAa,EAAE,MAAM,CAAC,aAAa,IAAI,IAAI;yBAC5C;qBACF;iBACF,CAAC;YACJ,CAAC;oBAAS,CAAC;gBACT,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,UAAU;oBACtD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBAC3C,uEAAuE;gBACvE,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACvC,CAAC;QACH,CAAC,CAAC;aACD,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YACrE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;QAEL,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,UAAU,CAAC,MAAM,CAAC;IAC1B,CAAC;IAEO,KAAK,CAAC,WAAW,CACvB,MAAiC,EACjC,MAA+B;QAE/B,OAAO,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;YAC7B,IAAI,EAAE,iBAAiB,MAAM,EAAE;YAC/B,SAAS,EAAE,MAAM,CAAC,WAAW,CAAC;YAC9B,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC;YACvB,qBAAqB,EAAE,MAAM,CAAC,uBAAuB,CAAC;SACvD,CAAC,CAAqB,CAAC;IAC1B,CAAC;IAEO,iBAAiB,CAAC,IAAY;QACpC,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QAC7C,IAAI,CAAC;YACH,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE;gBAAE,OAAO;QAC3C,CAAC;QAAC,MAAM,CAAC;YACP,uEAAuE;YACvE,wEAAwE;QAC1E,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC/D,CAAC;IAEO,kBAAkB,CAAC,IAAY,EAAE,IAAY;QACnD,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAClE,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,oCAAoC,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,YAAY,CACxB,MAAwB,EACxB,SAAiB,EACjB,IAAY;QAEZ,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE;YACrD,SAAS;YACT,MAAM,EAAE;gBACN,aAAa,EAAE,qBAAqB;gBACpC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;aAChC;SACF,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,WAAW,CACvB,MAAwB,EACxB,SAAiB,EACjB,IAAY;QAEZ,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE;YACrD,SAAS;YACT,MAAM,EAAE;gBACN,aAAa,EAAE,oBAAoB;gBACnC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;aAChC;SACF,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,eAAe,CAC3B,MAAwB,EACxB,SAAiB,EACjB,KAAU;QAEV,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;QACvC,MAAM,OAAO,GAAG,CAAC,KAAK,EAAE,OAAO,IAAI,EAAE,CAAwB,CAAC;QAC9D,IAAI,IAAI,KAAK,iBAAiB,IAAI,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ;YACnE,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAC/D,IACE,IAAI,KAAK,iBAAiB;YAC1B,OAAO,CAAC,OAAO,EAAE,IAAI,KAAK,YAAY;YACtC,OAAO,CAAC,OAAO,EAAE,MAAM,KAAK,SAAS;YACrC,OAAO,CAAC,SAAS,EAAE,IAAI,KAAK,MAAM;YAElC,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,SAAS,EAAE,0CAA0C,CAAC,CAAC;QAC1F,IAAI,IAAI,KAAK,eAAe;YAAE,OAAO;QACrC,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1C,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAoC,CAAC;QAChE,oFAAoF;QACpF,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;QAClC,MAAM,KAAK,GAAG,OAAO,IAAI,EAAE,CAAC,QAAQ,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAE,IAAI,CAAC,QAAQ,CAAY,CAAC,CAAC,CAAC,IAAI,CAAC;QACvF,MAAM,OAAO,GAAG,GAAG,SAAS,KAAK,KAAK,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;QAC1E,IAAI,CAAC,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,UAAU,CAAC,IAAI,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,QAAQ,EAAE,CAAC;YACrF,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE;gBACrD,SAAS;gBACT,MAAM,EAAE;oBACN,aAAa,EAAE,GAAG,KAAK,UAAU,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,qBAAqB;oBACjF,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE;iBACjD;aACF,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,IAAI,GAAG,KAAK,WAAW,IAAI,IAAI,EAAE,CAAC;YAChC,MAAM,EAAE,GAAG,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACtF,IAAI,KAAK,KAAK,IAAI;gBAChB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;YACpF,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE;gBACrD,SAAS;gBACT,MAAM,EAAE;oBACN,aAAa,EAAE,WAAW;oBAC1B,UAAU,EAAE,EAAE;oBACd,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC;oBACrC,MAAM,EAAE,aAAa;iBACtB;aACF,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAChE,IAAI,MAAM;YAAE,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;QAC1F,IAAI,GAAG,KAAK,aAAa,IAAI,IAAI,EAAE,CAAC;YAClC,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC9C,MAAM,EAAE,GAAG,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACzE,IAAI,KAAK,EAAE,MAAM,KAAK,CAAC;gBAAE,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC5D,IAAI,CAAC,EAAE;gBAAE,OAAO;YAChB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;YAChD,MAAM,OAAO,GAAG,gBAAgB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;YAC3C,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;QACzF,CAAC;IACH,CAAC;IAEO,aAAa,CAAC,SAAiB;QACrC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACpC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC;YAC5C,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,SAAS,IAAI,CAAC;gBAAE,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;CACF"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import * as acp from "@agentclientprotocol/sdk";
|
|
2
|
+
/**
|
|
3
|
+
* Collect answers to one pending interaction through ACP permission requests.
|
|
4
|
+
* Choice and multi-select questions are asked inline (multi-select as one
|
|
5
|
+
* include/skip round per option); a title and option names cannot carry a
|
|
6
|
+
* question's header or its options' descriptions, so each prompt also carries
|
|
7
|
+
* them as tool-call text content, every option of the question in every round.
|
|
8
|
+
* ACP cannot collect free text. Every question left without an answer (free
|
|
9
|
+
* text, every option skipped, dismissed) is named in one turn-text message
|
|
10
|
+
* instead of being skipped silently: with nothing chosen no answer is sent and
|
|
11
|
+
* a blocking question set keeps the agent waiting, while an async one leaves
|
|
12
|
+
* the agent working with its question still open; once some questions are
|
|
13
|
+
* answered, the message says those answers will be submitted as a partial
|
|
14
|
+
* answer, which closes the whole set if the daemon accepts it. The message goes
|
|
15
|
+
* out before the caller submits, so it cannot report the outcome. `ctx.signal`
|
|
16
|
+
* (the question resolved elsewhere, the caller cancelled or the run ended)
|
|
17
|
+
* cancels the open permission request and ends the round without waiting for the
|
|
18
|
+
* client's reply: its open call closes as failed, nothing further is asked, and
|
|
19
|
+
* it returns no answer and sends no message. A permission
|
|
20
|
+
* request that fails otherwise answered nothing: its call is closed as failed,
|
|
21
|
+
* still showing the question and saying it stays open, and the round fails with
|
|
22
|
+
* that error (with the close's own error too, if the close could not be sent).
|
|
23
|
+
*/
|
|
24
|
+
export declare function requestInteractionAnswers(client: acp.AgentContext, sessionId: string, ctx: any, say: (text: string) => Promise<void>): Promise<any | null>;
|
|
25
|
+
//# sourceMappingURL=interaction-answers.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"interaction-answers.d.ts","sourceRoot":"","sources":["../src/interaction-answers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAKhD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,GAAG,CAAC,YAAY,EACxB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GACnC,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CA+FrB"}
|
|
@@ -0,0 +1,220 @@
|
|
|
1
|
+
import * as acp from "@agentclientprotocol/sdk";
|
|
2
|
+
/**
|
|
3
|
+
* Collect answers to one pending interaction through ACP permission requests.
|
|
4
|
+
* Choice and multi-select questions are asked inline (multi-select as one
|
|
5
|
+
* include/skip round per option); a title and option names cannot carry a
|
|
6
|
+
* question's header or its options' descriptions, so each prompt also carries
|
|
7
|
+
* them as tool-call text content, every option of the question in every round.
|
|
8
|
+
* ACP cannot collect free text. Every question left without an answer (free
|
|
9
|
+
* text, every option skipped, dismissed) is named in one turn-text message
|
|
10
|
+
* instead of being skipped silently: with nothing chosen no answer is sent and
|
|
11
|
+
* a blocking question set keeps the agent waiting, while an async one leaves
|
|
12
|
+
* the agent working with its question still open; once some questions are
|
|
13
|
+
* answered, the message says those answers will be submitted as a partial
|
|
14
|
+
* answer, which closes the whole set if the daemon accepts it. The message goes
|
|
15
|
+
* out before the caller submits, so it cannot report the outcome. `ctx.signal`
|
|
16
|
+
* (the question resolved elsewhere, the caller cancelled or the run ended)
|
|
17
|
+
* cancels the open permission request and ends the round without waiting for the
|
|
18
|
+
* client's reply: its open call closes as failed, nothing further is asked, and
|
|
19
|
+
* it returns no answer and sends no message. A permission
|
|
20
|
+
* request that fails otherwise answered nothing: its call is closed as failed,
|
|
21
|
+
* still showing the question and saying it stays open, and the round fails with
|
|
22
|
+
* that error (with the close's own error too, if the close could not be sent).
|
|
23
|
+
*/
|
|
24
|
+
export async function requestInteractionAnswers(client, sessionId, ctx, say) {
|
|
25
|
+
const request = ctx?.request;
|
|
26
|
+
const runId = typeof ctx?.run_id === "string" ? ctx.run_id : "";
|
|
27
|
+
const signal = ctx?.signal instanceof AbortSignal ? ctx.signal : undefined;
|
|
28
|
+
const isAsync = request?.delivery === "async";
|
|
29
|
+
const questions = Array.isArray(request?.questions) ? request.questions : [];
|
|
30
|
+
const answers = [];
|
|
31
|
+
const left = [];
|
|
32
|
+
for (const [index, question] of questions.entries()) {
|
|
33
|
+
if (signal?.aborted)
|
|
34
|
+
return null;
|
|
35
|
+
const rawOptions = Array.isArray(question?.options) ? question.options : [];
|
|
36
|
+
const options = rawOptions.map((option, optionIndex) => ({
|
|
37
|
+
optionId: `opt-${optionIndex + 1}`,
|
|
38
|
+
name: String(option?.label ?? `option ${optionIndex + 1}`),
|
|
39
|
+
description: typeof option?.description === "string" ? option.description : null,
|
|
40
|
+
}));
|
|
41
|
+
const title = String(question?.question ?? "Question");
|
|
42
|
+
if (options.length === 0) {
|
|
43
|
+
left.push({
|
|
44
|
+
question: typeof question?.header === "string" && question.header
|
|
45
|
+
? `${question.header}\n\n${title}`
|
|
46
|
+
: title,
|
|
47
|
+
reason: "free text, which ACP cannot collect",
|
|
48
|
+
});
|
|
49
|
+
continue;
|
|
50
|
+
}
|
|
51
|
+
const prompt = (toolCallId, toolTitle, choices, answered) => ask(client, sessionId, runId, { toolCallId, title: toolTitle, content: questionContent(question, options, isAsync) }, choices, answered, signal);
|
|
52
|
+
const toolCallId = `${String(request?.interaction_id ?? "interaction")}:${String(question?.id ?? index)}`;
|
|
53
|
+
if (question?.multi_select === true) {
|
|
54
|
+
// One include/skip round per option, so the client can pick MORE THAN ONE
|
|
55
|
+
// label (a single requestPermission returns exactly one optionId). Each
|
|
56
|
+
// round shows every option, so no choice is made without its siblings.
|
|
57
|
+
const selectedLabels = [];
|
|
58
|
+
for (const option of options) {
|
|
59
|
+
const include = await prompt(`${toolCallId}:${option.optionId}`, `${title} — include "${option.name}"?`, [
|
|
60
|
+
{ optionId: "include", name: `Include ${option.name}`, kind: "allow_once" },
|
|
61
|
+
{ optionId: "skip", name: `Skip ${option.name}`, kind: "reject_once" },
|
|
62
|
+
], () => true);
|
|
63
|
+
// Closed during this option: the rest of the round must not be asked.
|
|
64
|
+
if (signal?.aborted)
|
|
65
|
+
return null;
|
|
66
|
+
if (include === "include")
|
|
67
|
+
selectedLabels.push(option.name);
|
|
68
|
+
}
|
|
69
|
+
if (selectedLabels.length === 0)
|
|
70
|
+
left.push({ question: title, reason: "every option skipped" });
|
|
71
|
+
else
|
|
72
|
+
answers.push({
|
|
73
|
+
question_id: String(question?.id ?? ""),
|
|
74
|
+
selected_labels: selectedLabels,
|
|
75
|
+
free_text: null,
|
|
76
|
+
});
|
|
77
|
+
continue;
|
|
78
|
+
}
|
|
79
|
+
const picked = await prompt(toolCallId, title, options.map(({ optionId, name }) => ({ optionId, name, kind: "allow_once" })), (picked) => options.some((option) => option.optionId === picked));
|
|
80
|
+
const selected = options.find((option) => option.optionId === picked);
|
|
81
|
+
if (!selected)
|
|
82
|
+
left.push({ question: title, reason: "dismissed without a choice" });
|
|
83
|
+
else
|
|
84
|
+
answers.push({
|
|
85
|
+
question_id: String(question?.id ?? ""),
|
|
86
|
+
selected_labels: [selected.name],
|
|
87
|
+
free_text: null,
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
// A closed round's question was resolved elsewhere or its run ended.
|
|
91
|
+
if (signal?.aborted)
|
|
92
|
+
return null;
|
|
93
|
+
if (left.length > 0)
|
|
94
|
+
await say(leftOutMessage(left, answers.length > 0, runId, ctx?.timeoutAt, isAsync));
|
|
95
|
+
return answers.length > 0
|
|
96
|
+
? { interaction_id: String(request?.interaction_id ?? ""), answers }
|
|
97
|
+
: null;
|
|
98
|
+
}
|
|
99
|
+
/** One permission round as a pending tool call; the selected option id, if any.
|
|
100
|
+
* The tool call ends `completed` when `answered` accepts the pick while the
|
|
101
|
+
* round is still open. A closed round opens no call and sends no request once
|
|
102
|
+
* it knows, and a call it did open ends `failed`. */
|
|
103
|
+
async function ask(client, sessionId, runId, call, options, answered, signal) {
|
|
104
|
+
if (signal?.aborted)
|
|
105
|
+
return null;
|
|
106
|
+
await client.notify(acp.methods.client.session.update, {
|
|
107
|
+
sessionId,
|
|
108
|
+
update: { sessionUpdate: "tool_call", ...call, kind: "other", status: "pending" },
|
|
109
|
+
});
|
|
110
|
+
let picked = null;
|
|
111
|
+
if (!signal?.aborted) {
|
|
112
|
+
try {
|
|
113
|
+
const response = await untilRoundCloses(client.request(acp.methods.client.session.requestPermission, { sessionId, toolCall: call, options }, signal ? { cancellationSignal: signal } : undefined), signal);
|
|
114
|
+
const outcome = response?.outcome;
|
|
115
|
+
picked = outcome?.outcome === "selected" ? outcome.optionId : null;
|
|
116
|
+
}
|
|
117
|
+
catch (error) {
|
|
118
|
+
// A cancelled request settles with the client's cancellation below. Any
|
|
119
|
+
// other failure answered nothing: close the call as failed where the
|
|
120
|
+
// connection still carries updates, then fail with the request's error,
|
|
121
|
+
// and with the close's too when that could not be sent either.
|
|
122
|
+
if (!signal?.aborted) {
|
|
123
|
+
try {
|
|
124
|
+
await client.notify(acp.methods.client.session.update, {
|
|
125
|
+
sessionId,
|
|
126
|
+
update: {
|
|
127
|
+
sessionUpdate: "tool_call_update",
|
|
128
|
+
toolCallId: call.toolCallId,
|
|
129
|
+
status: "failed",
|
|
130
|
+
content: [...call.content, textContent(failedPromptText(runId, error))],
|
|
131
|
+
},
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
catch (closeError) {
|
|
135
|
+
throw new AggregateError([error, closeError], `permission request failed (${errorText(error)}) and its prompt could not be closed (${errorText(closeError)})`);
|
|
136
|
+
}
|
|
137
|
+
throw error;
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
// A pick that crossed the cancellation is dropped with the round, so the call
|
|
142
|
+
// cannot claim it was answered.
|
|
143
|
+
const roundClosed = signal?.aborted === true;
|
|
144
|
+
await client.notify(acp.methods.client.session.update, {
|
|
145
|
+
sessionId,
|
|
146
|
+
update: {
|
|
147
|
+
sessionUpdate: "tool_call_update",
|
|
148
|
+
toolCallId: call.toolCallId,
|
|
149
|
+
status: !roundClosed && answered(picked) ? "completed" : "failed",
|
|
150
|
+
},
|
|
151
|
+
});
|
|
152
|
+
return picked;
|
|
153
|
+
}
|
|
154
|
+
/** The SDK's cancellation only sends `$/cancel_request`: the request stays open
|
|
155
|
+
* until the client replies, and a client may never reply to a stale prompt. */
|
|
156
|
+
function untilRoundCloses(request, signal) {
|
|
157
|
+
if (!signal)
|
|
158
|
+
return request;
|
|
159
|
+
return new Promise((resolve, reject) => {
|
|
160
|
+
const closed = () => resolve(null);
|
|
161
|
+
if (signal.aborted)
|
|
162
|
+
closed();
|
|
163
|
+
else
|
|
164
|
+
signal.addEventListener("abort", closed, { once: true });
|
|
165
|
+
const settled = () => signal.removeEventListener("abort", closed);
|
|
166
|
+
request.then((value) => {
|
|
167
|
+
settled();
|
|
168
|
+
resolve(value);
|
|
169
|
+
}, (error) => {
|
|
170
|
+
settled();
|
|
171
|
+
reject(error);
|
|
172
|
+
});
|
|
173
|
+
});
|
|
174
|
+
}
|
|
175
|
+
/** The question in full as text: its header, its text and every option with
|
|
176
|
+
* its description; an async question also says the agent keeps working. */
|
|
177
|
+
function questionContent(question, options, isAsync = false) {
|
|
178
|
+
const lines = [];
|
|
179
|
+
if (isAsync)
|
|
180
|
+
lines.push("The agent keeps working while you answer.", "");
|
|
181
|
+
if (typeof question?.header === "string" && question.header)
|
|
182
|
+
lines.push(question.header, "");
|
|
183
|
+
lines.push(String(question?.question ?? ""), "");
|
|
184
|
+
for (const option of options)
|
|
185
|
+
lines.push(`- ${option.name}${option.description ? `: ${option.description}` : ""}`);
|
|
186
|
+
return [textContent(lines.join("\n"))];
|
|
187
|
+
}
|
|
188
|
+
function textContent(text) {
|
|
189
|
+
return { type: "content", content: { type: "text", text } };
|
|
190
|
+
}
|
|
191
|
+
function errorText(error) {
|
|
192
|
+
return error instanceof Error ? error.message : String(error);
|
|
193
|
+
}
|
|
194
|
+
/** Where a question this surface could not settle can still be answered. */
|
|
195
|
+
function answerElsewhere(runId) {
|
|
196
|
+
const follow = runId ? `\`claudexor follow ${runId}\`` : "`claudexor follow <run>`";
|
|
197
|
+
return `${follow} or POST /v2/runs/:id/interactions/:id/answer`;
|
|
198
|
+
}
|
|
199
|
+
/** The closing text of a prompt whose permission request failed. */
|
|
200
|
+
function failedPromptText(runId, error) {
|
|
201
|
+
return `This question could not be asked here: the permission request failed (${errorText(error)}). Nothing was answered or declined, and it stays open: answer it with ${answerElsewhere(runId)}.`;
|
|
202
|
+
}
|
|
203
|
+
function leftOutMessage(left, partial, runId, timeoutAt, isAsync) {
|
|
204
|
+
const list = left.map((item, i) => `${i + 1}. ${item.question} (${item.reason})`).join("\n");
|
|
205
|
+
const elsewhere = answerElsewhere(runId);
|
|
206
|
+
const expiry = typeof timeoutAt === "string"
|
|
207
|
+
? isAsync
|
|
208
|
+
? ` If nobody answers by ${timeoutAt}, it closes and nothing is sent to the agent.`
|
|
209
|
+
: ` If nobody answers by ${timeoutAt}, it is declined automatically and the model continues with stated assumptions.`
|
|
210
|
+
: timeoutAt === null
|
|
211
|
+
? " It has no automatic expiry."
|
|
212
|
+
: "";
|
|
213
|
+
// Said before the answer is submitted, so it states the effect conditionally.
|
|
214
|
+
if (partial)
|
|
215
|
+
return `The chosen answers will now be submitted as a partial answer. Once it is accepted, it closes this question set, and these question(s) can no longer be answered in this run:\n\n${list}\n\nUntil then the set stays pending and can be answered with ${elsewhere}.${expiry}`;
|
|
216
|
+
if (isAsync)
|
|
217
|
+
return `No answer was sent. The agent keeps working, and its question(s) stay open:\n\n${list}\n\nAnswer them with ${elsewhere} (ACP presents choices only).${expiry}`;
|
|
218
|
+
return `No answer was sent, so this run stays paused on its question(s):\n\n${list}\n\nAnswer them with ${elsewhere} (ACP presents choices only).${expiry}`;
|
|
219
|
+
}
|
|
220
|
+
//# sourceMappingURL=interaction-answers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"interaction-answers.js","sourceRoot":"","sources":["../src/interaction-answers.ts"],"names":[],"mappings":"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"}
|
package/dist/tool-update.d.ts
CHANGED
|
@@ -1,11 +1,25 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The run and try a stored run event names (`run_id`, then the harness
|
|
3
|
+
* payload's `attempt_id` and `session_id`), each part URI-encoded and joined;
|
|
4
|
+
* "" for an event without them (a custom runner's).
|
|
5
|
+
*/
|
|
6
|
+
export declare function acpToolOwner(event: unknown): string;
|
|
7
|
+
/**
|
|
8
|
+
* The ACP call id of a native tool use (X2). ACP needs a call id unique in its
|
|
9
|
+
* session, while a native id is unique only in the try that issued it: two tries
|
|
10
|
+
* of a race, or two turns, may repeat it. So the id names its owner, and the
|
|
11
|
+
* same call keeps it from open through close to refinement. An event without
|
|
12
|
+
* an owner keeps the bare native id.
|
|
13
|
+
*/
|
|
14
|
+
export declare function acpToolCallId(owner: string, useId: string): string;
|
|
1
15
|
/**
|
|
2
16
|
* The ACP `tool_call_update` for one normalized tool result. ACP v1 has two
|
|
3
17
|
* terminal tool statuses: `completed` ("completed successfully") and `failed`.
|
|
4
|
-
* A command
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
18
|
+
* A command handed to a background shell, timed out, or in an unknown state did
|
|
19
|
+
* not complete successfully and no later frame is guaranteed for its call, so
|
|
20
|
+
* it closes as `failed`, with the typed state as the call's text content and
|
|
21
|
+
* `_meta.claudexor.commandOutcome` (#450). `in_progress` would leave the client
|
|
22
|
+
* waiting for an update that may never come.
|
|
9
23
|
*/
|
|
10
24
|
export declare function toolResultUpdate(toolCallId: string, tool: Record<string, unknown>): {
|
|
11
25
|
sessionUpdate: "tool_call_update";
|
|
@@ -24,4 +38,47 @@ export declare function toolResultUpdate(toolCallId: string, tool: Record<string
|
|
|
24
38
|
};
|
|
25
39
|
} | undefined;
|
|
26
40
|
};
|
|
41
|
+
/**
|
|
42
|
+
* #546: the calls of each ACP session that closed as a background handoff, so a
|
|
43
|
+
* later `command_outcome_refined` status of the same try reaches exactly that
|
|
44
|
+
* existing call, once, and replaces its stale "completion not observed". The
|
|
45
|
+
* server forgets them when the turn that opened them ends. In the ACP schema all
|
|
46
|
+
* `tool_call_update` fields but the id are optional ("only changed fields need
|
|
47
|
+
* to be included") and `content` is "Replace the content collection". So the
|
|
48
|
+
* update carries content and `_meta` alone: omitting `status` keeps the terminal
|
|
49
|
+
* `failed`, because a report without an exit code is no `completed` success, and
|
|
50
|
+
* nothing is reopened or sent as a second result.
|
|
51
|
+
*/
|
|
52
|
+
export declare class AcpClosedHandoffs {
|
|
53
|
+
private readonly calls;
|
|
54
|
+
/** Remember a call `toolResultUpdate` closed as a background handoff. */
|
|
55
|
+
closed(sessionId: string, toolCallId: string, tool: Record<string, unknown>): void;
|
|
56
|
+
/** The partial update for a report naming a handoff its own try closed in this
|
|
57
|
+
* session, else null. `event` is the run event; its payload is the report. */
|
|
58
|
+
refinement(sessionId: string, event: unknown): {
|
|
59
|
+
sessionUpdate: "tool_call_update";
|
|
60
|
+
toolCallId: string;
|
|
61
|
+
content: {
|
|
62
|
+
type: "content";
|
|
63
|
+
content: {
|
|
64
|
+
type: "text";
|
|
65
|
+
text: string;
|
|
66
|
+
};
|
|
67
|
+
}[];
|
|
68
|
+
_meta: {
|
|
69
|
+
claudexor: {
|
|
70
|
+
commandOutcome: {
|
|
71
|
+
state: "backgrounded" | "completion_reported" | "exited" | "timed_out" | "unknown";
|
|
72
|
+
signal?: string | undefined;
|
|
73
|
+
timeout_ms?: number | undefined;
|
|
74
|
+
background_reason?: "requested" | "timeout" | undefined;
|
|
75
|
+
shell_id?: string | undefined;
|
|
76
|
+
pid?: number | undefined;
|
|
77
|
+
completion_status?: "aborted" | "error" | "success" | undefined;
|
|
78
|
+
};
|
|
79
|
+
};
|
|
80
|
+
};
|
|
81
|
+
} | null;
|
|
82
|
+
drop(sessionId: string): void;
|
|
83
|
+
}
|
|
27
84
|
//# sourceMappingURL=tool-update.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-update.d.ts","sourceRoot":"","sources":["../src/tool-update.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tool-update.d.ts","sourceRoot":"","sources":["../src/tool-update.ts"],"names":[],"mappings":"AAUA;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CASnD;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAElE;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;mBAI/D,kBAAkB;;;;cA3C3B,SAAS;;kBAA4B,MAAM;;;;;;YAkDQ,cAAc;;;EAG1E;AAED;;;;;;;;;;GAUG;AACH,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;IAE3C,yEAAyE;IACzE,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAGjF;IAED;kFAC8E;IAC9E,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;uBAMzB,kBAAkB;;;kBAnF7B,SAAS;;sBAA4B,MAAM;;;;;YAsFtC,SAAS;gBAAI,cAAc;;;;;;;;;;;aAEvC;IAED,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAE5B;CACF"}
|
package/dist/tool-update.js
CHANGED
|
@@ -1,12 +1,37 @@
|
|
|
1
|
-
import { commandOutcomeLabel, commandOutcomeUnconfirmed } from "@claudexor/schema";
|
|
1
|
+
import { commandOutcomeLabel, commandOutcomeRefinement, commandOutcomeUnconfirmed, } from "@claudexor/schema";
|
|
2
|
+
const textContent = (text) => [
|
|
3
|
+
{ type: "content", content: { type: "text", text } },
|
|
4
|
+
];
|
|
5
|
+
/**
|
|
6
|
+
* The run and try a stored run event names (`run_id`, then the harness
|
|
7
|
+
* payload's `attempt_id` and `session_id`), each part URI-encoded and joined;
|
|
8
|
+
* "" for an event without them (a custom runner's).
|
|
9
|
+
*/
|
|
10
|
+
export function acpToolOwner(event) {
|
|
11
|
+
const row = (event ?? {});
|
|
12
|
+
return [row.run_id, row.payload?.attempt_id, row.payload?.session_id]
|
|
13
|
+
.filter((part) => typeof part === "string" && part.length > 0)
|
|
14
|
+
.map(encodeURIComponent)
|
|
15
|
+
.join("/");
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* The ACP call id of a native tool use (X2). ACP needs a call id unique in its
|
|
19
|
+
* session, while a native id is unique only in the try that issued it: two tries
|
|
20
|
+
* of a race, or two turns, may repeat it. So the id names its owner, and the
|
|
21
|
+
* same call keeps it from open through close to refinement. An event without
|
|
22
|
+
* an owner keeps the bare native id.
|
|
23
|
+
*/
|
|
24
|
+
export function acpToolCallId(owner, useId) {
|
|
25
|
+
return owner ? `${owner}/${encodeURIComponent(useId)}` : useId;
|
|
26
|
+
}
|
|
2
27
|
/**
|
|
3
28
|
* The ACP `tool_call_update` for one normalized tool result. ACP v1 has two
|
|
4
29
|
* terminal tool statuses: `completed` ("completed successfully") and `failed`.
|
|
5
|
-
* A command
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
30
|
+
* A command handed to a background shell, timed out, or in an unknown state did
|
|
31
|
+
* not complete successfully and no later frame is guaranteed for its call, so
|
|
32
|
+
* it closes as `failed`, with the typed state as the call's text content and
|
|
33
|
+
* `_meta.claudexor.commandOutcome` (#450). `in_progress` would leave the client
|
|
34
|
+
* waiting for an update that may never come.
|
|
10
35
|
*/
|
|
11
36
|
export function toolResultUpdate(toolCallId, tool) {
|
|
12
37
|
const outcome = tool["command_outcome"];
|
|
@@ -18,11 +43,49 @@ export function toolResultUpdate(toolCallId, tool) {
|
|
|
18
43
|
? "failed"
|
|
19
44
|
: "completed",
|
|
20
45
|
...(label
|
|
21
|
-
? {
|
|
22
|
-
content: [{ type: "content", content: { type: "text", text: label } }],
|
|
23
|
-
_meta: { claudexor: { commandOutcome: outcome } },
|
|
24
|
-
}
|
|
46
|
+
? { content: textContent(label), _meta: { claudexor: { commandOutcome: outcome } } }
|
|
25
47
|
: {}),
|
|
26
48
|
};
|
|
27
49
|
}
|
|
50
|
+
/**
|
|
51
|
+
* #546: the calls of each ACP session that closed as a background handoff, so a
|
|
52
|
+
* later `command_outcome_refined` status of the same try reaches exactly that
|
|
53
|
+
* existing call, once, and replaces its stale "completion not observed". The
|
|
54
|
+
* server forgets them when the turn that opened them ends. In the ACP schema all
|
|
55
|
+
* `tool_call_update` fields but the id are optional ("only changed fields need
|
|
56
|
+
* to be included") and `content` is "Replace the content collection". So the
|
|
57
|
+
* update carries content and `_meta` alone: omitting `status` keeps the terminal
|
|
58
|
+
* `failed`, because a report without an exit code is no `completed` success, and
|
|
59
|
+
* nothing is reopened or sent as a second result.
|
|
60
|
+
*/
|
|
61
|
+
export class AcpClosedHandoffs {
|
|
62
|
+
calls = new Set();
|
|
63
|
+
/** Remember a call `toolResultUpdate` closed as a background handoff. */
|
|
64
|
+
closed(sessionId, toolCallId, tool) {
|
|
65
|
+
const outcome = tool["command_outcome"];
|
|
66
|
+
if (outcome?.state === "backgrounded")
|
|
67
|
+
this.calls.add(`${sessionId}\0${toolCallId}`);
|
|
68
|
+
}
|
|
69
|
+
/** The partial update for a report naming a handoff its own try closed in this
|
|
70
|
+
* session, else null. `event` is the run event; its payload is the report. */
|
|
71
|
+
refinement(sessionId, event) {
|
|
72
|
+
const refined = commandOutcomeRefinement(event?.payload);
|
|
73
|
+
if (!refined)
|
|
74
|
+
return null;
|
|
75
|
+
const toolCallId = acpToolCallId(acpToolOwner(event), refined.useId);
|
|
76
|
+
if (!this.calls.delete(`${sessionId}\0${toolCallId}`))
|
|
77
|
+
return null;
|
|
78
|
+
return {
|
|
79
|
+
sessionUpdate: "tool_call_update",
|
|
80
|
+
toolCallId,
|
|
81
|
+
content: textContent(commandOutcomeLabel(refined.outcome) ?? ""),
|
|
82
|
+
_meta: { claudexor: { commandOutcome: refined.outcome } },
|
|
83
|
+
};
|
|
84
|
+
}
|
|
85
|
+
drop(sessionId) {
|
|
86
|
+
for (const key of this.calls)
|
|
87
|
+
if (key.startsWith(`${sessionId}\0`))
|
|
88
|
+
this.calls.delete(key);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
28
91
|
//# sourceMappingURL=tool-update.js.map
|
package/dist/tool-update.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-update.js","sourceRoot":"","sources":["../src/tool-update.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"tool-update.js","sourceRoot":"","sources":["../src/tool-update.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@claudexor/acp-server",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "6.0.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"description": "Official-SDK ACP projection over daemon-owned Claudexor threads and runs.",
|
|
6
6
|
"type": "module",
|
|
@@ -17,8 +17,8 @@
|
|
|
17
17
|
],
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"@agentclientprotocol/sdk": "1.5.1",
|
|
20
|
-
"@claudexor/
|
|
21
|
-
"@claudexor/
|
|
20
|
+
"@claudexor/schema": "6.0.0",
|
|
21
|
+
"@claudexor/util": "6.0.0"
|
|
22
22
|
},
|
|
23
23
|
"repository": {
|
|
24
24
|
"type": "git",
|