clanka 0.22.4 → 0.22.6
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/README.md +12 -0
- package/dist/Agent.d.ts.map +1 -1
- package/dist/Agent.js +4 -16
- package/dist/Agent.js.map +1 -1
- package/dist/AgentCallerConfig.test.js +22 -0
- package/dist/AgentCallerConfig.test.js.map +1 -1
- package/dist/AgentExecutor.d.ts +1 -0
- package/dist/AgentExecutor.d.ts.map +1 -1
- package/dist/AgentExecutor.js +15 -6
- package/dist/AgentExecutor.js.map +1 -1
- package/dist/AgentExecutor.test.js +3 -1
- package/dist/AgentExecutor.test.js.map +1 -1
- package/dist/AgentSubagents.test.js +34 -5
- package/dist/AgentSubagents.test.js.map +1 -1
- package/dist/AgentTools.d.ts +6 -46
- package/dist/AgentTools.d.ts.map +1 -1
- package/dist/AgentTools.js +1 -2
- package/dist/AgentTools.js.map +1 -1
- package/dist/bin/cli.mjs +23 -26
- package/dist/bin/cli.mjs.map +1 -1
- package/dist/cli.js +8 -1
- package/dist/cli.js.map +1 -1
- package/package.json +1 -1
- package/src/Agent.ts +3 -27
- package/src/AgentCallerConfig.test.ts +26 -0
- package/src/AgentExecutor.test.ts +3 -1
- package/src/AgentExecutor.ts +24 -8
- package/src/AgentSubagents.test.ts +50 -9
- package/src/AgentTools.ts +4 -7
- package/src/cli.ts +18 -1
package/dist/cli.js
CHANGED
|
@@ -166,6 +166,7 @@ const compactionConfig = (flags) => Compaction.CompactionConfig.layer({
|
|
|
166
166
|
enabled: flags.compaction,
|
|
167
167
|
thresholdTokens: flags.compactionThreshold,
|
|
168
168
|
});
|
|
169
|
+
const fetch = Flag.Boolean("fetch").pipe(Flag.withDescription("Expose the global Fetch API to scripts. Disable with --no-fetch or CLANKA_FETCH=false."), Flag.withFallbackConfig(Config.Boolean("CLANKA_FETCH").pipe(Config.withDefault(true))));
|
|
169
170
|
// Kill switch: `--no-mcp` or CLANKA_MCP=false.
|
|
170
171
|
const mcp = Flag.Boolean("mcp").pipe(Flag.withDescription("Start the MCP servers from ~/.config/clanka/mcp.json, ./.mcp.json and --mcp-config. Disable with --no-mcp or CLANKA_MCP=false."), Flag.withFallbackConfig(Config.Boolean("CLANKA_MCP").pipe(Config.withDefault(true))));
|
|
171
172
|
const mcpConfig = Flag.String("mcp-config").pipe(Flag.withDescription('An MCP config file in the { "mcpServers": { ... } } format. Repeatable; a later file wins.'), Flag.atLeast(0));
|
|
@@ -206,6 +207,7 @@ const trustAllTools = Flag.Boolean("trust-all-tools").pipe(Flag.withDescription(
|
|
|
206
207
|
const reasoning = Config.schema(Acp.ThoughtLevel, "CLANKA_REASONING").pipe(Config.withDefault("medium"));
|
|
207
208
|
const acp = Command.make("acp", {
|
|
208
209
|
model: acpModel,
|
|
210
|
+
fetch,
|
|
209
211
|
trustAllTools,
|
|
210
212
|
fast,
|
|
211
213
|
compaction,
|
|
@@ -226,7 +228,10 @@ const acp = Command.make("acp", {
|
|
|
226
228
|
availableModels: Effect.map(repo.models, ModelLayer.acpModels),
|
|
227
229
|
// Built in the session scope: the executor runs commands in its own
|
|
228
230
|
// scope, which `Effect.provide` would close once the agent is made.
|
|
229
|
-
makeAgent: (cwd) => Layer.build(AgentExecutor.layerLocal({
|
|
231
|
+
makeAgent: (cwd) => Layer.build(AgentExecutor.layerLocal({
|
|
232
|
+
directory: cwd,
|
|
233
|
+
excludeTools: flags.fetch ? [] : ["fetch"],
|
|
234
|
+
})).pipe(Effect.flatMap((context) => Agent.make.pipe(Effect.provideContext(context)))),
|
|
230
235
|
makeModel: ModelLayer.makeAcp({
|
|
231
236
|
models: repo.models,
|
|
232
237
|
openai: {
|
|
@@ -239,6 +244,7 @@ const acp = Command.make("acp", {
|
|
|
239
244
|
})), Command.provide((flags) => Layer.mergeAll(Agent.ConversationMode.layer(false), Layer.succeed(Logger.LogToStderr, true), DeviceCodeHandler.layerLog, compactionConfig(flags))));
|
|
240
245
|
Command.make("clanka", {
|
|
241
246
|
provider,
|
|
247
|
+
fetch,
|
|
242
248
|
model,
|
|
243
249
|
fast,
|
|
244
250
|
semantic,
|
|
@@ -289,6 +295,7 @@ Command.make("clanka", {
|
|
|
289
295
|
}).pipe(Effect.provide([
|
|
290
296
|
Agent.layerLocal({
|
|
291
297
|
directory: process.cwd(),
|
|
298
|
+
excludeTools: flags.fetch ? [] : ["fetch"],
|
|
292
299
|
}).pipe(Layer.provide(Option.match(semantic, {
|
|
293
300
|
onNone: () => Layer.empty,
|
|
294
301
|
onSome: Search,
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/Agent.ts
CHANGED
|
@@ -686,7 +686,7 @@ ${prompt}`,
|
|
|
686
686
|
if (child.turn.status === "running") {
|
|
687
687
|
child.mailbox.messages.add({ message, resume: () => {} })
|
|
688
688
|
child.mailbox.notify()
|
|
689
|
-
return
|
|
689
|
+
return
|
|
690
690
|
}
|
|
691
691
|
child.turn = makeTurn(true)
|
|
692
692
|
yield* startTurn({
|
|
@@ -695,7 +695,6 @@ ${prompt}`,
|
|
|
695
695
|
label: message,
|
|
696
696
|
background: true,
|
|
697
697
|
})
|
|
698
|
-
return childTask(child)
|
|
699
698
|
}),
|
|
700
699
|
stopTask: Effect.fnUntraced(function* (id) {
|
|
701
700
|
const child = yield* lookupChild(id)
|
|
@@ -704,7 +703,6 @@ ${prompt}`,
|
|
|
704
703
|
if (turn.status === "running") {
|
|
705
704
|
yield* Fiber.interrupt(turn.fiber!)
|
|
706
705
|
}
|
|
707
|
-
return childTask(child)
|
|
708
706
|
}),
|
|
709
707
|
listTasks: Effect.sync(() =>
|
|
710
708
|
Array.Array.from(children.values(), childTask),
|
|
@@ -1795,27 +1793,13 @@ const generateSystemTools = (
|
|
|
1795
1793
|
tools.offers("search") && tools.offers("rg"),
|
|
1796
1794
|
`
|
|
1797
1795
|
- Prefer using the "search" function over "rg", unless you are targeting specific files or patterns.`,
|
|
1798
|
-
)}${when(
|
|
1799
|
-
tools.offers("applyPatch"),
|
|
1800
|
-
`
|
|
1801
|
-
- You can add / update / remove multiple files in one go with "applyPatch".${when(
|
|
1802
|
-
tools.offers("writeFile"),
|
|
1803
|
-
` Prefer it over "writeFile" to update existing files.`,
|
|
1804
|
-
)}`,
|
|
1805
1796
|
)}${when(
|
|
1806
1797
|
tools.offers("bash"),
|
|
1807
1798
|
`
|
|
1808
1799
|
- Avoid passing scripts into the "bash" function, and instead write javascript.`,
|
|
1809
1800
|
)}
|
|
1810
1801
|
- Variables are not shared between executions.
|
|
1811
|
-
- Do not use \`require\`, \`import\`, \`process\`, or any other Node.js apis.${when(
|
|
1812
|
-
tools.offers("delegate"),
|
|
1813
|
-
`
|
|
1814
|
-
- "delegate" runs a sub-agent and waits for it. Pass \`background: true\` to keep working while it runs: it returns an agent task straight away, and the agent's result is sent to you when it ends.${when(
|
|
1815
|
-
tools.offers("messageAgent"),
|
|
1816
|
-
` Use "messageAgent" to send a message to a sub-agent.`,
|
|
1817
|
-
)}`,
|
|
1818
|
-
)}${taskInstructions(tools)}${when(
|
|
1802
|
+
- Do not use \`require\`, \`import\`, \`process\`, or any other Node.js apis.${taskInstructions(tools)}${when(
|
|
1819
1803
|
!conversationMode,
|
|
1820
1804
|
`
|
|
1821
1805
|
|
|
@@ -1831,9 +1815,6 @@ These are the functions available to you:
|
|
|
1831
1815
|
|
|
1832
1816
|
\`\`\`ts
|
|
1833
1817
|
${tools.toolsDts}
|
|
1834
|
-
|
|
1835
|
-
/** The global Fetch API available for making HTTP requests. */
|
|
1836
|
-
declare const fetch: typeof globalThis.fetch
|
|
1837
1818
|
\`\`\`${when(
|
|
1838
1819
|
tools.mcp !== "",
|
|
1839
1820
|
`
|
|
@@ -1853,12 +1834,7 @@ Here is how you would read a file and list a directory:
|
|
|
1853
1834
|
\`\`\`
|
|
1854
1835
|
const [files, content] = await Promise.all([
|
|
1855
1836
|
ls("."),
|
|
1856
|
-
readFile({
|
|
1857
|
-
path: "package.json",
|
|
1858
|
-
startLine: 1,
|
|
1859
|
-
endLine: 10,
|
|
1860
|
-
lineNumbers: false,
|
|
1861
|
-
})
|
|
1837
|
+
readFile({ path: "package.json", startLine: 1, endLine: 10 })
|
|
1862
1838
|
])
|
|
1863
1839
|
console.log("files:", files)
|
|
1864
1840
|
console.log("package.json:", JSON.parse(content))
|
|
@@ -229,6 +229,32 @@ const execute = (
|
|
|
229
229
|
// Where the RPC executor takes its own path.
|
|
230
230
|
for (const mode of modes) {
|
|
231
231
|
describe(`${mode} executor`, () => {
|
|
232
|
+
it.live("fetch is available by default and can be left out", () =>
|
|
233
|
+
Effect.gen(function* () {
|
|
234
|
+
const enabled = yield* runAgent({
|
|
235
|
+
mode,
|
|
236
|
+
script: `await taskComplete(typeof fetch + " " + await (await fetch("data:text/plain,hello")).text())`,
|
|
237
|
+
})
|
|
238
|
+
assert.strictEqual(enabled.summary, "function hello")
|
|
239
|
+
assert.include(enabled.system, "declare const fetch:")
|
|
240
|
+
|
|
241
|
+
const disabled = yield* runAgent({
|
|
242
|
+
mode,
|
|
243
|
+
executor: { excludeTools: ["fetch"] },
|
|
244
|
+
script: `let result = typeof globalThis.fetch
|
|
245
|
+
try {
|
|
246
|
+
await fetch("data:text/plain,hello")
|
|
247
|
+
result += " called"
|
|
248
|
+
} catch {
|
|
249
|
+
result += " failed"
|
|
250
|
+
}
|
|
251
|
+
await taskComplete(result)`,
|
|
252
|
+
})
|
|
253
|
+
assert.strictEqual(disabled.summary, "undefined failed")
|
|
254
|
+
assert.notMatch(disabled.system, /\bfetch\b/)
|
|
255
|
+
}),
|
|
256
|
+
)
|
|
257
|
+
|
|
232
258
|
it.live("left-out tools are not offered to the model or the script", () =>
|
|
233
259
|
Effect.gen(function* () {
|
|
234
260
|
const { system, summary } = yield* runAgent({
|
|
@@ -801,7 +801,8 @@ try {
|
|
|
801
801
|
} catch (error) {
|
|
802
802
|
console.log("MESSAGE-REJECTED:", String(error))
|
|
803
803
|
}
|
|
804
|
-
console.log("
|
|
804
|
+
console.log("STOP-VOID:", (await stopTask("1")) === undefined)
|
|
805
|
+
console.log("STOPPED:", show(await taskOutput("1")))
|
|
805
806
|
try {
|
|
806
807
|
await stopTask("99")
|
|
807
808
|
} catch (error) {
|
|
@@ -816,6 +817,7 @@ try {
|
|
|
816
817
|
output,
|
|
817
818
|
'STOPPED: {"id":"1","kind":"bash","status":"stopped"}',
|
|
818
819
|
)
|
|
820
|
+
assert.include(output, "STOP-VOID: true")
|
|
819
821
|
assert.match(output, /REJECTED:.*No task with id "99".*listTasks\(\)/)
|
|
820
822
|
openGate(environment.cwd)
|
|
821
823
|
yield* Effect.sleep("500 millis")
|
package/src/AgentExecutor.ts
CHANGED
|
@@ -315,6 +315,7 @@ export interface LocalOptions<Toolkit extends Toolkit.Any = never> {
|
|
|
315
315
|
* Built-in tools to leave out of the sandbox and the type declarations.
|
|
316
316
|
* Leaving out `delegate` also leaves out `messageAgent`, and leaving out
|
|
317
317
|
* both `delegate` and `bash` leaves out the task functions.
|
|
318
|
+
* Leaving out `fetch` removes the global Fetch API.
|
|
318
319
|
*/
|
|
319
320
|
readonly excludeTools?: ReadonlyArray<ExcludableTool> | undefined
|
|
320
321
|
}
|
|
@@ -401,6 +402,7 @@ const makeLocalWith = Effect.fnUntraced(function* <
|
|
|
401
402
|
Duration.fromInputUnsafe,
|
|
402
403
|
)
|
|
403
404
|
const excluded = excludedToolNames(options.excludeTools)
|
|
405
|
+
const offersFetch = !excluded.has("fetch")
|
|
404
406
|
const search = yield* Effect.serviceOption(SemanticSearch)
|
|
405
407
|
const BuiltInTools = Toolkit.make(
|
|
406
408
|
...Object.values(
|
|
@@ -418,7 +420,14 @@ const makeLocalWith = Effect.fnUntraced(function* <
|
|
|
418
420
|
(options.tools as unknown as Toolkit.Toolkit<{}>) ?? Toolkit.empty,
|
|
419
421
|
)
|
|
420
422
|
const tools = yield* AllTools
|
|
421
|
-
const toolsDts =
|
|
423
|
+
const toolsDts = [
|
|
424
|
+
renderer.render(AllTools),
|
|
425
|
+
offersFetch
|
|
426
|
+
? "/** The global Fetch API available for making HTTP requests. */\ndeclare const fetch: typeof globalThis.fetch"
|
|
427
|
+
: "",
|
|
428
|
+
]
|
|
429
|
+
.filter((dts) => dts !== "")
|
|
430
|
+
.join("\n\n")
|
|
422
431
|
|
|
423
432
|
const services = yield* Effect.context()
|
|
424
433
|
|
|
@@ -548,6 +557,7 @@ const makeLocalWith = Effect.fnUntraced(function* <
|
|
|
548
557
|
eval: true,
|
|
549
558
|
workerData: {
|
|
550
559
|
source,
|
|
560
|
+
offersFetch,
|
|
551
561
|
tools: [...toolNames, ...Object.keys(opts.loopTools ?? {})],
|
|
552
562
|
} satisfies WorkerData,
|
|
553
563
|
}),
|
|
@@ -686,7 +696,9 @@ const makeLocalWith = Effect.fnUntraced(function* <
|
|
|
686
696
|
],
|
|
687
697
|
seen: [],
|
|
688
698
|
}),
|
|
689
|
-
tools:
|
|
699
|
+
tools: Array.from(
|
|
700
|
+
new Set([...toolNames, ...(offersFetch ? ["fetch"] : [])]),
|
|
701
|
+
),
|
|
690
702
|
skills,
|
|
691
703
|
taskPushes: true,
|
|
692
704
|
})
|
|
@@ -996,11 +1008,14 @@ export const layerRpcServer = <Toolkit extends Toolkit.Any = never>(
|
|
|
996
1008
|
timeoutMs,
|
|
997
1009
|
}),
|
|
998
1010
|
messageAgent: (options) =>
|
|
999
|
-
|
|
1000
|
-
|
|
1001
|
-
|
|
1002
|
-
|
|
1003
|
-
|
|
1011
|
+
Effect.asVoid(
|
|
1012
|
+
request<void>({
|
|
1013
|
+
_tag: "MessageAgent",
|
|
1014
|
+
...options,
|
|
1015
|
+
}),
|
|
1016
|
+
),
|
|
1017
|
+
stopTask: (id) =>
|
|
1018
|
+
Effect.asVoid(request<void>({ _tag: "StopTask", id })),
|
|
1004
1019
|
listTasks: Effect.orDie(
|
|
1005
1020
|
request<ReadonlyArray<Task>>({
|
|
1006
1021
|
_tag: "ListTasks",
|
|
@@ -1420,6 +1435,7 @@ const prepareScript = (script: string): string => {
|
|
|
1420
1435
|
|
|
1421
1436
|
interface WorkerData {
|
|
1422
1437
|
readonly source: string
|
|
1438
|
+
readonly offersFetch: boolean
|
|
1423
1439
|
readonly tools: ReadonlyArray<string>
|
|
1424
1440
|
}
|
|
1425
1441
|
|
|
@@ -1569,7 +1585,7 @@ function runScriptWorker(load: (id: string) => unknown): void {
|
|
|
1569
1585
|
stdout,
|
|
1570
1586
|
inspectOptions: { colors: false, compact: true, breakLength: Infinity },
|
|
1571
1587
|
}),
|
|
1572
|
-
fetch,
|
|
1588
|
+
...(data.offersFetch ? { fetch } : {}),
|
|
1573
1589
|
process: undefined,
|
|
1574
1590
|
}
|
|
1575
1591
|
// MCP tools are named "<server>.<tool>" and bound as `mcp[server][tool]`.
|
|
@@ -603,8 +603,8 @@ await taskComplete("done")`,
|
|
|
603
603
|
Stream.as(
|
|
604
604
|
toolCall(
|
|
605
605
|
"stop",
|
|
606
|
-
`
|
|
607
|
-
console.log(JSON.stringify(
|
|
606
|
+
`console.log("STOP-VOID:", (await stopTask("1")) === undefined)
|
|
607
|
+
console.log(JSON.stringify(await taskOutput("1")))`,
|
|
608
608
|
),
|
|
609
609
|
),
|
|
610
610
|
)
|
|
@@ -622,6 +622,7 @@ console.log(JSON.stringify(result))`,
|
|
|
622
622
|
assert.deepStrictEqual(exit, Exit.succeed("stopped"))
|
|
623
623
|
const root = calls.filter((call) => call.role === "root")
|
|
624
624
|
const stopped = lastToolResult(root[2]!.prompt)
|
|
625
|
+
assert.include(stopped, "STOP-VOID: true")
|
|
625
626
|
assert.include(stopped, '"id":"1"')
|
|
626
627
|
assert.include(stopped, '"status":"stopped"')
|
|
627
628
|
assert.isTrue(
|
|
@@ -630,6 +631,51 @@ console.log(JSON.stringify(result))`,
|
|
|
630
631
|
)
|
|
631
632
|
}))
|
|
632
633
|
|
|
634
|
+
test("messageAgent returns void when steering a running child", () =>
|
|
635
|
+
Effect.gen(function* () {
|
|
636
|
+
const childStarted = Latch.makeUnsafe(false)
|
|
637
|
+
const childRelease = Latch.makeUnsafe(false)
|
|
638
|
+
const { exit, calls } = yield* runAgent({
|
|
639
|
+
conversationMode: true,
|
|
640
|
+
respond: (call) => {
|
|
641
|
+
if (call.role === "child") {
|
|
642
|
+
if (call.index === 0) {
|
|
643
|
+
return Stream.fromEffect(
|
|
644
|
+
Effect.sync(() => childStarted.openUnsafe()).pipe(
|
|
645
|
+
Effect.andThen(childRelease.await),
|
|
646
|
+
),
|
|
647
|
+
).pipe(Stream.flatMap(() => Stream.fromIterable(text("ready"))))
|
|
648
|
+
}
|
|
649
|
+
return complete("STEERED-ANSWER")
|
|
650
|
+
}
|
|
651
|
+
if (call.index === 0) {
|
|
652
|
+
return Stream.make(spawnBackground("TASK-CHILD"))
|
|
653
|
+
}
|
|
654
|
+
if (call.index === 1) {
|
|
655
|
+
return Stream.fromEffect(childStarted.await).pipe(
|
|
656
|
+
Stream.as(
|
|
657
|
+
toolCall(
|
|
658
|
+
"message",
|
|
659
|
+
`console.log("MESSAGE-VOID:", (await messageAgent({ id: "1", message: "STEER" })) === undefined)`,
|
|
660
|
+
),
|
|
661
|
+
),
|
|
662
|
+
)
|
|
663
|
+
}
|
|
664
|
+
childRelease.openUnsafe()
|
|
665
|
+
return Stream.fromIterable(text("steered"))
|
|
666
|
+
},
|
|
667
|
+
})
|
|
668
|
+
|
|
669
|
+
assert.deepStrictEqual(exit, Exit.succeed("steered"))
|
|
670
|
+
const root = calls.filter((call) => call.role === "root")
|
|
671
|
+
assert.include(lastToolResult(root[2]!.prompt), "MESSAGE-VOID: true")
|
|
672
|
+
const steered = calls.find(
|
|
673
|
+
(call) => call.role === "child" && call.index === 1,
|
|
674
|
+
)
|
|
675
|
+
assert.isDefined(steered, "the running child received the message")
|
|
676
|
+
assert.include(JSON.stringify(steered!.prompt), "STEER")
|
|
677
|
+
}))
|
|
678
|
+
|
|
633
679
|
test("messageAgent resumes a finished child on top of its history", () =>
|
|
634
680
|
Effect.gen(function* () {
|
|
635
681
|
let messageCall: number | undefined
|
|
@@ -666,7 +712,7 @@ console.log(JSON.stringify(result))`,
|
|
|
666
712
|
toolCall(
|
|
667
713
|
"message",
|
|
668
714
|
`const result = await messageAgent({ id: "1", message: "FOLLOW-UP" })
|
|
669
|
-
console.log(
|
|
715
|
+
console.log("MESSAGE-VOID:", result === undefined)`,
|
|
670
716
|
),
|
|
671
717
|
)
|
|
672
718
|
}
|
|
@@ -678,12 +724,7 @@ console.log(JSON.stringify(result))`,
|
|
|
678
724
|
assert.isDefined(messageCall, "the first answer was pushed")
|
|
679
725
|
const root = calls.filter((call) => call.role === "root")
|
|
680
726
|
const messaged = lastToolResult(root[messageCall! + 1]!.prompt)
|
|
681
|
-
assert.include(messaged,
|
|
682
|
-
assert.include(
|
|
683
|
-
messaged,
|
|
684
|
-
'"status":"running"',
|
|
685
|
-
"messageAgent returns without waiting for the new turn",
|
|
686
|
-
)
|
|
727
|
+
assert.include(messaged, "MESSAGE-VOID: true")
|
|
687
728
|
|
|
688
729
|
assert.isDefined(resumedPrompt, "the finished child was resumed")
|
|
689
730
|
const resumed = messageJsons(resumedPrompt!)
|
package/src/AgentTools.ts
CHANGED
|
@@ -161,7 +161,7 @@ export interface AgentTasks {
|
|
|
161
161
|
/**
|
|
162
162
|
* Interrupt an agent and everything it spawned.
|
|
163
163
|
*/
|
|
164
|
-
readonly stopTask: (id: string) => Effect.Effect<
|
|
164
|
+
readonly stopTask: (id: string) => Effect.Effect<void, string>
|
|
165
165
|
/**
|
|
166
166
|
* The agents this agent started.
|
|
167
167
|
*/
|
|
@@ -454,7 +454,6 @@ export const AgentTools = Toolkit.make(
|
|
|
454
454
|
parameters: Schema.String.annotate({
|
|
455
455
|
identifier: "id",
|
|
456
456
|
}),
|
|
457
|
-
success: Task,
|
|
458
457
|
failure: Schema.String,
|
|
459
458
|
dependencies: [AgentTaskExecutor],
|
|
460
459
|
}),
|
|
@@ -562,10 +561,8 @@ export const AgentToolsWithSearch = Toolkit.merge(SearchTool, AgentTools)
|
|
|
562
561
|
* @since 1.0.0
|
|
563
562
|
* @category Toolkit
|
|
564
563
|
*/
|
|
565
|
-
export type ExcludableTool =
|
|
566
|
-
keyof typeof AgentToolsWithSearch.tools,
|
|
567
|
-
"taskComplete"
|
|
568
|
-
>
|
|
564
|
+
export type ExcludableTool =
|
|
565
|
+
Exclude<keyof typeof AgentToolsWithSearch.tools, "taskComplete"> | "fetch"
|
|
569
566
|
|
|
570
567
|
/**
|
|
571
568
|
* @since 1.0.0
|
|
@@ -981,7 +978,7 @@ export const AgentToolHandlersNoDeps = AgentToolsWithSearch.toLayer(
|
|
|
981
978
|
return yield* agentTasks.stopTask(id)
|
|
982
979
|
}
|
|
983
980
|
yield* Fiber.interrupt(entry.command.fiber)
|
|
984
|
-
|
|
981
|
+
entry.command.reported = true
|
|
985
982
|
}),
|
|
986
983
|
listTasks: Effect.fn("AgentTools.listTasks")(function* () {
|
|
987
984
|
yield* Effect.logInfo(`Calling "listTasks"`)
|
package/src/cli.ts
CHANGED
|
@@ -292,6 +292,15 @@ const compactionConfig = (flags: {
|
|
|
292
292
|
thresholdTokens: flags.compactionThreshold,
|
|
293
293
|
})
|
|
294
294
|
|
|
295
|
+
const fetch = Flag.Boolean("fetch").pipe(
|
|
296
|
+
Flag.withDescription(
|
|
297
|
+
"Expose the global Fetch API to scripts. Disable with --no-fetch or CLANKA_FETCH=false.",
|
|
298
|
+
),
|
|
299
|
+
Flag.withFallbackConfig(
|
|
300
|
+
Config.Boolean("CLANKA_FETCH").pipe(Config.withDefault(true)),
|
|
301
|
+
),
|
|
302
|
+
)
|
|
303
|
+
|
|
295
304
|
// Kill switch: `--no-mcp` or CLANKA_MCP=false.
|
|
296
305
|
const mcp = Flag.Boolean("mcp").pipe(
|
|
297
306
|
Flag.withDescription(
|
|
@@ -399,6 +408,7 @@ const reasoning = Config.schema(Acp.ThoughtLevel, "CLANKA_REASONING").pipe(
|
|
|
399
408
|
|
|
400
409
|
const acp = Command.make("acp", {
|
|
401
410
|
model: acpModel,
|
|
411
|
+
fetch,
|
|
402
412
|
trustAllTools,
|
|
403
413
|
fast,
|
|
404
414
|
compaction,
|
|
@@ -428,7 +438,12 @@ const acp = Command.make("acp", {
|
|
|
428
438
|
// Built in the session scope: the executor runs commands in its own
|
|
429
439
|
// scope, which `Effect.provide` would close once the agent is made.
|
|
430
440
|
makeAgent: (cwd) =>
|
|
431
|
-
Layer.build(
|
|
441
|
+
Layer.build(
|
|
442
|
+
AgentExecutor.layerLocal({
|
|
443
|
+
directory: cwd,
|
|
444
|
+
excludeTools: flags.fetch ? [] : ["fetch"],
|
|
445
|
+
}),
|
|
446
|
+
).pipe(
|
|
432
447
|
Effect.flatMap((context) =>
|
|
433
448
|
Agent.make.pipe(Effect.provideContext(context)),
|
|
434
449
|
),
|
|
@@ -456,6 +471,7 @@ const acp = Command.make("acp", {
|
|
|
456
471
|
|
|
457
472
|
Command.make("clanka", {
|
|
458
473
|
provider,
|
|
474
|
+
fetch,
|
|
459
475
|
model,
|
|
460
476
|
fast,
|
|
461
477
|
semantic,
|
|
@@ -548,6 +564,7 @@ Command.make("clanka", {
|
|
|
548
564
|
Effect.provide([
|
|
549
565
|
Agent.layerLocal({
|
|
550
566
|
directory: process.cwd(),
|
|
567
|
+
excludeTools: flags.fetch ? [] : ["fetch"],
|
|
551
568
|
}).pipe(
|
|
552
569
|
Layer.provide(
|
|
553
570
|
Option.match(semantic, {
|