clanka 0.23.1 → 0.24.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.
Files changed (45) hide show
  1. package/README.md +24 -1
  2. package/dist/Acp.test.js +5 -4
  3. package/dist/Acp.test.js.map +1 -1
  4. package/dist/Agent.js +2 -2
  5. package/dist/Agent.js.map +1 -1
  6. package/dist/AgentBashJobs.test.js +5 -4
  7. package/dist/AgentBashJobs.test.js.map +1 -1
  8. package/dist/AgentExecutor.test.js +1 -1
  9. package/dist/AgentExecutor.test.js.map +1 -1
  10. package/dist/AgentSubagents.test.js +19 -16
  11. package/dist/AgentSubagents.test.js.map +1 -1
  12. package/dist/ModelLayer.d.ts +31 -6
  13. package/dist/ModelLayer.d.ts.map +1 -1
  14. package/dist/ModelLayer.js +49 -7
  15. package/dist/ModelLayer.js.map +1 -1
  16. package/dist/ModelLayer.test.js +39 -0
  17. package/dist/ModelLayer.test.js.map +1 -1
  18. package/dist/ModelsRepo.d.ts +7 -5
  19. package/dist/ModelsRepo.d.ts.map +1 -1
  20. package/dist/ModelsRepo.js +12 -4
  21. package/dist/ModelsRepo.js.map +1 -1
  22. package/dist/OpenAiCompat.d.ts +59 -0
  23. package/dist/OpenAiCompat.d.ts.map +1 -0
  24. package/dist/OpenAiCompat.js +96 -0
  25. package/dist/OpenAiCompat.js.map +1 -0
  26. package/dist/OpenAiCompat.test.d.ts +2 -0
  27. package/dist/OpenAiCompat.test.d.ts.map +1 -0
  28. package/dist/OpenAiCompat.test.js +110 -0
  29. package/dist/OpenAiCompat.test.js.map +1 -0
  30. package/dist/bin/cli.mjs +108 -51
  31. package/dist/bin/cli.mjs.map +1 -1
  32. package/dist/cli.js +38 -31
  33. package/dist/cli.js.map +1 -1
  34. package/package.json +1 -1
  35. package/src/Acp.test.ts +8 -4
  36. package/src/Agent.ts +2 -2
  37. package/src/AgentBashJobs.test.ts +16 -5
  38. package/src/AgentExecutor.test.ts +1 -1
  39. package/src/AgentSubagents.test.ts +25 -23
  40. package/src/ModelLayer.test.ts +62 -0
  41. package/src/ModelLayer.ts +60 -7
  42. package/src/ModelsRepo.ts +12 -4
  43. package/src/OpenAiCompat.test.ts +166 -0
  44. package/src/OpenAiCompat.ts +175 -0
  45. package/src/cli.ts +51 -39
@@ -1 +1 @@
1
- {"version":3,"file":"ModelLayer.d.ts","sourceRoot":"","sources":["../src/ModelLayer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAGnC,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAG7C;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,aAAc,UAAU,CAAC,QAAQ,yBACvC,CAAA;AAEvB;;;;;;;GAOG;AACH,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAA;IACtC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAC5C;AAED;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,GAAG,SAAS,CAAA;IACzC,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,GAAG,SAAS,CAAA;CAC5C;AAsCD;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,IAAI,aACL,UAAU,CAAC,QAAQ,SACtB,MAAM,UACL,MAAM,GAAG,IAAI,GAAG,SAAS,UACzB,YAAY,CAAC,OAAO,kCAEhB,eAAe,mfAgB5B,CAAA;AAID;;;;;GAKG;AACH,eAAO,MAAM,eAAe,YAAa,MAAM;;;;;;EAK9C,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,YAAa,MAAM,YAGhD,CAAA;AAEH;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,WAAY,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC;;;GAIhE,CAAA;AA0BL;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,OAAO,YACR;IACR,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAA;IACnE,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,OAAO,CAAA;IACrC,QAAQ,CAAC,SAAS,CAAC,EAAE,eAAe,GAAG,SAAS,CAAA;CACjD,eACS,MAAM,gBAAgB,YAAY,shBAmBzC,CAAA"}
1
+ {"version":3,"file":"ModelLayer.d.ts","sourceRoot":"","sources":["../src/ModelLayer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAGnC,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAI7C;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,aAAc,UAAU,CAAC,QAAQ,yBACvC,CAAA;AAEvB;;;;;;;GAOG;AACH,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAA;IACtC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAC5C;AAED;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,GAAG,SAAS,CAAA;IACzC,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,GAAG,SAAS,CAAA;CAC5C;AA+CD;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,IAAI,aACL,UAAU,CAAC,QAAQ,SACtB,MAAM,UACL,MAAM,GAAG,IAAI,GAAG,SAAS,UACzB,YAAY,CAAC,OAAO,kCAEhB,eAAe,mfAgB5B,CAAA;AAID;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,YAAa,MAAM;;;;;;EAO9C,CAAA;AAID;;;;;;;GAOG;AACH,eAAO,MAAM,UAAU,UACd,MAAM,KACZ;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,GAAG,SAAS,CAAA;CAMrE,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,UAClB,MAAM,KACZ,MAAM,CAAC,MAAM,CAAC,SAAS,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,YAAY,GAAG,SAAS,CAAA;CAAE,CAOzE,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,YAAa,MAAM,YAGhD,CAAA;AAEH;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,WAAY,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC;;;GAIhE,CAAA;AA0BL;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,OAAO,YACR;IACR,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAA;IACnE,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,OAAO,CAAA;IACrC,QAAQ,CAAC,SAAS,CAAC,EAAE,eAAe,GAAG,SAAS,CAAA;CACjD,eACS,MAAM,gBAAgB,YAAY,shBAmBzC,CAAA"}
@@ -16,6 +16,7 @@ import * as Codex from "./Codex.js";
16
16
  import * as Compaction from "./Compaction.js";
17
17
  import * as Copilot from "./Copilot.js";
18
18
  import * as ModelsRepo from "./ModelsRepo.js";
19
+ import * as OpenAiCompat from "./OpenAiCompat.js";
19
20
  import * as Xai from "./Xai.js";
20
21
  /**
21
22
  * Whether a provider supports fast mode. Only OpenAI does, through the
@@ -43,12 +44,18 @@ const languageModel = (provider, model, effort, openai, fastMode) => {
43
44
  return ClaudeAgent.model(model, { effort });
44
45
  case "copilot":
45
46
  return Copilot.model(model, options).pipe(Layer.provide(Copilot.layerClient));
47
+ case "openai-compat":
48
+ return OpenAiCompat.model(model, options).pipe(Layer.provide(OpenAiCompat.layerClient({
49
+ apiKey: openai.apiKey,
50
+ apiUrl: openai.apiUrl,
51
+ })));
46
52
  }
47
53
  };
48
54
  /**
49
55
  * The model layer for a provider and model id. `effort` is `null` for models
50
56
  * that take no reasoning effort, and `undefined` to keep the provider's
51
- * default effort. `fastMode` requests the `priority` service tier and is
57
+ * default effort. `openai` is the client for the `openai` API-key mode and
58
+ * for the `openai-compat` provider. `fastMode` requests the `priority` service tier and is
52
59
  * ignored for providers without fast mode; it also applies to the
53
60
  * `auxiliary` models.
54
61
  *
@@ -69,17 +76,51 @@ export const make = (provider, model, effort, openai, fastMode = false, auxiliar
69
76
  };
70
77
  const isProvider = Schema.is(ModelsRepo.Provider);
71
78
  /**
72
- * Parses a `<provider>:<model>` id as advertised over ACP.
79
+ * Parses a `<provider>:<model>` id as advertised over ACP. The model id is
80
+ * everything after the first colon, so it may hold colons itself.
73
81
  *
74
82
  * @since 1.0.0
75
83
  * @category Parsing
76
84
  */
77
85
  export const parseAcpModelId = (modelId) => {
78
- const [provider, model, ...rest] = modelId.split(":");
79
- return isProvider(provider) && model !== undefined && rest.length === 0
86
+ const index = modelId.indexOf(":");
87
+ const provider = modelId.slice(0, index);
88
+ const model = modelId.slice(index + 1);
89
+ return index !== -1 && isProvider(provider) && model !== ""
80
90
  ? Option.some({ provider, model })
81
91
  : Option.none();
82
92
  };
93
+ const isThoughtLevel = Schema.is(ThoughtLevel);
94
+ /**
95
+ * Parses `<model>[/<effort>]`. The last segment is the effort only when it
96
+ * is a `ThoughtLevel`, so model ids may hold slashes, as in
97
+ * `moonshotai/Kimi-K2-Instruct`.
98
+ *
99
+ * @since 1.0.0
100
+ * @category Parsing
101
+ */
102
+ export const parseModel = (value) => {
103
+ const index = value.lastIndexOf("/");
104
+ const effort = value.slice(index + 1);
105
+ return index > 0 && isThoughtLevel(effort)
106
+ ? { model: value.slice(0, index), effort }
107
+ : { model: value, effort: undefined };
108
+ };
109
+ /**
110
+ * Parses `<provider>/<model>[/<effort>]`, as the CLI model flags take it.
111
+ * See `parseModel` for the model and effort.
112
+ *
113
+ * @since 1.0.0
114
+ * @category Parsing
115
+ */
116
+ export const parseModelSpec = (value) => {
117
+ const index = value.indexOf("/");
118
+ const provider = value.slice(0, index);
119
+ const { model, effort } = parseModel(value.slice(index + 1));
120
+ return index !== -1 && isProvider(provider) && model !== ""
121
+ ? Option.some({ provider, model, effort })
122
+ : Option.none();
123
+ };
83
124
  /**
84
125
  * An `Acp.Options.supportsFastMode` callback for `<provider>:<model>` ids.
85
126
  *
@@ -116,11 +157,12 @@ const resolveEffort = (efforts, thoughtLevel) => {
116
157
  };
117
158
  /**
118
159
  * An `Acp.Options.makeModel` callback. Ids that do not parse as
119
- * `<provider>:<model>` are unknown models. A model the catalog lists without
160
+ * `<provider>:<model>` are unknown models. A model the catalog lists with no
120
161
  * efforts runs with no reasoning options, whatever the session thought level.
121
162
  * A listed model that does not support the session thought level runs at the
122
163
  * supported effort nearest to it in `ThoughtLevel` order, the higher one on a
123
- * tie. Unlisted models run at the session thought level. Fast mode applies
164
+ * tie. Unlisted models, and listed models whose efforts are unknown, run at
165
+ * the session thought level. Fast mode applies
124
166
  * to OpenAI models only. Every session uses the same `auxiliary` models.
125
167
  *
126
168
  * @since 1.0.0
@@ -128,7 +170,7 @@ const resolveEffort = (efforts, thoughtLevel) => {
128
170
  */
129
171
  export const makeAcp = (options) => (modelId, thoughtLevel, fastMode = false) => Option.map(parseAcpModelId(modelId), ({ provider, model }) => Layer.unwrap(Effect.map(options.models, (catalog) => {
130
172
  const info = catalog.find((entry) => entry.provider === provider && entry.id === model);
131
- return make(provider, model, info === undefined
173
+ return make(provider, model, info?.efforts === undefined
132
174
  ? thoughtLevel
133
175
  : resolveEffort(info.efforts, thoughtLevel), options.openai, fastMode, options.auxiliary);
134
176
  })));
@@ -1 +1 @@
1
- {"version":3,"file":"ModelLayer.js","sourceRoot":"","sources":["../src/ModelLayer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ModelLayer.js","sourceRoot":"","sources":["../src/ModelLayer.ts"],"names":[],"mappings":"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"}
@@ -33,6 +33,12 @@ const makeModel = ModelLayer.makeAcp({
33
33
  name: "GPT-5 Pro",
34
34
  efforts: ["high"],
35
35
  }),
36
+ // Discovered from an endpoint's /models, which lists no efforts.
37
+ new ModelsRepo.ModelInfo({
38
+ provider: "openai-compat",
39
+ id: "kimi-k3",
40
+ name: "kimi-k3",
41
+ }),
36
42
  ]),
37
43
  openai: {
38
44
  apiKey: Redacted.make("test-key"),
@@ -88,6 +94,18 @@ describe("ModelLayer.makeAcp", () => {
88
94
  it.effect("runs sub-agents on the auxiliary sub-agent model", () => Effect.gen(function* () {
89
95
  assert.strictEqual((yield* requestBody("openai:gpt-6-astra", "high", false, true)).model, "gpt-4.1");
90
96
  }));
97
+ for (const modelId of ["openai-compat:kimi-k3", "openai-compat:kimi-k9"]) {
98
+ it.effect("runs " + modelId + " on chat completions at the session effort", () => Effect.gen(function* () {
99
+ const body = yield* requestBody(modelId, "low", true);
100
+ assert.strictEqual(body.model, modelId.slice("openai-compat:".length));
101
+ assert.isArray(body.messages);
102
+ assert.strictEqual(body.reasoning_effort, "low");
103
+ assert.isFalse("service_tier" in body);
104
+ }));
105
+ }
106
+ it.effect("keeps colons in the model id", () => Effect.gen(function* () {
107
+ assert.strictEqual((yield* requestBody("openai-compat:qwen3:8b")).model, "qwen3:8b");
108
+ }));
91
109
  it("rejects ids that are not <provider>:<model>", () => {
92
110
  assert.isTrue(Option.isNone(makeModel("nope", "high")));
93
111
  });
@@ -95,4 +113,25 @@ describe("ModelLayer.makeAcp", () => {
95
113
  assert.isTrue(Option.isSome(makeModel("claude:claude-opus-5-5", "high")));
96
114
  });
97
115
  });
116
+ describe("ModelLayer.parseModelSpec", () => {
117
+ it("splits off a trailing effort and keeps slashes in the model id", () => {
118
+ assert.deepStrictEqual(ModelLayer.parseModelSpec("openai/gpt-6-astra/medium"), Option.some({
119
+ provider: "openai",
120
+ model: "gpt-6-astra",
121
+ effort: "medium",
122
+ }));
123
+ assert.deepStrictEqual(ModelLayer.parseModelSpec("openai-compat/moonshotai/Kimi-K2-Instruct"), Option.some({
124
+ provider: "openai-compat",
125
+ model: "moonshotai/Kimi-K2-Instruct",
126
+ effort: undefined,
127
+ }));
128
+ assert.deepStrictEqual(ModelLayer.parseModelSpec("openai-compat/moonshotai/Kimi-K2-Instruct/high"), Option.some({
129
+ provider: "openai-compat",
130
+ model: "moonshotai/Kimi-K2-Instruct",
131
+ effort: "high",
132
+ }));
133
+ assert.isTrue(Option.isNone(ModelLayer.parseModelSpec("nope/gpt-6-astra")));
134
+ assert.isTrue(Option.isNone(ModelLayer.parseModelSpec("openai")));
135
+ });
136
+ });
98
137
  //# sourceMappingURL=ModelLayer.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ModelLayer.test.js","sourceRoot":"","sources":["../src/ModelLayer.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ModelLayer.test.js","sourceRoot":"","sources":["../src/ModelLayer.test.ts"],"names":[],"mappings":"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"}
@@ -11,23 +11,24 @@ import * as Schema from "effect/Schema";
11
11
  * @since 1.0.0
12
12
  * @category Models
13
13
  */
14
- export declare const Provider: Schema.Literals<readonly ["openai", "copilot", "xai", "claude"]>;
14
+ export declare const Provider: Schema.Literals<readonly ["openai", "copilot", "xai", "claude", "openai-compat"]>;
15
15
  /**
16
16
  * @since 1.0.0
17
17
  * @category Models
18
18
  */
19
19
  export type Provider = typeof Provider.Type;
20
20
  declare const ModelInfo_base: Schema.Class<ModelInfo, Schema.Struct<{
21
- readonly provider: Schema.Literals<readonly ["openai", "copilot", "xai", "claude"]>;
21
+ readonly provider: Schema.Literals<readonly ["openai", "copilot", "xai", "claude", "openai-compat"]>;
22
22
  /**
23
23
  * The model id as the provider API expects it, e.g. `gpt-6-astra`.
24
24
  */
25
25
  readonly id: Schema.String;
26
26
  readonly name: Schema.String;
27
27
  /**
28
- * Reasoning efforts the model accepts; empty when it takes none.
28
+ * Reasoning efforts the model accepts; empty when it takes none, and
29
+ * absent when its source does not say.
29
30
  */
30
- readonly efforts: Schema.$Array<Schema.Literals<readonly ["none", "minimal", "low", "medium", "high", "xhigh", "max"]>>;
31
+ readonly efforts: Schema.optionalKey<Schema.$Array<Schema.Literals<readonly ["none", "minimal", "low", "medium", "high", "xhigh", "max"]>>>;
31
32
  }>, {}>;
32
33
  /**
33
34
  * @since 1.0.0
@@ -37,7 +38,8 @@ export declare class ModelInfo extends ModelInfo_base {
37
38
  }
38
39
  /**
39
40
  * The built-in catalog, served when neither models.dev nor a cached catalog
40
- * is available.
41
+ * is available. It has no `openai-compat` model, since that provider's
42
+ * models depend on the endpoint.
41
43
  *
42
44
  * @since 1.0.0
43
45
  * @category Models
@@ -1 +1 @@
1
- {"version":3,"file":"ModelsRepo.d.ts","sourceRoot":"","sources":["../src/ModelsRepo.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAA;AAEpD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,KAAK,aAAa,MAAM,kCAAkC,CAAA;AACjE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC;;;;;GAKG;AACH,eAAO,MAAM,QAAQ,kEAA0D,CAAA;AAE/E;;;GAGG;AACH,MAAM,MAAM,QAAQ,GAAG,OAAO,QAAQ,CAAC,IAAI,CAAA;;;IAUzC;;OAEG;;;IAGH;;OAEG;;;AAfL;;;GAGG;AACH,qBAAa,SAAU,SAAQ,cAa7B;CAAG;AAEL;;;;;;GAMG;AACH,eAAO,MAAM,QAAQ,EAAE,aAAa,CAAC,SAAS,CAyB7C,CAAA;;IAkGG;;;OAGG;qBACc,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;;AAX5D;;;GAGG;AACH,qBAAa,UAAW,SAAQ,eASR;IACtB;;;;;OAKG;IACH,MAAM,CAAC,QAAQ,CAAC,KAAK,WACX,aAAa,CAAC,SAAS,CAAC,KAC/B,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CACoD;IAE9E;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,QAAQ,CAAC,cAAc,aAExB;QACE,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAA;KAC1C,GACD,SAAS,KACZ,KAAK,CAAC,KAAK,CACZ,UAAU,EACV,KAAK,EACL,UAAU,CAAC,UAAU,GAAG,aAAa,CAAC,aAAa,CACpD,CA8DE;CACJ"}
1
+ {"version":3,"file":"ModelsRepo.d.ts","sourceRoot":"","sources":["../src/ModelsRepo.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAA;AAEpD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,KAAK,aAAa,MAAM,kCAAkC,CAAA;AACjE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC;;;;;GAKG;AACH,eAAO,MAAM,QAAQ,mFAMnB,CAAA;AAEF;;;GAGG;AACH,MAAM,MAAM,QAAQ,GAAG,OAAO,QAAQ,CAAC,IAAI,CAAA;;;IAUzC;;OAEG;;;IAGH;;;OAGG;;;AAhBL;;;GAGG;AACH,qBAAa,SAAU,SAAQ,cAc7B;CAAG;AAEL;;;;;;;GAOG;AACH,eAAO,MAAM,QAAQ,EAAE,aAAa,CAAC,SAAS,CAyB7C,CAAA;;IAkGG;;;OAGG;qBACc,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;;AAX5D;;;GAGG;AACH,qBAAa,UAAW,SAAQ,eASR;IACtB;;;;;OAKG;IACH,MAAM,CAAC,QAAQ,CAAC,KAAK,WACX,aAAa,CAAC,SAAS,CAAC,KAC/B,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CACoD;IAE9E;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,QAAQ,CAAC,cAAc,aAExB;QACE,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAA;KAC1C,GACD,SAAS,KACZ,KAAK,CAAC,KAAK,CACZ,UAAU,EACV,KAAK,EACL,UAAU,CAAC,UAAU,GAAG,aAAa,CAAC,aAAa,CACpD,CA8DE;CACJ"}
@@ -22,7 +22,13 @@ import { ThoughtLevel } from "./Acp.js";
22
22
  * @since 1.0.0
23
23
  * @category Models
24
24
  */
25
- export const Provider = Schema.Literals(["openai", "copilot", "xai", "claude"]);
25
+ export const Provider = Schema.Literals([
26
+ "openai",
27
+ "copilot",
28
+ "xai",
29
+ "claude",
30
+ "openai-compat",
31
+ ]);
26
32
  /**
27
33
  * @since 1.0.0
28
34
  * @category Models
@@ -35,14 +41,16 @@ export class ModelInfo extends Schema.Class("clanka/ModelsRepo/ModelInfo")({
35
41
  id: Schema.String,
36
42
  name: Schema.String,
37
43
  /**
38
- * Reasoning efforts the model accepts; empty when it takes none.
44
+ * Reasoning efforts the model accepts; empty when it takes none, and
45
+ * absent when its source does not say.
39
46
  */
40
- efforts: Schema.Array(ThoughtLevel),
47
+ efforts: Schema.optionalKey(Schema.Array(ThoughtLevel)),
41
48
  }) {
42
49
  }
43
50
  /**
44
51
  * The built-in catalog, served when neither models.dev nor a cached catalog
45
- * is available.
52
+ * is available. It has no `openai-compat` model, since that provider's
53
+ * models depend on the endpoint.
46
54
  *
47
55
  * @since 1.0.0
48
56
  * @category Models
@@ -1 +1 @@
1
- {"version":3,"file":"ModelsRepo.js","sourceRoot":"","sources":["../src/ModelsRepo.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAA;AACpD,OAAO,KAAK,kBAAkB,MAAM,gCAAgC,CAAA;AACpE,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,aAAa,MAAM,kCAAkC,CAAA;AACjE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAEvC;;;;;GAKG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAA;AAQ/E;;;GAGG;AACH,MAAM,OAAO,SAAU,SAAQ,MAAM,CAAC,KAAK,CACzC,6BAA6B,CAC9B,CAAC;IACA,QAAQ,EAAE,QAAQ;IAClB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC;CACpC,CAAC;CAAG;AAEL;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,QAAQ,GAA6B;IAChD,IAAI,SAAS,CAAC;QACZ,QAAQ,EAAE,QAAQ;QAClB,EAAE,EAAE,aAAa;QACjB,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC;KACnD,CAAC;IACF,IAAI,SAAS,CAAC;QACZ,QAAQ,EAAE,SAAS;QACnB,EAAE,EAAE,aAAa;QACjB,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC;KACnD,CAAC;IACF,IAAI,SAAS,CAAC;QACZ,QAAQ,EAAE,KAAK;QACf,EAAE,EAAE,UAAU;QACd,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC;KAC5C,CAAC;IACF,IAAI,SAAS,CAAC;QACZ,QAAQ,EAAE,QAAQ;QAClB,EAAE,EAAE,iBAAiB;QACrB,IAAI,EAAE,iBAAiB;QACvB,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC;KACnD,CAAC;CACH,CAAA;AAED,wEAAwE;AACxE,kEAAkE;AAClE,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC;IACnC,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC;IACvC,YAAY,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC;IAC/C,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC;IACzC,SAAS,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC;IAC7C,iBAAiB,EAAE,MAAM,CAAC,WAAW,CACnC,MAAM,CAAC,KAAK,CACV,MAAM,CAAC,MAAM,CAAC;QACZ,IAAI,EAAE,MAAM,CAAC,MAAM;QACnB,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KACzD,CAAC,CACH,CACF;CACF,CAAC,CAAA;AAEF,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC;IACtC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC;CACrD,CAAC,CAAA;AAEF,6CAA6C;AAC7C,MAAM,WAAW,GAA+C;IAC9D,CAAC,QAAQ,EAAE,QAAQ,CAAC;IACpB,CAAC,gBAAgB,EAAE,SAAS,CAAC;IAC7B,CAAC,KAAK,EAAE,KAAK,CAAC;IACd,CAAC,WAAW,EAAE,QAAQ,CAAC;CACxB,CAAA;AAED,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAChC,MAAM,CAAC,WAAW,CAChB,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC,CAAC,CACvE,CACF,CAAA;AAED,MAAM,WAAW,GAAG,MAAM,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAA;AAC9D,MAAM,cAAc,GAAG,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,CAAA;AAE9C,MAAM,SAAS,GAAG,CAAC,GAA6B,EAA4B,EAAE;IAC5E,MAAM,MAAM,GAAG,IAAI,GAAG,EAAoB,CAAA;IAC1C,OAAO,WAAW;SACf,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,CAC1B,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACrD,MAAM,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAA;QACvD,IACE,KAAK,KAAK,SAAS;YACnB,KAAK,CAAC,IAAI,KAAK,SAAS;YACxB,KAAK,CAAC,MAAM,KAAK,YAAY;YAC7B,KAAK,CAAC,SAAS,KAAK,IAAI,EACxB,CAAC;YACD,OAAO,EAAE,CAAA;QACX,CAAC;QACD,OAAO,CAAC,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAA;IACjC,CAAC,CAAC,CACH;SACA,QAAQ,CACP,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACP,CAAC,CAAC,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,YAAY,IAAI,EAAE,CAAC;QAC1D,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAC/B;SACA,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QAChB,sEAAsE;QACtE,sEAAsE;QACtE,MAAM,KAAK,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;QACnD,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;QACjC,OAAO,KAAK,IAAI,EAAE,CAAA;IACpB,CAAC,CAAC;SACD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACb,MAAM,MAAM,GAAG,KAAK,CAAC,iBAAiB,EAAE,IAAI,CAC1C,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,CACrC,CAAA;QACD,OAAO,IAAI,SAAS,CAAC;YACnB,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,EAAE,EAAE,KAAK,CAAC,EAAE;YACZ,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC;SACvD,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACN,CAAC,CAAA;AAED,MAAM,aAAc,SAAQ,MAAM,CAAC,KAAK,CACtC,iCAAiC,CAClC,CAAC;IACA,SAAS,EAAE,MAAM,CAAC,MAAM;IACxB,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC;CAChC,CAAC;CAAG;AAEL;;;GAGG;AACH,MAAM,OAAO,UAAW,SAAQ,OAAO,CAAC,OAAO,EAS5C,CAAC,mBAAmB,CAAC;IACtB;;;;;OAKG;IACH,MAAM,CAAU,KAAK,GAAG,CACtB,MAAgC,EACP,EAAE,CAC3B,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IAE9E;;;;;;;;;;;OAWG;IACH,MAAM,CAAU,cAAc,GAAG,CAC/B,OAKa,EAKb,EAAE,CACF,KAAK,CAAC,MAAM,CACV,UAAU,EACV,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,GAAG,GAAG,OAAO,EAAE,GAAG,IAAI,6BAA6B,CAAA;QACzD,MAAM,GAAG,GAAG,QAAQ,CAAC,QAAQ,CAC3B,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAC7D,CAAA;QACD,MAAM,KAAK,GAAG,aAAa,CAAC,aAAa,CACvC,aAAa,CAAC,MAAM,CAClB,KAAK,CAAC,CAAC,aAAa,CAAC,aAAa,EAClC,aAAa,CACd,EACD,aAAa,CACd,CAAA;QACD,MAAM,UAAU,GAAG,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,IAAI,CACpD,UAAU,CAAC,cAAc,CAC1B,CAAA;QAED,MAAM,YAAY,GAAG,UAAU;aAC5B,GAAG,CAAC,GAAG,CAAC;aACR,IAAI,CACH,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,EAC/D,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,EACrB,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAC7B,CAAA;QAEH,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC/B,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CACvC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,EACjC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CACrC,CAAA;YACD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAA;YAC1C,IAAI,MAAM,KAAK,SAAS,IAAI,GAAG,GAAG,MAAM,CAAC,SAAS,GAAG,GAAG,EAAE,CAAC;gBACzD,OAAO,MAAM,CAAC,MAAM,CAAA;YACtB,CAAC;YACD,OAAO,KAAK,CAAC,CAAC,YAAY,CAAC,IAAI,CAC7B,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACpB,KAAK;iBACF,GAAG,CAAC,GAAG,EAAE,IAAI,aAAa,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;iBACvD,IAAI,CACH,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CACrB,MAAM,CAAC,UAAU,CACf,wCAAwC,EACxC,KAAK,CACN,CACF,CACF,CACJ,EACD,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CACrB,MAAM,CAAC,UAAU,CACf,MAAM,KAAK,SAAS;gBAClB,CAAC,CAAC,oEAAoE;gBACtE,CAAC,CAAC,oEAAoE,EACxE,KAAK,CACN,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,IAAI,QAAQ,CAAC,CAAC,CAC9C,CACF,CAAA;QACH,CAAC,CAAC,CAAA;QAEF,OAAO,UAAU,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAC9D,CAAC,CAAC,CACH,CAAA;CACJ"}
1
+ {"version":3,"file":"ModelsRepo.js","sourceRoot":"","sources":["../src/ModelsRepo.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,59 @@
1
+ /**
2
+ * The `openai-compat` provider: any OpenAI-compatible chat completions
3
+ * endpoint, such as a model proxy, through `@effect/ai-openai-compat`.
4
+ *
5
+ * @since 1.0.0
6
+ */
7
+ import { OpenAiClient, OpenAiLanguageModel } from "@effect/ai-openai-compat";
8
+ import * as Effect from "effect/Effect";
9
+ import * as HttpClient from "effect/http/HttpClient";
10
+ import * as Layer from "effect/Layer";
11
+ import type * as LanguageModel from "effect/ai/LanguageModel";
12
+ import * as Model from "effect/ai/Model";
13
+ import { AgentModelConfig } from "./Agent.ts";
14
+ import * as ModelsRepo from "./ModelsRepo.ts";
15
+ /**
16
+ * The client for an endpoint. Without `apiUrl` it talks to
17
+ * `https://api.openai.com/v1`.
18
+ *
19
+ * @since 1.0.0
20
+ * @category Layers
21
+ */
22
+ export declare const layerClient: (options: OpenAiClient.Options) => Layer.Layer<OpenAiClient.OpenAiClient, never, HttpClient.HttpClient>;
23
+ /**
24
+ * Options for a model. The effort of `reasoning` is sent as the chat
25
+ * completions `reasoning_effort`; `reasoning: null` or no effort sends no
26
+ * reasoning options, which keeps the endpoint's default.
27
+ *
28
+ * @since 1.0.0
29
+ * @category Models
30
+ */
31
+ export type ModelOptions = OpenAiLanguageModel.Config["Service"] & {
32
+ readonly reasoning?: {
33
+ readonly effort?: string | undefined;
34
+ } | null | undefined;
35
+ } & typeof AgentModelConfig.Service;
36
+ /**
37
+ * @since 1.0.0
38
+ * @category Layers
39
+ */
40
+ export declare const model: (model: string, options?: ModelOptions | undefined) => Model.Model<"openai-compat", LanguageModel.LanguageModel, OpenAiClient.OpenAiClient>;
41
+ /**
42
+ * The models the endpoint lists at `GET /models`, newest first, as
43
+ * `openai-compat` catalog entries named by their id. The listing carries no
44
+ * reasoning efforts, so the entries leave `efforts` out. Never fails: logs a warning and serves no models when the
45
+ * endpoint cannot be listed.
46
+ *
47
+ * @since 1.0.0
48
+ * @category Models
49
+ */
50
+ export declare const models: Effect.Effect<ReadonlyArray<ModelsRepo.ModelInfo>, never, OpenAiClient.OpenAiClient>;
51
+ /**
52
+ * The `ModelsRepo` in context followed by the models `client` lists at
53
+ * `GET /models`. The endpoint is listed once, on first use.
54
+ *
55
+ * @since 1.0.0
56
+ * @category Layers
57
+ */
58
+ export declare const layerModelsRepo: (client: OpenAiClient.Options) => Layer.Layer<ModelsRepo.ModelsRepo, never, ModelsRepo.ModelsRepo | HttpClient.HttpClient>;
59
+ //# sourceMappingURL=OpenAiCompat.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"OpenAiCompat.d.ts","sourceRoot":"","sources":["../src/OpenAiCompat.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC5E,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAA;AAEpD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAIrC,OAAO,KAAK,KAAK,aAAa,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,KAAK,MAAM,iBAAiB,CAAA;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAE7C,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,YACb,YAAY,CAAC,OAAO,KAC5B,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,YAAY,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CACzC,CAAA;AAE7B;;;;;;;GAOG;AACH,MAAM,MAAM,YAAY,GAAG,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG;IACjE,QAAQ,CAAC,SAAS,CAAC,EACjB;QAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,GAAG,IAAI,GAAG,SAAS,CAAA;CAC9D,GAAG,OAAO,gBAAgB,CAAC,OAAO,CAAA;AAEnC;;;GAGG;AACH,eAAO,MAAM,KAAK,UACT,MAAM,YACH,YAAY,GAAG,SAAS,KACjC,KAAK,CAAC,KAAK,CACZ,eAAe,EACf,aAAa,CAAC,aAAa,EAC3B,YAAY,CAAC,YAAY,CA8BxB,CAAA;AAeH;;;;;;;;GAQG;AACH,eAAO,MAAM,MAAM,EAAE,MAAM,CAAC,MAAM,CAChC,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,EACnC,KAAK,EACL,YAAY,CAAC,YAAY,CA0B1B,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,WAClB,YAAY,CAAC,OAAO,KAC3B,KAAK,CAAC,KAAK,CACZ,UAAU,CAAC,UAAU,EACrB,KAAK,EACL,UAAU,CAAC,UAAU,GAAG,UAAU,CAAC,UAAU,CAsBH,CAAA"}
@@ -0,0 +1,96 @@
1
+ /**
2
+ * The `openai-compat` provider: any OpenAI-compatible chat completions
3
+ * endpoint, such as a model proxy, through `@effect/ai-openai-compat`.
4
+ *
5
+ * @since 1.0.0
6
+ */
7
+ import { OpenAiClient, OpenAiLanguageModel } from "@effect/ai-openai-compat";
8
+ import * as Effect from "effect/Effect";
9
+ import * as HttpClient from "effect/http/HttpClient";
10
+ import * as HttpClientResponse from "effect/http/HttpClientResponse";
11
+ import * as Layer from "effect/Layer";
12
+ import * as Option from "effect/Option";
13
+ import * as Schema from "effect/Schema";
14
+ import * as Struct from "effect/Struct";
15
+ import * as Model from "effect/ai/Model";
16
+ import { AgentModelConfig } from "./Agent.js";
17
+ import * as Compaction from "./Compaction.js";
18
+ import * as ModelsRepo from "./ModelsRepo.js";
19
+ /**
20
+ * The client for an endpoint. Without `apiUrl` it talks to
21
+ * `https://api.openai.com/v1`.
22
+ *
23
+ * @since 1.0.0
24
+ * @category Layers
25
+ */
26
+ export const layerClient = (options) => OpenAiClient.layer(options);
27
+ /**
28
+ * @since 1.0.0
29
+ * @category Layers
30
+ */
31
+ export const model = (model, options) => Model.make("openai-compat", model, Layer.mergeAll(OpenAiLanguageModel.layer({
32
+ model,
33
+ config: {
34
+ // Chat completions endpoints read `reasoning_effort`; the
35
+ // Responses-style `reasoning` object is ignored or rejected.
36
+ ...Struct.omit(options ?? {}, [
37
+ "reasoning",
38
+ ...AgentModelConfig.optionKeys,
39
+ ]),
40
+ ...(options?.reasoning?.effort === undefined
41
+ ? undefined
42
+ : { reasoning_effort: options.reasoning.effort }),
43
+ },
44
+ }), AgentModelConfig.layer(Struct.pick(options ?? {}, AgentModelConfig.optionKeys)),
45
+ // Cap compaction summaries; sent as chat completions `max_tokens`.
46
+ Layer.succeed(Compaction.SummarizerTransform, (effect) => OpenAiLanguageModel.withConfigOverride(effect, {
47
+ max_output_tokens: Compaction.summarizerMaxOutputTokens,
48
+ }))));
49
+ // The fields of a `GET /models` response the catalog reads. Entries are
50
+ // decoded one by one, so a malformed entry drops that model only.
51
+ const ModelsResponse = Schema.Struct({
52
+ data: Schema.Array(Schema.Unknown),
53
+ });
54
+ const ModelEntry = Schema.Struct({
55
+ id: Schema.String,
56
+ created: Schema.optionalKey(Schema.Finite),
57
+ });
58
+ const decodeEntry = Schema.decodeUnknownOption(ModelEntry);
59
+ /**
60
+ * The models the endpoint lists at `GET /models`, newest first, as
61
+ * `openai-compat` catalog entries named by their id. The listing carries no
62
+ * reasoning efforts, so the entries leave `efforts` out. Never fails: logs a warning and serves no models when the
63
+ * endpoint cannot be listed.
64
+ *
65
+ * @since 1.0.0
66
+ * @category Models
67
+ */
68
+ export const models = Effect.gen(function* () {
69
+ const { client } = yield* OpenAiClient.OpenAiClient;
70
+ const response = yield* HttpClient.filterStatusOk(client)
71
+ .get("/models")
72
+ .pipe(Effect.flatMap(HttpClientResponse.schemaBodyJson(ModelsResponse)));
73
+ return response.data
74
+ .flatMap((entry) => decodeEntry(entry).pipe(Option.toArray))
75
+ .toSorted((a, b) => (b.created ?? 0) - (a.created ?? 0) || a.id.localeCompare(b.id))
76
+ .map((entry) => new ModelsRepo.ModelInfo({
77
+ provider: "openai-compat",
78
+ id: entry.id,
79
+ name: entry.id,
80
+ }));
81
+ }).pipe(Effect.timeout("15 seconds"), Effect.catch((error) => Effect.logWarning("Failed to list the openai-compat models", error).pipe(Effect.as([]))));
82
+ /**
83
+ * The `ModelsRepo` in context followed by the models `client` lists at
84
+ * `GET /models`. The endpoint is listed once, on first use.
85
+ *
86
+ * @since 1.0.0
87
+ * @category Layers
88
+ */
89
+ export const layerModelsRepo = (client) => Layer.effect(ModelsRepo.ModelsRepo, Effect.gen(function* () {
90
+ const repo = yield* ModelsRepo.ModelsRepo;
91
+ const listed = yield* Effect.cached(Effect.provideService(models, OpenAiClient.OpenAiClient, yield* OpenAiClient.OpenAiClient));
92
+ return ModelsRepo.ModelsRepo.of({
93
+ models: Effect.zipWith(repo.models, listed, (catalog, compat) => [...catalog, ...compat], { concurrent: true }),
94
+ });
95
+ })).pipe(Layer.provide(layerClient(client)));
96
+ //# sourceMappingURL=OpenAiCompat.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"OpenAiCompat.js","sourceRoot":"","sources":["../src/OpenAiCompat.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=OpenAiCompat.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"OpenAiCompat.test.d.ts","sourceRoot":"","sources":["../src/OpenAiCompat.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,110 @@
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 * as HttpClientResponse from "effect/http/HttpClientResponse";
9
+ import * as Compaction from "./Compaction.js";
10
+ import * as ModelsRepo from "./ModelsRepo.js";
11
+ import * as OpenAiCompat from "./OpenAiCompat.js";
12
+ const client = {
13
+ apiUrl: "https://proxy.test/v1",
14
+ apiKey: Redacted.make("proxy-key"),
15
+ };
16
+ // An HttpClient that records its requests and answers each with `response`.
17
+ const recording = (response) => {
18
+ const requests = [];
19
+ const layer = Layer.succeed(HttpClient.HttpClient, HttpClient.make((request) => Effect.sync(() => {
20
+ requests.push(request);
21
+ return HttpClientResponse.fromWeb(request, response());
22
+ })));
23
+ return { requests, layer };
24
+ };
25
+ const jsonBody = (request) => {
26
+ if (request.body._tag !== "Uint8Array")
27
+ throw new Error("Expected JSON body");
28
+ return JSON.parse(new TextDecoder().decode(request.body.body));
29
+ };
30
+ // The requests a prompt sends, then the same prompt as a compaction summary.
31
+ const send = Effect.fnUntraced(function* (options) {
32
+ const http = recording(() => new Response(null, { status: 400 }));
33
+ yield* Effect.gen(function* () {
34
+ const ai = yield* LanguageModel.LanguageModel;
35
+ const summarize = yield* Compaction.SummarizerTransform;
36
+ const request = ai.streamText({ prompt: "hello" }).pipe(Stream.runDrain);
37
+ yield* request.pipe(Effect.exit);
38
+ yield* summarize(request).pipe(Effect.exit);
39
+ }).pipe(Effect.provide(OpenAiCompat.model("kimi-k3", options).pipe(Layer.provide(OpenAiCompat.layerClient(client)), Layer.provide(http.layer))));
40
+ assert.lengthOf(http.requests, 2);
41
+ return http.requests;
42
+ });
43
+ describe("OpenAiCompat.model", () => {
44
+ it.effect("streams chat completions from the configured endpoint", () => Effect.gen(function* () {
45
+ const [request] = yield* send();
46
+ assert.strictEqual(request.url, "https://proxy.test/v1/chat/completions");
47
+ assert.strictEqual(request.headers.authorization, "Bearer proxy-key");
48
+ assert.strictEqual(jsonBody(request).model, "kimi-k3");
49
+ }));
50
+ it.effect("sends the effort as reasoning_effort, and none when null", () => Effect.gen(function* () {
51
+ const [high] = yield* send({ reasoning: { effort: "high" } });
52
+ assert.strictEqual(jsonBody(high).reasoning_effort, "high");
53
+ assert.isFalse("reasoning" in jsonBody(high));
54
+ for (const options of [{ reasoning: null }, undefined]) {
55
+ const [request] = yield* send(options);
56
+ assert.isFalse("reasoning_effort" in jsonBody(request));
57
+ assert.isFalse("reasoning" in jsonBody(request));
58
+ }
59
+ }));
60
+ it.effect("caps compaction summaries with max_tokens", () => Effect.gen(function* () {
61
+ const [prompt, summary] = yield* send();
62
+ assert.isFalse("max_tokens" in jsonBody(prompt));
63
+ assert.strictEqual(jsonBody(summary).max_tokens, Compaction.summarizerMaxOutputTokens);
64
+ }));
65
+ });
66
+ const base = new ModelsRepo.ModelInfo({
67
+ provider: "openai",
68
+ id: "gpt-6-astra",
69
+ name: "GPT-6 Astra",
70
+ efforts: ["low", "high"],
71
+ });
72
+ // The catalog of a repo over `base` and an endpoint answering `response`.
73
+ const catalog = (response) => {
74
+ const http = recording(response);
75
+ return Effect.gen(function* () {
76
+ const repo = yield* ModelsRepo.ModelsRepo;
77
+ const first = yield* repo.models;
78
+ assert.deepStrictEqual(yield* repo.models, first);
79
+ return { models: first, requests: http.requests };
80
+ }).pipe(Effect.provide(OpenAiCompat.layerModelsRepo(client).pipe(Layer.provide([ModelsRepo.ModelsRepo.layer([base]), http.layer]))));
81
+ };
82
+ describe("OpenAiCompat.layerModelsRepo", () => {
83
+ it.effect("appends the listed models, newest first, with unknown efforts", () => Effect.gen(function* () {
84
+ const { models, requests } = yield* catalog(() => Response.json({
85
+ object: "list",
86
+ data: [
87
+ { id: "kimi-k2", object: "model", created: 1 },
88
+ { id: "kimi-k3", object: "model", created: 3 },
89
+ { object: "model" },
90
+ { id: "custom", object: "model" },
91
+ ],
92
+ }));
93
+ assert.lengthOf(requests, 1);
94
+ assert.strictEqual(requests[0].url, "https://proxy.test/v1/models");
95
+ assert.strictEqual(requests[0].headers.authorization, "Bearer proxy-key");
96
+ assert.deepStrictEqual(models, [
97
+ base,
98
+ ...["kimi-k3", "kimi-k2", "custom"].map((id) => new ModelsRepo.ModelInfo({
99
+ provider: "openai-compat",
100
+ id,
101
+ name: id,
102
+ })),
103
+ ]);
104
+ }));
105
+ it.effect("keeps the catalog when the endpoint cannot be listed", () => Effect.gen(function* () {
106
+ const { models } = yield* catalog(() => new Response(null, { status: 401 }));
107
+ assert.deepStrictEqual(models, [base]);
108
+ }));
109
+ });
110
+ //# sourceMappingURL=OpenAiCompat.test.js.map