johns-harness 2026.9.16 → 2026.9.18

package/README.md

@@ -73,8 +73,8 @@ node johnness.mjs --help
 ### Verify
 
 ```bash
-npm test                        # 767 tests against the installed dependency tree
-bash scripts/verify-patches.sh  # 395 checks across every patch family
+npm test                        # 850 tests against the installed dependency tree
+bash scripts/verify-patches.sh  # 417 checks across every patch family
 ```
 
 ## Launch a swarm with one command
@@ -187,7 +187,7 @@ The log is a [`RULES.md`](RULES.md) workspace convention enforced through the ac
 
 ## Patch families
 
-The runtime carries 64 patch families. Each is a production fix applied at the source with a regression test, a durable patch marker, and a rollback path. A verifier runs 395 checks against the package tree and installed dependencies, and 767 tests run against the installed dependency tree.
+The runtime carries 65 patch families plus the 65.1 safe-update amendment. Each is a production fix applied at the source with a regression test, a durable patch marker, and a rollback path. A verifier runs 417 checks against the package tree and installed dependencies, and 850 tests run against the installed dependency tree.
 
 Every family follows the same six steps: reproduce the failure, trace the exact runtime path, make the smallest source-level change that restores the invariant, add a regression test and a patch marker, run the verifier, and retain rollback artifacts. The full index: [`docs/PATCHES.md`](docs/PATCHES.md).
 

package/dist/audio-transcription-runner-DfRfzdqH.js

@@ -1,3 +1,5 @@
+// JOHNNESS_PATCH_CATALOG_REFRESH_65
+import { mergeShippedCatalog65 } from "./catalog-refresh.js";
 import { detectLocalWhisper, runNativeWhisper } from "./native-whisper.js";
 import { b as resolveAgentModelPrimaryValue, y as resolveAgentModelFallbackValues } from "./run-with-concurrency-Cuc1THN9.js";
 import { T as resolvePreferredJohnnessTmpDir, d as logVerbose, m as shouldLogVerbose, t as createSubsystemLogger } from "./subsystem-C-Cf_MFK.js";
@@ -136,7 +138,7 @@ async function loadModelCatalog(params) {
 			const { join } = await import("node:path");
 			const authStorage = piSdk.discoverAuthStorage(agentDir);
 			const registry = new piSdk.ModelRegistry(authStorage, join(agentDir, "models.json"));
-			const entries = Array.isArray(registry) ? registry : registry.getAll();
+			const entries = mergeShippedCatalog65(Array.isArray(registry) ? registry : registry.getAll());
 			for (const entry of entries) {
 				const id = String(entry?.id ?? "").trim();
 				if (!id) continue;
@@ -168,8 +170,7 @@ async function loadModelCatalog(params) {
 				log.warn(`Failed to load model catalog: ${String(error)}`);
 			}
 			modelCatalogPromise = null;
-			if (models.length > 0) return sortModels(models);
-			return [];
+			return sortModels(mergeShippedCatalog65(models));
 		}
 	})();
 	return modelCatalogPromise;

package/dist/audio-transcription-runner-DldZwQqa.js

@@ -1,3 +1,5 @@
+// JOHNNESS_PATCH_CATALOG_REFRESH_65
+import { mergeShippedCatalog65 } from "./catalog-refresh.js";
 import { detectLocalWhisper, runNativeWhisper } from "./native-whisper.js";
 import { O as runExec, _t as resolveAgentModelFallbackValues, vt as resolveAgentModelPrimaryValue } from "./run-with-concurrency-BXSUl5Nj.js";
 import { B as shouldLogVerbose, O as createSubsystemLogger, R as logVerbose, X as resolvePreferredJohnnessTmpDir } from "./logger-Bj0Xl6pn.js";
@@ -135,7 +137,7 @@ async function loadModelCatalog(params) {
 			const { join } = await import("node:path");
 			const authStorage = piSdk.discoverAuthStorage(agentDir);
 			const registry = new piSdk.ModelRegistry(authStorage, join(agentDir, "models.json"));
-			const entries = Array.isArray(registry) ? registry : registry.getAll();
+			const entries = mergeShippedCatalog65(Array.isArray(registry) ? registry : registry.getAll());
 			for (const entry of entries) {
 				const id = String(entry?.id ?? "").trim();
 				if (!id) continue;
@@ -167,8 +169,7 @@ async function loadModelCatalog(params) {
 				log.warn(`Failed to load model catalog: ${String(error)}`);
 			}
 			modelCatalogPromise = null;
-			if (models.length > 0) return sortModels(models);
-			return [];
+			return sortModels(mergeShippedCatalog65(models));
 		}
 	})();
 	return modelCatalogPromise;

package/dist/auth-profiles-5CHn7vq1.js

@@ -1,3 +1,5 @@
+// JOHNNESS_PATCH_CATALOG_REFRESH_65
+import { mergeShippedCatalog65 } from "./catalog-refresh.js";
 import { refreshManagedCodexProfile, readManagedCodexStore, mutateAuthProfile, updateAuthStoreMetadata, saveAuthStoreSnapshot } from "./codex-oauth-owner.js";
 import { t as __exportAll } from "./rolldown-runtime-DUslC3ob.js";
 import { _ as expandHomePrefix, a as resolveCanonicalConfigPath, c as resolveDefaultConfigCandidates, d as resolveIsNixMode, f as resolveLegacyStateDirs, g as resolveStateDir, h as resolveOAuthPath, i as isNixMode, l as resolveGatewayLockDir, m as resolveOAuthDir, n as DEFAULT_GATEWAY_PORT, o as resolveConfigPath, p as resolveNewStateDir, r as STATE_DIR, s as resolveConfigPathCandidate, t as CONFIG_PATH, u as resolveGatewayPort, y as resolveRequiredHomeDir } from "./paths-BfR2LXbA.js";
@@ -3783,6 +3785,7 @@ function resolveSubagentSpawnModelSelection(params) {
 	}) ?? normalizeModelSelection(resolveAgentModelPrimaryValue(params.cfg.agents?.defaults?.model)) ?? `${runtimeDefault.provider}/${runtimeDefault.model}`;
 }
 function buildAllowedModelSet(params) {
+	params = { ...params, catalog: mergeShippedCatalog65(params.catalog) };
 	const rawAllowlist = (() => {
 		const modelMap = params.cfg.agents?.defaults?.models ?? {};
 		return Object.keys(modelMap);
@@ -5391,7 +5394,7 @@ function applyContextPruningDefaults(cfg) {
 		};
 		mutated = true;
 	}
-	if (authMode === "api_key") {
+	if (authMode === "api_key" && Object.keys(defaults.models ?? {}).length > 0) {
 		const nextModels = defaults.models ? { ...defaults.models } : {};
 		let modelsMutated = false;
 		const isAnthropicCacheRetentionTarget = (parsed) => Boolean(parsed && (parsed.provider === "anthropic" || parsed.provider === "amazon-bedrock" && parsed.model.toLowerCase().includes("anthropic.claude")));

package/dist/catalog-refresh.js

@@ -0,0 +1,90 @@
+// JOHNNESS_PATCH_CATALOG_REFRESH_65
+import fs from "node:fs/promises";
+import { readFileSync } from "node:fs";
+import path from "node:path";
+import { createHash, randomUUID } from "node:crypto";
+import { getModels, getProviders } from "@mariozechner/pi-ai";
+const MODELS = Object.fromEntries(getProviders().map((provider) => [provider, Object.fromEntries(getModels(provider).map((model) => [model.id, model]))]));
+
+const VERSION = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8")).version;
+const SHIPPED = Object.values(MODELS).flatMap((models) => Object.values(models));
+const keyOf = (model) => `${model.provider}/${model.id}`;
+const digest = (value) => createHash("sha256").update(JSON.stringify(value)).digest("hex");
+const locks = globalThis[Symbol.for("johnness.catalog-refresh.65.locks")] ??= new Map();
+const record = (value) => value && typeof value === "object" && !Array.isArray(value);
+
+// Selection is independent of disk freshness or writability. Custom descriptors win.
+export function mergeShippedCatalog65(entries = []) {
+  const merged = new Map(SHIPPED.map((entry) => [keyOf(entry), entry]));
+  for (const entry of entries) {
+    if (!entry?.provider || !entry?.id) continue;
+    const key = keyOf(entry);
+    merged.set(key, { ...merged.get(key), ...entry });
+  }
+  return [...merged.values()];
+}
+
+export function buildCatalogDocument65(existing = {}, providers = {}, version = VERSION) {
+  const generated = {};
+  const merged = {};
+  const previousGenerated = existing._johnness?.generated ?? {};
+  for (const [provider, models] of Object.entries(MODELS)) {
+    const entries = Object.values(models).map((model) => ({ ...model }));
+    merged[provider] = { models: entries };
+    for (const model of entries) generated[`${provider}/${model.id}`] = digest(model);
+  }
+  for (const source of [existing.providers, providers]) {
+    for (const [provider, config] of Object.entries(record(source) ? source : {})) {
+      if (!record(config)) continue;
+      const prior = merged[provider] ?? { models: [] };
+      const models = new Map(prior.models.map((model) => [model.id, model]));
+      for (const model of Array.isArray(config.models) ? config.models : []) {
+        if (!model?.id) continue;
+        const key = `${provider}/${model.id}`;
+        // Unedited generated entries follow the new release; custom tuning survives.
+        if (previousGenerated[key] === digest(model)) continue;
+        const base = models.get(model.id);
+        models.set(model.id, { ...base, ...model, ...(base?.cost && model.cost ? { cost: { ...base.cost, ...model.cost } } : {}) });
+      }
+      merged[provider] = { ...prior, ...config, models: [...models.values()] };
+    }
+  }
+  return { ...existing, providers: merged, _johnness: { version, generated } };
+}
+
+// Called at gateway startup and every derived-model ensure. No config/auth writes.
+export async function refreshJohnnessCatalog65({ agentDir, providers = {}, log = console, version = VERSION }) {
+  const target = path.join(agentDir, "models.json");
+  const prior = locks.get(target) ?? Promise.resolve();
+  const run = prior.catch(() => {}).then(async () => {
+    let existing = {};
+    let raw = "";
+    let temporary;
+    try {
+      try {
+        raw = await fs.readFile(target, "utf8");
+        const parsed = JSON.parse(raw);
+        if (record(parsed)) existing = parsed;
+      } catch (error) {
+        if (error.code !== "ENOENT" && !(error instanceof SyntaxError)) throw error;
+      }
+      const document = buildCatalogDocument65(existing, providers, version);
+      const next = `${JSON.stringify(document, null, 2)}\n`;
+      if (raw === next) return { agentDir, wrote: false };
+      await fs.mkdir(agentDir, { recursive: true, mode: 0o700 });
+      temporary = `${target}.${randomUUID()}.tmp`;
+      await fs.writeFile(temporary, next, { mode: 0o600, flag: "wx" });
+      await fs.rename(temporary, target);
+      return { agentDir, wrote: true };
+    } catch (error) {
+      // Never echo provider configuration, credentials, file content or error prose.
+      log.warn?.(`model-catalog: refresh unavailable (${String(error?.code ?? "WRITE_FAILED").replace(/[^A-Z0-9_]/g, "")}); using merged shipped catalog`);
+      return { agentDir, wrote: false };
+    } finally {
+      if (temporary) await fs.unlink(temporary).catch(() => {});
+    }
+  });
+  locks.set(target, run);
+  try { return await run; }
+  finally { if (locks.get(target) === run) locks.delete(target); }
+}

package/dist/config-koj5M_EO.js

@@ -1,3 +1,4 @@
+// JOHNNESS_PATCH_CATALOG_REFRESH_65
 // JOHNNESS_PATCH_NATIVE_STATE_MIGRATION_59
 import { i as isBlockedObjectKey } from "./account-id-DQE6gyMr.js";
 import { a as normalizeAgentId, i as DEFAULT_AGENT_ID, n as hasConfiguredSecretInput, t as coerceSecretRef } from "./types.secrets-D9YNIyIP.js";
@@ -2088,7 +2089,7 @@ function applyContextPruningDefaults(cfg) {
 		};
 		mutated = true;
 	}
-	if (authMode === "api_key") {
+	if (authMode === "api_key" && Object.keys(defaults.models ?? {}).length > 0) {
 		const nextModels = defaults.models ? { ...defaults.models } : {};
 		let modelsMutated = false;
 		const isAnthropicCacheRetentionTarget = (parsed) => Boolean(parsed && (parsed.provider === "anthropic" || parsed.provider === "amazon-bedrock" && parsed.model.toLowerCase().includes("anthropic.claude")));

package/dist/daemon-cli.js

@@ -1,3 +1,4 @@
+// JOHNNESS_PATCH_CATALOG_REFRESH_65
 // JOHNNESS_PATCH_NATIVE_STATE_MIGRATION_59
 import { createRequire } from "node:module";
 import fsSync from "node:fs";
@@ -5239,7 +5240,7 @@ function applyContextPruningDefaults(cfg) {
 		};
 		mutated = true;
 	}
-	if (authMode === "api_key") {
+	if (authMode === "api_key" && Object.keys(defaults.models ?? {}).length > 0) {
 		const nextModels = defaults.models ? { ...defaults.models } : {};
 		let modelsMutated = false;
 		const isAnthropicCacheRetentionTarget = (parsed) => Boolean(parsed && (parsed.provider === "anthropic" || parsed.provider === "amazon-bedrock" && parsed.model.toLowerCase().includes("anthropic.claude")));

package/dist/gateway-cli-B7fBU7gD.js

@@ -1,3 +1,7 @@
+// JOHNNESS_PATCH_SAFE_VOLUME_UPDATE_65_1
+import { readInstalledVersion as readUpdatedRuntimeVersion } from "./update-command.js";
+// JOHNNESS_PATCH_CATALOG_REFRESH_65
+import { refreshJohnnessCatalog65 } from "./catalog-refresh.js";
 import { g as resolveStateDir, i as isNixMode, l as resolveGatewayLockDir, o as resolveConfigPath, r as STATE_DIR, t as CONFIG_PATH, u as resolveGatewayPort } from "./paths-BJV7vkaX.js";
 import { a as logVerbose, d as colorize, f as isRich, g as getResolvedLoggerSettings, h as getLogger, m as getChildLogger, p as theme, s as setVerbose } from "./globals-BM8hKFm0.js";
 import { C as sleep, D as isPlainObject, E as truncateUtf16Safe, S as shortenHomePath, c as ensureDir, r as clamp, y as resolveUserPath } from "./utils-DC4zYvW0.js";
@@ -21752,6 +21756,10 @@ async function scheduleRestartSentinelWake(_params) {
 	const sentinel = await consumeRestartSentinel();
 	if (!sentinel) return;
 	const payload = sentinel.payload;
+	if (payload.stats?.mode === "chat.update") {
+		const running = readUpdatedRuntimeVersion();
+		payload.message = running === payload.stats.targetVersion ? `johns-harness is now on ${running}. The new runtime has booted.` : `Update restart complete. Running johns-harness ${running}; requested ${payload.stats.targetVersion ?? "unknown"}.`;
+	}
 	const sessionKey = payload.sessionKey?.trim();
 	const message = formatRestartSentinelMessage(payload);
 	const summary = summarizeRestartSentinel(payload);
@@ -23553,6 +23561,7 @@ async function startGatewayServer(port = 18789, opts = {}) {
 	});
 	initSubagentRegistry();
 	const defaultAgentId = resolveDefaultAgentId(cfgAtStart);
+	for (const agentId of listAgentIds(cfgAtStart)) await refreshJohnnessCatalog65({ agentDir: resolveAgentDir(cfgAtStart, agentId), log });
 	const defaultWorkspaceDir = resolveAgentWorkspaceDir(cfgAtStart, defaultAgentId);
 	const baseMethods = listGatewayMethods();
 	const emptyPluginRegistry = createEmptyPluginRegistry();

package/dist/gateway-cli-BCNMwzNq.js

@@ -1,3 +1,7 @@
+// JOHNNESS_PATCH_SAFE_VOLUME_UPDATE_65_1
+import { readInstalledVersion as readUpdatedRuntimeVersion } from "./update-command.js";
+// JOHNNESS_PATCH_CATALOG_REFRESH_65
+import { refreshJohnnessCatalog65 } from "./catalog-refresh.js";
 import { a as logVerbose, d as colorize, f as isRich, g as getResolvedLoggerSettings, h as getLogger, m as getChildLogger, p as theme, s as setVerbose } from "./globals-Bv4ZcVWM.js";
 import { g as resolveStateDir, i as isNixMode, l as resolveGatewayLockDir, o as resolveConfigPath, r as STATE_DIR, t as CONFIG_PATH, u as resolveGatewayPort } from "./paths-BfR2LXbA.js";
 import { a as setConsoleSubsystemFilter, f as defaultRuntime, n as runtimeForLogger, o as setConsoleTimestampPrefix, t as createSubsystemLogger } from "./subsystem-Cf9yS0UI.js";
@@ -21754,6 +21758,10 @@ async function scheduleRestartSentinelWake(_params) {
 	const sentinel = await consumeRestartSentinel();
 	if (!sentinel) return;
 	const payload = sentinel.payload;
+	if (payload.stats?.mode === "chat.update") {
+		const running = readUpdatedRuntimeVersion();
+		payload.message = running === payload.stats.targetVersion ? `johns-harness is now on ${running}. The new runtime has booted.` : `Update restart complete. Running johns-harness ${running}; requested ${payload.stats.targetVersion ?? "unknown"}.`;
+	}
 	const sessionKey = payload.sessionKey?.trim();
 	const message = formatRestartSentinelMessage(payload);
 	const summary = summarizeRestartSentinel(payload);
@@ -23555,6 +23563,7 @@ async function startGatewayServer(port = 18789, opts = {}) {
 	});
 	initSubagentRegistry();
 	const defaultAgentId = resolveDefaultAgentId(cfgAtStart);
+	for (const agentId of listAgentIds(cfgAtStart)) await refreshJohnnessCatalog65({ agentDir: resolveAgentDir(cfgAtStart, agentId), log });
 	const defaultWorkspaceDir = resolveAgentWorkspaceDir(cfgAtStart, defaultAgentId);
 	const baseMethods = listGatewayMethods();
 	const emptyPluginRegistry = createEmptyPluginRegistry();

package/dist/image-fMgabouP.js

@@ -1,3 +1,5 @@
+// JOHNNESS_PATCH_CATALOG_REFRESH_65
+import { refreshJohnnessCatalog65 } from "./catalog-refresh.js";
 import { b as resolveAgentModelPrimaryValue, y as resolveAgentModelFallbackValues } from "./run-with-concurrency-Cuc1THN9.js";
 import { f as isRecord, x as shortenHomeInString } from "./logger-BW8uLq6f.js";
 import { $ as getRuntimeConfigSnapshot, A as requireApiKey, Cr as normalizeSecretInput, O as getApiKeyForModel, P as isNonSecretApiKeyMarker, _ as normalizeProviders, b as resolveImplicitProviders, er as applyConfigEnvVars, et as getRuntimeConfigSourceSnapshot, mr as resolveJohnnessAgentDir, s as normalizeModelRef, tt as loadConfig, v as resolveImplicitBedrockProvider, y as resolveImplicitCopilotProvider } from "./model-selection-BU6wl1le.js";
@@ -183,10 +185,7 @@ async function ensureJohnnessModelsJson(config, agentDirOverride) {
 			cfg,
 			agentDir
 		});
-		if (Object.keys(providers).length === 0) return {
-			agentDir,
-			wrote: false
-		};
+		// Empty provider config still needs the shipped catalog.
 		const mode = cfg.models?.mode ?? DEFAULT_MODE;
 		const secretRefManagedProviders = /* @__PURE__ */ new Set();
 		const explicitBaseUrlProviders = new Set(Object.entries(cfg.models?.providers ?? {}).map(([key, provider]) => [key.trim(), provider]).filter(([key, provider]) => Boolean(key) && typeof provider?.baseUrl === "string" && provider.baseUrl.trim()).map(([key]) => key));
@@ -202,24 +201,7 @@ async function ensureJohnnessModelsJson(config, agentDirOverride) {
 			secretRefManagedProviders,
 			explicitBaseUrlProviders
 		});
-		const next = `${JSON.stringify({ providers: mergedProviders }, null, 2)}\n`;
-		if (await readRawFile(targetPath) === next) {
-			await ensureModelsFileMode(targetPath);
-			return {
-				agentDir,
-				wrote: false
-			};
-		}
-		await fs.mkdir(agentDir, {
-			recursive: true,
-			mode: 448
-		});
-		await fs.writeFile(targetPath, next, { mode: 384 });
-		await ensureModelsFileMode(targetPath);
-		return {
-			agentDir,
-			wrote: true
-		};
+		return await refreshJohnnessCatalog65({ agentDir, providers: mergedProviders });
 	});
 }
 //#endregion

package/dist/image-u5AOhmHp.js

@@ -1,3 +1,5 @@
+// JOHNNESS_PATCH_CATALOG_REFRESH_65
+import { refreshJohnnessCatalog65 } from "./catalog-refresh.js";
 import { _t as resolveAgentModelFallbackValues, vt as resolveAgentModelPrimaryValue } from "./run-with-concurrency-BXSUl5Nj.js";
 import { f as isRecord, x as shortenHomeInString } from "./logger-Bj0Xl6pn.js";
 import { $ as getRuntimeConfigSourceSnapshot, D as getApiKeyForModel, Dr as normalizeSecretInput, N as isNonSecretApiKeyMarker, Q as getRuntimeConfigSnapshot, _ as resolveImplicitBedrockProvider, et as loadConfig, g as normalizeProviders, k as requireApiKey, rr as applyConfigEnvVars, s as normalizeModelRef, v as resolveImplicitCopilotProvider, vr as resolveJohnnessAgentDir, y as resolveImplicitProviders } from "./model-selection-BGlGpPgM.js";
@@ -183,10 +185,7 @@ async function ensureJohnnessModelsJson(config, agentDirOverride) {
 			cfg,
 			agentDir
 		});
-		if (Object.keys(providers).length === 0) return {
-			agentDir,
-			wrote: false
-		};
+		// Empty provider config still needs the shipped catalog.
 		const mode = cfg.models?.mode ?? DEFAULT_MODE;
 		const secretRefManagedProviders = /* @__PURE__ */ new Set();
 		const explicitBaseUrlProviders = new Set(Object.entries(cfg.models?.providers ?? {}).map(([key, provider]) => [key.trim(), provider]).filter(([key, provider]) => Boolean(key) && typeof provider?.baseUrl === "string" && provider.baseUrl.trim()).map(([key]) => key));
@@ -202,24 +201,7 @@ async function ensureJohnnessModelsJson(config, agentDirOverride) {
 			secretRefManagedProviders,
 			explicitBaseUrlProviders
 		});
-		const next = `${JSON.stringify({ providers: mergedProviders }, null, 2)}\n`;
-		if (await readRawFile(targetPath) === next) {
-			await ensureModelsFileMode(targetPath);
-			return {
-				agentDir,
-				wrote: false
-			};
-		}
-		await fs.mkdir(agentDir, {
-			recursive: true,
-			mode: 448
-		});
-		await fs.writeFile(targetPath, next, { mode: 384 });
-		await ensureModelsFileMode(targetPath);
-		return {
-			agentDir,
-			wrote: true
-		};
+		return await refreshJohnnessCatalog65({ agentDir, providers: mergedProviders });
 	});
 }
 //#endregion

package/dist/model-catalog-D1QJl-qH.js

@@ -1,3 +1,5 @@
+// JOHNNESS_PATCH_CATALOG_REFRESH_65
+import { mergeShippedCatalog65 } from "./catalog-refresh.js";
 import { t as createSubsystemLogger } from "./subsystem-C9Xgeyrw.js";
 import { Ai as resolveJohnnessAgentDir, rn as loadConfig } from "./model-selection-L7RMwsG-.js";
 import { t as ensureJohnnessModelsJson } from "./models-config-CAmcg63r.js";
@@ -119,7 +121,7 @@ async function loadModelCatalog(params) {
 			const { join } = await import("node:path");
 			const authStorage = piSdk.discoverAuthStorage(agentDir);
 			const registry = new piSdk.ModelRegistry(authStorage, join(agentDir, "models.json"));
-			const entries = Array.isArray(registry) ? registry : registry.getAll();
+			const entries = mergeShippedCatalog65(Array.isArray(registry) ? registry : registry.getAll());
 			for (const entry of entries) {
 				const id = String(entry?.id ?? "").trim();
 				if (!id) continue;
@@ -151,8 +153,7 @@ async function loadModelCatalog(params) {
 				log.warn(`Failed to load model catalog: ${String(error)}`);
 			}
 			modelCatalogPromise = null;
-			if (models.length > 0) return sortModels(models);
-			return [];
+			return sortModels(mergeShippedCatalog65(models));
 		}
 	})();
 	return modelCatalogPromise;

package/dist/model-catalog-Ezhj-HLy.js

@@ -1,3 +1,5 @@
+// JOHNNESS_PATCH_CATALOG_REFRESH_65
+import { mergeShippedCatalog65 } from "./catalog-refresh.js";
 import { t as createSubsystemLogger } from "./subsystem-Cf9yS0UI.js";
 import { H as loadConfig, lr as resolveJohnnessAgentDir } from "./auth-profiles-5CHn7vq1.js";
 import { t as ensureJohnnessModelsJson } from "./models-config-DXA5BkaM.js";
@@ -119,7 +121,7 @@ async function loadModelCatalog(params) {
 			const { join } = await import("node:path");
 			const authStorage = piSdk.discoverAuthStorage(agentDir);
 			const registry = new piSdk.ModelRegistry(authStorage, join(agentDir, "models.json"));
-			const entries = Array.isArray(registry) ? registry : registry.getAll();
+			const entries = mergeShippedCatalog65(Array.isArray(registry) ? registry : registry.getAll());
 			for (const entry of entries) {
 				const id = String(entry?.id ?? "").trim();
 				if (!id) continue;
@@ -151,8 +153,7 @@ async function loadModelCatalog(params) {
 				log.warn(`Failed to load model catalog: ${String(error)}`);
 			}
 			modelCatalogPromise = null;
-			if (models.length > 0) return sortModels(models);
-			return [];
+			return sortModels(mergeShippedCatalog65(models));
 		}
 	})();
 	return modelCatalogPromise;

package/dist/model-selection-BGlGpPgM.js

@@ -1,3 +1,5 @@
+// JOHNNESS_PATCH_CATALOG_REFRESH_65
+import { mergeShippedCatalog65 } from "./catalog-refresh.js";
 // JOHNNESS_PATCH_NATIVE_STATE_MIGRATION_59
 import { refreshManagedCodexProfile, readManagedCodexStore, mutateAuthProfile, updateAuthStoreMetadata, saveAuthStoreSnapshot } from "./codex-oauth-owner.js";
 import { t as __exportAll } from "./rolldown-runtime-DUslC3ob.js";
@@ -1956,7 +1958,7 @@ function applyContextPruningDefaults(cfg) {
 		};
 		mutated = true;
 	}
-	if (authMode === "api_key") {
+	if (authMode === "api_key" && Object.keys(defaults.models ?? {}).length > 0) {
 		const nextModels = defaults.models ? { ...defaults.models } : {};
 		let modelsMutated = false;
 		const isAnthropicCacheRetentionTarget = (parsed) => Boolean(parsed && (parsed.provider === "anthropic" || parsed.provider === "amazon-bedrock" && parsed.model.toLowerCase().includes("anthropic.claude")));
@@ -18582,6 +18584,7 @@ function resolveSubagentSpawnModelSelection(params) {
 	}) ?? normalizeModelSelection(resolveAgentModelPrimaryValue(params.cfg.agents?.defaults?.model)) ?? `${runtimeDefault.provider}/${runtimeDefault.model}`;
 }
 function buildAllowedModelSet(params) {
+	params = { ...params, catalog: mergeShippedCatalog65(params.catalog) };
 	const rawAllowlist = (() => {
 		const modelMap = params.cfg.agents?.defaults?.models ?? {};
 		return Object.keys(modelMap);

package/dist/model-selection-BU6wl1le.js

@@ -1,3 +1,5 @@
+// JOHNNESS_PATCH_CATALOG_REFRESH_65
+import { mergeShippedCatalog65 } from "./catalog-refresh.js";
 // JOHNNESS_PATCH_NATIVE_STATE_MIGRATION_59
 import { refreshManagedCodexProfile, readManagedCodexStore, mutateAuthProfile, updateAuthStoreMetadata, saveAuthStoreSnapshot } from "./codex-oauth-owner.js";
 import { t as __exportAll } from "./rolldown-runtime-DUslC3ob.js";
@@ -1931,7 +1933,7 @@ function applyContextPruningDefaults(cfg) {
 		};
 		mutated = true;
 	}
-	if (authMode === "api_key") {
+	if (authMode === "api_key" && Object.keys(defaults.models ?? {}).length > 0) {
 		const nextModels = defaults.models ? { ...defaults.models } : {};
 		let modelsMutated = false;
 		const isAnthropicCacheRetentionTarget = (parsed) => Boolean(parsed && (parsed.provider === "anthropic" || parsed.provider === "amazon-bedrock" && parsed.model.toLowerCase().includes("anthropic.claude")));
@@ -18471,6 +18473,7 @@ function resolveSubagentSpawnModelSelection(params) {
 	}) ?? normalizeModelSelection(resolveAgentModelPrimaryValue(params.cfg.agents?.defaults?.model)) ?? `${runtimeDefault.provider}/${runtimeDefault.model}`;
 }
 function buildAllowedModelSet(params) {
+	params = { ...params, catalog: mergeShippedCatalog65(params.catalog) };
 	const rawAllowlist = (() => {
 		const modelMap = params.cfg.agents?.defaults?.models ?? {};
 		return Object.keys(modelMap);

package/dist/model-selection-L7RMwsG-.js

@@ -1,3 +1,5 @@
+// JOHNNESS_PATCH_CATALOG_REFRESH_65
+import { mergeShippedCatalog65 } from "./catalog-refresh.js";
 import { refreshManagedCodexProfile, readManagedCodexStore, mutateAuthProfile, updateAuthStoreMetadata, saveAuthStoreSnapshot } from "./codex-oauth-owner.js";
 import { t as __exportAll } from "./rolldown-runtime-DUslC3ob.js";
 import { _ as expandHomePrefix, a as resolveCanonicalConfigPath, c as resolveDefaultConfigCandidates, d as resolveIsNixMode, f as resolveLegacyStateDirs, g as resolveStateDir, h as resolveOAuthPath, i as isNixMode, l as resolveGatewayLockDir, m as resolveOAuthDir, n as DEFAULT_GATEWAY_PORT, o as resolveConfigPath, p as resolveNewStateDir, r as STATE_DIR, s as resolveConfigPathCandidate, t as CONFIG_PATH, u as resolveGatewayPort, y as resolveRequiredHomeDir } from "./paths-BJV7vkaX.js";
@@ -1862,7 +1864,7 @@ function applyContextPruningDefaults(cfg) {
 		};
 		mutated = true;
 	}
-	if (authMode === "api_key") {
+	if (authMode === "api_key" && Object.keys(defaults.models ?? {}).length > 0) {
 		const nextModels = defaults.models ? { ...defaults.models } : {};
 		let modelsMutated = false;
 		const isAnthropicCacheRetentionTarget = (parsed) => Boolean(parsed && (parsed.provider === "anthropic" || parsed.provider === "amazon-bedrock" && parsed.model.toLowerCase().includes("anthropic.claude")));
@@ -16902,6 +16904,7 @@ function resolveSubagentSpawnModelSelection(params) {
 	}) ?? normalizeModelSelection(resolveAgentModelPrimaryValue(params.cfg.agents?.defaults?.model)) ?? `${runtimeDefault.provider}/${runtimeDefault.model}`;
 }
 function buildAllowedModelSet(params) {
+	params = { ...params, catalog: mergeShippedCatalog65(params.catalog) };
 	const rawAllowlist = (() => {
 		const modelMap = params.cfg.agents?.defaults?.models ?? {};
 		return Object.keys(modelMap);

package/dist/models-config-CAmcg63r.js

@@ -1,3 +1,5 @@
+// JOHNNESS_PATCH_CATALOG_REFRESH_65
+import { refreshJohnnessCatalog65 } from "./catalog-refresh.js";
 import { d as isRecord } from "./utils-DC4zYvW0.js";
 import { Ai as resolveJohnnessAgentDir, M as resolveImplicitBedrockProvider, N as resolveImplicitCopilotProvider, P as resolveImplicitProviders, ei as applyConfigEnvVars, j as normalizeProviders, nn as getRuntimeConfigSourceSnapshot, ot as isNonSecretApiKeyMarker, rn as loadConfig, tn as getRuntimeConfigSnapshot } from "./model-selection-L7RMwsG-.js";
 import path from "node:path";
@@ -208,10 +210,7 @@ async function ensureJohnnessModelsJson(config, agentDirOverride) {
 			cfg,
 			agentDir
 		});
-		if (Object.keys(providers).length === 0) return {
-			agentDir,
-			wrote: false
-		};
+		// Empty provider config still needs the shipped catalog.
 		const mode = cfg.models?.mode ?? DEFAULT_MODE;
 		const secretRefManagedProviders = /* @__PURE__ */ new Set();
 		const explicitBaseUrlProviders = new Set(Object.entries(cfg.models?.providers ?? {}).map(([key, provider]) => [key.trim(), provider]).filter(([key, provider]) => Boolean(key) && typeof provider?.baseUrl === "string" && provider.baseUrl.trim()).map(([key]) => key));
@@ -227,24 +226,7 @@ async function ensureJohnnessModelsJson(config, agentDirOverride) {
 			secretRefManagedProviders,
 			explicitBaseUrlProviders
 		});
-		const next = `${JSON.stringify({ providers: mergedProviders }, null, 2)}\n`;
-		if (await readRawFile(targetPath) === next) {
-			await ensureModelsFileMode(targetPath);
-			return {
-				agentDir,
-				wrote: false
-			};
-		}
-		await fs.mkdir(agentDir, {
-			recursive: true,
-			mode: 448
-		});
-		await fs.writeFile(targetPath, next, { mode: 384 });
-		await ensureModelsFileMode(targetPath);
-		return {
-			agentDir,
-			wrote: true
-		};
+		return await refreshJohnnessCatalog65({ agentDir, providers: mergedProviders });
 	});
 }
 //#endregion

package/dist/models-config-DXA5BkaM.js

@@ -1,3 +1,5 @@
+// JOHNNESS_PATCH_CATALOG_REFRESH_65
+import { refreshJohnnessCatalog65 } from "./catalog-refresh.js";
 import { B as getRuntimeConfigSnapshot, Ci as isNonSecretApiKeyMarker, Gr as resolveImplicitBedrockProvider, H as loadConfig, Kr as resolveImplicitCopilotProvider, V as getRuntimeConfigSourceSnapshot, Wr as normalizeProviders, lr as resolveJohnnessAgentDir, qr as resolveImplicitProviders, zn as applyConfigEnvVars } from "./auth-profiles-5CHn7vq1.js";
 import { u as isRecord } from "./utils-C5WN6czr.js";
 import path from "node:path";
@@ -208,10 +210,7 @@ async function ensureJohnnessModelsJson(config, agentDirOverride) {
 			cfg,
 			agentDir
 		});
-		if (Object.keys(providers).length === 0) return {
-			agentDir,
-			wrote: false
-		};
+		// Empty provider config still needs the shipped catalog.
 		const mode = cfg.models?.mode ?? DEFAULT_MODE;
 		const secretRefManagedProviders = /* @__PURE__ */ new Set();
 		const explicitBaseUrlProviders = new Set(Object.entries(cfg.models?.providers ?? {}).map(([key, provider]) => [key.trim(), provider]).filter(([key, provider]) => Boolean(key) && typeof provider?.baseUrl === "string" && provider.baseUrl.trim()).map(([key]) => key));
@@ -227,24 +226,7 @@ async function ensureJohnnessModelsJson(config, agentDirOverride) {
 			secretRefManagedProviders,
 			explicitBaseUrlProviders
 		});
-		const next = `${JSON.stringify({ providers: mergedProviders }, null, 2)}\n`;
-		if (await readRawFile(targetPath) === next) {
-			await ensureModelsFileMode(targetPath);
-			return {
-				agentDir,
-				wrote: false
-			};
-		}
-		await fs.mkdir(agentDir, {
-			recursive: true,
-			mode: 448
-		});
-		await fs.writeFile(targetPath, next, { mode: 384 });
-		await ensureModelsFileMode(targetPath);
-		return {
-			agentDir,
-			wrote: true
-		};
+		return await refreshJohnnessCatalog65({ agentDir, providers: mergedProviders });
 	});
 }
 //#endregion

package/dist/plugin-sdk/audio-transcription-runner-BKRoAe2_.js

@@ -1,3 +1,5 @@
+// JOHNNESS_PATCH_CATALOG_REFRESH_65
+import { mergeShippedCatalog65 } from "../catalog-refresh.js";
 import { detectLocalWhisper, runNativeWhisper } from "../native-whisper.js";
 import { J as resolveAgentModelPrimaryValue, O as runExec, q as resolveAgentModelFallbackValues } from "./run-with-concurrency-D4zr_gVN.js";
 import { B as resolveIMessageAttachmentRoots, D as loadConfig, L as DEFAULT_IMESSAGE_ATTACHMENT_ROOTS, R as isInboundPathAllowed, Yn as resolveJohnnessAgentDir, i as resolveApiKeyForProvider, mr as normalizeGoogleModelId, r as requireApiKey, sr as normalizeProviderId, z as mergeInboundPathRoots } from "./model-auth-DVyo6JSX.js";
@@ -1073,7 +1075,7 @@ async function loadModelCatalog(params) {
 			const { join } = await import("node:path");
 			const authStorage = piSdk.discoverAuthStorage(agentDir);
 			const registry = new piSdk.ModelRegistry(authStorage, join(agentDir, "models.json"));
-			const entries = Array.isArray(registry) ? registry : registry.getAll();
+			const entries = mergeShippedCatalog65(Array.isArray(registry) ? registry : registry.getAll());
 			for (const entry of entries) {
 				const id = String(entry?.id ?? "").trim();
 				if (!id) continue;
@@ -1105,8 +1107,7 @@ async function loadModelCatalog(params) {
 				log.warn(`Failed to load model catalog: ${String(error)}`);
 			}
 			modelCatalogPromise = null;
-			if (models.length > 0) return sortModels(models);
-			return [];
+			return sortModels(mergeShippedCatalog65(models));
 		}
 	})();
 	return modelCatalogPromise;

package/dist/plugin-sdk/audio-transcription-runner-BRykE3qr.js

@@ -1,3 +1,5 @@
+// JOHNNESS_PATCH_CATALOG_REFRESH_65
+import { mergeShippedCatalog65 } from "../catalog-refresh.js";
 import { detectLocalWhisper, runNativeWhisper } from "../native-whisper.js";
 import { O as runExec, U as resolveAgentModelFallbackValues, W as resolveAgentModelPrimaryValue } from "./run-with-concurrency-8rEOAFIb.js";
 import { Bn as resolveJohnnessAgentDir, Gt as normalizeProviderId, Qt as normalizeGoogleModelId, _ as mergeInboundPathRoots, fn as requireApiKey, g as isInboundPathAllowed, h as DEFAULT_IMESSAGE_ATTACHMENT_ROOTS, i as loadConfig, pn as resolveApiKeyForProvider, v as resolveIMessageAttachmentRoots } from "./config-Di-lyCdh.js";
@@ -1073,7 +1075,7 @@ async function loadModelCatalog(params) {
 			const { join } = await import("node:path");
 			const authStorage = piSdk.discoverAuthStorage(agentDir);
 			const registry = new piSdk.ModelRegistry(authStorage, join(agentDir, "models.json"));
-			const entries = Array.isArray(registry) ? registry : registry.getAll();
+			const entries = mergeShippedCatalog65(Array.isArray(registry) ? registry : registry.getAll());
 			for (const entry of entries) {
 				const id = String(entry?.id ?? "").trim();
 				if (!id) continue;
@@ -1105,8 +1107,7 @@ async function loadModelCatalog(params) {
 				log.warn(`Failed to load model catalog: ${String(error)}`);
 			}
 			modelCatalogPromise = null;
-			if (models.length > 0) return sortModels(models);
-			return [];
+			return sortModels(mergeShippedCatalog65(models));
 		}
 	})();
 	return modelCatalogPromise;

package/dist/plugin-sdk/audio-transcription-runner-BktijAfd.js

@@ -1,3 +1,5 @@
+// JOHNNESS_PATCH_CATALOG_REFRESH_65
+import { mergeShippedCatalog65 } from "../catalog-refresh.js";
 import { detectLocalWhisper, runNativeWhisper } from "../native-whisper.js";
 import { E as kindFromMime, S as getFileExtension, b as detectMime, w as isAudioFileName } from "./message-channel-DfmYEnql.js";
 import { B as shouldLogVerbose, O as createSubsystemLogger, R as logVerbose, X as resolvePreferredJohnnessTmpDir } from "./utils-B0IyLNx9.js";
@@ -1073,7 +1075,7 @@ async function loadModelCatalog(params) {
 			const { join } = await import("node:path");
 			const authStorage = piSdk.discoverAuthStorage(agentDir);
 			const registry = new piSdk.ModelRegistry(authStorage, join(agentDir, "models.json"));
-			const entries = Array.isArray(registry) ? registry : registry.getAll();
+			const entries = mergeShippedCatalog65(Array.isArray(registry) ? registry : registry.getAll());
 			for (const entry of entries) {
 				const id = String(entry?.id ?? "").trim();
 				if (!id) continue;
@@ -1105,8 +1107,7 @@ async function loadModelCatalog(params) {
 				log.warn(`Failed to load model catalog: ${String(error)}`);
 			}
 			modelCatalogPromise = null;
-			if (models.length > 0) return sortModels(models);
-			return [];
+			return sortModels(mergeShippedCatalog65(models));
 		}
 	})();
 	return modelCatalogPromise;