clanka 0.23.2 → 0.24.1

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.
Files changed (56) hide show
  1. package/README.md +24 -1
  2. package/dist/ModelLayer.d.ts +31 -6
  3. package/dist/ModelLayer.d.ts.map +1 -1
  4. package/dist/ModelLayer.js +49 -7
  5. package/dist/ModelLayer.js.map +1 -1
  6. package/dist/ModelLayer.test.js +39 -0
  7. package/dist/ModelLayer.test.js.map +1 -1
  8. package/dist/ModelsRepo.d.ts +7 -5
  9. package/dist/ModelsRepo.d.ts.map +1 -1
  10. package/dist/ModelsRepo.js +12 -4
  11. package/dist/ModelsRepo.js.map +1 -1
  12. package/dist/OpenAiCompat.d.ts +59 -0
  13. package/dist/OpenAiCompat.d.ts.map +1 -0
  14. package/dist/OpenAiCompat.js +96 -0
  15. package/dist/OpenAiCompat.js.map +1 -0
  16. package/dist/OpenAiCompat.test.d.ts +2 -0
  17. package/dist/OpenAiCompat.test.d.ts.map +1 -0
  18. package/dist/OpenAiCompat.test.js +110 -0
  19. package/dist/OpenAiCompat.test.js.map +1 -0
  20. package/dist/bin/Effect-5XYMLOiB.mjs +0 -2
  21. package/dist/bin/Latch-BnrpWMd1.mjs +0 -2
  22. package/dist/bin/McpClient-DoPNaNzW.mjs +0 -2
  23. package/dist/bin/OutputFormatter-U02YKTfy.mjs +0 -2
  24. package/dist/bin/Schema-Box_9VZG.mjs +0 -2
  25. package/dist/bin/SemanticSearch-CH125AHH.mjs +0 -2
  26. package/dist/bin/Stream-C51usiew.mjs +0 -2
  27. package/dist/bin/cli.mjs +106 -51
  28. package/dist/bin/helpers-CljL9OKa.mjs +0 -2
  29. package/dist/bin/index.min-ClUfQ5ji.mjs +0 -2
  30. package/dist/bin/server-HlLriZxF.mjs +0 -2
  31. package/dist/bin/turndown.cjs-C2WBxeA-.mjs +0 -2
  32. package/dist/bin/types-LcwjLVkt.mjs +0 -2
  33. package/dist/bin/upgrade-HMRGSqq8.mjs +0 -2
  34. package/dist/cli.js +38 -31
  35. package/dist/cli.js.map +1 -1
  36. package/package.json +1 -1
  37. package/src/ModelLayer.test.ts +62 -0
  38. package/src/ModelLayer.ts +60 -7
  39. package/src/ModelsRepo.ts +12 -4
  40. package/src/OpenAiCompat.test.ts +166 -0
  41. package/src/OpenAiCompat.ts +175 -0
  42. package/src/cli.ts +51 -39
  43. package/dist/bin/Effect-5XYMLOiB.mjs.map +0 -1
  44. package/dist/bin/Latch-BnrpWMd1.mjs.map +0 -1
  45. package/dist/bin/McpClient-DoPNaNzW.mjs.map +0 -1
  46. package/dist/bin/OutputFormatter-U02YKTfy.mjs.map +0 -1
  47. package/dist/bin/Schema-Box_9VZG.mjs.map +0 -1
  48. package/dist/bin/SemanticSearch-CH125AHH.mjs.map +0 -1
  49. package/dist/bin/Stream-C51usiew.mjs.map +0 -1
  50. package/dist/bin/cli.mjs.map +0 -1
  51. package/dist/bin/helpers-CljL9OKa.mjs.map +0 -1
  52. package/dist/bin/index.min-ClUfQ5ji.mjs.map +0 -1
  53. package/dist/bin/server-HlLriZxF.mjs.map +0 -1
  54. package/dist/bin/turndown.cjs-C2WBxeA-.mjs.map +0 -1
  55. package/dist/bin/types-LcwjLVkt.mjs.map +0 -1
  56. package/dist/bin/upgrade-HMRGSqq8.mjs.map +0 -1
package/dist/cli.js CHANGED
@@ -16,6 +16,7 @@ import * as McpConfig from "./McpConfig.js";
16
16
  import * as McpServers from "./McpServers.js";
17
17
  import * as ModelLayer from "./ModelLayer.js";
18
18
  import * as ModelsRepo from "./ModelsRepo.js";
19
+ import * as OpenAiCompat from "./OpenAiCompat.js";
19
20
  import * as Stream from "effect/Stream";
20
21
  import * as Stdio from "effect/Stdio";
21
22
  import { pipe } from "effect/Function";
@@ -55,13 +56,18 @@ const version = reportedVersion(process.argv.slice(2)) ?? packageJson.version;
55
56
  const HttpClientLive = NodeHttpClient.layerNodeHttpNoAgent.pipe(Layer.provide(NodeHttpClient.layerAgentOptions({ keepAlive: true })));
56
57
  const providers = ModelsRepo.Provider.literals;
57
58
  // Pick a model from the catalog, filtering by name as the user types, then
58
- // one of its reasoning efforts.
59
+ // one of its reasoning efforts. A model whose efforts are unknown runs at the
60
+ // provider's default effort. A provider with no models takes a typed
61
+ // <model>[/<effort>].
59
62
  const selectModel = Effect.fnUntraced(function* (provider) {
60
63
  const repo = yield* ModelsRepo.ModelsRepo;
61
64
  const catalog = (yield* repo.models).filter((model) => model.provider === provider);
62
65
  const models = catalog.length > 0
63
66
  ? catalog
64
67
  : ModelsRepo.fallback.filter((model) => model.provider === provider);
68
+ if (models.length === 0) {
69
+ return ModelLayer.parseModel(yield* Prompt.String({ message: "Enter a model id" }));
70
+ }
65
71
  const defaultId = ModelsRepo.fallback.find((model) => model.provider === provider)?.id;
66
72
  const model = yield* Prompt.AutoComplete({
67
73
  message: "Select a model",
@@ -72,6 +78,9 @@ const selectModel = Effect.fnUntraced(function* (provider) {
72
78
  selected: model.id === defaultId,
73
79
  })),
74
80
  });
81
+ if (model.efforts === undefined) {
82
+ return { model: model.id, effort: undefined };
83
+ }
75
84
  if (model.efforts.length === 0) {
76
85
  return { model: model.id, effort: null };
77
86
  }
@@ -85,29 +94,11 @@ const selectModel = Effect.fnUntraced(function* (provider) {
85
94
  });
86
95
  return { model: model.id, effort };
87
96
  });
88
- const isProvider = Schema.is(ModelsRepo.Provider);
89
- const isThoughtLevel = Schema.is(Acp.ThoughtLevel);
90
- // `<provider>/<model>[/<effort>]` as accepted by the `acp` --model flag.
91
- const parseModelId = (modelId) => {
92
- const [provider, model, effort, ...rest] = modelId.split("/");
93
- return isProvider(provider) &&
94
- model !== undefined &&
95
- (effort === undefined || isThoughtLevel(effort)) &&
96
- rest.length === 0
97
- ? Option.some({
98
- model: `${provider}:${model}`,
99
- thoughtLevel: Option.fromUndefinedOr(effort),
100
- })
101
- : Option.none();
102
- };
103
- const ModelId = Schema.String.pipe(Schema.check(Schema.makeFilter((modelId) => Option.isSome(parseModelId(modelId)) ||
104
- `Invalid model "${modelId}", expected <provider>/<model>[/<effort>] with effort one of ${Acp.ThoughtLevel.literals.join(", ")}`)));
97
+ const ModelId = Schema.String.pipe(Schema.check(Schema.makeFilter((modelId) => Option.isSome(ModelLayer.parseModelSpec(modelId)) ||
98
+ `Invalid model "${modelId}", expected <provider>/<model>[/<effort>] with provider one of ${providers.join(", ")}`)));
105
99
  // An `--subagent-model` or `--summarizer-model` value. Without an effort, the
106
100
  // provider's default effort is used.
107
- const auxiliaryModel = (options) => Flag.String(options.name).pipe(Flag.withDescription(`${options.description} As <provider>/<model>[/<effort>], e.g. openai/gpt-6-astra/low; also ${options.env}.`), Flag.withFallbackConfig(Config.String(options.env)), Flag.withSchema(ModelId), Flag.map((modelId) => {
108
- const [provider, model, effort] = modelId.split("/");
109
- return { provider, model, effort };
110
- }), Flag.optional);
101
+ const auxiliaryModel = (options) => Flag.String(options.name).pipe(Flag.withDescription(`${options.description} As <provider>/<model>[/<effort>], e.g. openai/gpt-6-astra/low; also ${options.env}.`), Flag.withFallbackConfig(Config.String(options.env)), Flag.withSchema(ModelId), Flag.map((modelId) => Option.getOrThrow(ModelLayer.parseModelSpec(modelId))), Flag.optional);
111
102
  const subagentModel = auxiliaryModel({
112
103
  name: "subagent-model",
113
104
  env: "CLANKA_SUBAGENT_MODEL",
@@ -142,11 +133,24 @@ const provider = Flag.Literals("provider", providers).pipe(Flag.withAlias("p"),
142
133
  title: "claude",
143
134
  value: "claude",
144
135
  },
136
+ {
137
+ title: "openai-compat",
138
+ value: "openai-compat",
139
+ },
145
140
  ],
146
141
  })));
147
142
  const model = Flag.String("model").pipe(Flag.withAlias("m"), Flag.optional);
148
- 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);
149
- 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);
143
+ const apiKey = Flag.Redacted("api-key").pipe(Flag.withDescription("API key for the openai API-key mode and the openai-compat provider (defaults to CLANKA_OPENAI_API_KEY)"), Flag.withFallbackConfig(Config.Redacted("CLANKA_OPENAI_API_KEY")), Flag.optional);
144
+ const apiUrl = Flag.String("api-url").pipe(Flag.withDescription("API base URL for the openai API-key mode and the openai-compat provider (defaults to CLANKA_OPENAI_API_URL or https://api.openai.com/v1). When set, the models it lists at /models are offered as openai-compat models."), Flag.withFallbackConfig(Config.String("CLANKA_OPENAI_API_URL")), Flag.optional);
145
+ // Adds the models an --api-url endpoint lists to the catalog, as openai-compat
146
+ // models. Without --api-url the endpoint is OpenAI's, which is not listed.
147
+ const openAiCompatModels = (flags) => Option.match(flags.apiUrl, {
148
+ onNone: () => Layer.empty,
149
+ onSome: (apiUrl) => OpenAiCompat.layerModelsRepo({
150
+ apiUrl,
151
+ apiKey: Option.getOrUndefined(flags.apiKey),
152
+ }),
153
+ });
150
154
  // OpenAI's `priority` service tier.
151
155
  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))));
152
156
  const semantic = Flag.Directory("search").pipe(Flag.withDescription("Directory for semantic search data (uses OPENAI_API_KEY env var)"), Flag.withAlias("s"), Flag.optional);
@@ -198,7 +202,13 @@ const Search = (directory) => Layer.unwrap(Effect.gen(function* () {
198
202
  apiKey: apiKey.value,
199
203
  })));
200
204
  })).pipe(Layer.provide([NodeServices.layer, HttpClientLive]));
201
- const acpModel = Flag.String("model").pipe(Flag.withAlias("m"), Flag.withDescription("Default model as <provider>/<model>[/<effort>], e.g. openai/gpt-6-astra/medium. Without an effort, uses CLANKA_REASONING, or medium."), Flag.withSchema(ModelId), Flag.withDefault("openai/gpt-6-astra"), Flag.map((modelId) => Option.getOrThrow(parseModelId(modelId))));
205
+ const acpModel = Flag.String("model").pipe(Flag.withAlias("m"), Flag.withDescription("Default model as <provider>/<model>[/<effort>], e.g. openai/gpt-6-astra/medium. Without an effort, uses CLANKA_REASONING, or medium."), Flag.withSchema(ModelId), Flag.withDefault("openai/gpt-6-astra"), Flag.map((modelId) => {
206
+ const spec = Option.getOrThrow(ModelLayer.parseModelSpec(modelId));
207
+ return {
208
+ model: `${spec.provider}:${spec.model}`,
209
+ thoughtLevel: Option.fromUndefinedOr(spec.effort),
210
+ };
211
+ }));
202
212
  // kiro launchers pass it to every `acp` run; clanka has no tool permissions to
203
213
  // skip.
204
214
  const trustAllTools = Flag.Boolean("trust-all-tools").pipe(Flag.withDescription("Accepted for kiro-cli compatibility. Has no effect: clanka runs every tool call without asking."), Flag.withDefault(false));
@@ -241,7 +251,7 @@ const acp = Command.make("acp", {
241
251
  auxiliary: auxiliaryModels(flags),
242
252
  }),
243
253
  });
244
- })), Command.provide((flags) => Layer.mergeAll(Agent.ConversationMode.layer(false), Layer.succeed(Logger.LogToStderr, true), DeviceCodeHandler.layerLog, compactionConfig(flags))));
254
+ })), Command.provide((flags) => Layer.mergeAll(Agent.ConversationMode.layer(false), Layer.succeed(Logger.LogToStderr, true), DeviceCodeHandler.layerLog, compactionConfig(flags), openAiCompatModels(flags))));
245
255
  Command.make("clanka", {
246
256
  provider,
247
257
  fetch,
@@ -266,10 +276,7 @@ Command.make("clanka", {
266
276
  });
267
277
  const OutputFormatter = yield* Effect.promise(() => import("./OutputFormatter.js"));
268
278
  const { model, effort } = yield* Option.match(modelRaw, {
269
- onSome: (selected) => {
270
- const [model, effort] = selected.split("/");
271
- return Effect.succeed({ model, effort });
272
- },
279
+ onSome: (selected) => Effect.succeed(ModelLayer.parseModel(selected)),
273
280
  onNone: () => selectModel(provider),
274
281
  });
275
282
  const Model = ModelLayer.make(provider, model, effort, {
@@ -302,7 +309,7 @@ Command.make("clanka", {
302
309
  })), Layer.provideMerge(McpServers.layer(mcpServers))),
303
310
  Model,
304
311
  ]));
305
- })), Command.provide(({ prompt, ...flags }) => Layer.mergeAll(Agent.ConversationMode.layer(Option.isNone(prompt)), compactionConfig(flags))), Command.withSubcommands([acp]), Command.withGlobalFlags([ReportedVersion]), Command.run({
312
+ })), Command.provide(({ prompt, ...flags }) => Layer.mergeAll(Agent.ConversationMode.layer(Option.isNone(prompt)), compactionConfig(flags), openAiCompatModels(flags))), Command.withSubcommands([acp]), Command.withGlobalFlags([ReportedVersion]), Command.run({
306
313
  version,
307
314
  }), Effect.provide([
308
315
  NodeServices.layer,
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.23.2",
4
+ "version": "0.24.1",
5
5
  "publishConfig": {
6
6
  "access": "public"
7
7
  },
@@ -36,6 +36,12 @@ const makeModel = ModelLayer.makeAcp({
36
36
  name: "GPT-5 Pro",
37
37
  efforts: ["high"],
38
38
  }),
39
+ // Discovered from an endpoint's /models, which lists no efforts.
40
+ new ModelsRepo.ModelInfo({
41
+ provider: "openai-compat",
42
+ id: "kimi-k3",
43
+ name: "kimi-k3",
44
+ }),
39
45
  ]),
40
46
  openai: {
41
47
  apiKey: Redacted.make("test-key"),
@@ -144,6 +150,29 @@ describe("ModelLayer.makeAcp", () => {
144
150
  }),
145
151
  )
146
152
 
153
+ for (const modelId of ["openai-compat:kimi-k3", "openai-compat:kimi-k9"]) {
154
+ it.effect(
155
+ "runs " + modelId + " on chat completions at the session effort",
156
+ () =>
157
+ Effect.gen(function* () {
158
+ const body = yield* requestBody(modelId, "low", true)
159
+ assert.strictEqual(body.model, modelId.slice("openai-compat:".length))
160
+ assert.isArray(body.messages)
161
+ assert.strictEqual(body.reasoning_effort, "low")
162
+ assert.isFalse("service_tier" in body)
163
+ }),
164
+ )
165
+ }
166
+
167
+ it.effect("keeps colons in the model id", () =>
168
+ Effect.gen(function* () {
169
+ assert.strictEqual(
170
+ (yield* requestBody("openai-compat:qwen3:8b")).model,
171
+ "qwen3:8b",
172
+ )
173
+ }),
174
+ )
175
+
147
176
  it("rejects ids that are not <provider>:<model>", () => {
148
177
  assert.isTrue(Option.isNone(makeModel("nope", "high")))
149
178
  })
@@ -152,3 +181,36 @@ describe("ModelLayer.makeAcp", () => {
152
181
  assert.isTrue(Option.isSome(makeModel("claude:claude-opus-5-5", "high")))
153
182
  })
154
183
  })
184
+
185
+ describe("ModelLayer.parseModelSpec", () => {
186
+ it("splits off a trailing effort and keeps slashes in the model id", () => {
187
+ assert.deepStrictEqual(
188
+ ModelLayer.parseModelSpec("openai/gpt-6-astra/medium"),
189
+ Option.some({
190
+ provider: "openai",
191
+ model: "gpt-6-astra",
192
+ effort: "medium",
193
+ }),
194
+ )
195
+ assert.deepStrictEqual(
196
+ ModelLayer.parseModelSpec("openai-compat/moonshotai/Kimi-K2-Instruct"),
197
+ Option.some({
198
+ provider: "openai-compat",
199
+ model: "moonshotai/Kimi-K2-Instruct",
200
+ effort: undefined,
201
+ }),
202
+ )
203
+ assert.deepStrictEqual(
204
+ ModelLayer.parseModelSpec(
205
+ "openai-compat/moonshotai/Kimi-K2-Instruct/high",
206
+ ),
207
+ Option.some({
208
+ provider: "openai-compat",
209
+ model: "moonshotai/Kimi-K2-Instruct",
210
+ effort: "high",
211
+ }),
212
+ )
213
+ assert.isTrue(Option.isNone(ModelLayer.parseModelSpec("nope/gpt-6-astra")))
214
+ assert.isTrue(Option.isNone(ModelLayer.parseModelSpec("openai")))
215
+ })
216
+ })
package/src/ModelLayer.ts CHANGED
@@ -16,6 +16,7 @@ import * as Codex from "./Codex.ts"
16
16
  import * as Compaction from "./Compaction.ts"
17
17
  import * as Copilot from "./Copilot.ts"
18
18
  import * as ModelsRepo from "./ModelsRepo.ts"
19
+ import * as OpenAiCompat from "./OpenAiCompat.ts"
19
20
  import * as Xai from "./Xai.ts"
20
21
 
21
22
  /**
@@ -87,13 +88,23 @@ const languageModel = (
87
88
  return Copilot.model(model, options).pipe(
88
89
  Layer.provide(Copilot.layerClient),
89
90
  )
91
+ case "openai-compat":
92
+ return OpenAiCompat.model(model, options).pipe(
93
+ Layer.provide(
94
+ OpenAiCompat.layerClient({
95
+ apiKey: openai.apiKey,
96
+ apiUrl: openai.apiUrl,
97
+ }),
98
+ ),
99
+ )
90
100
  }
91
101
  }
92
102
 
93
103
  /**
94
104
  * The model layer for a provider and model id. `effort` is `null` for models
95
105
  * that take no reasoning effort, and `undefined` to keep the provider's
96
- * default effort. `fastMode` requests the `priority` service tier and is
106
+ * default effort. `openai` is the client for the `openai` API-key mode and
107
+ * for the `openai-compat` provider. `fastMode` requests the `priority` service tier and is
97
108
  * ignored for providers without fast mode; it also applies to the
98
109
  * `auxiliary` models.
99
110
  *
@@ -132,18 +143,59 @@ export const make = (
132
143
  const isProvider = Schema.is(ModelsRepo.Provider)
133
144
 
134
145
  /**
135
- * Parses a `<provider>:<model>` id as advertised over ACP.
146
+ * Parses a `<provider>:<model>` id as advertised over ACP. The model id is
147
+ * everything after the first colon, so it may hold colons itself.
136
148
  *
137
149
  * @since 1.0.0
138
150
  * @category Parsing
139
151
  */
140
152
  export const parseAcpModelId = (modelId: string) => {
141
- const [provider, model, ...rest] = modelId.split(":")
142
- return isProvider(provider) && model !== undefined && rest.length === 0
153
+ const index = modelId.indexOf(":")
154
+ const provider = modelId.slice(0, index)
155
+ const model = modelId.slice(index + 1)
156
+ return index !== -1 && isProvider(provider) && model !== ""
143
157
  ? Option.some({ provider, model })
144
158
  : Option.none()
145
159
  }
146
160
 
161
+ const isThoughtLevel = Schema.is(ThoughtLevel)
162
+
163
+ /**
164
+ * Parses `<model>[/<effort>]`. The last segment is the effort only when it
165
+ * is a `ThoughtLevel`, so model ids may hold slashes, as in
166
+ * `moonshotai/Kimi-K2-Instruct`.
167
+ *
168
+ * @since 1.0.0
169
+ * @category Parsing
170
+ */
171
+ export const parseModel = (
172
+ value: string,
173
+ ): { readonly model: string; readonly effort: ThoughtLevel | undefined } => {
174
+ const index = value.lastIndexOf("/")
175
+ const effort = value.slice(index + 1)
176
+ return index > 0 && isThoughtLevel(effort)
177
+ ? { model: value.slice(0, index), effort }
178
+ : { model: value, effort: undefined }
179
+ }
180
+
181
+ /**
182
+ * Parses `<provider>/<model>[/<effort>]`, as the CLI model flags take it.
183
+ * See `parseModel` for the model and effort.
184
+ *
185
+ * @since 1.0.0
186
+ * @category Parsing
187
+ */
188
+ export const parseModelSpec = (
189
+ value: string,
190
+ ): Option.Option<ModelSpec & { readonly effort: ThoughtLevel | undefined }> => {
191
+ const index = value.indexOf("/")
192
+ const provider = value.slice(0, index)
193
+ const { model, effort } = parseModel(value.slice(index + 1))
194
+ return index !== -1 && isProvider(provider) && model !== ""
195
+ ? Option.some({ provider, model, effort })
196
+ : Option.none()
197
+ }
198
+
147
199
  /**
148
200
  * An `Acp.Options.supportsFastMode` callback for `<provider>:<model>` ids.
149
201
  *
@@ -194,11 +246,12 @@ const resolveEffort = (
194
246
 
195
247
  /**
196
248
  * An `Acp.Options.makeModel` callback. Ids that do not parse as
197
- * `<provider>:<model>` are unknown models. A model the catalog lists without
249
+ * `<provider>:<model>` are unknown models. A model the catalog lists with no
198
250
  * efforts runs with no reasoning options, whatever the session thought level.
199
251
  * A listed model that does not support the session thought level runs at the
200
252
  * supported effort nearest to it in `ThoughtLevel` order, the higher one on a
201
- * tie. Unlisted models run at the session thought level. Fast mode applies
253
+ * tie. Unlisted models, and listed models whose efforts are unknown, run at
254
+ * the session thought level. Fast mode applies
202
255
  * to OpenAI models only. Every session uses the same `auxiliary` models.
203
256
  *
204
257
  * @since 1.0.0
@@ -220,7 +273,7 @@ export const makeAcp =
220
273
  return make(
221
274
  provider,
222
275
  model,
223
- info === undefined
276
+ info?.efforts === undefined
224
277
  ? thoughtLevel
225
278
  : resolveEffort(info.efforts, thoughtLevel),
226
279
  options.openai,
package/src/ModelsRepo.ts CHANGED
@@ -23,7 +23,13 @@ import { ThoughtLevel } from "./Acp.ts"
23
23
  * @since 1.0.0
24
24
  * @category Models
25
25
  */
26
- export const Provider = Schema.Literals(["openai", "copilot", "xai", "claude"])
26
+ export const Provider = Schema.Literals([
27
+ "openai",
28
+ "copilot",
29
+ "xai",
30
+ "claude",
31
+ "openai-compat",
32
+ ])
27
33
 
28
34
  /**
29
35
  * @since 1.0.0
@@ -45,14 +51,16 @@ export class ModelInfo extends Schema.Class<ModelInfo>(
45
51
  id: Schema.String,
46
52
  name: Schema.String,
47
53
  /**
48
- * Reasoning efforts the model accepts; empty when it takes none.
54
+ * Reasoning efforts the model accepts; empty when it takes none, and
55
+ * absent when its source does not say.
49
56
  */
50
- efforts: Schema.Array(ThoughtLevel),
57
+ efforts: Schema.optionalKey(Schema.Array(ThoughtLevel)),
51
58
  }) {}
52
59
 
53
60
  /**
54
61
  * The built-in catalog, served when neither models.dev nor a cached catalog
55
- * is available.
62
+ * is available. It has no `openai-compat` model, since that provider's
63
+ * models depend on the endpoint.
56
64
  *
57
65
  * @since 1.0.0
58
66
  * @category Models
@@ -0,0 +1,166 @@
1
+ import { assert, describe, it } from "@effect/vitest"
2
+ import * as Effect from "effect/Effect"
3
+ import * as Layer from "effect/Layer"
4
+ import * as Redacted from "effect/Redacted"
5
+ import * as Stream from "effect/Stream"
6
+ import * as LanguageModel from "effect/ai/LanguageModel"
7
+ import * as HttpClient from "effect/http/HttpClient"
8
+ import type * as HttpClientRequest from "effect/http/HttpClientRequest"
9
+ import * as HttpClientResponse from "effect/http/HttpClientResponse"
10
+ import * as Compaction from "./Compaction.ts"
11
+ import * as ModelsRepo from "./ModelsRepo.ts"
12
+ import * as OpenAiCompat from "./OpenAiCompat.ts"
13
+
14
+ const client = {
15
+ apiUrl: "https://proxy.test/v1",
16
+ apiKey: Redacted.make("proxy-key"),
17
+ }
18
+
19
+ // An HttpClient that records its requests and answers each with `response`.
20
+ const recording = (response: () => Response) => {
21
+ const requests: Array<HttpClientRequest.HttpClientRequest> = []
22
+ const layer = Layer.succeed(
23
+ HttpClient.HttpClient,
24
+ HttpClient.make((request) =>
25
+ Effect.sync(() => {
26
+ requests.push(request)
27
+ return HttpClientResponse.fromWeb(request, response())
28
+ }),
29
+ ),
30
+ )
31
+ return { requests, layer }
32
+ }
33
+
34
+ const jsonBody = (request: HttpClientRequest.HttpClientRequest) => {
35
+ if (request.body._tag !== "Uint8Array") throw new Error("Expected JSON body")
36
+ return JSON.parse(new TextDecoder().decode(request.body.body)) as Record<
37
+ string,
38
+ unknown
39
+ >
40
+ }
41
+
42
+ // The requests a prompt sends, then the same prompt as a compaction summary.
43
+ const send = Effect.fnUntraced(function* (options?: OpenAiCompat.ModelOptions) {
44
+ const http = recording(() => new Response(null, { status: 400 }))
45
+ yield* Effect.gen(function* () {
46
+ const ai = yield* LanguageModel.LanguageModel
47
+ const summarize = yield* Compaction.SummarizerTransform
48
+ const request = ai.streamText({ prompt: "hello" }).pipe(Stream.runDrain)
49
+ yield* request.pipe(Effect.exit)
50
+ yield* summarize(request).pipe(Effect.exit)
51
+ }).pipe(
52
+ Effect.provide(
53
+ OpenAiCompat.model("kimi-k3", options).pipe(
54
+ Layer.provide(OpenAiCompat.layerClient(client)),
55
+ Layer.provide(http.layer),
56
+ ),
57
+ ),
58
+ )
59
+ assert.lengthOf(http.requests, 2)
60
+ return http.requests
61
+ })
62
+
63
+ describe("OpenAiCompat.model", () => {
64
+ it.effect("streams chat completions from the configured endpoint", () =>
65
+ Effect.gen(function* () {
66
+ const [request] = yield* send()
67
+ assert.strictEqual(request!.url, "https://proxy.test/v1/chat/completions")
68
+ assert.strictEqual(request!.headers.authorization, "Bearer proxy-key")
69
+ assert.strictEqual(jsonBody(request!).model, "kimi-k3")
70
+ }),
71
+ )
72
+
73
+ it.effect("sends the effort as reasoning_effort, and none when null", () =>
74
+ Effect.gen(function* () {
75
+ const [high] = yield* send({ reasoning: { effort: "high" } })
76
+ assert.strictEqual(jsonBody(high!).reasoning_effort, "high")
77
+ assert.isFalse("reasoning" in jsonBody(high!))
78
+ for (const options of [{ reasoning: null }, undefined]) {
79
+ const [request] = yield* send(options)
80
+ assert.isFalse("reasoning_effort" in jsonBody(request!))
81
+ assert.isFalse("reasoning" in jsonBody(request!))
82
+ }
83
+ }),
84
+ )
85
+
86
+ it.effect("caps compaction summaries with max_tokens", () =>
87
+ Effect.gen(function* () {
88
+ const [prompt, summary] = yield* send()
89
+ assert.isFalse("max_tokens" in jsonBody(prompt!))
90
+ assert.strictEqual(
91
+ jsonBody(summary!).max_tokens,
92
+ Compaction.summarizerMaxOutputTokens,
93
+ )
94
+ }),
95
+ )
96
+ })
97
+
98
+ const base = new ModelsRepo.ModelInfo({
99
+ provider: "openai",
100
+ id: "gpt-6-astra",
101
+ name: "GPT-6 Astra",
102
+ efforts: ["low", "high"],
103
+ })
104
+
105
+ // The catalog of a repo over `base` and an endpoint answering `response`.
106
+ const catalog = (response: () => Response) => {
107
+ const http = recording(response)
108
+ return Effect.gen(function* () {
109
+ const repo = yield* ModelsRepo.ModelsRepo
110
+ const first = yield* repo.models
111
+ assert.deepStrictEqual(yield* repo.models, first)
112
+ return { models: first, requests: http.requests }
113
+ }).pipe(
114
+ Effect.provide(
115
+ OpenAiCompat.layerModelsRepo(client).pipe(
116
+ Layer.provide([ModelsRepo.ModelsRepo.layer([base]), http.layer]),
117
+ ),
118
+ ),
119
+ )
120
+ }
121
+
122
+ describe("OpenAiCompat.layerModelsRepo", () => {
123
+ it.effect(
124
+ "appends the listed models, newest first, with unknown efforts",
125
+ () =>
126
+ Effect.gen(function* () {
127
+ const { models, requests } = yield* catalog(() =>
128
+ Response.json({
129
+ object: "list",
130
+ data: [
131
+ { id: "kimi-k2", object: "model", created: 1 },
132
+ { id: "kimi-k3", object: "model", created: 3 },
133
+ { object: "model" },
134
+ { id: "custom", object: "model" },
135
+ ],
136
+ }),
137
+ )
138
+ assert.lengthOf(requests, 1)
139
+ assert.strictEqual(requests[0]!.url, "https://proxy.test/v1/models")
140
+ assert.strictEqual(
141
+ requests[0]!.headers.authorization,
142
+ "Bearer proxy-key",
143
+ )
144
+ assert.deepStrictEqual(models, [
145
+ base,
146
+ ...["kimi-k3", "kimi-k2", "custom"].map(
147
+ (id) =>
148
+ new ModelsRepo.ModelInfo({
149
+ provider: "openai-compat",
150
+ id,
151
+ name: id,
152
+ }),
153
+ ),
154
+ ])
155
+ }),
156
+ )
157
+
158
+ it.effect("keeps the catalog when the endpoint cannot be listed", () =>
159
+ Effect.gen(function* () {
160
+ const { models } = yield* catalog(
161
+ () => new Response(null, { status: 401 }),
162
+ )
163
+ assert.deepStrictEqual(models, [base])
164
+ }),
165
+ )
166
+ })