clanka 0.17.2 → 0.18.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 +24 -0
- package/dist/Acp.d.ts.map +1 -1
- package/dist/Acp.js +5 -0
- package/dist/Acp.js.map +1 -1
- package/dist/Agent.d.ts +11 -0
- package/dist/Agent.d.ts.map +1 -1
- package/dist/Agent.js +35 -15
- package/dist/Agent.js.map +1 -1
- package/dist/Agent.test.js +23 -0
- package/dist/Agent.test.js.map +1 -1
- package/dist/AgentExecutor.js +15 -2
- package/dist/AgentExecutor.js.map +1 -1
- package/dist/AgentExecutor.test.js +16 -0
- package/dist/AgentExecutor.test.js.map +1 -1
- package/dist/AgentOutput.d.ts +23 -4
- package/dist/AgentOutput.d.ts.map +1 -1
- package/dist/AgentOutput.js +19 -0
- package/dist/AgentOutput.js.map +1 -1
- package/dist/ClaudeAgent.d.ts.map +1 -1
- package/dist/ClaudeAgent.js +84 -13
- package/dist/ClaudeAgent.js.map +1 -1
- package/dist/ClaudeAgent.test.js +187 -4
- package/dist/ClaudeAgent.test.js.map +1 -1
- package/dist/Codex.js +9 -5
- package/dist/Codex.js.map +1 -1
- package/dist/Codex.test.js +26 -7
- package/dist/Codex.test.js.map +1 -1
- package/dist/Compaction.d.ts +41 -6
- package/dist/Compaction.d.ts.map +1 -1
- package/dist/Compaction.js +52 -11
- package/dist/Compaction.js.map +1 -1
- package/dist/Compaction.test.js +5 -4
- package/dist/Compaction.test.js.map +1 -1
- package/dist/CompactionTransport.test.js +11 -0
- package/dist/CompactionTransport.test.js.map +1 -1
- package/dist/Copilot.d.ts.map +1 -1
- package/dist/Copilot.js +3 -6
- package/dist/Copilot.js.map +1 -1
- package/dist/ModelLayer.d.ts +35 -6
- package/dist/ModelLayer.d.ts.map +1 -1
- package/dist/ModelLayer.js +30 -18
- package/dist/ModelLayer.js.map +1 -1
- package/dist/ModelLayer.test.js +11 -3
- package/dist/ModelLayer.test.js.map +1 -1
- package/dist/OutputFormatter.d.ts.map +1 -1
- package/dist/OutputFormatter.js +3 -0
- package/dist/OutputFormatter.js.map +1 -1
- package/dist/Xai.d.ts.map +1 -1
- package/dist/Xai.js +4 -12
- package/dist/Xai.js.map +1 -1
- package/dist/bin/{Effect-DNYYQ84C.mjs → Effect-5XYMLOiB.mjs} +31 -30
- package/dist/bin/Effect-5XYMLOiB.mjs.map +1 -0
- package/dist/bin/{Latch-BSlIwuxI.mjs → Latch-BnrpWMd1.mjs} +2 -2
- package/dist/bin/{Latch-BSlIwuxI.mjs.map → Latch-BnrpWMd1.mjs.map} +1 -1
- package/dist/bin/{McpClient-C7ctqJWo.mjs → McpClient-DoPNaNzW.mjs} +3 -3
- package/dist/bin/{McpClient-C7ctqJWo.mjs.map → McpClient-DoPNaNzW.mjs.map} +1 -1
- package/dist/bin/{OutputFormatter-DXej05JW.mjs → OutputFormatter-Dqxyk2qD.mjs} +4 -3
- package/dist/bin/{OutputFormatter-DXej05JW.mjs.map → OutputFormatter-Dqxyk2qD.mjs.map} +1 -1
- package/dist/bin/{Schema-CSQN_Zso.mjs → Schema-Box_9VZG.mjs} +6 -3
- package/dist/bin/{Schema-CSQN_Zso.mjs.map → Schema-Box_9VZG.mjs.map} +1 -1
- package/dist/bin/{SemanticSearch-BiwCnpKX.mjs → SemanticSearch-CH125AHH.mjs} +4 -4
- package/dist/bin/{SemanticSearch-BiwCnpKX.mjs.map → SemanticSearch-CH125AHH.mjs.map} +1 -1
- package/dist/bin/{Stream-Dwvj9X5X.mjs → Stream-C51usiew.mjs} +3 -3
- package/dist/bin/{Stream-Dwvj9X5X.mjs.map → Stream-C51usiew.mjs.map} +1 -1
- package/dist/bin/cli.mjs +339 -229
- package/dist/bin/cli.mjs.map +1 -1
- package/dist/bin/{upgrade-BSNjCnra.mjs → upgrade-HMRGSqq8.mjs} +4 -4
- package/dist/bin/{upgrade-BSNjCnra.mjs.map → upgrade-HMRGSqq8.mjs.map} +1 -1
- package/dist/cli.js +45 -5
- package/dist/cli.js.map +1 -1
- package/package.json +1 -1
- package/src/Acp.ts +7 -0
- package/src/Agent.test.ts +27 -0
- package/src/Agent.ts +49 -15
- package/src/AgentExecutor.test.ts +23 -1
- package/src/AgentExecutor.ts +16 -2
- package/src/AgentOutput.ts +23 -0
- package/src/ClaudeAgent.test.ts +271 -4
- package/src/ClaudeAgent.ts +114 -19
- package/src/Codex.test.ts +37 -9
- package/src/Codex.ts +25 -20
- package/src/Compaction.test.ts +18 -15
- package/src/Compaction.ts +89 -20
- package/src/CompactionTransport.test.ts +36 -0
- package/src/Copilot.ts +5 -6
- package/src/ModelLayer.test.ts +17 -2
- package/src/ModelLayer.ts +68 -22
- package/src/OutputFormatter.ts +3 -0
- package/src/Xai.ts +8 -12
- package/src/cli.ts +97 -5
- package/dist/bin/Effect-DNYYQ84C.mjs.map +0 -1
package/src/cli.ts
CHANGED
|
@@ -132,6 +132,51 @@ const ModelId = Schema.String.pipe(
|
|
|
132
132
|
),
|
|
133
133
|
)
|
|
134
134
|
|
|
135
|
+
// An `--subagent-model` or `--summarizer-model` value. Without an effort, the
|
|
136
|
+
// provider's default effort is used.
|
|
137
|
+
const auxiliaryModel = (options: {
|
|
138
|
+
readonly name: string
|
|
139
|
+
readonly env: string
|
|
140
|
+
readonly description: string
|
|
141
|
+
}) =>
|
|
142
|
+
Flag.String(options.name).pipe(
|
|
143
|
+
Flag.withDescription(
|
|
144
|
+
`${options.description} As <provider>/<model>[/<effort>], e.g. openai/gpt-6-astra/low; also ${options.env}.`,
|
|
145
|
+
),
|
|
146
|
+
Flag.withFallbackConfig(Config.String(options.env)),
|
|
147
|
+
Flag.withSchema(ModelId),
|
|
148
|
+
Flag.map((modelId): ModelLayer.ModelSpec => {
|
|
149
|
+
const [provider, model, effort] = modelId.split("/") as [
|
|
150
|
+
Provider,
|
|
151
|
+
string,
|
|
152
|
+
string | undefined,
|
|
153
|
+
]
|
|
154
|
+
return { provider, model, effort }
|
|
155
|
+
}),
|
|
156
|
+
Flag.optional,
|
|
157
|
+
)
|
|
158
|
+
|
|
159
|
+
const subagentModel = auxiliaryModel({
|
|
160
|
+
name: "subagent-model",
|
|
161
|
+
env: "CLANKA_SUBAGENT_MODEL",
|
|
162
|
+
description: "Run sub-agents on this model instead of the agent's model.",
|
|
163
|
+
})
|
|
164
|
+
|
|
165
|
+
const summarizerModel = auxiliaryModel({
|
|
166
|
+
name: "summarizer-model",
|
|
167
|
+
env: "CLANKA_SUMMARIZER_MODEL",
|
|
168
|
+
description:
|
|
169
|
+
"Summarize the history for compaction with this model instead of the agent's model.",
|
|
170
|
+
})
|
|
171
|
+
|
|
172
|
+
const auxiliaryModels = (flags: {
|
|
173
|
+
readonly subagentModel: Option.Option<ModelLayer.ModelSpec>
|
|
174
|
+
readonly summarizerModel: Option.Option<ModelLayer.ModelSpec>
|
|
175
|
+
}): ModelLayer.AuxiliaryModels => ({
|
|
176
|
+
subagent: Option.getOrUndefined(flags.subagentModel),
|
|
177
|
+
summarizer: Option.getOrUndefined(flags.summarizerModel),
|
|
178
|
+
})
|
|
179
|
+
|
|
135
180
|
const provider = Flag.Literals("provider", providers).pipe(
|
|
136
181
|
Flag.withAlias("p"),
|
|
137
182
|
Flag.withFallbackPrompt(
|
|
@@ -209,6 +254,44 @@ const compaction = Flag.Boolean("compaction").pipe(
|
|
|
209
254
|
),
|
|
210
255
|
)
|
|
211
256
|
|
|
257
|
+
const NonNegativeInt = Schema.Int.pipe(
|
|
258
|
+
Schema.check(Schema.isGreaterThanOrEqualTo(0)),
|
|
259
|
+
)
|
|
260
|
+
|
|
261
|
+
// A compaction token setting, defaulting to `Compaction.defaultConfig`.
|
|
262
|
+
const tokens = (options: {
|
|
263
|
+
readonly name: string
|
|
264
|
+
readonly env: string
|
|
265
|
+
readonly description: string
|
|
266
|
+
readonly defaultValue: number
|
|
267
|
+
}) =>
|
|
268
|
+
Flag.Int(options.name).pipe(
|
|
269
|
+
Flag.withDescription(
|
|
270
|
+
`${options.description} Defaults to ${options.env} or ${options.defaultValue}.`,
|
|
271
|
+
),
|
|
272
|
+
Flag.withFallbackConfig(
|
|
273
|
+
Config.Int(options.env).pipe(Config.withDefault(options.defaultValue)),
|
|
274
|
+
),
|
|
275
|
+
Flag.withSchema(NonNegativeInt),
|
|
276
|
+
)
|
|
277
|
+
|
|
278
|
+
const compactionThreshold = tokens({
|
|
279
|
+
name: "compaction-threshold",
|
|
280
|
+
env: "CLANKA_COMPACTION_THRESHOLD",
|
|
281
|
+
description:
|
|
282
|
+
"Compact once the context exceeds this many tokens, or the context window minus its reserve when that is lower.",
|
|
283
|
+
defaultValue: Compaction.defaultConfig.thresholdTokens,
|
|
284
|
+
})
|
|
285
|
+
|
|
286
|
+
const compactionConfig = (flags: {
|
|
287
|
+
readonly compaction: boolean
|
|
288
|
+
readonly compactionThreshold: number
|
|
289
|
+
}) =>
|
|
290
|
+
Compaction.CompactionConfig.layer({
|
|
291
|
+
enabled: flags.compaction,
|
|
292
|
+
thresholdTokens: flags.compactionThreshold,
|
|
293
|
+
})
|
|
294
|
+
|
|
212
295
|
// Kill switch: `--no-mcp` or CLANKA_MCP=false.
|
|
213
296
|
const mcp = Flag.Boolean("mcp").pipe(
|
|
214
297
|
Flag.withDescription(
|
|
@@ -319,13 +402,16 @@ const acp = Command.make("acp", {
|
|
|
319
402
|
trustAllTools,
|
|
320
403
|
fast,
|
|
321
404
|
compaction,
|
|
405
|
+
compactionThreshold,
|
|
406
|
+
subagentModel,
|
|
407
|
+
summarizerModel,
|
|
322
408
|
apiKey,
|
|
323
409
|
apiUrl,
|
|
324
410
|
}).pipe(
|
|
325
411
|
Command.withDescription(
|
|
326
412
|
"Run as an Agent Client Protocol (ACP) server over stdio",
|
|
327
413
|
),
|
|
328
|
-
Command.withHandler(({ model, fast, apiKey, apiUrl }) =>
|
|
414
|
+
Command.withHandler(({ model, fast, apiKey, apiUrl, ...flags }) =>
|
|
329
415
|
Effect.gen(function* () {
|
|
330
416
|
const repo = yield* ModelsRepo.ModelsRepo
|
|
331
417
|
const defaultThoughtLevel = yield* reasoning
|
|
@@ -349,16 +435,17 @@ const acp = Command.make("acp", {
|
|
|
349
435
|
apiKey: Option.getOrUndefined(apiKey),
|
|
350
436
|
apiUrl: Option.getOrUndefined(apiUrl),
|
|
351
437
|
},
|
|
438
|
+
auxiliary: auxiliaryModels(flags),
|
|
352
439
|
}),
|
|
353
440
|
})
|
|
354
441
|
}),
|
|
355
442
|
),
|
|
356
|
-
Command.provide((
|
|
443
|
+
Command.provide((flags) =>
|
|
357
444
|
Layer.mergeAll(
|
|
358
445
|
Agent.ConversationMode.layer(false),
|
|
359
446
|
Layer.succeed(Logger.LogToStderr, true),
|
|
360
447
|
DeviceCodeHandler.layerLog,
|
|
361
|
-
|
|
448
|
+
compactionConfig(flags),
|
|
362
449
|
),
|
|
363
450
|
),
|
|
364
451
|
)
|
|
@@ -370,6 +457,9 @@ Command.make("clanka", {
|
|
|
370
457
|
semantic,
|
|
371
458
|
prompt,
|
|
372
459
|
compaction,
|
|
460
|
+
compactionThreshold,
|
|
461
|
+
subagentModel,
|
|
462
|
+
summarizerModel,
|
|
373
463
|
apiKey,
|
|
374
464
|
apiUrl,
|
|
375
465
|
mcp,
|
|
@@ -386,6 +476,7 @@ Command.make("clanka", {
|
|
|
386
476
|
apiUrl,
|
|
387
477
|
mcp,
|
|
388
478
|
mcpConfig,
|
|
479
|
+
...flags
|
|
389
480
|
}) {
|
|
390
481
|
const stdio = yield* Stdio.Stdio
|
|
391
482
|
const mcpServers = yield* McpConfig.load({
|
|
@@ -415,6 +506,7 @@ Command.make("clanka", {
|
|
|
415
506
|
apiUrl: Option.getOrUndefined(apiUrl),
|
|
416
507
|
},
|
|
417
508
|
fast,
|
|
509
|
+
auxiliaryModels(flags),
|
|
418
510
|
)
|
|
419
511
|
|
|
420
512
|
return yield* Effect.gen(function* () {
|
|
@@ -466,10 +558,10 @@ Command.make("clanka", {
|
|
|
466
558
|
)
|
|
467
559
|
}),
|
|
468
560
|
),
|
|
469
|
-
Command.provide(({ prompt,
|
|
561
|
+
Command.provide(({ prompt, ...flags }) =>
|
|
470
562
|
Layer.mergeAll(
|
|
471
563
|
Agent.ConversationMode.layer(Option.isNone(prompt)),
|
|
472
|
-
|
|
564
|
+
compactionConfig(flags),
|
|
473
565
|
),
|
|
474
566
|
),
|
|
475
567
|
Command.withSubcommands([acp]),
|