clanka 0.13.2 → 0.14.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 +21 -0
- package/dist/Acp.d.ts +17 -2
- package/dist/Acp.d.ts.map +1 -1
- package/dist/Acp.js +72 -15
- package/dist/Acp.js.map +1 -1
- package/dist/Acp.test.js +20 -1
- package/dist/Acp.test.js.map +1 -1
- package/dist/ModelLayer.d.ts +21 -4
- package/dist/ModelLayer.d.ts.map +1 -1
- package/dist/ModelLayer.js +27 -7
- package/dist/ModelLayer.js.map +1 -1
- package/dist/ModelLayer.test.js +6 -2
- package/dist/ModelLayer.test.js.map +1 -1
- package/dist/bin/cli.mjs +71 -21
- package/dist/bin/cli.mjs.map +1 -1
- package/dist/cli.js +9 -3
- package/dist/cli.js.map +1 -1
- package/package.json +1 -1
- package/src/Acp.test.ts +37 -0
- package/src/Acp.ts +102 -20
- package/src/ModelLayer.test.ts +14 -1
- package/src/ModelLayer.ts +33 -5
- package/src/cli.ts +26 -5
package/dist/cli.js
CHANGED
|
@@ -99,6 +99,8 @@ const provider = Flag.Literals("provider", providers).pipe(Flag.withAlias("p"),
|
|
|
99
99
|
const model = Flag.String("model").pipe(Flag.withAlias("m"), Flag.optional);
|
|
100
100
|
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);
|
|
101
101
|
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);
|
|
102
|
+
// OpenAI's `priority` service tier.
|
|
103
|
+
const fast = Flag.Boolean("fast").pipe(Flag.withDescription("Use OpenAI fast mode (the priority service tier) for faster responses at a higher cost. Applies to the openai provider only; also CLANKA_FAST=true."), Flag.withFallbackConfig(Config.Boolean("CLANKA_FAST").pipe(Config.withDefault(false))));
|
|
102
104
|
const semantic = Flag.Directory("search").pipe(Flag.withDescription("Directory for semantic search data (uses OPENAI_API_KEY env var)"), Flag.withAlias("s"), Flag.optional);
|
|
103
105
|
const prompt = Flag.String("prompt").pipe(Flag.withDescription("Pass a prompt in non-interactive mode"), Flag.optional);
|
|
104
106
|
// Kill switch: `--no-compaction` or CLANKA_COMPACTION=false.
|
|
@@ -137,15 +139,18 @@ const Search = (directory) => Layer.unwrap(Effect.gen(function* () {
|
|
|
137
139
|
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))));
|
|
138
140
|
const acp = Command.make("acp", {
|
|
139
141
|
model: acpModel,
|
|
142
|
+
fast,
|
|
140
143
|
compaction,
|
|
141
144
|
apiKey,
|
|
142
145
|
apiUrl,
|
|
143
|
-
}).pipe(Command.withDescription("Run as an Agent Client Protocol (ACP) server over stdio"), Command.withHandler(({ model, apiKey, apiUrl }) => Effect.gen(function* () {
|
|
146
|
+
}).pipe(Command.withDescription("Run as an Agent Client Protocol (ACP) server over stdio"), Command.withHandler(({ model, fast, apiKey, apiUrl }) => Effect.gen(function* () {
|
|
144
147
|
const repo = yield* ModelsRepo.ModelsRepo;
|
|
145
148
|
return yield* Acp.runStdio({
|
|
146
149
|
version,
|
|
147
150
|
defaultModel: model.model,
|
|
148
151
|
defaultThoughtLevel: model.thoughtLevel,
|
|
152
|
+
defaultFastMode: fast,
|
|
153
|
+
supportsFastMode: ModelLayer.acpSupportsFastMode,
|
|
149
154
|
availableModels: Effect.map(repo.models, ModelLayer.acpModels),
|
|
150
155
|
makeAgent: (cwd) => Agent.make.pipe(Effect.provide(AgentExecutor.layerLocal({ directory: cwd }))),
|
|
151
156
|
makeModel: ModelLayer.makeAcp({
|
|
@@ -160,6 +165,7 @@ const acp = Command.make("acp", {
|
|
|
160
165
|
Command.make("clanka", {
|
|
161
166
|
provider,
|
|
162
167
|
model,
|
|
168
|
+
fast,
|
|
163
169
|
semantic,
|
|
164
170
|
prompt,
|
|
165
171
|
compaction,
|
|
@@ -167,7 +173,7 @@ Command.make("clanka", {
|
|
|
167
173
|
apiUrl,
|
|
168
174
|
mcp,
|
|
169
175
|
mcpConfig,
|
|
170
|
-
}).pipe(Command.withHandler(Effect.fnUntraced(function* ({ provider, model: modelRaw, semantic, prompt: nonInteractivePrompt, apiKey, apiUrl, mcp, mcpConfig, }) {
|
|
176
|
+
}).pipe(Command.withHandler(Effect.fnUntraced(function* ({ provider, model: modelRaw, fast, semantic, prompt: nonInteractivePrompt, apiKey, apiUrl, mcp, mcpConfig, }) {
|
|
171
177
|
const stdio = yield* Stdio.Stdio;
|
|
172
178
|
const mcpServers = yield* McpConfig.load({
|
|
173
179
|
cwd: process.cwd(),
|
|
@@ -185,7 +191,7 @@ Command.make("clanka", {
|
|
|
185
191
|
const Model = ModelLayer.make(provider, model, effort, {
|
|
186
192
|
apiKey: Option.getOrUndefined(apiKey),
|
|
187
193
|
apiUrl: Option.getOrUndefined(apiUrl),
|
|
188
|
-
});
|
|
194
|
+
}, fast);
|
|
189
195
|
return yield* Effect.gen(function* () {
|
|
190
196
|
const agent = yield* Agent.Agent;
|
|
191
197
|
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
package/src/Acp.test.ts
CHANGED
|
@@ -69,6 +69,7 @@ const makeServer = (
|
|
|
69
69
|
agentExecutor = executor,
|
|
70
70
|
onMakeModel?: (modelId: string, thoughtLevel: string) => void,
|
|
71
71
|
availableModels?: Acp.Options<never, never>["availableModels"],
|
|
72
|
+
supportsFastMode?: Acp.Options<never, never>["supportsFastMode"],
|
|
72
73
|
) =>
|
|
73
74
|
Effect.gen(function* () {
|
|
74
75
|
const sent: Array<Message> = []
|
|
@@ -102,6 +103,7 @@ const makeServer = (
|
|
|
102
103
|
: Option.none()
|
|
103
104
|
},
|
|
104
105
|
availableModels,
|
|
106
|
+
supportsFastMode,
|
|
105
107
|
})
|
|
106
108
|
const request = (id: number, method: string, params?: unknown) =>
|
|
107
109
|
server
|
|
@@ -363,6 +365,41 @@ describe("Acp", () => {
|
|
|
363
365
|
),
|
|
364
366
|
)
|
|
365
367
|
|
|
368
|
+
it.effect("notifies the config options a model switch changes", () =>
|
|
369
|
+
withStore(
|
|
370
|
+
Effect.scoped(
|
|
371
|
+
Effect.gen(function* () {
|
|
372
|
+
const server = yield* makeServer(
|
|
373
|
+
() => assistantSays("done"),
|
|
374
|
+
executor,
|
|
375
|
+
undefined,
|
|
376
|
+
undefined,
|
|
377
|
+
(modelId) => modelId === "other:model",
|
|
378
|
+
)
|
|
379
|
+
const created = yield* server.request(1, "session/new", {
|
|
380
|
+
cwd: "/tmp",
|
|
381
|
+
})
|
|
382
|
+
const sessionId: string = created.result.sessionId
|
|
383
|
+
assert.deepStrictEqual(
|
|
384
|
+
created.result.configOptions.map((option: any) => option.id),
|
|
385
|
+
["thought_level"],
|
|
386
|
+
)
|
|
387
|
+
|
|
388
|
+
yield* server.request(2, "session/set_model", {
|
|
389
|
+
sessionId,
|
|
390
|
+
modelId: "other:model",
|
|
391
|
+
})
|
|
392
|
+
const [notified] = server.updates(sessionId)
|
|
393
|
+
assert.strictEqual(notified.sessionUpdate, "config_option_update")
|
|
394
|
+
assert.deepInclude(notified.configOptions[1], {
|
|
395
|
+
id: "fast_mode",
|
|
396
|
+
currentValue: "off",
|
|
397
|
+
})
|
|
398
|
+
}),
|
|
399
|
+
),
|
|
400
|
+
),
|
|
401
|
+
)
|
|
402
|
+
|
|
366
403
|
for (const script of [
|
|
367
404
|
"console.log(1)",
|
|
368
405
|
'console.log("' + "x".repeat(200) + '")',
|
package/src/Acp.ts
CHANGED
|
@@ -63,6 +63,15 @@ export interface Options<RAgent, RModel> {
|
|
|
63
63
|
* Thought level used for new sessions.
|
|
64
64
|
*/
|
|
65
65
|
readonly defaultThoughtLevel: ThoughtLevel
|
|
66
|
+
/**
|
|
67
|
+
* Whether new sessions start in fast mode. Defaults to `false`.
|
|
68
|
+
*/
|
|
69
|
+
readonly defaultFastMode?: boolean | undefined
|
|
70
|
+
/**
|
|
71
|
+
* Whether a model id supports fast mode. The `fast_mode` config option is
|
|
72
|
+
* offered only while the session model does. Defaults to no model.
|
|
73
|
+
*/
|
|
74
|
+
readonly supportsFastMode?: ((modelId: string) => boolean) | undefined
|
|
66
75
|
/**
|
|
67
76
|
* Write one JSON-RPC message to the client.
|
|
68
77
|
*/
|
|
@@ -74,12 +83,14 @@ export interface Options<RAgent, RModel> {
|
|
|
74
83
|
cwd: string,
|
|
75
84
|
) => Effect.Effect<Agent.Agent, never, Scope.Scope | RAgent>
|
|
76
85
|
/**
|
|
77
|
-
* Resolve a model id
|
|
86
|
+
* Resolve a model id, thought level and fast mode to the services an Agent
|
|
87
|
+
* needs. `fastMode` is only `true` for models `supportsFastMode` accepts.
|
|
78
88
|
* `None` rejects the combination.
|
|
79
89
|
*/
|
|
80
90
|
readonly makeModel: (
|
|
81
91
|
modelId: string,
|
|
82
92
|
thoughtLevel: ThoughtLevel,
|
|
93
|
+
fastMode: boolean,
|
|
83
94
|
) => Option.Option<Layer.Layer<ModelServices, never, RModel>>
|
|
84
95
|
/**
|
|
85
96
|
* Models to advertise as `availableModels`, listed first in this order. The
|
|
@@ -138,6 +149,11 @@ export class SessionRecord extends Schema.Class<SessionRecord>(
|
|
|
138
149
|
cwd: Schema.String,
|
|
139
150
|
model: Schema.String,
|
|
140
151
|
thoughtLevel: ThoughtLevel,
|
|
152
|
+
/**
|
|
153
|
+
* The session's fast mode setting. It is kept across model switches and
|
|
154
|
+
* applies while the session model supports fast mode.
|
|
155
|
+
*/
|
|
156
|
+
fastMode: Schema.optionalKey(Schema.Boolean),
|
|
141
157
|
history: Prompt.Prompt,
|
|
142
158
|
/**
|
|
143
159
|
* The agent's executor environment, such as its working directory.
|
|
@@ -262,11 +278,22 @@ const SetModelParams = Schema.Struct({
|
|
|
262
278
|
modelId: Schema.String,
|
|
263
279
|
})
|
|
264
280
|
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
281
|
+
// The `fast_mode` select values. A select works with every client; a
|
|
282
|
+
// `boolean` option needs the client's `configOptions.boolean` capability.
|
|
283
|
+
const FastModeValue = Schema.Literals(["off", "on"])
|
|
284
|
+
|
|
285
|
+
const SetConfigOptionParams = Schema.Union([
|
|
286
|
+
Schema.Struct({
|
|
287
|
+
sessionId: Schema.String,
|
|
288
|
+
configId: Schema.Literal("thought_level"),
|
|
289
|
+
value: ThoughtLevel,
|
|
290
|
+
}),
|
|
291
|
+
Schema.Struct({
|
|
292
|
+
sessionId: Schema.String,
|
|
293
|
+
configId: Schema.Literal("fast_mode"),
|
|
294
|
+
value: FastModeValue,
|
|
295
|
+
}),
|
|
296
|
+
])
|
|
270
297
|
|
|
271
298
|
const TextBlock = Schema.Struct({
|
|
272
299
|
type: Schema.Literal("text"),
|
|
@@ -389,6 +416,7 @@ interface Session {
|
|
|
389
416
|
readonly cwd: string
|
|
390
417
|
model: string
|
|
391
418
|
thoughtLevel: ThoughtLevel
|
|
419
|
+
fastMode: boolean
|
|
392
420
|
readonly agent: Agent.Agent
|
|
393
421
|
running: Fiber.Fiber<void, unknown> | undefined
|
|
394
422
|
toolCalls: number
|
|
@@ -452,9 +480,20 @@ export const make = Effect.fnUntraced(function* <RAgent, RModel>(
|
|
|
452
480
|
sessionNotFound(sessionId),
|
|
453
481
|
)
|
|
454
482
|
|
|
455
|
-
const
|
|
483
|
+
const supportsFastMode = (modelId: string) =>
|
|
484
|
+
options.supportsFastMode?.(modelId) ?? false
|
|
485
|
+
|
|
486
|
+
const requireModel = (
|
|
487
|
+
modelId: string,
|
|
488
|
+
thoughtLevel: ThoughtLevel,
|
|
489
|
+
fastMode: boolean,
|
|
490
|
+
) =>
|
|
456
491
|
Effect.fromOption(
|
|
457
|
-
options.makeModel(
|
|
492
|
+
options.makeModel(
|
|
493
|
+
modelId,
|
|
494
|
+
thoughtLevel,
|
|
495
|
+
fastMode && supportsFastMode(modelId),
|
|
496
|
+
),
|
|
458
497
|
() =>
|
|
459
498
|
new RpcError({ code: -32602, message: `Unknown model: ${modelId}` }),
|
|
460
499
|
)
|
|
@@ -468,6 +507,24 @@ export const make = Effect.fnUntraced(function* <RAgent, RModel>(
|
|
|
468
507
|
currentValue: session.thoughtLevel,
|
|
469
508
|
options: ThoughtLevel.literals.map((value) => ({ value, name: value })),
|
|
470
509
|
},
|
|
510
|
+
...(supportsFastMode(session.model)
|
|
511
|
+
? [
|
|
512
|
+
{
|
|
513
|
+
id: "fast_mode",
|
|
514
|
+
name: "Fast mode",
|
|
515
|
+
description: "Faster responses at a higher cost",
|
|
516
|
+
category: "model_config",
|
|
517
|
+
type: "select",
|
|
518
|
+
currentValue: session.fastMode ? "on" : "off",
|
|
519
|
+
// "off" sends no service tier, so the account or project default
|
|
520
|
+
// applies, and that default can itself be fast.
|
|
521
|
+
options: [
|
|
522
|
+
{ value: "off", name: "Default" },
|
|
523
|
+
{ value: "on", name: "On" },
|
|
524
|
+
],
|
|
525
|
+
},
|
|
526
|
+
]
|
|
527
|
+
: []),
|
|
471
528
|
]
|
|
472
529
|
|
|
473
530
|
const sessionState = Effect.fnUntraced(function* (session: Session) {
|
|
@@ -498,6 +555,7 @@ export const make = Effect.fnUntraced(function* <RAgent, RModel>(
|
|
|
498
555
|
cwd: session.cwd,
|
|
499
556
|
model: session.model,
|
|
500
557
|
thoughtLevel: session.thoughtLevel,
|
|
558
|
+
fastMode: session.fastMode,
|
|
501
559
|
history: session.agent.history.current,
|
|
502
560
|
environment: session.agent.environment.current,
|
|
503
561
|
}),
|
|
@@ -545,6 +603,7 @@ export const make = Effect.fnUntraced(function* <RAgent, RModel>(
|
|
|
545
603
|
cwd: record.cwd,
|
|
546
604
|
model: record.model,
|
|
547
605
|
thoughtLevel: record.thoughtLevel,
|
|
606
|
+
fastMode: record.fastMode ?? false,
|
|
548
607
|
agent,
|
|
549
608
|
running: undefined,
|
|
550
609
|
toolCalls: 0,
|
|
@@ -887,13 +946,15 @@ export const make = Effect.fnUntraced(function* <RAgent, RModel>(
|
|
|
887
946
|
)
|
|
888
947
|
const modelId = model ?? options.defaultModel
|
|
889
948
|
const thoughtLevel = options.defaultThoughtLevel
|
|
890
|
-
|
|
949
|
+
const fastMode = options.defaultFastMode ?? false
|
|
950
|
+
yield* requireModel(modelId, thoughtLevel, fastMode)
|
|
891
951
|
const session = yield* openSession(
|
|
892
952
|
crypto.randomUUID(),
|
|
893
953
|
new SessionRecord({
|
|
894
954
|
cwd,
|
|
895
955
|
model: modelId,
|
|
896
956
|
thoughtLevel,
|
|
957
|
+
fastMode,
|
|
897
958
|
history: Prompt.empty,
|
|
898
959
|
}),
|
|
899
960
|
mcpServers ?? [],
|
|
@@ -925,13 +986,15 @@ export const make = Effect.fnUntraced(function* <RAgent, RModel>(
|
|
|
925
986
|
return yield* sessionNotFound(sessionId)
|
|
926
987
|
}
|
|
927
988
|
const modelId = model ?? record.value.model
|
|
928
|
-
|
|
989
|
+
const fastMode = record.value.fastMode ?? false
|
|
990
|
+
yield* requireModel(modelId, record.value.thoughtLevel, fastMode)
|
|
929
991
|
const session = yield* openSession(
|
|
930
992
|
sessionId,
|
|
931
993
|
new SessionRecord({
|
|
932
994
|
cwd: cwd ?? record.value.cwd,
|
|
933
995
|
model: modelId,
|
|
934
996
|
thoughtLevel: record.value.thoughtLevel,
|
|
997
|
+
fastMode,
|
|
935
998
|
history: record.value.history,
|
|
936
999
|
// The stored environment belongs to the stored cwd.
|
|
937
1000
|
...(record.value.environment !== undefined &&
|
|
@@ -950,20 +1013,35 @@ export const make = Effect.fnUntraced(function* <RAgent, RModel>(
|
|
|
950
1013
|
const setModel = Effect.fnUntraced(function* (params: unknown) {
|
|
951
1014
|
const { sessionId, modelId } = yield* decodeParams(SetModelParams, params)
|
|
952
1015
|
const session = yield* getSession(sessionId)
|
|
953
|
-
yield* requireModel(modelId, session.thoughtLevel)
|
|
1016
|
+
yield* requireModel(modelId, session.thoughtLevel, session.fastMode)
|
|
954
1017
|
session.model = modelId
|
|
955
1018
|
yield* persist(session)
|
|
956
|
-
|
|
1019
|
+
// The options depend on the model, and the `session/set_model` response
|
|
1020
|
+
// has no `configOptions` field in the ACP schema.
|
|
1021
|
+
const options = configOptions(session)
|
|
1022
|
+
yield* update(sessionId, {
|
|
1023
|
+
sessionUpdate: "config_option_update",
|
|
1024
|
+
configOptions: options,
|
|
1025
|
+
})
|
|
1026
|
+
return { configOptions: options }
|
|
957
1027
|
})
|
|
958
1028
|
|
|
959
1029
|
const setConfigOption = Effect.fnUntraced(function* (params: unknown) {
|
|
960
|
-
const
|
|
961
|
-
|
|
962
|
-
|
|
963
|
-
|
|
964
|
-
|
|
965
|
-
|
|
966
|
-
|
|
1030
|
+
const option = yield* decodeParams(SetConfigOptionParams, params)
|
|
1031
|
+
const session = yield* getSession(option.sessionId)
|
|
1032
|
+
if (option.configId === "thought_level") {
|
|
1033
|
+
yield* requireModel(session.model, option.value, session.fastMode)
|
|
1034
|
+
session.thoughtLevel = option.value
|
|
1035
|
+
} else {
|
|
1036
|
+
const fastMode = option.value === "on"
|
|
1037
|
+
if (fastMode && !supportsFastMode(session.model)) {
|
|
1038
|
+
return yield* invalidParams(
|
|
1039
|
+
`Fast mode is not supported by model: ${session.model}`,
|
|
1040
|
+
)
|
|
1041
|
+
}
|
|
1042
|
+
yield* requireModel(session.model, session.thoughtLevel, fastMode)
|
|
1043
|
+
session.fastMode = fastMode
|
|
1044
|
+
}
|
|
967
1045
|
yield* persist(session)
|
|
968
1046
|
return { configOptions: configOptions(session) }
|
|
969
1047
|
})
|
|
@@ -977,7 +1055,11 @@ export const make = Effect.fnUntraced(function* <RAgent, RModel>(
|
|
|
977
1055
|
message: `Session ${sessionId} already has a prompt in progress`,
|
|
978
1056
|
})
|
|
979
1057
|
}
|
|
980
|
-
const model = yield* requireModel(
|
|
1058
|
+
const model = yield* requireModel(
|
|
1059
|
+
session.model,
|
|
1060
|
+
session.thoughtLevel,
|
|
1061
|
+
session.fastMode,
|
|
1062
|
+
)
|
|
981
1063
|
// Resolve images before the turn starts, so a bad block rejects the
|
|
982
1064
|
// request without a model call.
|
|
983
1065
|
const input = yield* promptFromBlocks(session.cwd, prompt)
|
package/src/ModelLayer.test.ts
CHANGED
|
@@ -59,6 +59,7 @@ const unused = Layer.mergeAll(
|
|
|
59
59
|
const requestBody = Effect.fnUntraced(function* (
|
|
60
60
|
modelId: string,
|
|
61
61
|
thoughtLevel: Acp.ThoughtLevel = "high",
|
|
62
|
+
fastMode = false,
|
|
62
63
|
) {
|
|
63
64
|
const requests: Array<HttpClientRequest.HttpClientRequest> = []
|
|
64
65
|
const client = HttpClient.make((request) =>
|
|
@@ -70,7 +71,7 @@ const requestBody = Effect.fnUntraced(function* (
|
|
|
70
71
|
)
|
|
71
72
|
}),
|
|
72
73
|
)
|
|
73
|
-
const model = Option.getOrThrow(makeModel(modelId, thoughtLevel))
|
|
74
|
+
const model = Option.getOrThrow(makeModel(modelId, thoughtLevel, fastMode))
|
|
74
75
|
yield* Effect.gen(function* () {
|
|
75
76
|
const ai = yield* LanguageModel.LanguageModel
|
|
76
77
|
yield* ai.streamText({ prompt: "hello" }).pipe(Stream.runDrain, Effect.exit)
|
|
@@ -116,6 +117,18 @@ describe("ModelLayer.makeAcp", () => {
|
|
|
116
117
|
}),
|
|
117
118
|
)
|
|
118
119
|
|
|
120
|
+
it.effect("sends the priority service tier in fast mode only", () =>
|
|
121
|
+
Effect.gen(function* () {
|
|
122
|
+
assert.strictEqual(
|
|
123
|
+
(yield* requestBody("openai:gpt-6-astra", "high", true)).service_tier,
|
|
124
|
+
"priority",
|
|
125
|
+
)
|
|
126
|
+
assert.isFalse(
|
|
127
|
+
"service_tier" in (yield* requestBody("openai:gpt-6-astra")),
|
|
128
|
+
)
|
|
129
|
+
}),
|
|
130
|
+
)
|
|
131
|
+
|
|
119
132
|
it("rejects ids that are not <provider>:<model>", () => {
|
|
120
133
|
assert.isTrue(Option.isNone(makeModel("nope", "high")))
|
|
121
134
|
})
|
package/src/ModelLayer.ts
CHANGED
|
@@ -26,10 +26,21 @@ const withSubagentModel = <E, R>(
|
|
|
26
26
|
>,
|
|
27
27
|
) => Layer.merge(model, Agent.layerSubagentModel(model))
|
|
28
28
|
|
|
29
|
+
/**
|
|
30
|
+
* Whether a provider supports fast mode. Only OpenAI does, through the
|
|
31
|
+
* `priority` service tier.
|
|
32
|
+
*
|
|
33
|
+
* @since 1.0.0
|
|
34
|
+
* @category Fast mode
|
|
35
|
+
*/
|
|
36
|
+
export const supportsFastMode = (provider: ModelsRepo.Provider) =>
|
|
37
|
+
provider === "openai"
|
|
38
|
+
|
|
29
39
|
/**
|
|
30
40
|
* The model layer for a provider and model id. `effort` is `null` for models
|
|
31
41
|
* that take no reasoning effort, and `undefined` to keep the provider's
|
|
32
|
-
* default effort.
|
|
42
|
+
* default effort. `fastMode` requests the `priority` service tier and is
|
|
43
|
+
* ignored for providers without fast mode.
|
|
33
44
|
*
|
|
34
45
|
* @since 1.0.0
|
|
35
46
|
* @category Layers
|
|
@@ -39,17 +50,21 @@ export const make = (
|
|
|
39
50
|
model: string,
|
|
40
51
|
effort: string | null | undefined,
|
|
41
52
|
openai: OpenAiClient.Options,
|
|
53
|
+
fastMode = false,
|
|
42
54
|
) => {
|
|
43
55
|
const options =
|
|
44
56
|
effort === undefined
|
|
45
57
|
? undefined
|
|
46
58
|
: { reasoning: effort === null ? null : { effort: effort as any } }
|
|
59
|
+
const openaiOptions = fastMode
|
|
60
|
+
? { ...options, service_tier: "priority" }
|
|
61
|
+
: options
|
|
47
62
|
return provider === "openai"
|
|
48
63
|
? openai.apiKey !== undefined
|
|
49
|
-
? withSubagentModel(Codex.model(model,
|
|
64
|
+
? withSubagentModel(Codex.model(model, openaiOptions)).pipe(
|
|
50
65
|
Layer.provide(OpenAiClient.layer(openai)),
|
|
51
66
|
)
|
|
52
|
-
: withSubagentModel(Codex.modelWebSocket(model,
|
|
67
|
+
: withSubagentModel(Codex.modelWebSocket(model, openaiOptions)).pipe(
|
|
53
68
|
Layer.provide(Codex.layerClient),
|
|
54
69
|
)
|
|
55
70
|
: provider === "xai"
|
|
@@ -76,6 +91,17 @@ export const parseAcpModelId = (modelId: string) => {
|
|
|
76
91
|
: Option.none()
|
|
77
92
|
}
|
|
78
93
|
|
|
94
|
+
/**
|
|
95
|
+
* An `Acp.Options.supportsFastMode` callback for `<provider>:<model>` ids.
|
|
96
|
+
*
|
|
97
|
+
* @since 1.0.0
|
|
98
|
+
* @category ACP
|
|
99
|
+
*/
|
|
100
|
+
export const acpSupportsFastMode = (modelId: string) =>
|
|
101
|
+
Option.exists(parseAcpModelId(modelId), ({ provider }) =>
|
|
102
|
+
supportsFastMode(provider),
|
|
103
|
+
)
|
|
104
|
+
|
|
79
105
|
/**
|
|
80
106
|
* The catalog as ACP `availableModels`, with `<provider>:<id>` ids. The
|
|
81
107
|
* provider is part of the name because providers share model names.
|
|
@@ -119,7 +145,8 @@ const resolveEffort = (
|
|
|
119
145
|
* efforts runs with no reasoning options, whatever the session thought level.
|
|
120
146
|
* A listed model that does not support the session thought level runs at the
|
|
121
147
|
* supported effort nearest to it in `ThoughtLevel` order, the higher one on a
|
|
122
|
-
* tie. Unlisted models run at the session thought level.
|
|
148
|
+
* tie. Unlisted models run at the session thought level. Fast mode applies
|
|
149
|
+
* to OpenAI models only.
|
|
123
150
|
*
|
|
124
151
|
* @since 1.0.0
|
|
125
152
|
* @category ACP
|
|
@@ -129,7 +156,7 @@ export const makeAcp =
|
|
|
129
156
|
readonly models: Effect.Effect<ReadonlyArray<ModelsRepo.ModelInfo>>
|
|
130
157
|
readonly openai: OpenAiClient.Options
|
|
131
158
|
}) =>
|
|
132
|
-
(modelId: string, thoughtLevel: ThoughtLevel) =>
|
|
159
|
+
(modelId: string, thoughtLevel: ThoughtLevel, fastMode = false) =>
|
|
133
160
|
Option.map(parseAcpModelId(modelId), ({ provider, model }) =>
|
|
134
161
|
Layer.unwrap(
|
|
135
162
|
Effect.map(options.models, (catalog) => {
|
|
@@ -143,6 +170,7 @@ export const makeAcp =
|
|
|
143
170
|
? thoughtLevel
|
|
144
171
|
: resolveEffort(info.efforts, thoughtLevel),
|
|
145
172
|
options.openai,
|
|
173
|
+
fastMode,
|
|
146
174
|
)
|
|
147
175
|
}),
|
|
148
176
|
),
|
package/src/cli.ts
CHANGED
|
@@ -142,6 +142,16 @@ const apiUrl = Flag.String("api-url").pipe(
|
|
|
142
142
|
Flag.optional,
|
|
143
143
|
)
|
|
144
144
|
|
|
145
|
+
// OpenAI's `priority` service tier.
|
|
146
|
+
const fast = Flag.Boolean("fast").pipe(
|
|
147
|
+
Flag.withDescription(
|
|
148
|
+
"Use OpenAI fast mode (the priority service tier) for faster responses at a higher cost. Applies to the openai provider only; also CLANKA_FAST=true.",
|
|
149
|
+
),
|
|
150
|
+
Flag.withFallbackConfig(
|
|
151
|
+
Config.Boolean("CLANKA_FAST").pipe(Config.withDefault(false)),
|
|
152
|
+
),
|
|
153
|
+
)
|
|
154
|
+
|
|
145
155
|
const semantic = Flag.Directory("search").pipe(
|
|
146
156
|
Flag.withDescription(
|
|
147
157
|
"Directory for semantic search data (uses OPENAI_API_KEY env var)",
|
|
@@ -257,6 +267,7 @@ const acpModel = Flag.String("model").pipe(
|
|
|
257
267
|
|
|
258
268
|
const acp = Command.make("acp", {
|
|
259
269
|
model: acpModel,
|
|
270
|
+
fast,
|
|
260
271
|
compaction,
|
|
261
272
|
apiKey,
|
|
262
273
|
apiUrl,
|
|
@@ -264,13 +275,15 @@ const acp = Command.make("acp", {
|
|
|
264
275
|
Command.withDescription(
|
|
265
276
|
"Run as an Agent Client Protocol (ACP) server over stdio",
|
|
266
277
|
),
|
|
267
|
-
Command.withHandler(({ model, apiKey, apiUrl }) =>
|
|
278
|
+
Command.withHandler(({ model, fast, apiKey, apiUrl }) =>
|
|
268
279
|
Effect.gen(function* () {
|
|
269
280
|
const repo = yield* ModelsRepo.ModelsRepo
|
|
270
281
|
return yield* Acp.runStdio({
|
|
271
282
|
version,
|
|
272
283
|
defaultModel: model.model,
|
|
273
284
|
defaultThoughtLevel: model.thoughtLevel,
|
|
285
|
+
defaultFastMode: fast,
|
|
286
|
+
supportsFastMode: ModelLayer.acpSupportsFastMode,
|
|
274
287
|
availableModels: Effect.map(repo.models, ModelLayer.acpModels),
|
|
275
288
|
makeAgent: (cwd) =>
|
|
276
289
|
Agent.make.pipe(
|
|
@@ -299,6 +312,7 @@ const acp = Command.make("acp", {
|
|
|
299
312
|
Command.make("clanka", {
|
|
300
313
|
provider,
|
|
301
314
|
model,
|
|
315
|
+
fast,
|
|
302
316
|
semantic,
|
|
303
317
|
prompt,
|
|
304
318
|
compaction,
|
|
@@ -311,6 +325,7 @@ Command.make("clanka", {
|
|
|
311
325
|
Effect.fnUntraced(function* ({
|
|
312
326
|
provider,
|
|
313
327
|
model: modelRaw,
|
|
328
|
+
fast,
|
|
314
329
|
semantic,
|
|
315
330
|
prompt: nonInteractivePrompt,
|
|
316
331
|
apiKey,
|
|
@@ -337,10 +352,16 @@ Command.make("clanka", {
|
|
|
337
352
|
},
|
|
338
353
|
onNone: () => selectModel(provider),
|
|
339
354
|
})
|
|
340
|
-
const Model = ModelLayer.make(
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
355
|
+
const Model = ModelLayer.make(
|
|
356
|
+
provider,
|
|
357
|
+
model,
|
|
358
|
+
effort,
|
|
359
|
+
{
|
|
360
|
+
apiKey: Option.getOrUndefined(apiKey),
|
|
361
|
+
apiUrl: Option.getOrUndefined(apiUrl),
|
|
362
|
+
},
|
|
363
|
+
fast,
|
|
364
|
+
)
|
|
344
365
|
|
|
345
366
|
return yield* Effect.gen(function* () {
|
|
346
367
|
const agent = yield* Agent.Agent
|