@circuitwall/jarela 2.2.0 → 2.2.1

package/lib/stores/model-config.ts

@@ -17,6 +17,9 @@ export function withModelConfigMutation<T>(
 export interface ModelConfigRow {
   name: string; provider: string; model_id: string;
   params: string; is_default: number;
+  // ADR-0102: 0 hides the config from model selection, routing, and the
+  // default fallback without deleting it. Optional for rows built in tests.
+  enabled?: number;
   // ADR forthcoming ??? first-class credentials. NULL until the row is
   // explicitly bound (or until the auto-migration in lib/db/migrations.ts
   // lifts an inline api_key into a credential row).
@@ -24,6 +27,16 @@ export interface ModelConfigRow {
   created_at: string; updated_at: string;
 }
 
+export class ModelConfigStateError extends Error {
+  constructor(message: string, readonly status: 404 | 409) {
+    super(message);
+  }
+}
+
+export function isModelConfigEnabled(cfg: Pick<ModelConfigRow, "enabled"> | null | undefined): boolean {
+  return !!cfg && cfg.enabled !== 0;
+}
+
 // `params` holds the provider API key alongside hyperparameters and is
 // stored encrypted at rest (ADR-0005). Decrypt before returning rows.
 function decryptRow<T extends { params: string }>(row: T): T {
@@ -37,6 +50,11 @@ export function listModelConfigs(): ModelConfigRow[] {
   return rows.map(decryptRow);
 }
 
+/** Model configs that may be offered for selection or routing. */
+export function listEnabledModelConfigs(): ModelConfigRow[] {
+  return listModelConfigs().filter(isModelConfigEnabled);
+}
+
 export function getModelConfig(name: string): ModelConfigRow | null {
   const row = (getDb().prepare("SELECT * FROM model_configs WHERE name=?").get(name) as unknown as ModelConfigRow) ?? null;
   return row ? decryptRow(row) : null;
@@ -44,15 +62,77 @@ export function getModelConfig(name: string): ModelConfigRow | null {
 
 export function getDefaultModelConfig(): ModelConfigRow | null {
   const db = getDb();
-  const row = (db.prepare("SELECT * FROM model_configs WHERE is_default=1 LIMIT 1").get() as unknown as ModelConfigRow) ?? null;
+  const row = (db.prepare("SELECT * FROM model_configs WHERE is_default=1 AND enabled=1 LIMIT 1").get() as unknown as ModelConfigRow) ?? null;
   if (row) return decryptRow(row);
-  const fallback = (db.prepare("SELECT * FROM model_configs ORDER BY name ASC LIMIT 1").get() as unknown as ModelConfigRow) ?? null;
+  const fallback = (db.prepare("SELECT * FROM model_configs WHERE enabled=1 ORDER BY name ASC LIMIT 1").get() as unknown as ModelConfigRow) ?? null;
   return fallback ? decryptRow(fallback) : null;
 }
 
+/**
+ * Resolve the config a run should use: the named config when it exists and is
+ * enabled, otherwise the workspace default. A disabled assignment therefore
+ * falls back without being cleared, so re-enabling restores it.
+ */
+export function resolveRunnableModelConfig(name: string | null | undefined): ModelConfigRow | null {
+  const named = name ? getModelConfig(name) : null;
+  if (named && isModelConfigEnabled(named)) return named;
+  return getDefaultModelConfig();
+}
+
+/** Atomically make `name` the only default model config. */
+export function setDefaultModelConfig(name: string): ModelConfigRow {
+  return withDbTransaction(() => {
+    const db = getDb();
+    const target = getModelConfig(name);
+    if (!target) throw new ModelConfigStateError(`Model config "${name}" not found`, 404);
+    if (!isModelConfigEnabled(target)) {
+      throw new ModelConfigStateError(`Model config "${name}" is disabled; enable it before making it the default`, 409);
+    }
+    const t = now();
+    db.prepare("UPDATE model_configs SET is_default=0, updated_at=? WHERE is_default=1 AND name<>?").run(t, name);
+    db.prepare("UPDATE model_configs SET is_default=1, updated_at=? WHERE name=?").run(t, name);
+    return getModelConfig(name)!;
+  });
+}
+
+/**
+ * Enable or disable a model config. Disabling the default promotes the
+ * alphabetically-first other enabled config in the same transaction, and the
+ * last enabled config cannot be disabled so runs always have a model.
+ */
+export function setModelConfigEnabled(name: string, enabled: boolean): ModelConfigRow {
+  return withDbTransaction(() => {
+    const db = getDb();
+    const target = getModelConfig(name);
+    if (!target) throw new ModelConfigStateError(`Model config "${name}" not found`, 404);
+    if (isModelConfigEnabled(target) === enabled) return target;
+    const t = now();
+    if (enabled) {
+      db.prepare("UPDATE model_configs SET enabled=1, updated_at=? WHERE name=?").run(t, name);
+      return getModelConfig(name)!;
+    }
+    const next = db.prepare(
+      "SELECT name FROM model_configs WHERE enabled=1 AND name<>? ORDER BY name ASC LIMIT 1",
+    ).get(name) as { name?: string } | undefined;
+    if (!next?.name) {
+      throw new ModelConfigStateError("At least one model config must stay enabled", 409);
+    }
+    db.prepare("UPDATE model_configs SET enabled=0, is_default=0, updated_at=? WHERE name=?").run(t, name);
+    if (target.is_default === 1) {
+      db.prepare("UPDATE model_configs SET is_default=1, updated_at=? WHERE name=?").run(t, next.name);
+    }
+    return getModelConfig(name)!;
+  });
+}
+
+/**
+ * Insert or update a model config. `is_default` undefined keeps the current
+ * flag (false for new rows); true atomically clears every other default and
+ * re-enables the row, because the default must always be selectable.
+ */
 export function upsertModelConfig(
   name: string, provider: string, model_id: string,
-  params: Record<string, unknown>, is_default: boolean,
+  params: Record<string, unknown>, is_default: boolean | undefined,
   credential_id: string | null = null,
 ): ModelConfigRow {
   return withDbTransaction(() => {
@@ -67,11 +147,13 @@ export function upsertModelConfig(
     // other field a custom provider relies on (e.g. custom-provider.js's
     // username/password auth) on every save.
     const mergedParams = { ...decodeInlineParams(existing), ...params };
+    const finalDefault = is_default ?? existing?.is_default === 1;
+    const finalEnabled = finalDefault || !existing || isModelConfigEnabled(existing);
     const db = getDb();
-    if (is_default) db.prepare("UPDATE model_configs SET is_default=0").run();
+    if (finalDefault) db.prepare("UPDATE model_configs SET is_default=0 WHERE name<>?").run(name);
     db.prepare(
-      "INSERT OR REPLACE INTO model_configs (name,provider,model_id,params,is_default,credential_id,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?)"
-    ).run(name, provider, model_id, encrypt(JSON.stringify(mergedParams)), is_default ? 1 : 0, finalCredId, created_at, t);
+      "INSERT OR REPLACE INTO model_configs (name,provider,model_id,params,is_default,enabled,credential_id,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?)"
+    ).run(name, provider, model_id, encrypt(JSON.stringify(mergedParams)), finalDefault ? 1 : 0, finalEnabled ? 1 : 0, finalCredId, created_at, t);
     return getModelConfig(name)!;
   });
 }
@@ -85,10 +167,10 @@ export function deleteModelConfig(name: string): boolean {
     // Automatically reset any agent pointing to this deleted model config to NULL (automatic / default model)
     db.prepare("UPDATE agent_configs SET model_config_name = NULL WHERE model_config_name = ?").run(name);
     // Avoid the "no default" state: if the deleted row was the default and any
-    // other rows remain, promote the alphabetically-first remaining row so
+    // other enabled rows remain, promote the alphabetically-first one so
     // agents that fall back to the default keep working.
     if (wasDefault) {
-      const next = db.prepare("SELECT name FROM model_configs ORDER BY name ASC LIMIT 1").get() as { name?: string } | undefined;
+      const next = db.prepare("SELECT name FROM model_configs WHERE enabled=1 ORDER BY name ASC LIMIT 1").get() as { name?: string } | undefined;
       if (next?.name) db.prepare("UPDATE model_configs SET is_default=1 WHERE name=?").run(next.name);
     }
     return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@circuitwall/jarela",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Jarela — local chat interface for LangGraph agents (multi-provider, single-process, SQLite-backed).",
   "license": "Apache-2.0",
   "author": "Andrew Ge Wu",