clanka 0.16.0 → 0.16.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.
@@ -65,7 +65,9 @@ export declare class ModelsRepo extends ModelsRepo_base {
65
65
  /**
66
66
  * The catalog built from `https://models.dev/api.json`: the `openai`,
67
67
  * `github-copilot` and `xai` text models that are not deprecated and accept
68
- * tool calls, cached in the `KeyValueStore` for `ttl` (default 24 hours).
68
+ * tool calls. Keeps the 10 newest models by release date, then name
69
+ * alphabetically, with undated models last. Cached in the `KeyValueStore`
70
+ * for `ttl` (default 24 hours).
69
71
  * Serves the cached catalog when the fetch fails, then `fallback`.
70
72
  *
71
73
  * @since 1.0.0
@@ -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,wDAAgD,CAAA;AAErE;;;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,CAmB7C,CAAA;;IAgFG;;;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;;;;;;;;OAQG;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,wDAAgD,CAAA;AAErE;;;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,CAmB7C,CAAA;;IAyFG;;;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;;;;;;;;;;OAUG;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"}
@@ -73,6 +73,7 @@ const ModelsDevModel = Schema.Struct({
73
73
  id: Schema.String,
74
74
  name: Schema.String,
75
75
  type: Schema.optionalKey(Schema.String),
76
+ release_date: Schema.optionalKey(Schema.String),
76
77
  status: Schema.optionalKey(Schema.String),
77
78
  tool_call: Schema.optionalKey(Schema.Boolean),
78
79
  reasoning_options: Schema.optionalKey(Schema.Array(Schema.Struct({
@@ -83,7 +84,7 @@ const ModelsDevModel = Schema.Struct({
83
84
  const ModelsDevProvider = Schema.Struct({
84
85
  models: Schema.Record(Schema.String, Schema.Unknown),
85
86
  });
86
- // models.dev provider id to clanka provider, in catalog order.
87
+ // models.dev provider id to clanka provider.
87
88
  const providerIds = [
88
89
  ["openai", "openai"],
89
90
  ["github-copilot", "copilot"],
@@ -92,7 +93,8 @@ const providerIds = [
92
93
  const ModelsDevApi = Schema.Struct(Object.fromEntries(providerIds.map(([id]) => [id, Schema.optionalKey(ModelsDevProvider)])));
93
94
  const decodeModel = Schema.decodeUnknownOption(ModelsDevModel);
94
95
  const isThoughtLevel = Schema.is(ThoughtLevel);
95
- const toCatalog = (api) => providerIds.flatMap(([id, provider]) => Object.values(api[id]?.models ?? {}).flatMap((entry) => {
96
+ const toCatalog = (api) => providerIds
97
+ .flatMap(([id, provider]) => Object.values(api[id]?.models ?? {}).flatMap((entry) => {
96
98
  const model = Option.getOrUndefined(decodeModel(entry));
97
99
  if (model === undefined ||
98
100
  model.type !== undefined ||
@@ -100,16 +102,20 @@ const toCatalog = (api) => providerIds.flatMap(([id, provider]) => Object.values
100
102
  model.tool_call !== true) {
101
103
  return [];
102
104
  }
105
+ return [{ ...model, provider }];
106
+ }))
107
+ .toSorted((a, b) => (b.release_date ?? "").localeCompare(a.release_date ?? "") ||
108
+ a.name.localeCompare(b.name))
109
+ .slice(0, 10)
110
+ .map((model) => {
103
111
  const effort = model.reasoning_options?.find((option) => option.type === "effort");
104
- return [
105
- new ModelInfo({
106
- provider,
107
- id: model.id,
108
- name: model.name,
109
- efforts: (effort?.values ?? []).filter(isThoughtLevel),
110
- }),
111
- ];
112
- }));
112
+ return new ModelInfo({
113
+ provider: model.provider,
114
+ id: model.id,
115
+ name: model.name,
116
+ efforts: (effort?.values ?? []).filter(isThoughtLevel),
117
+ });
118
+ });
113
119
  class CachedCatalog extends Schema.Class("clanka/ModelsRepo/CachedCatalog")({
114
120
  fetchedAt: Schema.Finite,
115
121
  models: Schema.Array(ModelInfo),
@@ -130,7 +136,9 @@ export class ModelsRepo extends Context.Service()("clanka/ModelsRepo") {
130
136
  /**
131
137
  * The catalog built from `https://models.dev/api.json`: the `openai`,
132
138
  * `github-copilot` and `xai` text models that are not deprecated and accept
133
- * tool calls, cached in the `KeyValueStore` for `ttl` (default 24 hours).
139
+ * tool calls. Keeps the 10 newest models by release date, then name
140
+ * alphabetically, with undated models last. Cached in the `KeyValueStore`
141
+ * for `ttl` (default 24 hours).
134
142
  * Serves the cached catalog when the fetch fails, then `fallback`.
135
143
  *
136
144
  * @since 1.0.0
@@ -1 +1 @@
1
- {"version":3,"file":"ModelsRepo.js","sourceRoot":"","sources":["../src/ModelsRepo.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ModelsRepo.js","sourceRoot":"","sources":["../src/ModelsRepo.ts"],"names":[],"mappings":"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"}
@@ -107,18 +107,18 @@ const apiJson = {
107
107
  },
108
108
  };
109
109
  const catalog = [
110
- new ModelsRepo.ModelInfo({
111
- provider: "openai",
112
- id: "gpt-6-astra",
113
- name: "GPT-6 Astra",
114
- efforts: ["low", "medium", "high", "xhigh", "max"],
115
- }),
116
110
  new ModelsRepo.ModelInfo({
117
111
  provider: "copilot",
118
112
  id: "claude-fable-5.1",
119
113
  name: "Claude Fable 5.1",
120
114
  efforts: ["low", "high"],
121
115
  }),
116
+ new ModelsRepo.ModelInfo({
117
+ provider: "openai",
118
+ id: "gpt-6-astra",
119
+ name: "GPT-6 Astra",
120
+ efforts: ["low", "medium", "high", "xhigh", "max"],
121
+ }),
122
122
  new ModelsRepo.ModelInfo({
123
123
  provider: "xai",
124
124
  id: "grok-4.6",
@@ -154,6 +154,39 @@ describe("ModelsRepo.layerModelsDev", () => {
154
154
  it.effect("lists the openai, copilot and xai text models that accept tool calls", () => Effect.gen(function* () {
155
155
  assert.deepStrictEqual(yield* modelsWith(online), catalog);
156
156
  }).pipe(Effect.provide(KeyValueStore.layerMemory)));
157
+ it.effect("keeps the 10 newest models, breaking date ties by name", () => Effect.gen(function* () {
158
+ const models = Object.fromEntries([
159
+ ["oldest", "Alpha old", "2020-01-01"],
160
+ ["undated-z", "Zulu undated"],
161
+ ["first-tie", "Zulu tie", "2026-06-01"],
162
+ ["march", "Gamma", "2026-03-01"],
163
+ ["newest", "Zulu newest", "2026-10-01"],
164
+ ["january", "Delta", "2026-01-01"],
165
+ ["undated-a", "Alpha undated"],
166
+ ["december", "Epsilon", "2025-12-01"],
167
+ ["second-tie", "Alpha tie", "2026-06-01"],
168
+ ["november", "Eta", "2025-11-01"],
169
+ ["older", "Theta", "2024-01-01"],
170
+ ].map(([id, name, release_date]) => [
171
+ id,
172
+ { id, name, release_date, tool_call: true },
173
+ ]));
174
+ const client = HttpClient.make((request) => Effect.succeed(HttpClientResponse.fromWeb(request, new Response(JSON.stringify({ openai: { models } }), {
175
+ headers: { "content-type": "application/json" },
176
+ }))));
177
+ assert.deepStrictEqual((yield* modelsWith(client)).map((model) => model.id), [
178
+ "newest",
179
+ "second-tie",
180
+ "first-tie",
181
+ "march",
182
+ "january",
183
+ "december",
184
+ "november",
185
+ "older",
186
+ "oldest",
187
+ "undated-a",
188
+ ]);
189
+ }).pipe(Effect.provide(KeyValueStore.layerMemory)));
157
190
  it.effect("serves an expired cached catalog when the refresh fails", () => Effect.gen(function* () {
158
191
  yield* modelsWith(online);
159
192
  yield* TestClock.adjust("25 hours");
@@ -1 +1 @@
1
- {"version":3,"file":"ModelsRepo.test.js","sourceRoot":"","sources":["../src/ModelsRepo.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ModelsRepo.test.js","sourceRoot":"","sources":["../src/ModelsRepo.test.ts"],"names":[],"mappings":"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"}
package/dist/bin/cli.mjs CHANGED
@@ -41301,6 +41301,7 @@ const ModelsDevModel = Struct({
41301
41301
  id: String$6,
41302
41302
  name: String$6,
41303
41303
  type: optionalKey(String$6),
41304
+ release_date: optionalKey(String$6),
41304
41305
  status: optionalKey(String$6),
41305
41306
  tool_call: optionalKey(Boolean$5),
41306
41307
  reasoning_options: optionalKey(ArraySchema(Struct({
@@ -41320,14 +41321,19 @@ const isThoughtLevel$1 = is(ThoughtLevel);
41320
41321
  const toCatalog = (api) => providerIds.flatMap(([id, provider]) => Object.values(api[id]?.models ?? {}).flatMap((entry) => {
41321
41322
  const model = getOrUndefined(decodeModel(entry));
41322
41323
  if (model === void 0 || model.type !== void 0 || model.status === "deprecated" || model.tool_call !== true) return [];
41324
+ return [{
41325
+ ...model,
41326
+ provider
41327
+ }];
41328
+ })).toSorted((a, b) => (b.release_date ?? "").localeCompare(a.release_date ?? "") || a.name.localeCompare(b.name)).slice(0, 10).map((model) => {
41323
41329
  const effort = model.reasoning_options?.find((option) => option.type === "effort");
41324
- return [new ModelInfo({
41325
- provider,
41330
+ return new ModelInfo({
41331
+ provider: model.provider,
41326
41332
  id: model.id,
41327
41333
  name: model.name,
41328
41334
  efforts: (effort?.values ?? []).filter(isThoughtLevel$1)
41329
- })];
41330
- }));
41335
+ });
41336
+ });
41331
41337
  var CachedCatalog = class extends Class$1("clanka/ModelsRepo/CachedCatalog")({
41332
41338
  fetchedAt: Finite,
41333
41339
  models: ArraySchema(ModelInfo)
@@ -41555,7 +41561,7 @@ const makeAcp = (options) => (modelId, thoughtLevel, fastMode = false) => map$8(
41555
41561
  const LogToStderr = LogToStderr$1;
41556
41562
  //#endregion
41557
41563
  //#region package.json
41558
- var version$1 = "0.16.0";
41564
+ var version$1 = "0.16.1";
41559
41565
  //#endregion
41560
41566
  //#region src/cli.ts
41561
41567
  const ReportedVersion = Setting("reported-version")({ flag: String$1("reported-version").pipe(withDescription$1("Report this version instead of clanka's own, for --version and to ACP clients"), optional$1) });