clanka 0.21.0 → 0.22.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.test.js +19 -7
- package/dist/Acp.test.js.map +1 -1
- package/dist/Agent.d.ts +4 -4
- package/dist/Agent.d.ts.map +1 -1
- package/dist/Agent.js +140 -99
- package/dist/Agent.js.map +1 -1
- package/dist/Agent.test.js +5 -4
- package/dist/Agent.test.js.map +1 -1
- package/dist/AgentBashJobs.test.js +47 -32
- package/dist/AgentBashJobs.test.js.map +1 -1
- package/dist/AgentCallerConfig.test.js +26 -7
- package/dist/AgentCallerConfig.test.js.map +1 -1
- package/dist/AgentExecutor.d.ts +71 -41
- package/dist/AgentExecutor.d.ts.map +1 -1
- package/dist/AgentExecutor.js +86 -79
- package/dist/AgentExecutor.js.map +1 -1
- package/dist/AgentExecutor.test.js +108 -83
- package/dist/AgentExecutor.test.js.map +1 -1
- package/dist/AgentExecutorImage.test.js +2 -2
- package/dist/AgentExecutorImage.test.js.map +1 -1
- package/dist/AgentImage.test.js +3 -2
- package/dist/AgentImage.test.js.map +1 -1
- package/dist/AgentSubagents.test.js +218 -29
- package/dist/AgentSubagents.test.js.map +1 -1
- package/dist/AgentTools.d.ts +318 -290
- package/dist/AgentTools.d.ts.map +1 -1
- package/dist/AgentTools.js +218 -199
- package/dist/AgentTools.js.map +1 -1
- package/dist/AgentTools.test.js +2 -2
- package/dist/AgentTools.test.js.map +1 -1
- package/dist/bin/cli.mjs +308 -289
- package/dist/bin/cli.mjs.map +1 -1
- package/package.json +1 -1
- package/src/Acp.test.ts +31 -10
- package/src/Agent.test.ts +5 -4
- package/src/Agent.ts +175 -140
- package/src/AgentBashJobs.test.ts +70 -38
- package/src/AgentCallerConfig.test.ts +39 -7
- package/src/AgentExecutor.test.ts +132 -91
- package/src/AgentExecutor.ts +120 -105
- package/src/AgentExecutorImage.test.ts +2 -2
- package/src/AgentImage.test.ts +4 -3
- package/src/AgentSubagents.test.ts +825 -562
- package/src/AgentTools.test.ts +2 -2
- package/src/AgentTools.ts +331 -288
|
@@ -21,7 +21,16 @@ import * as NodeFs from "node:fs"
|
|
|
21
21
|
import * as NodeOs from "node:os"
|
|
22
22
|
import * as NodePath from "node:path"
|
|
23
23
|
import * as AgentExecutor from "./AgentExecutor.ts"
|
|
24
|
-
import {
|
|
24
|
+
import { agentTasksUnavailable, type Task } from "./AgentTools.ts"
|
|
25
|
+
|
|
26
|
+
// The task a stub `delegate` resolves with once its agent has finished.
|
|
27
|
+
const completedAgent = (id: string, prompt: string, output: string): Task => ({
|
|
28
|
+
id,
|
|
29
|
+
kind: "agent",
|
|
30
|
+
status: "completed",
|
|
31
|
+
description: prompt,
|
|
32
|
+
output,
|
|
33
|
+
})
|
|
25
34
|
|
|
26
35
|
const withRpc = <A, E, R>(
|
|
27
36
|
f: (
|
|
@@ -81,18 +90,14 @@ describe("RPC subagent executor", () => {
|
|
|
81
90
|
'console.log("first:" + (await delegate({ prompt: "first" })).output)',
|
|
82
91
|
onTaskComplete: () => Effect.void,
|
|
83
92
|
onImage: () => Effect.void,
|
|
84
|
-
|
|
85
|
-
...
|
|
86
|
-
delegate: ({ prompt }) =>
|
|
93
|
+
agentTasks: {
|
|
94
|
+
...agentTasksUnavailable,
|
|
95
|
+
delegate: ({ id, prompt }) =>
|
|
87
96
|
Effect.gen(function* () {
|
|
88
97
|
assert.strictEqual(prompt, "first")
|
|
89
98
|
yield* Deferred.succeed(firstStarted, undefined)
|
|
90
99
|
yield* Deferred.await(secondStarted)
|
|
91
|
-
return
|
|
92
|
-
id: "1",
|
|
93
|
-
status: "completed" as const,
|
|
94
|
-
output: "first-output",
|
|
95
|
-
}
|
|
100
|
+
return completedAgent(id, prompt, "first-output")
|
|
96
101
|
}),
|
|
97
102
|
},
|
|
98
103
|
})
|
|
@@ -105,18 +110,14 @@ describe("RPC subagent executor", () => {
|
|
|
105
110
|
'console.log("second:" + (await delegate({ prompt: "second" })).output)',
|
|
106
111
|
onTaskComplete: () => Effect.void,
|
|
107
112
|
onImage: () => Effect.void,
|
|
108
|
-
|
|
109
|
-
...
|
|
110
|
-
delegate: ({ prompt }) =>
|
|
113
|
+
agentTasks: {
|
|
114
|
+
...agentTasksUnavailable,
|
|
115
|
+
delegate: ({ id, prompt }) =>
|
|
111
116
|
Effect.gen(function* () {
|
|
112
117
|
assert.strictEqual(prompt, "second")
|
|
113
118
|
yield* Deferred.succeed(secondStarted, undefined)
|
|
114
119
|
yield* Deferred.await(firstStarted)
|
|
115
|
-
return
|
|
116
|
-
id: "2",
|
|
117
|
-
status: "completed" as const,
|
|
118
|
-
output: "second-output",
|
|
119
|
-
}
|
|
120
|
+
return completedAgent(id, prompt, "second-output")
|
|
120
121
|
}),
|
|
121
122
|
},
|
|
122
123
|
})
|
|
@@ -144,9 +145,9 @@ describe("RPC subagent executor", () => {
|
|
|
144
145
|
'console.log("parent:" + (await delegate({ prompt: "outer" })).output)',
|
|
145
146
|
onTaskComplete: () => Effect.void,
|
|
146
147
|
onImage: () => Effect.void,
|
|
147
|
-
|
|
148
|
-
...
|
|
149
|
-
delegate: ({ prompt }) =>
|
|
148
|
+
agentTasks: {
|
|
149
|
+
...agentTasksUnavailable,
|
|
150
|
+
delegate: ({ id, prompt }) =>
|
|
150
151
|
Effect.gen(function* () {
|
|
151
152
|
assert.strictEqual(prompt, "outer")
|
|
152
153
|
const childOutput = yield* executor
|
|
@@ -157,16 +158,16 @@ describe("RPC subagent executor", () => {
|
|
|
157
158
|
'console.log("child:" + (await delegate({ prompt: "inner" })).output)',
|
|
158
159
|
onTaskComplete: () => Effect.void,
|
|
159
160
|
onImage: () => Effect.void,
|
|
160
|
-
|
|
161
|
-
...
|
|
162
|
-
delegate: ({ prompt: innerPrompt }) =>
|
|
161
|
+
agentTasks: {
|
|
162
|
+
...agentTasksUnavailable,
|
|
163
|
+
delegate: ({ id: innerId, prompt: innerPrompt }) =>
|
|
163
164
|
Effect.sync(() => {
|
|
164
165
|
assert.strictEqual(innerPrompt, "inner")
|
|
165
|
-
return
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
166
|
+
return completedAgent(
|
|
167
|
+
innerId,
|
|
168
|
+
innerPrompt,
|
|
169
|
+
"inner-output",
|
|
170
|
+
)
|
|
170
171
|
}),
|
|
171
172
|
},
|
|
172
173
|
})
|
|
@@ -174,11 +175,11 @@ describe("RPC subagent executor", () => {
|
|
|
174
175
|
assert.isTrue(
|
|
175
176
|
childOutput.join("").endsWith("child:inner-output\n"),
|
|
176
177
|
)
|
|
177
|
-
return
|
|
178
|
-
id
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
178
|
+
return completedAgent(
|
|
179
|
+
id,
|
|
180
|
+
prompt,
|
|
181
|
+
childOutput.join("").trim().split("\n").at(-1)!,
|
|
182
|
+
)
|
|
182
183
|
}),
|
|
183
184
|
},
|
|
184
185
|
})
|
|
@@ -216,11 +217,11 @@ describe("RPC executeUnsafe", () => {
|
|
|
216
217
|
NodePath.join(environment.cwd, "x.txt"),
|
|
217
218
|
"hello",
|
|
218
219
|
)
|
|
219
|
-
const
|
|
220
|
-
tool: "
|
|
220
|
+
const tasks = yield* executor.executeUnsafe({
|
|
221
|
+
tool: "listTasks",
|
|
221
222
|
params: undefined,
|
|
222
223
|
})
|
|
223
|
-
assert.deepStrictEqual(
|
|
224
|
+
assert.deepStrictEqual(tasks, [])
|
|
224
225
|
const content = yield* executor.executeUnsafe({
|
|
225
226
|
tool: "readFile",
|
|
226
227
|
params: { path: "x.txt", startLine: undefined, lineNumbers: false },
|
|
@@ -350,7 +351,7 @@ const runScript = (script: string) =>
|
|
|
350
351
|
onEnvironment: () => Effect.void,
|
|
351
352
|
script,
|
|
352
353
|
onTaskComplete: () => Effect.void,
|
|
353
|
-
|
|
354
|
+
agentTasks: agentTasksUnavailable,
|
|
354
355
|
onImage: () => Effect.void,
|
|
355
356
|
})
|
|
356
357
|
.pipe(Stream.mkString)
|
|
@@ -459,7 +460,7 @@ console.log({ name: "my-project", version: "1.0.0", scripts: { check: "oxlint -c
|
|
|
459
460
|
for (const [mode, executorLayer] of Object.entries(executorModes)) {
|
|
460
461
|
describe(`${mode} executor environment`, () => {
|
|
461
462
|
// A cancelled script keeps the directory it changed to, as an ACP
|
|
462
|
-
// `session/cancel` or a `
|
|
463
|
+
// `session/cancel` or a `stopTask` continues the same agent afterwards.
|
|
463
464
|
it.live("returns the environment when the caller interrupts", () =>
|
|
464
465
|
Effect.gen(function* () {
|
|
465
466
|
const executor = yield* AgentExecutor.AgentExecutor
|
|
@@ -477,7 +478,7 @@ await sleep(60000)`,
|
|
|
477
478
|
updates.push(update)
|
|
478
479
|
}),
|
|
479
480
|
onTaskComplete: () => Effect.void,
|
|
480
|
-
|
|
481
|
+
agentTasks: agentTasksUnavailable,
|
|
481
482
|
onImage: () => Effect.void,
|
|
482
483
|
})
|
|
483
484
|
.pipe(
|
|
@@ -524,7 +525,7 @@ await sleep(60000)`,
|
|
|
524
525
|
updates.push(update)
|
|
525
526
|
}),
|
|
526
527
|
onTaskComplete: () => Effect.void,
|
|
527
|
-
|
|
528
|
+
agentTasks: agentTasksUnavailable,
|
|
528
529
|
onImage: () => Effect.void,
|
|
529
530
|
})
|
|
530
531
|
.pipe(
|
|
@@ -562,15 +563,19 @@ await sleep(60000)`,
|
|
|
562
563
|
const executor = yield* AgentExecutor.AgentExecutor
|
|
563
564
|
const { environment } = yield* executor.capabilities
|
|
564
565
|
const output = yield* runScript(`
|
|
565
|
-
const
|
|
566
|
+
const task = await bash({
|
|
566
567
|
command: ${JSON.stringify(gatedCommand(environment.cwd))},
|
|
567
568
|
background: true,
|
|
568
569
|
})
|
|
569
|
-
console.log("RETURNED:", JSON.stringify(
|
|
570
|
-
|
|
571
|
-
|
|
572
|
-
|
|
573
|
-
|
|
570
|
+
console.log("RETURNED:", JSON.stringify(task))`)
|
|
571
|
+
const task = JSON.parse(output.split("RETURNED:")[1]!)
|
|
572
|
+
assert.deepStrictEqual(task, {
|
|
573
|
+
id: "1",
|
|
574
|
+
kind: "bash",
|
|
575
|
+
status: "running",
|
|
576
|
+
description: gatedCommand(environment.cwd),
|
|
577
|
+
output: "",
|
|
578
|
+
})
|
|
574
579
|
assert.strictEqual(
|
|
575
580
|
yield* waitForLog(environment.cwd, started),
|
|
576
581
|
"start\n",
|
|
@@ -588,21 +593,25 @@ console.log("RETURNED:", JSON.stringify(result))`)
|
|
|
588
593
|
Effect.gen(function* () {
|
|
589
594
|
const executor = yield* AgentExecutor.AgentExecutor
|
|
590
595
|
const { environment } = yield* executor.capabilities
|
|
596
|
+
const command = `echo early && ${gatedCommand(environment.cwd)}`
|
|
591
597
|
const output = yield* runScript(`
|
|
592
598
|
try {
|
|
593
599
|
const result = await bash({
|
|
594
|
-
command: ${JSON.stringify(
|
|
600
|
+
command: ${JSON.stringify(command)},
|
|
595
601
|
timeoutMs: 60000,
|
|
596
602
|
})
|
|
597
603
|
console.log("RETURNED:", JSON.stringify(result))
|
|
598
604
|
} catch (error) {
|
|
599
605
|
console.log("REJECTED:", String(error))
|
|
600
606
|
}`)
|
|
601
|
-
assert.include(
|
|
602
|
-
output,
|
|
603
|
-
'RETURNED: {"id":"1","status":"running","output":"early\\n"}',
|
|
604
|
-
)
|
|
605
607
|
assert.notInclude(output, "REJECTED:")
|
|
608
|
+
assert.deepStrictEqual(JSON.parse(output.split("RETURNED:")[1]!), {
|
|
609
|
+
id: "1",
|
|
610
|
+
kind: "bash",
|
|
611
|
+
status: "running",
|
|
612
|
+
description: command,
|
|
613
|
+
output: "early\n",
|
|
614
|
+
})
|
|
606
615
|
assert.strictEqual(
|
|
607
616
|
yield* waitForLog(environment.cwd, started),
|
|
608
617
|
"start\n",
|
|
@@ -620,7 +629,7 @@ try {
|
|
|
620
629
|
)
|
|
621
630
|
|
|
622
631
|
// A foreground command that succeeds returns a task with an id from the
|
|
623
|
-
// same counter as background
|
|
632
|
+
// same counter as background tasks; one that fails still rejects.
|
|
624
633
|
it.live(
|
|
625
634
|
"returns a task from a foreground bash command, or rejects on failure",
|
|
626
635
|
() =>
|
|
@@ -632,9 +641,16 @@ try {
|
|
|
632
641
|
} catch (error) {
|
|
633
642
|
console.log("REJECTED:", String(error))
|
|
634
643
|
}`)
|
|
635
|
-
assert.
|
|
636
|
-
output,
|
|
637
|
-
|
|
644
|
+
assert.deepStrictEqual(
|
|
645
|
+
JSON.parse(output.split("OK:")[1]!.split("\n")[0]!),
|
|
646
|
+
{
|
|
647
|
+
id: "1",
|
|
648
|
+
kind: "bash",
|
|
649
|
+
status: "completed",
|
|
650
|
+
description: "echo hi",
|
|
651
|
+
output: "hi\n",
|
|
652
|
+
exitCode: 0,
|
|
653
|
+
},
|
|
638
654
|
)
|
|
639
655
|
assert.match(
|
|
640
656
|
output,
|
|
@@ -644,20 +660,22 @@ try {
|
|
|
644
660
|
}).pipe(Effect.timeout("5 seconds"), Effect.provide(executorLayer({}))),
|
|
645
661
|
)
|
|
646
662
|
|
|
647
|
-
it.live("waits for a background task with
|
|
663
|
+
it.live("waits for a background bash task with waitTasks", () =>
|
|
648
664
|
Effect.gen(function* () {
|
|
649
665
|
const executor = yield* AgentExecutor.AgentExecutor
|
|
650
666
|
const { environment } = yield* executor.capabilities
|
|
651
667
|
const output = yield* runScript(`
|
|
668
|
+
const show = ({ id, kind, status, exitCode, output }) =>
|
|
669
|
+
JSON.stringify({ id, kind, status, exitCode, output })
|
|
652
670
|
const task = await bash({
|
|
653
671
|
command: ${JSON.stringify(`${gatedCommand(environment.cwd)} && echo done`)},
|
|
654
672
|
background: true,
|
|
655
673
|
})
|
|
656
674
|
await writeFile({ path: "gate", content: "" })
|
|
657
|
-
console.log("WAITED:",
|
|
675
|
+
console.log("WAITED:", (await waitTasks({ ids: [task.id] })).map(show).join())`)
|
|
658
676
|
assert.include(
|
|
659
677
|
output,
|
|
660
|
-
'WAITED: {"id":"1","status":"completed","exitCode":0,"output":"done\\n"}',
|
|
678
|
+
'WAITED: {"id":"1","kind":"bash","status":"completed","exitCode":0,"output":"done\\n"}',
|
|
661
679
|
)
|
|
662
680
|
}).pipe(Effect.timeout("5 seconds"), Effect.provide(executorLayer({}))),
|
|
663
681
|
)
|
|
@@ -674,11 +692,11 @@ const task = await bash({
|
|
|
674
692
|
background: true,
|
|
675
693
|
})
|
|
676
694
|
const waits = [
|
|
677
|
-
await
|
|
678
|
-
await
|
|
679
|
-
await
|
|
695
|
+
...(await waitTasks({ ids: [task.id], timeoutMs: 100 })),
|
|
696
|
+
...(await waitTasks({ ids: [task.id] })),
|
|
697
|
+
...(await waitTasks({ ids: [task.id], timeoutMs: 60000 })),
|
|
680
698
|
]
|
|
681
|
-
console.log("WAITS:", JSON.stringify(waits.map((
|
|
699
|
+
console.log("WAITS:", JSON.stringify(waits.map((task) => task.status)))`)
|
|
682
700
|
assert.include(output, 'WAITS: ["running","running","running"]')
|
|
683
701
|
assert.strictEqual(
|
|
684
702
|
yield* waitForLog(environment.cwd, started),
|
|
@@ -696,12 +714,12 @@ console.log("WAITS:", JSON.stringify(waits.map((job) => job.status)))`)
|
|
|
696
714
|
),
|
|
697
715
|
)
|
|
698
716
|
|
|
699
|
-
// The watcher returns only after the
|
|
717
|
+
// The watcher returns only after the task has ended, so the task always
|
|
700
718
|
// finishes before `bash` returns. `bash` must return the snapshot it
|
|
701
719
|
// handed over, leaving the final state to the watcher alone. Over RPC the
|
|
702
720
|
// server's watcher does not wait for the client's, so only local mode
|
|
703
721
|
// forces the ordering.
|
|
704
|
-
it.live("returns the task it hands to the
|
|
722
|
+
it.live("returns the task it hands to the task watcher", () =>
|
|
705
723
|
Effect.gen(function* () {
|
|
706
724
|
const executor = yield* AgentExecutor.AgentExecutor
|
|
707
725
|
const { environment } = yield* executor.capabilities
|
|
@@ -713,69 +731,92 @@ console.log("WAITS:", JSON.stringify(waits.map((job) => job.status)))`)
|
|
|
713
731
|
onEnvironment: () => Effect.void,
|
|
714
732
|
script: `
|
|
715
733
|
await bash({ command: "true" })
|
|
716
|
-
|
|
734
|
+
const { id, kind, status } = await bash({ command: "true", background: true })
|
|
735
|
+
console.log("RETURNED:", JSON.stringify({ id, kind, status }))`,
|
|
717
736
|
onTaskComplete: () => Effect.void,
|
|
718
|
-
|
|
737
|
+
agentTasks: agentTasksUnavailable,
|
|
719
738
|
onImage: () => Effect.void,
|
|
720
|
-
|
|
739
|
+
onTask: (task) =>
|
|
721
740
|
Effect.gen(function* () {
|
|
722
|
-
watched.push(
|
|
723
|
-
yield*
|
|
724
|
-
claims.push(yield*
|
|
741
|
+
watched.push(task.id)
|
|
742
|
+
yield* task.await
|
|
743
|
+
claims.push(yield* task.claim)
|
|
725
744
|
}),
|
|
726
745
|
})
|
|
727
746
|
.pipe(Stream.mkString)
|
|
728
|
-
assert.include(
|
|
747
|
+
assert.include(
|
|
748
|
+
output,
|
|
749
|
+
'RETURNED: {"id":"2","kind":"bash","status":"running"}',
|
|
750
|
+
)
|
|
729
751
|
assert.deepStrictEqual(watched, ["2"], "only the running task")
|
|
730
752
|
assert.deepStrictEqual(claims, [true], "reported once, by the watcher")
|
|
731
753
|
}).pipe(Effect.timeout("5 seconds"), Effect.provide(executorLayer({}))),
|
|
732
754
|
)
|
|
733
755
|
|
|
734
|
-
it.live("reports background
|
|
756
|
+
it.live("reports background bash tasks through taskOutput", () =>
|
|
735
757
|
Effect.gen(function* () {
|
|
736
758
|
const executor = yield* AgentExecutor.AgentExecutor
|
|
737
759
|
const { environment } = yield* executor.capabilities
|
|
738
760
|
const output = yield* runScript(`
|
|
761
|
+
const show = ({ id, kind, status, exitCode, output }) =>
|
|
762
|
+
JSON.stringify({ id, kind, status, exitCode, output })
|
|
739
763
|
const done = async (id) => {
|
|
740
|
-
let
|
|
741
|
-
while (
|
|
764
|
+
let task = await taskOutput(id)
|
|
765
|
+
while (task.status === "running") {
|
|
742
766
|
await sleep(20)
|
|
743
|
-
|
|
767
|
+
task = await taskOutput(id)
|
|
744
768
|
}
|
|
745
|
-
return
|
|
769
|
+
return task
|
|
746
770
|
}
|
|
747
771
|
await bash({ command: ${JSON.stringify(gatedCommand(environment.cwd))}, background: true })
|
|
748
772
|
await bash({ command: "echo out && exit 3", background: true })
|
|
749
|
-
console.log("RUNNING:",
|
|
773
|
+
console.log("RUNNING:", show(await taskOutput("1")))
|
|
750
774
|
await writeFile({ path: "gate", content: "" })
|
|
751
|
-
console.log("COMPLETED:",
|
|
752
|
-
console.log("FAILED:",
|
|
753
|
-
assert.include(output, 'RUNNING: {"id":"1","status":"running"')
|
|
775
|
+
console.log("COMPLETED:", show(await done("1")))
|
|
776
|
+
console.log("FAILED:", show(await done("2")))`)
|
|
754
777
|
assert.include(
|
|
755
778
|
output,
|
|
756
|
-
'
|
|
779
|
+
'RUNNING: {"id":"1","kind":"bash","status":"running","output":""}',
|
|
757
780
|
)
|
|
758
781
|
assert.include(
|
|
759
782
|
output,
|
|
760
|
-
'
|
|
783
|
+
'COMPLETED: {"id":"1","kind":"bash","status":"completed","exitCode":0,"output":""}',
|
|
784
|
+
)
|
|
785
|
+
assert.include(
|
|
786
|
+
output,
|
|
787
|
+
'FAILED: {"id":"2","kind":"bash","status":"failed","exitCode":3,"output":"out\\n"}',
|
|
761
788
|
)
|
|
762
789
|
}).pipe(Effect.timeout("5 seconds"), Effect.provide(executorLayer({}))),
|
|
763
790
|
)
|
|
764
791
|
|
|
765
|
-
it.live("stops a background
|
|
792
|
+
it.live("stops a background bash task with stopTask", () =>
|
|
766
793
|
Effect.gen(function* () {
|
|
767
794
|
const executor = yield* AgentExecutor.AgentExecutor
|
|
768
795
|
const { environment } = yield* executor.capabilities
|
|
769
796
|
const output = yield* runScript(`
|
|
797
|
+
const show = ({ id, kind, status }) => JSON.stringify({ id, kind, status })
|
|
770
798
|
await bash({ command: ${JSON.stringify(gatedCommand(environment.cwd))}, background: true })
|
|
771
|
-
console.log("STOPPED:", JSON.stringify(await stopJob("1")))
|
|
772
799
|
try {
|
|
773
|
-
await
|
|
800
|
+
await messageAgent({ id: "1", message: "hello" })
|
|
801
|
+
} catch (error) {
|
|
802
|
+
console.log("MESSAGE-REJECTED:", String(error))
|
|
803
|
+
}
|
|
804
|
+
console.log("STOPPED:", show(await stopTask("1")))
|
|
805
|
+
try {
|
|
806
|
+
await stopTask("99")
|
|
774
807
|
} catch (error) {
|
|
775
808
|
console.log("REJECTED:", String(error))
|
|
776
809
|
}`)
|
|
777
|
-
assert.
|
|
778
|
-
|
|
810
|
+
assert.match(
|
|
811
|
+
output,
|
|
812
|
+
/MESSAGE-REJECTED:.*\bbash\b/,
|
|
813
|
+
"messageAgent only addresses agent tasks",
|
|
814
|
+
)
|
|
815
|
+
assert.include(
|
|
816
|
+
output,
|
|
817
|
+
'STOPPED: {"id":"1","kind":"bash","status":"stopped"}',
|
|
818
|
+
)
|
|
819
|
+
assert.match(output, /REJECTED:.*No task with id "99".*listTasks\(\)/)
|
|
779
820
|
openGate(environment.cwd)
|
|
780
821
|
yield* Effect.sleep("500 millis")
|
|
781
822
|
assert.notInclude(
|
|
@@ -814,7 +855,7 @@ try {
|
|
|
814
855
|
|
|
815
856
|
// The log sits outside the executor's directory, which is removed with
|
|
816
857
|
// the executor.
|
|
817
|
-
it.live("stops background
|
|
858
|
+
it.live("stops background bash tasks when the executor shuts down", () =>
|
|
818
859
|
Effect.gen(function* () {
|
|
819
860
|
const fs = yield* FileSystem.FileSystem
|
|
820
861
|
const directory = yield* fs.makeTempDirectoryScoped()
|
|
@@ -878,7 +919,7 @@ try {
|
|
|
878
919
|
onEnvironment: () => Effect.void,
|
|
879
920
|
onTaskComplete: () => Effect.void,
|
|
880
921
|
onImage: () => Effect.void,
|
|
881
|
-
|
|
922
|
+
agentTasks: agentTasksUnavailable,
|
|
882
923
|
script: `
|
|
883
924
|
console.log("before")
|
|
884
925
|
await sleep(10000)
|
|
@@ -957,8 +998,8 @@ console.log("MAIN" + "_DONE")`)
|
|
|
957
998
|
delegate({ prompt: "never finishes" })
|
|
958
999
|
sleep(100).then(() => console.constructor.constructor("return process")().exit(7))`,
|
|
959
1000
|
onTaskComplete: () => Effect.void,
|
|
960
|
-
|
|
961
|
-
...
|
|
1001
|
+
agentTasks: {
|
|
1002
|
+
...agentTasksUnavailable,
|
|
962
1003
|
delegate: () => Effect.never,
|
|
963
1004
|
},
|
|
964
1005
|
onImage: () => Effect.void,
|