clanka 0.22.6 → 0.23.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/Acp.js +1 -1
- package/dist/Acp.test.js +7 -7
- package/dist/Agent.js +6 -6
- package/dist/Agent.test.js +1 -1
- package/dist/AgentCallerConfig.test.js +11 -10
- package/dist/AgentCallerConfig.test.js.map +1 -1
- package/dist/AgentEnvironment.test.js +2 -2
- package/dist/AgentExecutor.d.ts +25 -25
- package/dist/AgentExecutor.js +9 -9
- package/dist/AgentExecutor.test.js +13 -13
- package/dist/AgentImage.test.js +4 -4
- package/dist/AgentSubagents.test.js +11 -11
- package/dist/AgentTools.d.ts +78 -78
- package/dist/AgentTools.d.ts.map +1 -1
- package/dist/AgentTools.js +8 -8
- package/dist/McpServers.test.js +1 -1
- package/dist/bin/cli.mjs +19 -19
- package/dist/bin/cli.mjs.map +1 -1
- package/package.json +1 -1
- package/src/Acp.test.ts +7 -7
- package/src/Acp.ts +1 -1
- package/src/Agent.test.ts +1 -1
- package/src/Agent.ts +6 -6
- package/src/AgentCallerConfig.test.ts +14 -10
- package/src/AgentEnvironment.test.ts +2 -2
- package/src/AgentExecutor.test.ts +13 -13
- package/src/AgentExecutor.ts +16 -16
- package/src/AgentImage.test.ts +4 -4
- package/src/AgentSubagents.test.ts +12 -12
- package/src/AgentTools.ts +11 -11
- package/src/McpServers.test.ts +1 -1
package/dist/Acp.js
CHANGED
|
@@ -618,7 +618,7 @@ export const make = Effect.fnUntraced(function* (options) {
|
|
|
618
618
|
return update(session.id, {
|
|
619
619
|
sessionUpdate: announced ? "tool_call_update" : "tool_call",
|
|
620
620
|
toolCallId: `subagent-${part.id}`,
|
|
621
|
-
title: `
|
|
621
|
+
title: `subagent: ${part.prompt.replace(/\s+/g, " ").trim().slice(0, 120)}`,
|
|
622
622
|
kind: "think",
|
|
623
623
|
status: "in_progress",
|
|
624
624
|
rawInput: { prompt: part.prompt },
|
package/dist/Acp.test.js
CHANGED
|
@@ -415,7 +415,7 @@ describe("Acp", () => {
|
|
|
415
415
|
assert.strictEqual(jobs[0].status, "completed");
|
|
416
416
|
assert.strictEqual(jobs[0].rawOutput, "built\n");
|
|
417
417
|
}))));
|
|
418
|
-
it.effect("reports subagents with a
|
|
418
|
+
it.effect("reports subagents with a subagent prompt preview", () => withStore(Effect.scoped(Effect.gen(function* () {
|
|
419
419
|
const prompt = "Inspect the repository\nSummarize the findings " + "x".repeat(200);
|
|
420
420
|
const summary = "First finding\nSecond finding\n";
|
|
421
421
|
let calls = 0;
|
|
@@ -424,11 +424,11 @@ describe("Acp", () => {
|
|
|
424
424
|
type: "tool-call",
|
|
425
425
|
id: "call-1",
|
|
426
426
|
name: "execute",
|
|
427
|
-
params: { script: "await
|
|
427
|
+
params: { script: "await subagent()" },
|
|
428
428
|
})
|
|
429
429
|
: assistantSays(summary), {
|
|
430
430
|
...executor,
|
|
431
|
-
execute: ({ agentTasks, environment }) => Stream.fromEffect(agentTasks.
|
|
431
|
+
execute: ({ agentTasks, environment }) => Stream.fromEffect(agentTasks.subagent({
|
|
432
432
|
id: "1",
|
|
433
433
|
prompt,
|
|
434
434
|
background: false,
|
|
@@ -458,10 +458,10 @@ describe("Acp", () => {
|
|
|
458
458
|
assert.strictEqual(tools[1].sessionUpdate, "tool_call_update");
|
|
459
459
|
assert.strictEqual(tools[1].toolCallId, tools[0].toolCallId);
|
|
460
460
|
assert.strictEqual(tools[1].status, "completed");
|
|
461
|
-
assert.match(tools[0].title, /^
|
|
461
|
+
assert.match(tools[0].title, /^subagent: Inspect the repository/);
|
|
462
462
|
assert.notMatch(tools[0].title, /[\r\n]/);
|
|
463
|
-
assert.strictEqual(tools[0].title, "
|
|
464
|
-
assert.strictEqual(tools[0].title.length, "
|
|
463
|
+
assert.strictEqual(tools[0].title, "subagent: " + prompt.replace(/\s+/g, " ").slice(0, 120));
|
|
464
|
+
assert.strictEqual(tools[0].title.length, "subagent: ".length + 120);
|
|
465
465
|
assert.deepStrictEqual(tools[1].content, [
|
|
466
466
|
{ type: "content", content: { type: "text", text: summary } },
|
|
467
467
|
]);
|
|
@@ -494,7 +494,7 @@ describe("Acp", () => {
|
|
|
494
494
|
// resumes it once its first result has been delivered.
|
|
495
495
|
execute: ({ agentTasks, environment }) => Stream.fromEffect(executions++ === 0
|
|
496
496
|
? agentTasks
|
|
497
|
-
.
|
|
497
|
+
.subagent({
|
|
498
498
|
id: "1",
|
|
499
499
|
prompt: "TASK-CHILD",
|
|
500
500
|
background: true,
|
package/dist/Agent.js
CHANGED
|
@@ -339,7 +339,7 @@ export const makeWith = Effect.fnUntraced(function* (options) {
|
|
|
339
339
|
: Effect.fail(`No task with id ${JSON.stringify(id)}. You can only address tasks you started; call listTasks() to see them.`);
|
|
340
340
|
});
|
|
341
341
|
const agentTasks = {
|
|
342
|
-
|
|
342
|
+
subagent: Effect.fnUntraced(function* ({ id, prompt, background, environment, }) {
|
|
343
343
|
const child = {
|
|
344
344
|
id: Number(id),
|
|
345
345
|
taskOwner: crypto.randomUUID(),
|
|
@@ -354,7 +354,7 @@ export const makeWith = Effect.fnUntraced(function* (options) {
|
|
|
354
354
|
yield* startTurn({
|
|
355
355
|
child,
|
|
356
356
|
label: prompt,
|
|
357
|
-
prompt: `You have been asked using the "
|
|
357
|
+
prompt: `You have been asked using the "subagent" function to complete the following task. Try to avoid using the "subagent" function yourself unless strictly necessary:
|
|
358
358
|
|
|
359
359
|
${prompt}`,
|
|
360
360
|
// The update goes into the child's first prompt.
|
|
@@ -1146,8 +1146,8 @@ const when = (condition, text) => (condition ? text : "");
|
|
|
1146
1146
|
// model. Only offered functions are named.
|
|
1147
1147
|
const taskInstructions = (tools) => {
|
|
1148
1148
|
const bash = tools.offers("bash");
|
|
1149
|
-
const
|
|
1150
|
-
if (!bash && !
|
|
1149
|
+
const subagent = tools.offers("subagent");
|
|
1150
|
+
if (!bash && !subagent)
|
|
1151
1151
|
return "";
|
|
1152
1152
|
const functions = [
|
|
1153
1153
|
["taskOutput", `"taskOutput" reads one`],
|
|
@@ -1160,7 +1160,7 @@ const taskInstructions = (tools) => {
|
|
|
1160
1160
|
]
|
|
1161
1161
|
.filter(([name]) => tools.offers(name))
|
|
1162
1162
|
.map(([, text]) => text);
|
|
1163
|
-
const kinds = bash &&
|
|
1163
|
+
const kinds = bash && subagent
|
|
1164
1164
|
? "Background commands and sub-agents are"
|
|
1165
1165
|
: bash
|
|
1166
1166
|
? "Background commands are"
|
|
@@ -1187,7 +1187,7 @@ const generateSystemTools = (tools, conversationMode) => `YOU ONLY HAVE ONE TOOL
|
|
|
1187
1187
|
- Do not use \`require\`, \`import\`, \`process\`, or any other Node.js apis.${taskInstructions(tools)}${when(!conversationMode, `
|
|
1188
1188
|
|
|
1189
1189
|
When you have fully completed your task, call the "taskComplete" function with the final output.
|
|
1190
|
-
Make sure every detail of the task is done before calling "taskComplete".${when(tools.offers("
|
|
1190
|
+
Make sure every detail of the task is done before calling "taskComplete".${when(tools.offers("subagent"), `
|
|
1191
1191
|
Any sub-agents you started must finish first: "taskComplete" fails while they are running.`)}`)}${when(tools.offers("readFile") && tools.offers("ls"), example)}
|
|
1192
1192
|
|
|
1193
1193
|
These are the functions available to you:
|
package/dist/Agent.test.js
CHANGED
|
@@ -95,7 +95,7 @@ describe("Agent", () => {
|
|
|
95
95
|
// The root delegates once in the foreground, then every agent finishes.
|
|
96
96
|
const executor = makeExecutor(({ script, environment, agentTasks, onTaskComplete }) => Stream.fromEffect((script === "done"
|
|
97
97
|
? onTaskComplete("done")
|
|
98
|
-
: agentTasks.
|
|
98
|
+
: agentTasks.subagent({
|
|
99
99
|
id: "1",
|
|
100
100
|
prompt: "TASK-CHILD",
|
|
101
101
|
background: false,
|
|
@@ -156,9 +156,9 @@ await taskComplete(result)`,
|
|
|
156
156
|
const { system, summary } = yield* runAgent({
|
|
157
157
|
mode,
|
|
158
158
|
executor: {
|
|
159
|
-
excludeTools: ["gh", "webSearch", "fetchMarkdown", "
|
|
159
|
+
excludeTools: ["gh", "webSearch", "fetchMarkdown", "subagent"],
|
|
160
160
|
},
|
|
161
|
-
script: `const missing = [typeof gh, typeof webSearch, typeof fetchMarkdown, typeof
|
|
161
|
+
script: `const missing = [typeof gh, typeof webSearch, typeof fetchMarkdown, typeof subagent, typeof messageAgent].join(",")
|
|
162
162
|
let call
|
|
163
163
|
try {
|
|
164
164
|
await gh(["pr", "view"])
|
|
@@ -169,22 +169,22 @@ try {
|
|
|
169
169
|
await taskComplete(missing + " " + call)`,
|
|
170
170
|
});
|
|
171
171
|
assert.strictEqual(summary, "undefined,undefined,undefined,undefined,undefined failed");
|
|
172
|
-
assert.notMatch(system, /\b(gh|webSearch|fetchMarkdown|
|
|
172
|
+
assert.notMatch(system, /\b(gh|webSearch|fetchMarkdown|subagent|messageAgent)\b/);
|
|
173
173
|
assert.include(system, "declare function readFile(");
|
|
174
174
|
}));
|
|
175
175
|
// The shared task functions address bash and agent tasks, so they stay
|
|
176
176
|
// while either kind can still be started.
|
|
177
|
-
it.live("the task functions go only when bash and
|
|
177
|
+
it.live("the task functions go only when bash and subagent both go", () => Effect.gen(function* () {
|
|
178
178
|
const tasks = "[typeof taskOutput, typeof waitTasks, typeof stopTask, typeof listTasks].join()";
|
|
179
179
|
const withBash = yield* runAgent({
|
|
180
180
|
mode,
|
|
181
|
-
executor: { excludeTools: ["
|
|
181
|
+
executor: { excludeTools: ["subagent"] },
|
|
182
182
|
script: `await taskComplete(${tasks})`,
|
|
183
183
|
});
|
|
184
184
|
assert.strictEqual(withBash.summary, "function,function,function,function");
|
|
185
185
|
const withNeither = yield* runAgent({
|
|
186
186
|
mode,
|
|
187
|
-
executor: { excludeTools: ["bash", "
|
|
187
|
+
executor: { excludeTools: ["bash", "subagent"] },
|
|
188
188
|
script: `await taskComplete(${tasks})`,
|
|
189
189
|
});
|
|
190
190
|
assert.strictEqual(withNeither.summary, "undefined,undefined,undefined,undefined");
|
|
@@ -280,16 +280,17 @@ describe("rpc executor", () => {
|
|
|
280
280
|
// transport.
|
|
281
281
|
describe("agent", () => {
|
|
282
282
|
it.live("a left-out tool is not mentioned anywhere in the prompt", () => Effect.gen(function* () {
|
|
283
|
-
// Each is named outside its own declaration: the
|
|
283
|
+
// Each is named outside its own declaration: the subagent bullet, the
|
|
284
284
|
// applyPatch hint and the executor's skills catalog.
|
|
285
285
|
const { system, summary } = yield* runAgent({
|
|
286
286
|
mode: "local",
|
|
287
287
|
executor: { excludeTools: ["waitTasks", "applyPatch", "readFile"] },
|
|
288
|
-
script: "await taskComplete([typeof waitTasks, typeof applyPatch, typeof readFile].join())",
|
|
288
|
+
script: "await taskComplete([typeof waitTasks, typeof applyPatch, typeof readFile, typeof subagent, typeof delegate].join())",
|
|
289
289
|
});
|
|
290
|
-
assert.strictEqual(summary, "undefined,undefined,undefined");
|
|
290
|
+
assert.strictEqual(summary, "undefined,undefined,undefined,function,undefined");
|
|
291
291
|
assert.notMatch(system, /\b(waitTasks|applyPatch|readFile)\b/);
|
|
292
|
-
assert.include(system, "declare function
|
|
292
|
+
assert.include(system, "declare function subagent(");
|
|
293
|
+
assert.notInclude(system, "declare function delegate(");
|
|
293
294
|
}));
|
|
294
295
|
it.live("caller instructions and skills replace the executor's", () => Effect.gen(function* () {
|
|
295
296
|
const byDefault = yield* runAgent({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AgentCallerConfig.test.js","sourceRoot":"","sources":["../src/AgentCallerConfig.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,KAAK,cAAc,MAAM,sCAAsC,CAAA;AACtE,OAAO,KAAK,YAAY,MAAM,oCAAoC,CAAA;AAClE,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA;AACnC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,eAAe,MAAM,6BAA6B,CAAA;AAC9D,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAA;AACpD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA;AACnC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,aAAa,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,KAAK,MAAM,iBAAiB,CAAA;AAGxC,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAA;AACtC,OAAO,KAAK,OAAO,MAAM,mBAAmB,CAAA;AAC5C,OAAO,KAAK,SAAS,MAAM,sBAAsB,CAAA;AACjD,OAAO,KAAK,gBAAgB,MAAM,6BAA6B,CAAA;AAC/D,OAAO,KAAK,SAAS,MAAM,sBAAsB,CAAA;AACjD,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AACnC,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AACnD,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAuB,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAe5E,MAAM,KAAK,GAAwB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;AAOnD,wEAAwE;AACxE,qEAAqE;AACrE,MAAM,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAC3C,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAA;IACvC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;IAC7B,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC,uBAAuB,EAAE,CAAA;IACrD,KAAK,CAAC,CAAC,EAAE,CAAC,eAAe,CACvB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EACjC,oBAAoB,CACrB,CAAA;IACD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAA;IAC5E,KAAK,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACtD,KAAK,CAAC,CAAC,EAAE,CAAC,eAAe,CACvB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,EAC/B,qFAAqF,CACtF,CAAA;IACD,OAAO,SAAS,CAAA;AAClB,CAAC,CAAC,CAAA;AAEF,MAAM,aAAa,GAAG,CAAC,OAAwB,EAAE,EAAE,CACjD,KAAK,CAAC,MAAM,CACV,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,gBAAgB,CAAA;IACzC,OAAO,aAAa,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,GAAG,OAAO,EAAE,CAAC,CAAA;AAC5D,CAAC,CAAC,CACH,CAAC,IAAI,CACJ,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC,CACzE,CAAA;AAEH,MAAM,WAAW,GAAG,CAAC,OAAwB,EAAE,EAAE,CAC/C,KAAK,CAAC,MAAM,CACV,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,gBAAgB,CAAA;IACzC,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAC5B,KAAK,CAAC,CAAC,SAAS,CAAC,0BAA0B,EAAE,CAAA;IAC/C,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAChB,aAAa,CAAC,cAAc,CAAC,EAAE,SAAS,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC,IAAI,CAC1D,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAC3D,CACF,CAAA;IACD,KAAK,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;IACzC,OAAO,aAAa,CAAC,QAAQ,CAAC,IAAI,CAChC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,iBAAiB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,CACxD,CAAA;AACH,CAAC,CAAC,CACH,CAAC,IAAI,CACJ,KAAK,CAAC,OAAO,CACX,KAAK,CAAC,QAAQ,CACZ,gBAAgB,CAAC,WAAW,EAC5B,cAAc,CAAC,SAAS,EACxB,YAAY,CAAC,KAAK,CACnB,CACF,CACF,CAAA;AAEH,MAAM,aAAa,GAAG,CAAC,IAAU,EAAE,OAAO,GAAoB,EAAE,EAAE,EAAE,CAClE,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;AAElE,MAAM,UAAU,GAAG,CAAC,MAAqB,EAAU,EAAE,CACnD,MAAM,CAAC,OAAO;KACX,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC;KAC9C,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC;KACjC,IAAI,CAAC,IAAI,CAAC,CAAA;AAEf,4EAA4E;AAC5E,2EAA2E;AAC3E,MAAM,cAAc,GAAG,CAAC,MAAqB,EAAU,EAAE;IACvD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,MAAM,CAAC,CAAA;IAC7E,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO,EAAE,CAAA;IACpC,OAAO,OAAO,CAAC,OAAO;SACnB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SACvE,IAAI,CAAC,EAAE,CAAC,CAAA;AACb,CAAC,CAAA;AAED,MAAM,QAAQ,GAAG,CAAC,MAAc,EAA8B,EAAE,CAAC,CAAC;IAChE,IAAI,EAAE,WAAW;IACjB,EAAE,EAAE,QAAQ;IACZ,IAAI,EAAE,SAAS;IACf,MAAM,EAAE,EAAE,MAAM,EAAE;CACnB,CAAC,CAAA;AAEF;;;GAGG;AACH,MAAM,QAAQ,GAAG,CAAwC,OAMxD,EAAE,EAAE,CACH,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI,KAAK,GAAG,CAAC,CAAA;IACb,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC;QAC9C,YAAY,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,8BAA8B,CAAC;QAC9D,UAAU,EAAE,CAAC,eAAe,EAAE,EAAE;YAC9B,IAAI,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;gBAChB,OAAO,MAAM,CAAC,GAAG,CACf,yCAAyC,cAAc,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAClF,CAAA;YACH,CAAC;YACD,MAAM,GAAG,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;YAC3C,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;QAC9C,CAAC;KACF,CAAC,CAAA;IACF,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,CAC/B,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,aAAa,EAAE,aAAa,CAAC,EACzD,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,eAAe,CAAC,EAClD,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,YAAY,CAAC,CAC7C,CAAA;IACD,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAA;IACxD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CACzD,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAC/B,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EACb,MAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,QAAQ,EAAE,EAAE,CAC5C,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CACjC,EACD,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAC3B,CAAA;IACD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAA;AAC5B,CAAC,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,MAAM;AACb,wEAAwE;AACxE,MAAM,CAAC,OAAO,CAAC;IACb,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC;IAC7C,OAAO,CAAC,QAAQ,IAAI,KAAK,CAAC,KAAK;CAChC,CAAC,EACF,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAC5B,CAAA;AAEH,6EAA6E;AAC7E,uBAAuB;AACvB,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;IAClB,WAAW,EAAE,yCAAyC;IACtD,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;IAClD,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;IAC/C,OAAO,EAAE,MAAM,CAAC,MAAM;CACvB,CAAC,CACH,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,MAA6C,EAAE,EAAE,CACvE,MAAM,CAAC,OAAO,CAAC;IACb,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CACnB,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CACf,MAAM,CAAC,OAAO,CACZ,IAAI,GAAG,EAAE;QACP,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,qBAAqB,CAAC;QAChD,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAC7B,CACF;CACJ,CAAC,CAAA;AAEJ,2DAA2D;AAC3D,MAAM,OAAO,GAAG,CACd,MAAc,EACd,SAAsD,EACtD,EAAE,CACF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,aAAa,CAAA;IACnD,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAA;IACpD,OAAO,KAAK,CAAC,CAAC,QAAQ;SACnB,OAAO,CAAC;QACP,MAAM;QACN,WAAW;QACX,aAAa,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI;QAChC,cAAc,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI;QACjC,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI;QAC1B,UAAU,EAAE,qBAAqB;QACjC,SAAS;KACV,CAAC;SACD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;AAC1B,CAAC,CAAC,CAAA;AAEJ,gFAAgF;AAEhF,6CAA6C;AAC7C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;IACzB,QAAQ,CAAC,GAAG,IAAI,WAAW,EAAE,GAAG,EAAE;QAChC,EAAE,CAAC,IAAI,CAAC,mDAAmD,EAAE,GAAG,EAAE,CAChE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC;gBAC9B,IAAI;gBACJ,MAAM,EAAE,8FAA8F;aACvG,CAAC,CAAA;YACF,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAA;YACrD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAA;YAEtD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC;gBAC/B,IAAI;gBACJ,QAAQ,EAAE,EAAE,YAAY,EAAE,CAAC,OAAO,CAAC,EAAE;gBACrC,MAAM,EAAE;;;;;;;2BAOS;aAClB,CAAC,CAAA;YACF,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAA;YACxD,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;QAC/C,CAAC,CAAC,CACH,CAAA;QAED,EAAE,CAAC,IAAI,CAAC,2DAA2D,EAAE,GAAG,EAAE,CACxE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC;gBAC1C,IAAI;gBACJ,QAAQ,EAAE;oBACR,YAAY,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,CAAC;iBAC/D;gBACD,MAAM,EAAE;;;;;;;;yCAQuB;aAChC,CAAC,CAAA;YACF,MAAM,CAAC,WAAW,CAChB,OAAO,EACP,0DAA0D,CAC3D,CAAA;YACD,MAAM,CAAC,QAAQ,CACb,MAAM,EACN,wDAAwD,CACzD,CAAA;YACD,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAA;QACtD,CAAC,CAAC,CACH,CAAA;QAED,uEAAuE;QACvE,0CAA0C;QAC1C,EAAE,CAAC,IAAI,CAAC,2DAA2D,EAAE,GAAG,EAAE,CACxE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,MAAM,KAAK,GACT,iFAAiF,CAAA;YACnF,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC;gBAC/B,IAAI;gBACJ,QAAQ,EAAE,EAAE,YAAY,EAAE,CAAC,UAAU,CAAC,EAAE;gBACxC,MAAM,EAAE,sBAAsB,KAAK,GAAG;aACvC,CAAC,CAAA;YACF,MAAM,CAAC,WAAW,CAChB,QAAQ,CAAC,OAAO,EAChB,qCAAqC,CACtC,CAAA;YACD,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC;gBAClC,IAAI;gBACJ,QAAQ,EAAE,EAAE,YAAY,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE;gBAChD,MAAM,EAAE,sBAAsB,KAAK,GAAG;aACvC,CAAC,CAAA;YACF,MAAM,CAAC,WAAW,CAChB,WAAW,CAAC,OAAO,EACnB,yCAAyC,CAC1C,CAAA;YACD,MAAM,CAAC,QAAQ,CACb,WAAW,CAAC,MAAM,EAClB,+CAA+C,CAChD,CAAA;YACD,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAChD,CAAC,CAAC,CACH,CAAA;QAED,EAAE,CAAC,IAAI,CAAC,6DAA6D,EAAE,GAAG,EAAE,CAC1E,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,IAAI,KAAK,GAAG,CAAC,CAAA;YACb,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAC9B,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;gBACpB,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;gBAClD,OAAO,EAAE,MAAM,CAAC,MAAM;aACvB,CAAC,CACH,CAAA;YACD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,OAAO,CAC3B,oDAAoD,CACrD,CAAC,IAAI,CACJ,MAAM,CAAC,OAAO,CACZ,aAAa,CAAC,IAAI,EAAE;gBAClB,YAAY,EAAE,CAAC,UAAU,CAAC;gBAC1B,KAAK,EAAE,WAAW;aACnB,CAAC,CAAC,IAAI,CACL,KAAK,CAAC,OAAO,CACX,WAAW,CAAC,OAAO,CAAC;gBAClB,QAAQ,EAAE,GAAG,EAAE,CACb,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;oBACf,KAAK,EAAE,CAAA;oBACP,OAAO,QAAQ,CAAA;gBACjB,CAAC,CAAC;aACL,CAAC,CACH,CACF,CACF,EACD,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAC5B,CAAA;YACD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAA;YAC1C,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;QAC9B,CAAC,CAAC,CACH,CAAA;QAED,EAAE,CAAC,IAAI,CACL,yEAAyE,EACzE,GAAG,EAAE,CACH,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,kEAAkE;YAClE,kBAAkB;YAClB,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YAC5C,MAAM,KAAK,GAAkB,EAAE,CAAA;YAC/B,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC;gBAC1C,IAAI;gBACJ,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE;gBAC5B,QAAQ,EAAE,cAAc,CAAC,CAAC,IAAI,EAAE,EAAE,CAChC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;oBAClB,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;wBAAE,KAAK,CAAC,CAAC,WAAW,CAAC,IAAI,CAAA;oBACnD,KAAK,CAAC,CAAC,WAAW,CAAC,KAAK,CAAA;gBAC1B,CAAC,CAAC,CACH;gBACD,MAAM,EAAE;;;;;IAKhB;aACO,CAAC,CAAA;YACF,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YACzD,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;YAC1D,iEAAiE;YACjE,uBAAuB;YACvB,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;YACjC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;YAC/B,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,4BAA4B,CAAC,CAAA;YAC1D,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;YACrC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAA;YAClD,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,yCAAyC,CAAC,CAAA;QACnE,CAAC,CAAC,CACL,CAAA;QAED,EAAE,CAAC,IAAI,CAAC,2DAA2D,EAAE,GAAG,EAAE,CACxE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAQ,CAAA;YAC5C,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAQ,CAAA;YAChD,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CACnC,QAAQ,CAAC;gBACP,IAAI;gBACJ,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE;gBAC5B,QAAQ,EAAE,cAAc,CAAC,GAAG,EAAE,CAC5B,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,IAAI,CACvC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAC5B,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,CACtB,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CACzC,CACF,CACF;gBACD,MAAM,EAAE,2BAA2B;aACpC,CAAC,CACH,CAAA;YACD,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAC9B,KAAK,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;YAC7B,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAA;QACtE,CAAC,CAAC,CACH,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,EAAE,CAAC,IAAI,CAAC,4DAA4D,EAAE,GAAG,EAAE,CACzE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,wEAAwE;QACxE,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC3C,IAAI,OAAO,GAAG,CAAC,CAAA;QACf,MAAM,SAAS,GAAmC;YAChD,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CACf,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAClB,IAAI,EAAE,OAAO,KAAK,CAAC;oBAAE,KAAK,CAAC,CAAC,UAAU,CAAC,IAAI,CAAA;gBAC3C,KAAK,CAAC,CAAC,UAAU,CAAC,KAAK,CAAA;gBACvB,OAAO,MAAM,CAAA;YACf,CAAC,CAAC;SACL,CAAA;QACD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAC/B;YACE,OAAO,CACL,mEAAmE,EACnE,SAAS,CACV;YACD,OAAO,CACL,mEAAmE,EACnE,SAAS,CACV;SACF,EACD,EAAE,WAAW,EAAE,WAAW,EAAE,CAC7B,CAAC,IAAI,CACJ,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EACpC,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAC5B,CAAA;QACD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAA;QAC7C,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAA;IAC/C,CAAC,CAAC,CACH,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,sEAAsE;AACtE,aAAa;AACb,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;IACrB,EAAE,CAAC,IAAI,CAAC,yDAAyD,EAAE,GAAG,EAAE,CACtE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,sEAAsE;QACtE,qDAAqD;QACrD,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC;YAC1C,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,EAAE,YAAY,EAAE,CAAC,WAAW,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE;YACnE,MAAM,EACJ,mFAAmF;SACtF,CAAC,CAAA;QACF,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,+BAA+B,CAAC,CAAA;QAC5D,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,qCAAqC,CAAC,CAAA;QAC9D,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAA;IACtD,CAAC,CAAC,CACH,CAAA;IAED,EAAE,CAAC,IAAI,CAAC,uDAAuD,EAAE,GAAG,EAAE,CACpE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC;YAChC,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,0BAA0B;SACnC,CAAC,CAAA;QACF,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAA;QACtD,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;QAElD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC;YAC/B,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACL,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC;gBAChD,MAAM,EAAE;oBACN,IAAI,WAAW,CAAC,aAAa,CAAC;wBAC5B,IAAI,EAAE,cAAc;wBACpB,WAAW,EAAE,cAAc;wBAC3B,OAAO,EAAE,sBAAsB;qBAChC,CAAC;iBACH;aACF;YACD,MAAM,EAAE,qDAAqD;SAC9D,CAAC,CAAA;QACF,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAA;QAC5D,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAA;QACtD,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAA;QAC7D,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAA;QACxD,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;QACpD,wCAAwC;QACxC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAA;QAE1D,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC;YAC9B,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,EAAE,YAAY,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YAClD,MAAM,EAAE,0BAA0B;SACnC,CAAC,CAAA;QACF,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAA;QACvD,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAC/C,CAAC,CAAC,CACH,CAAA;IAED,EAAE,CAAC,IAAI,CAAC,gDAAgD,EAAE,GAAG,EAAE,CAC7D,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CACzB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CACrD,CAAA;QACD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,CAC9D,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,EAClB,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,OAAO,CAAC;YACb,aAAa,CAAC,OAAO,CAAC;YACtB,MAAM,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;SAChD,CAAC,EACF,MAAM,CAAC,WAAW,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAC/D,CAAA;QACD,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;QAClC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACxC,CAAC,CAAC,CACH,CAAA;IAED,EAAE,CAAC,IAAI,CAAC,qDAAqD,EAAE,GAAG,EAAE,CAClE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAC9B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACrB,UAAU,EAAE,MAAM,CAAC,MAAM;YACzB,OAAO,EAAE,MAAM,CAAC,MAAM;SACvB,CAAC,CACH,CAAA;QACD,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC;YAClC,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE;YAC7C,QAAQ,EAAE,WAAW,CAAC,OAAO,CAAC;gBAC5B,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;aACtD,CAAC;YACF,MAAM,EAAE,iDAAiD;SAC1D,CAAC,CAAA;QACF,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAA;IAChD,CAAC,CAAC,CACH,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,wEAAwE;IACxE,yEAAyE;IACzE,EAAE,CAAC,MAAM,CAAC,uCAAuC,EAAE,GAAG,EAAE,CACtD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,YAAY,CAAC,CAAA;QAC5D,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAC/C,IAAI,aAAa,CAAC,YAAY,CAAC;YAC7B,QAAQ,EAAE,EAAE;YACZ,WAAW,EAAE,IAAI,aAAa,CAAC,oBAAoB,CAAC;gBAClD,GAAG,EAAE,GAAG;gBACR,QAAQ,EAAE,EAAE;gBACZ,IAAI,EAAE,EAAE;aACT,CAAC;YACF,YAAY,EAAE,MAAM,CAAC,IAAI,EAAE;YAC3B,cAAc,EAAE,KAAK;YACrB,KAAK,EAAE,CAAC,UAAU,CAAC;YACnB,MAAM,EAAE,EAAE;SACX,CAAC,CACH,CAAA;QACD,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,KAAK,EAAE,GAAG,OAAsC,CAAA;QACrE,6DAA6D;QAC7D,MAAM,IAAI,GAAG,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAA;QACnD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAA;IACrC,CAAC,CAAC,CACH,CAAA;AACH,CAAC,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"AgentCallerConfig.test.js","sourceRoot":"","sources":["../src/AgentCallerConfig.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -167,7 +167,7 @@ for (const [mode, executorLayer] of Object.entries(executors)) {
|
|
|
167
167
|
case 2:
|
|
168
168
|
return Stream.make(toolCall(`await changeDirectory("pkg")`));
|
|
169
169
|
case 3:
|
|
170
|
-
return Stream.make(toolCall(`await
|
|
170
|
+
return Stream.make(toolCall(`await subagent({ prompt: "TASK-CHILD" })`));
|
|
171
171
|
default:
|
|
172
172
|
return Stream.fromIterable(text("done"));
|
|
173
173
|
}
|
|
@@ -193,7 +193,7 @@ for (const [mode, executorLayer] of Object.entries(executors)) {
|
|
|
193
193
|
assert.strictEqual(environmentUpdates(root[4].prompt).length, 1, "leaving and entering pkg again sends nothing new");
|
|
194
194
|
const child = calls.find(isChild);
|
|
195
195
|
assert.isDefined(child);
|
|
196
|
-
assert.include(JSON.stringify(encodePrompt(child.prompt)), "PKG-RULES", "a
|
|
196
|
+
assert.include(JSON.stringify(encodePrompt(child.prompt)), "PKG-RULES", "a subagent started after the cd sees pkg's instructions");
|
|
197
197
|
const childUpdates = outputs.flatMap((output) => output._tag === "SubagentPart" &&
|
|
198
198
|
output.part._tag === "EnvironmentUpdated"
|
|
199
199
|
? [{ id: output.id, update: output.part.update }]
|
package/dist/AgentExecutor.d.ts
CHANGED
|
@@ -103,16 +103,16 @@ export interface ExecuteOptions {
|
|
|
103
103
|
readonly loopTools?: LoopToolHandlers | undefined;
|
|
104
104
|
}
|
|
105
105
|
/**
|
|
106
|
-
* The sub-agents of the agent running a script. `
|
|
106
|
+
* The sub-agents of the agent running a script. `subagent` also receives the
|
|
107
107
|
* environment the new agent starts in: the script's directory at the moment
|
|
108
|
-
* `
|
|
108
|
+
* `subagent` was called, with an update holding everything that applies to
|
|
109
109
|
* it beyond the system prompt.
|
|
110
110
|
*
|
|
111
111
|
* @since 1.0.0
|
|
112
112
|
* @category Models
|
|
113
113
|
*/
|
|
114
|
-
export interface ExecuteAgentTasks extends Omit<AgentTasks, "
|
|
115
|
-
readonly
|
|
114
|
+
export interface ExecuteAgentTasks extends Omit<AgentTasks, "subagent"> {
|
|
115
|
+
readonly subagent: (options: {
|
|
116
116
|
readonly id: string;
|
|
117
117
|
readonly prompt: string;
|
|
118
118
|
readonly background: boolean;
|
|
@@ -246,8 +246,8 @@ export interface LocalOptions<Toolkit extends Toolkit.Any = never> {
|
|
|
246
246
|
readonly limits?: Limits | undefined;
|
|
247
247
|
/**
|
|
248
248
|
* Built-in tools to leave out of the sandbox and the type declarations.
|
|
249
|
-
* Leaving out `
|
|
250
|
-
* both `
|
|
249
|
+
* Leaving out `subagent` also leaves out `messageAgent`, and leaving out
|
|
250
|
+
* both `subagent` and `bash` leaves out the task functions.
|
|
251
251
|
* Leaving out `fetch` removes the global Fetch API.
|
|
252
252
|
*/
|
|
253
253
|
readonly excludeTools?: ReadonlyArray<ExcludableTool> | undefined;
|
|
@@ -318,12 +318,6 @@ export declare const layerRpcServer: <Toolkit extends Toolkit.Any = never>(optio
|
|
|
318
318
|
* @category Rpcs
|
|
319
319
|
*/
|
|
320
320
|
export declare const AgentRequest: Schema.TaggedUnion<{
|
|
321
|
-
readonly Delegate: Schema.TaggedStruct<"Delegate", {
|
|
322
|
-
readonly id: Schema.String;
|
|
323
|
-
readonly prompt: Schema.String;
|
|
324
|
-
readonly background: Schema.Boolean;
|
|
325
|
-
readonly environment: typeof EnvironmentUpdate;
|
|
326
|
-
}>;
|
|
327
321
|
readonly EnvironmentChanged: Schema.TaggedStruct<"EnvironmentChanged", {
|
|
328
322
|
readonly environment: typeof ExecutionEnvironment;
|
|
329
323
|
}>;
|
|
@@ -339,6 +333,12 @@ export declare const AgentRequest: Schema.TaggedUnion<{
|
|
|
339
333
|
readonly StopTask: Schema.TaggedStruct<"StopTask", {
|
|
340
334
|
readonly id: Schema.String;
|
|
341
335
|
}>;
|
|
336
|
+
readonly Subagent: Schema.TaggedStruct<"Subagent", {
|
|
337
|
+
readonly id: Schema.String;
|
|
338
|
+
readonly prompt: Schema.String;
|
|
339
|
+
readonly background: Schema.Boolean;
|
|
340
|
+
readonly environment: typeof EnvironmentUpdate;
|
|
341
|
+
}>;
|
|
342
342
|
readonly TaskComplete: Schema.TaggedStruct<"TaskComplete", {
|
|
343
343
|
readonly summary: Schema.String;
|
|
344
344
|
}>;
|
|
@@ -352,7 +352,7 @@ export declare const AgentRequest: Schema.TaggedUnion<{
|
|
|
352
352
|
}>;
|
|
353
353
|
/**
|
|
354
354
|
* The client's answer to a `Request`. `Failure` carries a message for the
|
|
355
|
-
* script; a failed foreground `
|
|
355
|
+
* script; a failed foreground `subagent` is raised there as a defect.
|
|
356
356
|
*
|
|
357
357
|
* @since 1.0.0
|
|
358
358
|
* @category Rpcs
|
|
@@ -381,12 +381,6 @@ export declare const ExecuteOutput: Schema.TaggedUnion<{
|
|
|
381
381
|
readonly Request: Schema.TaggedStruct<"Request", {
|
|
382
382
|
readonly id: Schema.Finite;
|
|
383
383
|
readonly request: Schema.TaggedUnion<{
|
|
384
|
-
readonly Delegate: Schema.TaggedStruct<"Delegate", {
|
|
385
|
-
readonly id: Schema.String;
|
|
386
|
-
readonly prompt: Schema.String;
|
|
387
|
-
readonly background: Schema.Boolean;
|
|
388
|
-
readonly environment: typeof EnvironmentUpdate;
|
|
389
|
-
}>;
|
|
390
384
|
readonly EnvironmentChanged: Schema.TaggedStruct<"EnvironmentChanged", {
|
|
391
385
|
readonly environment: typeof ExecutionEnvironment;
|
|
392
386
|
}>;
|
|
@@ -402,6 +396,12 @@ export declare const ExecuteOutput: Schema.TaggedUnion<{
|
|
|
402
396
|
readonly StopTask: Schema.TaggedStruct<"StopTask", {
|
|
403
397
|
readonly id: Schema.String;
|
|
404
398
|
}>;
|
|
399
|
+
readonly Subagent: Schema.TaggedStruct<"Subagent", {
|
|
400
|
+
readonly id: Schema.String;
|
|
401
|
+
readonly prompt: Schema.String;
|
|
402
|
+
readonly background: Schema.Boolean;
|
|
403
|
+
readonly environment: typeof EnvironmentUpdate;
|
|
404
|
+
}>;
|
|
405
405
|
readonly TaskComplete: Schema.TaggedStruct<"TaskComplete", {
|
|
406
406
|
readonly summary: Schema.String;
|
|
407
407
|
}>;
|
|
@@ -461,12 +461,6 @@ declare const Rpcs_base: RpcGroup.RpcGroup<Rpc.Rpc<"awaitTask", Schema.Struct<{
|
|
|
461
461
|
readonly Request: Schema.TaggedStruct<"Request", {
|
|
462
462
|
readonly id: Schema.Finite;
|
|
463
463
|
readonly request: Schema.TaggedUnion<{
|
|
464
|
-
readonly Delegate: Schema.TaggedStruct<"Delegate", {
|
|
465
|
-
readonly id: Schema.String;
|
|
466
|
-
readonly prompt: Schema.String;
|
|
467
|
-
readonly background: Schema.Boolean;
|
|
468
|
-
readonly environment: typeof EnvironmentUpdate;
|
|
469
|
-
}>;
|
|
470
464
|
readonly EnvironmentChanged: Schema.TaggedStruct<"EnvironmentChanged", {
|
|
471
465
|
readonly environment: typeof ExecutionEnvironment;
|
|
472
466
|
}>;
|
|
@@ -482,6 +476,12 @@ declare const Rpcs_base: RpcGroup.RpcGroup<Rpc.Rpc<"awaitTask", Schema.Struct<{
|
|
|
482
476
|
readonly StopTask: Schema.TaggedStruct<"StopTask", {
|
|
483
477
|
readonly id: Schema.String;
|
|
484
478
|
}>;
|
|
479
|
+
readonly Subagent: Schema.TaggedStruct<"Subagent", {
|
|
480
|
+
readonly id: Schema.String;
|
|
481
|
+
readonly prompt: Schema.String;
|
|
482
|
+
readonly background: Schema.Boolean;
|
|
483
|
+
readonly environment: typeof EnvironmentUpdate;
|
|
484
|
+
}>;
|
|
485
485
|
readonly TaskComplete: Schema.TaggedStruct<"TaskComplete", {
|
|
486
486
|
readonly summary: Schema.String;
|
|
487
487
|
}>;
|
package/dist/AgentExecutor.js
CHANGED
|
@@ -234,7 +234,7 @@ const makeLocalWith = Effect.fnUntraced(function* (options) {
|
|
|
234
234
|
...opts.agentTasks,
|
|
235
235
|
// A new agent has only the system prompt, so it gets everything that
|
|
236
236
|
// applies to the directory.
|
|
237
|
-
|
|
237
|
+
subagent: (options) => renderEnvironment(currentEnvironment(), { reset: true }).pipe(Effect.flatMap((environment) => opts.agentTasks.subagent({ ...options, environment }))),
|
|
238
238
|
}), Context.add(ImageAttacher, opts.onImage), Context.add(TaskWatcher, opts.onTask ?? (() => Effect.void)), Context.add(TaskOwner, opts.agentId), Context.add(CommandLimits, commandLimits), Context.add(Console.Console, console), Context.add(References.CurrentLogAnnotations, {}), Option.isSome(search)
|
|
239
239
|
? Context.add(SemanticSearch, search.value)
|
|
240
240
|
: identity);
|
|
@@ -515,8 +515,8 @@ export const layerRpcServer = (options) => RpcServer.layer(Rpcs, {
|
|
|
515
515
|
onTaskComplete: (summary) => request({ _tag: "TaskComplete", summary }),
|
|
516
516
|
agentId,
|
|
517
517
|
agentTasks: {
|
|
518
|
-
|
|
519
|
-
_tag: "
|
|
518
|
+
subagent: (options) => Effect.orDie(request({
|
|
519
|
+
_tag: "Subagent",
|
|
520
520
|
...options,
|
|
521
521
|
})),
|
|
522
522
|
taskOutput: (id) => request({ _tag: "TaskOutput", id }),
|
|
@@ -591,7 +591,7 @@ export const layerRpcServer = (options) => RpcServer.layer(Rpcs, {
|
|
|
591
591
|
*/
|
|
592
592
|
export const AgentRequest = Schema.TaggedUnion({
|
|
593
593
|
TaskComplete: { summary: Schema.String },
|
|
594
|
-
|
|
594
|
+
Subagent: {
|
|
595
595
|
id: Schema.String,
|
|
596
596
|
prompt: Schema.String,
|
|
597
597
|
background: Schema.Boolean,
|
|
@@ -611,7 +611,7 @@ export const AgentRequest = Schema.TaggedUnion({
|
|
|
611
611
|
});
|
|
612
612
|
/**
|
|
613
613
|
* The client's answer to a `Request`. `Failure` carries a message for the
|
|
614
|
-
* script; a failed foreground `
|
|
614
|
+
* script; a failed foreground `subagent` is raised there as a defect.
|
|
615
615
|
*
|
|
616
616
|
* @since 1.0.0
|
|
617
617
|
* @category Rpcs
|
|
@@ -756,8 +756,8 @@ const handleRequest = (opts, request) => {
|
|
|
756
756
|
switch (request._tag) {
|
|
757
757
|
case "TaskComplete":
|
|
758
758
|
return opts.onTaskComplete(request.summary);
|
|
759
|
-
case "
|
|
760
|
-
return opts.agentTasks.
|
|
759
|
+
case "Subagent":
|
|
760
|
+
return opts.agentTasks.subagent(request);
|
|
761
761
|
case "TaskOutput":
|
|
762
762
|
return opts.agentTasks.taskOutput(request.id);
|
|
763
763
|
case "WaitTasks":
|
|
@@ -801,11 +801,11 @@ const errorMessage = (error) => typeof error === "string"
|
|
|
801
801
|
: error instanceof Error
|
|
802
802
|
? error.message
|
|
803
803
|
: String(error);
|
|
804
|
-
// Leaving out `
|
|
804
|
+
// Leaving out `subagent` leaves out `messageAgent`. The task functions
|
|
805
805
|
// address both kinds, so they go once neither can be started.
|
|
806
806
|
const excludedToolNames = (excludeTools) => {
|
|
807
807
|
const names = new Set(excludeTools);
|
|
808
|
-
if (names.has("
|
|
808
|
+
if (names.has("subagent")) {
|
|
809
809
|
names.add("messageAgent");
|
|
810
810
|
if (names.has("bash")) {
|
|
811
811
|
for (const name of ["taskOutput", "waitTasks", "stopTask", "listTasks"]) {
|
|
@@ -22,7 +22,7 @@ import * as NodeOs from "node:os";
|
|
|
22
22
|
import * as NodePath from "node:path";
|
|
23
23
|
import * as AgentExecutor from "./AgentExecutor.js";
|
|
24
24
|
import { agentTasksUnavailable } from "./AgentTools.js";
|
|
25
|
-
// The task a stub `
|
|
25
|
+
// The task a stub `subagent` resolves with once its agent has finished.
|
|
26
26
|
const completedAgent = (id, prompt, output) => ({
|
|
27
27
|
id,
|
|
28
28
|
kind: "agent",
|
|
@@ -42,7 +42,7 @@ const withRpc = (f, server = (directory) => AgentExecutor.layerRpcServer({ direc
|
|
|
42
42
|
}).pipe(Effect.provide(AgentExecutor.layerRpc.pipe(Layer.provide(RpcClient.layerProtocolHttp({ url: "" })))));
|
|
43
43
|
}).pipe(Effect.provide(Layer.mergeAll(RpcSerialization.layerNdjson, NodeHttpServer.layerTest, NodeServices.layer)), Effect.scoped);
|
|
44
44
|
describe("RPC subagent executor", () => {
|
|
45
|
-
it.live("routes concurrent
|
|
45
|
+
it.live("routes concurrent subagents to their originating scripts", () => withRpc((executor) => Effect.gen(function* () {
|
|
46
46
|
const { environment } = yield* executor.capabilities;
|
|
47
47
|
const firstStarted = yield* Deferred.make();
|
|
48
48
|
const secondStarted = yield* Deferred.make();
|
|
@@ -51,12 +51,12 @@ describe("RPC subagent executor", () => {
|
|
|
51
51
|
.execute({
|
|
52
52
|
environment,
|
|
53
53
|
onEnvironment: () => Effect.void,
|
|
54
|
-
script: 'console.log("first:" + (await
|
|
54
|
+
script: 'console.log("first:" + (await subagent({ prompt: "first" })).output)',
|
|
55
55
|
onTaskComplete: () => Effect.void,
|
|
56
56
|
onImage: () => Effect.void,
|
|
57
57
|
agentTasks: {
|
|
58
58
|
...agentTasksUnavailable,
|
|
59
|
-
|
|
59
|
+
subagent: ({ id, prompt }) => Effect.gen(function* () {
|
|
60
60
|
assert.strictEqual(prompt, "first");
|
|
61
61
|
yield* Deferred.succeed(firstStarted, undefined);
|
|
62
62
|
yield* Deferred.await(secondStarted);
|
|
@@ -69,12 +69,12 @@ describe("RPC subagent executor", () => {
|
|
|
69
69
|
.execute({
|
|
70
70
|
environment,
|
|
71
71
|
onEnvironment: () => Effect.void,
|
|
72
|
-
script: 'console.log("second:" + (await
|
|
72
|
+
script: 'console.log("second:" + (await subagent({ prompt: "second" })).output)',
|
|
73
73
|
onTaskComplete: () => Effect.void,
|
|
74
74
|
onImage: () => Effect.void,
|
|
75
75
|
agentTasks: {
|
|
76
76
|
...agentTasksUnavailable,
|
|
77
|
-
|
|
77
|
+
subagent: ({ id, prompt }) => Effect.gen(function* () {
|
|
78
78
|
assert.strictEqual(prompt, "second");
|
|
79
79
|
yield* Deferred.succeed(secondStarted, undefined);
|
|
80
80
|
yield* Deferred.await(firstStarted);
|
|
@@ -93,23 +93,23 @@ describe("RPC subagent executor", () => {
|
|
|
93
93
|
.execute({
|
|
94
94
|
environment,
|
|
95
95
|
onEnvironment: () => Effect.void,
|
|
96
|
-
script: 'console.log("parent:" + (await
|
|
96
|
+
script: 'console.log("parent:" + (await subagent({ prompt: "outer" })).output)',
|
|
97
97
|
onTaskComplete: () => Effect.void,
|
|
98
98
|
onImage: () => Effect.void,
|
|
99
99
|
agentTasks: {
|
|
100
100
|
...agentTasksUnavailable,
|
|
101
|
-
|
|
101
|
+
subagent: ({ id, prompt }) => Effect.gen(function* () {
|
|
102
102
|
assert.strictEqual(prompt, "outer");
|
|
103
103
|
const childOutput = yield* executor
|
|
104
104
|
.execute({
|
|
105
105
|
environment,
|
|
106
106
|
onEnvironment: () => Effect.void,
|
|
107
|
-
script: 'console.log("child:" + (await
|
|
107
|
+
script: 'console.log("child:" + (await subagent({ prompt: "inner" })).output)',
|
|
108
108
|
onTaskComplete: () => Effect.void,
|
|
109
109
|
onImage: () => Effect.void,
|
|
110
110
|
agentTasks: {
|
|
111
111
|
...agentTasksUnavailable,
|
|
112
|
-
|
|
112
|
+
subagent: ({ id: innerId, prompt: innerPrompt }) => Effect.sync(() => {
|
|
113
113
|
assert.strictEqual(innerPrompt, "inner");
|
|
114
114
|
return completedAgent(innerId, innerPrompt, "inner-output");
|
|
115
115
|
}),
|
|
@@ -644,15 +644,15 @@ console.log("MAIN" + "_DONE")`);
|
|
|
644
644
|
.execute({
|
|
645
645
|
environment,
|
|
646
646
|
onEnvironment: () => Effect.void,
|
|
647
|
-
// `
|
|
647
|
+
// `subagent` never finishes. The worker then exits through
|
|
648
648
|
// the host's `process`, the way a crashed worker would.
|
|
649
649
|
script: `
|
|
650
|
-
|
|
650
|
+
subagent({ prompt: "never finishes" })
|
|
651
651
|
sleep(100).then(() => console.constructor.constructor("return process")().exit(7))`,
|
|
652
652
|
onTaskComplete: () => Effect.void,
|
|
653
653
|
agentTasks: {
|
|
654
654
|
...agentTasksUnavailable,
|
|
655
|
-
|
|
655
|
+
subagent: () => Effect.never,
|
|
656
656
|
},
|
|
657
657
|
onImage: () => Effect.void,
|
|
658
658
|
})
|
package/dist/AgentImage.test.js
CHANGED
|
@@ -158,8 +158,8 @@ describe("Agent images", () => {
|
|
|
158
158
|
assert.isTrue(Exit.isFailure(exit));
|
|
159
159
|
assert.strictEqual(calls.length, 1);
|
|
160
160
|
}));
|
|
161
|
-
it.effect("does not copy image bytes into a
|
|
162
|
-
const executor = makeExecutor(({ agentTasks, environment }) => Stream.fromEffect(agentTasks.
|
|
161
|
+
it.effect("does not copy image bytes into a subagent prompt", () => Effect.gen(function* () {
|
|
162
|
+
const executor = makeExecutor(({ agentTasks, environment }) => Stream.fromEffect(agentTasks.subagent({
|
|
163
163
|
id: "1",
|
|
164
164
|
prompt: "child task: describe the layout",
|
|
165
165
|
background: false,
|
|
@@ -173,7 +173,7 @@ describe("Agent images", () => {
|
|
|
173
173
|
executor,
|
|
174
174
|
respond: (call, index) => {
|
|
175
175
|
if (index === 0) {
|
|
176
|
-
return Stream.make(toolCall("call-1", 'await
|
|
176
|
+
return Stream.make(toolCall("call-1", 'await subagent("describe the layout")'));
|
|
177
177
|
}
|
|
178
178
|
const isChild = userText(call.prompt).includes("child task");
|
|
179
179
|
return Stream.fromIterable(text(isChild ? "child done" : "parent done"));
|
|
@@ -181,7 +181,7 @@ describe("Agent images", () => {
|
|
|
181
181
|
});
|
|
182
182
|
assert.isTrue(Exit.isSuccess(exit));
|
|
183
183
|
const child = calls.find((call) => userText(call.prompt).includes("child task"));
|
|
184
|
-
assert.isDefined(child, "the
|
|
184
|
+
assert.isDefined(child, "the subagent call reached the model");
|
|
185
185
|
assert.strictEqual(fileParts(child.prompt).length, 0);
|
|
186
186
|
// The parent still has its image.
|
|
187
187
|
assert.strictEqual(fileParts(calls[0].prompt).length, 1);
|