@shop-os/modelkit 0.2.2 → 0.2.4

package/CHANGELOG.md

@@ -9,6 +9,19 @@ header in the release PR.
 
 ## [Unreleased]
 
+## [0.2.4] - 2026-09-15
+
+### Fixed
+- Catalog prime and fallback log lines carry origin, row count, revision and the error in the message string. pino-style loggers dropped the trailing object argument, so services such as template-service logged no origin.
+
+## [0.2.3] - 2026-09-15
+
+### Changed
+- `display.sortOrder` sorts descending: a higher number shows first, so a new model takes the next number up. No published row set it before.
+
+### Fixed
+- `primeCatalog` treats a remote response with zero rows as a failure and keeps the last-good or snapshot rows, so a pro-backend whose catalog table is not seeded yet cannot empty every consumer's pickers.
+
 ## [0.2.2] - 2026-09-15
 
 Option audit against provider docs, limited to options a product surface sets.

package/dist/catalog.cjs

@@ -164,6 +164,12 @@ var GEMINI_RATIOS = [
   "adaptive"
 ];
 function geminiImage(id, label, aliases, sizes, display, exposure, references) {
+  const constraints = {
+    aspectRatios: [...GEMINI_RATIOS],
+    sizes,
+    supports: ["safetySettings", "temperature"]
+  };
+  if (references !== void 0) constraints.references = references;
   const model = {
     id,
     aliases,
@@ -173,12 +179,7 @@ function geminiImage(id, label, aliases, sizes, display, exposure, references) {
     providerModelId: id,
     lifecycle: "active",
     exposure,
-    constraints: {
-      aspectRatios: [...GEMINI_RATIOS],
-      sizes,
-      supports: ["safetySettings", "temperature"],
-      ...references ? { references } : {}
-    },
+    constraints,
     defaults: { size: "1K", aspectRatio: "1:1" },
     usage: { ...IMAGE_USAGE, slug: "gemini" },
     pricingKind: "image_size",
@@ -2079,31 +2080,31 @@ var liveState = store[KEY] ??= {
 var liveCatalog = liveState.catalog;
 
 // src/catalog/load.ts
+var import_zod2 = require("zod");
 function rowCount() {
   return liveCatalog.list({ lifecycle: ["active", "deprecated", "retired"] }).length;
 }
 function authHeaders(auth) {
   return "bearer" in auth ? { Authorization: `Bearer ${auth.bearer}` } : { "x-api-key": auth.apiKey };
 }
+var EnvelopeSchema = import_zod2.z.object({
+  rows: CatalogSchema,
+  revision: import_zod2.z.string().optional()
+});
+function toEnvelope(data) {
+  if (data.rows.length === 0) throw new Error("invalid catalog response: no rows");
+  const envelope = { rows: data.rows };
+  if (data.revision !== void 0) envelope.revision = data.revision;
+  return envelope;
+}
 function describeError(err) {
   return err instanceof Error ? err.message : String(err);
 }
-function parseEnvelope(json) {
-  if (typeof json !== "object" || json === null || !("rows" in json)) {
-    throw new Error("invalid catalog response: missing rows");
-  }
-  const rows = CatalogSchema.parse(json.rows);
-  const rev = json.revision;
-  if (typeof rev === "string") return { rows, revision: rev };
-  return { rows };
-}
 function logPrimed(logger, result) {
-  const { origin: loggedOrigin, rowCount: loggedCount, revision: loggedRevision } = result;
-  logger.info("[modelkit] catalog primed", {
-    origin: loggedOrigin,
-    rowCount: loggedCount,
-    revision: loggedRevision
-  });
+  const revision = result.revision === void 0 ? "" : ` revision=${result.revision}`;
+  logger.info(
+    `[modelkit] catalog primed origin=${result.origin} rowCount=${result.rowCount}${revision}`
+  );
 }
 async function fetchRemote(source, logger) {
   const fetchImpl = source.fetch ?? globalThis.fetch;
@@ -2116,7 +2117,9 @@ async function fetchRemote(source, logger) {
   if (res.status === 304) return { kept: true };
   if (!res.ok) throw new Error(`catalog fetch failed with status ${res.status}`);
   const json = await res.json();
-  const { rows, revision: rev } = parseEnvelope(json);
+  const parsed = EnvelopeSchema.safeParse(json);
+  if (!parsed.success) throw new Error("invalid catalog response: missing rows");
+  const { rows, revision: rev } = toEnvelope(parsed.data);
   if (rev === void 0) return { rows, fromCache: false };
   return { rows, revision: rev, fromCache: false };
 }
@@ -2125,7 +2128,7 @@ async function writeCache(source, logger, rows, rev) {
   try {
     await source.cache.set(JSON.stringify({ rows, revision: rev }));
   } catch (err) {
-    logger.warn("[modelkit] catalog cache write failed", err);
+    logger.warn(`[modelkit] catalog cache write failed: ${describeError(err)}`);
   }
 }
 async function prime(source, logger) {
@@ -2146,12 +2149,14 @@ async function prime(source, logger) {
     logPrimed(logger, result);
     return result;
   } catch (err) {
-    logger.warn("[modelkit] catalog remote failed, trying cache", err);
+    logger.warn(`[modelkit] catalog remote failed, trying cache: ${describeError(err)}`);
     const error = describeError(err);
     try {
       const cached = await source.cache?.get();
       if (!cached) throw new Error("no cached catalog");
-      const { rows, revision: rev } = parseEnvelope(JSON.parse(cached));
+      const cachedParsed = EnvelopeSchema.safeParse(JSON.parse(cached));
+      if (!cachedParsed.success) throw new Error("invalid catalog response: missing rows");
+      const { rows, revision: rev } = toEnvelope(cachedParsed.data);
       liveCatalog.replace(rows);
       liveState.origin = "last-good";
       liveState.revision = rev;
@@ -2164,7 +2169,9 @@ async function prime(source, logger) {
       logPrimed(logger, result);
       return result;
     } catch (cacheErr) {
-      logger.warn("[modelkit] catalog cache failed, using snapshot", cacheErr);
+      logger.warn(
+        `[modelkit] catalog cache failed, using snapshot: ${describeError(cacheErr)}`
+      );
       liveCatalog.replace([...MODELS]);
       liveState.origin = "snapshot";
       liveState.revision = void 0;
@@ -2187,23 +2194,24 @@ async function refresh(source, logger) {
     liveState.revision = fetched.revision;
     await writeCache(source, logger, fetched.rows, fetched.revision);
   } catch (err) {
-    logger.warn("[modelkit] catalog refresh failed, keeping current rows", err);
+    logger.warn(
+      `[modelkit] catalog refresh failed, keeping current rows: ${describeError(err)}`
+    );
   }
 }
 function primeCatalog(source) {
-  const memo = liveState.memo;
-  if (memo) return memo;
+  if (liveState.memo) return liveState.memo;
   const logger = source.logger ?? console;
-  liveState.memo = prime(source, logger).then((result) => {
+  const pending = prime(source, logger).then((result) => {
     const ttlMs = source.ttlMs ?? 3e5;
     if (ttlMs > 0 && liveState.timer === void 0) {
       liveState.timer = setInterval(() => void refresh(source, logger), ttlMs);
-      const maybeUnref = liveState.timer;
-      maybeUnref.unref?.();
+      liveState.timer.unref?.();
     }
     return result;
   });
-  return liveState.memo;
+  liveState.memo = pending;
+  return pending;
 }
 function resetLiveCatalog() {
   if (liveState.timer !== void 0) {