clanka 0.10.1 → 0.11.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/README.md +26 -0
- package/dist/AgentExecutor.test.js +24 -4
- package/dist/AgentExecutor.test.js.map +1 -1
- package/dist/AgentSkills.test.js +0 -1
- package/dist/AgentSkills.test.js.map +1 -1
- package/dist/AgentSubagents.test.js +16 -6
- package/dist/AgentSubagents.test.js.map +1 -1
- package/dist/bin/{Effect-2jPlJ8eu.mjs → Effect-zUBunSAW.mjs} +70 -67
- package/dist/bin/Effect-zUBunSAW.mjs.map +1 -0
- package/dist/bin/{McpClient-1W508adc.mjs → McpClient-CnP2P7c9.mjs} +19 -19
- package/dist/bin/{McpClient-1W508adc.mjs.map → McpClient-CnP2P7c9.mjs.map} +1 -1
- package/dist/bin/{OutputFormatter-BFAv48k9.mjs → OutputFormatter-BPdc6RmH.mjs} +3 -3
- package/dist/bin/{OutputFormatter-BFAv48k9.mjs.map → OutputFormatter-BPdc6RmH.mjs.map} +1 -1
- package/dist/bin/{Schema-D-7VuCiC.mjs → Schema-C2Y2y3tU.mjs} +243 -94
- package/dist/bin/Schema-C2Y2y3tU.mjs.map +1 -0
- package/dist/bin/{SemanticSearch-Cb8aqvGv.mjs → SemanticSearch-BKZxP19F.mjs} +26 -20
- package/dist/bin/SemanticSearch-BKZxP19F.mjs.map +1 -0
- package/dist/bin/{Stream-DEu2tfCV.mjs → Stream-BvmRbTMu.mjs} +44 -27
- package/dist/bin/Stream-BvmRbTMu.mjs.map +1 -0
- package/dist/bin/cli.mjs +2870 -2818
- package/dist/bin/cli.mjs.map +1 -1
- package/dist/bin/{index.min-CI3qqohw.mjs → index.min-DbZbUHX3.mjs} +3 -3
- package/dist/bin/index.min-DbZbUHX3.mjs.map +1 -0
- package/dist/bin/turndown.cjs-DK29wZw3.mjs.map +1 -1
- package/dist/cli.js +23 -6
- package/dist/cli.js.map +1 -1
- package/package.json +14 -14
- package/src/AgentExecutor.test.ts +31 -5
- package/src/AgentSkills.test.ts +0 -1
- package/src/AgentSubagents.test.ts +20 -6
- package/src/cli.ts +46 -8
- package/dist/bin/Effect-2jPlJ8eu.mjs.map +0 -1
- package/dist/bin/Schema-D-7VuCiC.mjs.map +0 -1
- package/dist/bin/SemanticSearch-Cb8aqvGv.mjs.map +0 -1
- package/dist/bin/Stream-DEu2tfCV.mjs.map +0 -1
- package/dist/bin/index.min-CI3qqohw.mjs.map +0 -1
package/dist/cli.js
CHANGED
|
@@ -34,8 +34,10 @@ const version = packageJson.version;
|
|
|
34
34
|
const HttpClientLive = NodeHttpClient.layerNodeHttpNoAgent.pipe(Layer.provide(NodeHttpClient.layerAgentOptions({ keepAlive: true })));
|
|
35
35
|
const providers = ["openai", "copilot", "xai"];
|
|
36
36
|
const withSubagentModel = (model) => Layer.merge(model, Agent.layerSubagentModel(model));
|
|
37
|
-
const modelLayer = (provider, model, effort) => provider === "openai"
|
|
38
|
-
?
|
|
37
|
+
const modelLayer = (provider, model, effort, openai) => provider === "openai"
|
|
38
|
+
? openai.apiKey !== undefined
|
|
39
|
+
? withSubagentModel(Codex.model(model, { reasoning: { effort: effort } })).pipe(Layer.provide(OpenAiClient.layer(openai)))
|
|
40
|
+
: withSubagentModel(Codex.modelWebSocket(model, { reasoning: { effort: effort } })).pipe(Layer.provide(Codex.layerClient))
|
|
39
41
|
: provider === "xai"
|
|
40
42
|
? withSubagentModel(Xai.modelWebSocket(model, {
|
|
41
43
|
reasoning: { effort: effort },
|
|
@@ -80,6 +82,8 @@ const provider = Flag.Literals("provider", providers).pipe(Flag.withAlias("p"),
|
|
|
80
82
|
],
|
|
81
83
|
})));
|
|
82
84
|
const model = Flag.String("model").pipe(Flag.withAlias("m"), Flag.optional);
|
|
85
|
+
const apiKey = Flag.Redacted("api-key").pipe(Flag.withDescription("OpenAI API key (defaults to CLANKA_OPENAI_API_KEY)"), Flag.withFallbackConfig(Config.Redacted("CLANKA_OPENAI_API_KEY")), Flag.optional);
|
|
86
|
+
const apiUrl = Flag.String("api-url").pipe(Flag.withDescription("OpenAI API base URL for API-key mode (defaults to CLANKA_OPENAI_API_URL or https://api.openai.com/v1)"), Flag.withFallbackConfig(Config.String("CLANKA_OPENAI_API_URL")), Flag.optional);
|
|
83
87
|
const semantic = Flag.Directory("search").pipe(Flag.withDescription("Directory for semantic search data (uses OPENAI_API_KEY env var)"), Flag.withAlias("s"), Flag.optional);
|
|
84
88
|
const prompt = Flag.String("prompt").pipe(Flag.withDescription("Pass a prompt in non-interactive mode"), Flag.optional);
|
|
85
89
|
// Kill switch: `--no-compaction` or CLANKA_COMPACTION=false.
|
|
@@ -107,12 +111,20 @@ const Search = (directory) => Layer.unwrap(Effect.gen(function* () {
|
|
|
107
111
|
})));
|
|
108
112
|
})).pipe(Layer.provide([NodeServices.layer, HttpClientLive]));
|
|
109
113
|
const acpModel = Flag.String("model").pipe(Flag.withAlias("m"), Flag.withDescription("Default model as <provider>/<model>/<effort>, e.g. openai/gpt-6-astra/medium"), Flag.withSchema(ModelId), Flag.withDefault("openai/gpt-6-astra/medium"), Flag.map((modelId) => Option.getOrThrow(parseModelId(modelId))));
|
|
110
|
-
const acp = Command.make("acp", {
|
|
114
|
+
const acp = Command.make("acp", {
|
|
115
|
+
model: acpModel,
|
|
116
|
+
compaction,
|
|
117
|
+
apiKey,
|
|
118
|
+
apiUrl,
|
|
119
|
+
}).pipe(Command.withDescription("Run as an Agent Client Protocol (ACP) server over stdio"), Command.withHandler(({ model, apiKey, apiUrl }) => Acp.runStdio({
|
|
111
120
|
version,
|
|
112
121
|
defaultModel: model.model,
|
|
113
122
|
defaultThoughtLevel: model.thoughtLevel,
|
|
114
123
|
makeAgent: (cwd) => Agent.make.pipe(Effect.provide(AgentExecutor.layerLocal({ directory: cwd }))),
|
|
115
|
-
makeModel: (modelId, thoughtLevel) => Option.map(parseAcpModelId(modelId), ({ provider, model }) => modelLayer(provider, model, thoughtLevel
|
|
124
|
+
makeModel: (modelId, thoughtLevel) => Option.map(parseAcpModelId(modelId), ({ provider, model }) => modelLayer(provider, model, thoughtLevel, {
|
|
125
|
+
apiKey: Option.getOrUndefined(apiKey),
|
|
126
|
+
apiUrl: Option.getOrUndefined(apiUrl),
|
|
127
|
+
})),
|
|
116
128
|
})), Command.provide(({ compaction }) => Layer.mergeAll(Agent.ConversationMode.layer(true), Layer.succeed(Logger.LogToStderr, true), DeviceCodeHandler.layerLog, Compaction.CompactionConfig.layer({ enabled: compaction }))));
|
|
117
129
|
Command.make("clanka", {
|
|
118
130
|
provider,
|
|
@@ -120,7 +132,9 @@ Command.make("clanka", {
|
|
|
120
132
|
semantic,
|
|
121
133
|
prompt,
|
|
122
134
|
compaction,
|
|
123
|
-
|
|
135
|
+
apiKey,
|
|
136
|
+
apiUrl,
|
|
137
|
+
}).pipe(Command.withHandler(Effect.fnUntraced(function* ({ provider, model: modelRaw, semantic, prompt: nonInteractivePrompt, apiKey, apiUrl, }) {
|
|
124
138
|
const stdio = yield* Stdio.Stdio;
|
|
125
139
|
const OutputFormatter = yield* Effect.promise(() => import("./OutputFormatter.js"));
|
|
126
140
|
const selectedModel = yield* Option.match(modelRaw, {
|
|
@@ -136,7 +150,10 @@ Command.make("clanka", {
|
|
|
136
150
|
}),
|
|
137
151
|
});
|
|
138
152
|
const [model, reasoning] = selectedModel.split("/");
|
|
139
|
-
const Model = modelLayer(provider, model, reasoning
|
|
153
|
+
const Model = modelLayer(provider, model, reasoning, {
|
|
154
|
+
apiKey: Option.getOrUndefined(apiKey),
|
|
155
|
+
apiUrl: Option.getOrUndefined(apiUrl),
|
|
156
|
+
});
|
|
140
157
|
return yield* Effect.gen(function* () {
|
|
141
158
|
const agent = yield* Agent.Agent;
|
|
142
159
|
if (Option.isSome(nonInteractivePrompt)) {
|
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
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "clanka",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.11.0",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
7
7
|
},
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"url": "https://github.com/Effectful-Tech/clanka.git"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@modelcontextprotocol/sdk": "^1.32.
|
|
28
|
+
"@modelcontextprotocol/sdk": "^1.32.1",
|
|
29
29
|
"@silvia-odwyer/photon-node": "^0.3.4",
|
|
30
30
|
"@vscode/ripgrep": "^1.18.0",
|
|
31
31
|
"chalk": "^6.0.1",
|
|
@@ -46,22 +46,22 @@
|
|
|
46
46
|
"devDependencies": {
|
|
47
47
|
"@changesets/changelog-github": "^1.0.1",
|
|
48
48
|
"@changesets/cli": "^3.0.3",
|
|
49
|
-
"@effect/ai-openai": "4.0.
|
|
50
|
-
"@effect/ai-openai-compat": "4.0.
|
|
51
|
-
"@effect/platform-node": "4.0.
|
|
52
|
-
"@effect/sql-sqlite-node": "4.0.
|
|
53
|
-
"@effect/tsgo": "0.
|
|
54
|
-
"@effect/vitest": "4.0.
|
|
55
|
-
"@types/node": "^26.6.
|
|
49
|
+
"@effect/ai-openai": "4.0.5",
|
|
50
|
+
"@effect/ai-openai-compat": "4.0.5",
|
|
51
|
+
"@effect/platform-node": "4.0.5",
|
|
52
|
+
"@effect/sql-sqlite-node": "4.0.5",
|
|
53
|
+
"@effect/tsgo": "0.53.1",
|
|
54
|
+
"@effect/vitest": "4.0.5",
|
|
55
|
+
"@types/node": "^26.6.5",
|
|
56
56
|
"@types/turndown": "^5.0.6",
|
|
57
|
-
"effect": "4.0.
|
|
57
|
+
"effect": "4.0.5",
|
|
58
58
|
"husky": "^9.1.7",
|
|
59
59
|
"lint-staged": "^17.6.0",
|
|
60
|
-
"oxlint": "^1.
|
|
61
|
-
"prettier": "^3.9.
|
|
62
|
-
"tsdown": "^0.23.
|
|
60
|
+
"oxlint": "^1.88.0",
|
|
61
|
+
"prettier": "^3.9.10",
|
|
62
|
+
"tsdown": "^0.23.1",
|
|
63
63
|
"typescript": "^7.0.2",
|
|
64
|
-
"vitest": "^5.0.
|
|
64
|
+
"vitest": "^5.0.5"
|
|
65
65
|
},
|
|
66
66
|
"lint-staged": {
|
|
67
67
|
"*.{ts,tsx}": [
|
|
@@ -7,6 +7,7 @@ import * as Fiber from "effect/Fiber"
|
|
|
7
7
|
import * as FileSystem from "effect/FileSystem"
|
|
8
8
|
import * as Layer from "effect/Layer"
|
|
9
9
|
import * as Stream from "effect/Stream"
|
|
10
|
+
import * as TestClock from "effect/testing/TestClock"
|
|
10
11
|
import * as FetchHttpClient from "effect/http/FetchHttpClient"
|
|
11
12
|
import * as HttpEffect from "effect/http/HttpEffect"
|
|
12
13
|
import * as HttpServer from "effect/http/HttpServer"
|
|
@@ -414,18 +415,43 @@ try {
|
|
|
414
415
|
}).pipe(Effect.provide(executorLayer({ commandTimeout: "3 minutes" }))),
|
|
415
416
|
)
|
|
416
417
|
|
|
417
|
-
it.
|
|
418
|
+
it.effect("ends a script at the caller's script timeout", () =>
|
|
418
419
|
Effect.gen(function* () {
|
|
419
|
-
const
|
|
420
|
+
const executor = yield* AgentExecutor.AgentExecutor
|
|
421
|
+
const { environment } = yield* executor.capabilities
|
|
422
|
+
const started = yield* Deferred.make<void>()
|
|
423
|
+
const script = yield* executor
|
|
424
|
+
.execute({
|
|
425
|
+
environment,
|
|
426
|
+
onEnvironment: () => Effect.void,
|
|
427
|
+
onTaskComplete: () => Effect.void,
|
|
428
|
+
onImage: () => Effect.void,
|
|
429
|
+
subagents: subagentsUnavailable,
|
|
430
|
+
script: `
|
|
420
431
|
console.log("before")
|
|
421
432
|
await sleep(10000)
|
|
422
|
-
console.log("after")
|
|
433
|
+
console.log("after")`,
|
|
434
|
+
})
|
|
435
|
+
.pipe(
|
|
436
|
+
Stream.tap((output) =>
|
|
437
|
+
output.includes("before")
|
|
438
|
+
? Deferred.succeed(started, undefined)
|
|
439
|
+
: Effect.void,
|
|
440
|
+
),
|
|
441
|
+
Stream.mkString,
|
|
442
|
+
Effect.forkScoped,
|
|
443
|
+
)
|
|
444
|
+
// Worker startup uses real time. Advance the whole-script clock only
|
|
445
|
+
// after output is observed, without changing when its deadline starts.
|
|
446
|
+
yield* Deferred.await(started)
|
|
447
|
+
yield* TestClock.adjust("300 millis")
|
|
448
|
+
const output = yield* Fiber.join(script)
|
|
423
449
|
assert.include(output, "before")
|
|
424
450
|
assert.notInclude(output, "after")
|
|
425
451
|
assert.match(output, /timed out/i)
|
|
426
452
|
}).pipe(
|
|
427
|
-
Effect.timeout("3 seconds"),
|
|
428
453
|
Effect.provide(executorLayer({ scriptTimeout: "300 millis" })),
|
|
454
|
+
Effect.scoped,
|
|
429
455
|
),
|
|
430
456
|
)
|
|
431
457
|
|
|
@@ -507,4 +533,4 @@ sleep(100).then(() => console.constructor.constructor("return process")().exit(7
|
|
|
507
533
|
),
|
|
508
534
|
)
|
|
509
535
|
})
|
|
510
|
-
}
|
|
536
|
+
}
|
package/src/AgentSkills.test.ts
CHANGED
|
@@ -106,7 +106,6 @@ const withLocalExecutor = <A, E, R>(
|
|
|
106
106
|
HERMES_HOME: process.env.HERMES_HOME,
|
|
107
107
|
}
|
|
108
108
|
process.env.HOME = roots.home
|
|
109
|
-
// @ts-expect-error
|
|
110
109
|
if (hermesHome === undefined) delete process.env.HERMES_HOME
|
|
111
110
|
else process.env.HERMES_HOME = hermesHome
|
|
112
111
|
return previous
|
|
@@ -22,6 +22,7 @@ import * as RpcSerialization from "effect/rpc/RpcSerialization"
|
|
|
22
22
|
import * as RpcServer from "effect/rpc/RpcServer"
|
|
23
23
|
import * as Agent from "./Agent.ts"
|
|
24
24
|
import * as AgentExecutor from "./AgentExecutor.ts"
|
|
25
|
+
import type { Output } from "./AgentOutput.ts"
|
|
25
26
|
import * as Compaction from "./Compaction.ts"
|
|
26
27
|
|
|
27
28
|
// =============================================================================
|
|
@@ -73,6 +74,7 @@ const roleOf = (prompt: Prompt.Prompt): Role => {
|
|
|
73
74
|
const runAgent = (options: {
|
|
74
75
|
readonly conversationMode: boolean
|
|
75
76
|
readonly respond: Respond
|
|
77
|
+
readonly onOutput?: ((output: Output) => Effect.Effect<void>) | undefined
|
|
76
78
|
readonly afterExit?: Effect.Effect<void> | undefined
|
|
77
79
|
}) =>
|
|
78
80
|
Effect.gen(function* () {
|
|
@@ -103,7 +105,7 @@ const runAgent = (options: {
|
|
|
103
105
|
const exit = yield* agent.send({ prompt: "hello" }).pipe(
|
|
104
106
|
Effect.flatMap((stream) =>
|
|
105
107
|
stream.pipe(
|
|
106
|
-
Stream.
|
|
108
|
+
Stream.runForEach(options.onOutput ?? (() => Effect.void)),
|
|
107
109
|
Effect.as(""),
|
|
108
110
|
Effect.catchTag("AgentFinished", (finished) =>
|
|
109
111
|
Effect.succeed(finished.summary),
|
|
@@ -326,14 +328,21 @@ for (const [executorName, executorLayer] of executors) {
|
|
|
326
328
|
() =>
|
|
327
329
|
Effect.gen(function* () {
|
|
328
330
|
const childRelease = Latch.makeUnsafe(false)
|
|
329
|
-
const
|
|
331
|
+
const completionDelivered = Latch.makeUnsafe(false)
|
|
330
332
|
const { exit, calls } = yield* runAgent({
|
|
331
333
|
conversationMode: true,
|
|
334
|
+
onOutput: (output) =>
|
|
335
|
+
Effect.sync(() => {
|
|
336
|
+
if (output._tag === "SubagentComplete" && output.id === 1) {
|
|
337
|
+
assert.strictEqual(output.status, "completed")
|
|
338
|
+
assert.strictEqual(output.summary, "CHILD-RESULT")
|
|
339
|
+
completionDelivered.openUnsafe()
|
|
340
|
+
}
|
|
341
|
+
}),
|
|
332
342
|
respond: (call) => {
|
|
333
343
|
if (call.role === "child") {
|
|
334
344
|
return Stream.fromEffect(childRelease.await).pipe(
|
|
335
345
|
Stream.flatMap(() => complete("CHILD-RESULT")),
|
|
336
|
-
Stream.ensuring(Effect.sync(() => childDone.openUnsafe())),
|
|
337
346
|
)
|
|
338
347
|
}
|
|
339
348
|
switch (call.index) {
|
|
@@ -347,8 +356,9 @@ for (const [executorName, executorLayer] of executors) {
|
|
|
347
356
|
Stream.fromEffect(
|
|
348
357
|
Effect.gen(function* () {
|
|
349
358
|
childRelease.openUnsafe()
|
|
350
|
-
|
|
351
|
-
|
|
359
|
+
// Unlike the child model stream ending, this event
|
|
360
|
+
// means cleanup finished and the push was queued.
|
|
361
|
+
yield* completionDelivered.await
|
|
352
362
|
}),
|
|
353
363
|
).pipe(Stream.drain),
|
|
354
364
|
),
|
|
@@ -367,7 +377,11 @@ for (const [executorName, executorLayer] of executors) {
|
|
|
367
377
|
|
|
368
378
|
assert.deepStrictEqual(exit, Exit.succeed("done"))
|
|
369
379
|
const root = calls.filter((call) => call.role === "root")
|
|
370
|
-
const
|
|
380
|
+
const delivery = root.find(
|
|
381
|
+
(call) => findPush(call.prompt, "1", "completed").index !== -1,
|
|
382
|
+
)
|
|
383
|
+
assert.isDefined(delivery, "completion push reached the model")
|
|
384
|
+
const prompt = delivery!.prompt
|
|
371
385
|
const assistantIndex = prompt.content.findIndex(
|
|
372
386
|
(message) =>
|
|
373
387
|
message.role === "assistant" &&
|
package/src/cli.ts
CHANGED
|
@@ -51,11 +51,20 @@ const withSubagentModel = <E, R>(
|
|
|
51
51
|
>,
|
|
52
52
|
) => Layer.merge(model, Agent.layerSubagentModel(model))
|
|
53
53
|
|
|
54
|
-
const modelLayer = (
|
|
54
|
+
const modelLayer = (
|
|
55
|
+
provider: Provider,
|
|
56
|
+
model: string,
|
|
57
|
+
effort: string,
|
|
58
|
+
openai: OpenAiClient.Options,
|
|
59
|
+
) =>
|
|
55
60
|
provider === "openai"
|
|
56
|
-
?
|
|
57
|
-
|
|
58
|
-
|
|
61
|
+
? openai.apiKey !== undefined
|
|
62
|
+
? withSubagentModel(
|
|
63
|
+
Codex.model(model, { reasoning: { effort: effort as any } }),
|
|
64
|
+
).pipe(Layer.provide(OpenAiClient.layer(openai)))
|
|
65
|
+
: withSubagentModel(
|
|
66
|
+
Codex.modelWebSocket(model, { reasoning: { effort: effort as any } }),
|
|
67
|
+
).pipe(Layer.provide(Codex.layerClient))
|
|
59
68
|
: provider === "xai"
|
|
60
69
|
? withSubagentModel(
|
|
61
70
|
Xai.modelWebSocket(model, {
|
|
@@ -124,6 +133,20 @@ const provider = Flag.Literals("provider", providers).pipe(
|
|
|
124
133
|
|
|
125
134
|
const model = Flag.String("model").pipe(Flag.withAlias("m"), Flag.optional)
|
|
126
135
|
|
|
136
|
+
const apiKey = Flag.Redacted("api-key").pipe(
|
|
137
|
+
Flag.withDescription("OpenAI API key (defaults to CLANKA_OPENAI_API_KEY)"),
|
|
138
|
+
Flag.withFallbackConfig(Config.Redacted("CLANKA_OPENAI_API_KEY")),
|
|
139
|
+
Flag.optional,
|
|
140
|
+
)
|
|
141
|
+
|
|
142
|
+
const apiUrl = Flag.String("api-url").pipe(
|
|
143
|
+
Flag.withDescription(
|
|
144
|
+
"OpenAI API base URL for API-key mode (defaults to CLANKA_OPENAI_API_URL or https://api.openai.com/v1)",
|
|
145
|
+
),
|
|
146
|
+
Flag.withFallbackConfig(Config.String("CLANKA_OPENAI_API_URL")),
|
|
147
|
+
Flag.optional,
|
|
148
|
+
)
|
|
149
|
+
|
|
127
150
|
const semantic = Flag.Directory("search").pipe(
|
|
128
151
|
Flag.withDescription(
|
|
129
152
|
"Directory for semantic search data (uses OPENAI_API_KEY env var)",
|
|
@@ -208,11 +231,16 @@ const acpModel = Flag.String("model").pipe(
|
|
|
208
231
|
Flag.map((modelId) => Option.getOrThrow(parseModelId(modelId))),
|
|
209
232
|
)
|
|
210
233
|
|
|
211
|
-
const acp = Command.make("acp", {
|
|
234
|
+
const acp = Command.make("acp", {
|
|
235
|
+
model: acpModel,
|
|
236
|
+
compaction,
|
|
237
|
+
apiKey,
|
|
238
|
+
apiUrl,
|
|
239
|
+
}).pipe(
|
|
212
240
|
Command.withDescription(
|
|
213
241
|
"Run as an Agent Client Protocol (ACP) server over stdio",
|
|
214
242
|
),
|
|
215
|
-
Command.withHandler(({ model }) =>
|
|
243
|
+
Command.withHandler(({ model, apiKey, apiUrl }) =>
|
|
216
244
|
Acp.runStdio({
|
|
217
245
|
version,
|
|
218
246
|
defaultModel: model.model,
|
|
@@ -223,7 +251,10 @@ const acp = Command.make("acp", { model: acpModel, compaction }).pipe(
|
|
|
223
251
|
),
|
|
224
252
|
makeModel: (modelId, thoughtLevel) =>
|
|
225
253
|
Option.map(parseAcpModelId(modelId), ({ provider, model }) =>
|
|
226
|
-
modelLayer(provider, model, thoughtLevel
|
|
254
|
+
modelLayer(provider, model, thoughtLevel, {
|
|
255
|
+
apiKey: Option.getOrUndefined(apiKey),
|
|
256
|
+
apiUrl: Option.getOrUndefined(apiUrl),
|
|
257
|
+
}),
|
|
227
258
|
),
|
|
228
259
|
}),
|
|
229
260
|
),
|
|
@@ -243,6 +274,8 @@ Command.make("clanka", {
|
|
|
243
274
|
semantic,
|
|
244
275
|
prompt,
|
|
245
276
|
compaction,
|
|
277
|
+
apiKey,
|
|
278
|
+
apiUrl,
|
|
246
279
|
}).pipe(
|
|
247
280
|
Command.withHandler(
|
|
248
281
|
Effect.fnUntraced(function* ({
|
|
@@ -250,6 +283,8 @@ Command.make("clanka", {
|
|
|
250
283
|
model: modelRaw,
|
|
251
284
|
semantic,
|
|
252
285
|
prompt: nonInteractivePrompt,
|
|
286
|
+
apiKey,
|
|
287
|
+
apiUrl,
|
|
253
288
|
}) {
|
|
254
289
|
const stdio = yield* Stdio.Stdio
|
|
255
290
|
const OutputFormatter = yield* Effect.promise(
|
|
@@ -270,7 +305,10 @@ Command.make("clanka", {
|
|
|
270
305
|
}),
|
|
271
306
|
})
|
|
272
307
|
const [model, reasoning] = selectedModel.split("/") as [string, string]
|
|
273
|
-
const Model = modelLayer(provider, model, reasoning
|
|
308
|
+
const Model = modelLayer(provider, model, reasoning, {
|
|
309
|
+
apiKey: Option.getOrUndefined(apiKey),
|
|
310
|
+
apiUrl: Option.getOrUndefined(apiUrl),
|
|
311
|
+
})
|
|
274
312
|
|
|
275
313
|
return yield* Effect.gen(function* () {
|
|
276
314
|
const agent = yield* Agent.Agent
|