@agent-proxy/gateway 0.11.1 → 0.11.3

package/README.md

@@ -26,8 +26,7 @@ agent-proxy install
 ```
 
 默认连接本机上游 `http://127.0.0.1:8317/v1`，网关端口为 `8320`。
-默认运行目录是 `~/.agent-proxy-gateway`。首次从旧默认目录安装时，
-`install` 会合并用户设置并复制受管文件，保留旧目录；自定义实例目录不自动迁移。
+默认运行目录是 `~/.agent-proxy-gateway`。
 按提示输入 API Key 并选择要在 Codex 中显示的模型：
 
 - `↑` / `↓` 移动，空格勾选，回车确认。

package/dist/index.js

@@ -13,7 +13,7 @@ var __export = (target, all) => {
 
 // src/cli.ts
 import fs21 from "fs";
-import path14 from "path";
+import path15 from "path";
 import { createHash as createHash3 } from "crypto";
 import { execFileSync as execFileSync5 } from "child_process";
 import bytes2 from "bytes";
@@ -230,10 +230,7 @@ function managedCatalogFiles(paths) {
   return [
     catalogFileFor(paths, "cliproxy"),
     catalogFileFor(paths, "newapi"),
-    path2.join(paths.runtimeHome, "codex-catalog.json"),
-    path2.join(paths.runtimeHome, "zcode-catalog.json"),
-    path2.join(paths.runtimeHome, "codebuddy-catalog.json"),
-    path2.join(paths.runtimeHome, "workbuddy-catalog.json")
+    path2.join(paths.runtimeHome, "codex-catalog.json")
   ];
 }
 
@@ -1027,13 +1024,15 @@ function migrateManagedDefaultPaths(config, legacyHome, nextHome) {
     result.model_merge_json = path6.join(nextHome, "models.json");
   return result;
 }
-function managedEntry(name) {
-  return ["config.json", "state.json", "models.json", "models-cache.json", "ui-token", "logs", "gateway.log", "gateway.error.log", "webui.log"].includes(name) || /^(?:cliproxy|newapi|codex|zcode|codebuddy(?:-(?:cn|intl))?|workbuddy(?:-(?:cn|intl))?|qoder(?:-(?:cn|intl))?|agy|opencode-zen)-(?:catalog|metadata)\.json$/.test(name) || /^gateway-\d[\dT:_-]*\.log$/.test(name) || /^(?:config|state)\.json\.(?:bak|backup)[\w.-]*$/.test(name);
-}
 function prepareDefaultInstallMigration(paths, env = process.env, platform = process.platform, launchctlExecutor, manualCodexConfig = false) {
   if (env[RUNTIME_HOME_ENV]?.trim() || realPathOrResolve(paths.runtimeHome) !== realPathOrResolve(path6.join(paths.home, DEFAULT_RUNTIME_DIRECTORY)))
     return;
   const legacyPaths = resolvePaths({ ...env, HOME: paths.home, CODEX_CLIPROXY_HOME: path6.join(paths.home, LEGACY_RUNTIME_DIRECTORY) });
+  const legacyRoot = entryStat(legacyPaths.runtimeHome);
+  if (!legacyRoot || legacyRoot.isSymbolicLink())
+    return;
+  if (!legacyRoot.isDirectory())
+    throw new Error(`Migration source is not a directory: ${legacyPaths.runtimeHome}; preserve this entry and repair it before retrying install`);
   const legacyConfig = readObject(legacyPaths.gatewayConfig);
   const legacyState = readObject(legacyPaths.stateFile);
   if (!legacyConfig && !legacyState)
@@ -1064,10 +1063,9 @@ function prepareDefaultInstallMigration(paths, env = process.env, platform = pro
       completeMigration();
     },
     apply() {
-      const originalEntries = new Set(fs7.existsSync(paths.runtimeHome) ? fs7.readdirSync(paths.runtimeHome) : []);
       const snapshots = new Map;
       const created = new Set;
-      const createdDirectories = new Set;
+      const createdDirectories = new Map;
       let restoreOwner;
       let restoreWebUi;
       let credentialWritten = false;
@@ -1076,11 +1074,13 @@ function prepareDefaultInstallMigration(paths, env = process.env, platform = pro
         if (stat) {
           if (!stat.isDirectory())
             throw new Error(`Migration target is not a directory: ${directory}`);
-          return;
+          return false;
         }
         ensureDirectory(path6.dirname(directory));
         fs7.mkdirSync(directory, { mode });
-        createdDirectories.add(directory);
+        createdDirectories.set(directory, mode);
+        fs7.chmodSync(directory, mode);
+        return true;
       };
       const capture = (file) => {
         if (snapshots.has(file) || created.has(file))
@@ -1094,22 +1094,26 @@ function prepareDefaultInstallMigration(paths, env = process.env, platform = pro
           created.add(file);
       };
       const copy = (source, target) => {
+        if (entryStat(target))
+          return;
         const stat = fs7.lstatSync(source);
         if (stat.isSymbolicLink())
-          throw new Error(`Managed migration source is a symbolic link: ${source}; repair it before retrying install`);
+          return;
         if (stat.isDirectory()) {
-          ensureDirectory(target, stat.mode & 511);
+          const mode = stat.mode & 511;
+          if (!ensureDirectory(target, mode | 448))
+            return;
+          createdDirectories.set(target, mode);
           for (const name of fs7.readdirSync(source))
             copy(path6.join(source, name), path6.join(target, name));
+          fs7.chmodSync(target, mode);
         } else if (stat.isFile()) {
-          capture(target);
-          if (!snapshots.has(target)) {
-            ensureDirectory(path6.dirname(target));
-            fs7.copyFileSync(source, target, fs7.constants.COPYFILE_EXCL);
-            fs7.chmodSync(target, stat.mode & 511);
-          }
+          ensureDirectory(path6.dirname(target));
+          fs7.copyFileSync(source, target, fs7.constants.COPYFILE_EXCL);
+          created.add(target);
+          fs7.chmodSync(target, stat.mode & 511);
         } else
-          throw new Error(`Managed migration source is not a regular file: ${source}`);
+          throw new Error(`Migration source is not a regular file: ${source}; preserve this entry and repair it before retrying install`);
       };
       const rollback = () => {
         const errors = [];
@@ -1122,29 +1126,42 @@ function prepareDefaultInstallMigration(paths, env = process.env, platform = pro
         };
         restore(() => restoreWebUi?.());
         restore(() => restoreOwner?.());
+        for (const [directory, mode] of createdDirectories)
+          restore(() => {
+            const stat = entryStat(directory);
+            if (stat?.isDirectory())
+              fs7.chmodSync(directory, mode | 448);
+          });
         if (credentialWritten)
           restore(() => createApiKeyStore(platform, paths.credentialsFile).delete());
         for (const [file, snapshot] of snapshots)
           restore(() => atomicWrite(file, snapshot.content, snapshot.mode));
         for (const file of created)
           restore(() => fs7.rmSync(file, { force: true }));
-        if (fs7.existsSync(paths.runtimeHome)) {
-          for (const name of fs7.readdirSync(paths.runtimeHome)) {
-            if (!originalEntries.has(name) && managedEntry(name))
-              restore(() => fs7.rmSync(path6.join(paths.runtimeHome, name), { recursive: true, force: true }));
-          }
-        }
-        for (const directory of [...createdDirectories].reverse()) {
-          if (fs7.existsSync(directory) && fs7.readdirSync(directory).length === 0)
-            restore(() => fs7.rmdirSync(directory));
-        }
+        for (const [directory, mode] of [...createdDirectories].reverse())
+          restore(() => {
+            const stat = entryStat(directory);
+            if (!stat?.isDirectory())
+              return;
+            if (fs7.readdirSync(directory).length === 0)
+              fs7.rmdirSync(directory);
+            else
+              fs7.chmodSync(directory, mode);
+          });
         if (errors.length)
           throw new Error(`Default installation restore incomplete: ${errors.join("; ")}`);
       };
       try {
-        ensureDirectory(paths.runtimeHome, fs7.statSync(legacyPaths.runtimeHome).mode & 511);
-        for (const name of fs7.readdirSync(legacyPaths.runtimeHome).filter(managedEntry))
-          copy(path6.join(legacyPaths.runtimeHome, name), path6.join(paths.runtimeHome, name));
+        const sourceRoot = entryStat(legacyPaths.runtimeHome);
+        if (!sourceRoot?.isDirectory())
+          throw new Error(`Migration source is not a directory: ${legacyPaths.runtimeHome}; preserve this entry and repair it before retrying install`);
+        const runtimeMode = sourceRoot.mode & 511;
+        if (ensureDirectory(paths.runtimeHome, runtimeMode | 448))
+          createdDirectories.set(paths.runtimeHome, runtimeMode);
+        for (const name of fs7.readdirSync(legacyPaths.runtimeHome)) {
+          if (name !== "credentials.json")
+            copy(path6.join(legacyPaths.runtimeHome, name), path6.join(paths.runtimeHome, name));
+        }
         capture(paths.gatewayConfig);
         const backupStamp = Date.now().toString();
         for (const file of [paths.gatewayConfig, paths.stateFile]) {
@@ -1197,6 +1214,8 @@ function prepareDefaultInstallMigration(paths, env = process.env, platform = pro
           atomicWrite(paths.stateFile, `${JSON.stringify(installedState, null, 2)}
 `, fs7.statSync(paths.stateFile).mode & 511);
         };
+        if (createdDirectories.has(paths.runtimeHome))
+          fs7.chmodSync(paths.runtimeHome, runtimeMode);
         return rollback;
       } catch (error) {
         try {
@@ -4437,11 +4456,12 @@ async function rebuildCatalog(paths, config, proxyModels, modelsConfigFile) {
 
 // src/gateway-composition.ts
 import { PluginRegistry as PluginRegistry2, compileModelPattern } from "@agent-proxy/plugin-api";
-import { createZcodePlugin, ZCODE_MODEL_PATTERNS } from "@agent-proxy/zcode";
-import { createCodebuddyPlugin, CODEBUDDY_MODEL_PATTERNS } from "@agent-proxy/codebuddy";
-import { createQoderPlugin, QODER_MODEL_PATTERNS } from "@agent-proxy/qoder";
-import { createAgyPlugin, AGY_MODEL_PATTERNS } from "@agent-proxy/agy";
-import { createOpencodeZenPlugin, OPENCODE_ZEN_MODEL_PATTERNS } from "@agent-proxy/opencode-zen";
+import path12 from "path";
+import { createZcodePlugin, ZCODE_MODEL_PATTERNS, ZCODE_RUNTIME_ARTIFACTS } from "@agent-proxy/zcode";
+import { createCodebuddyPlugin, CODEBUDDY_MODEL_PATTERNS, CODEBUDDY_RUNTIME_ARTIFACTS } from "@agent-proxy/codebuddy";
+import { createQoderPlugin, QODER_MODEL_PATTERNS, QODER_RUNTIME_ARTIFACTS } from "@agent-proxy/qoder";
+import { createAgyPlugin, AGY_MODEL_PATTERNS, AGY_RUNTIME_ARTIFACTS } from "@agent-proxy/agy";
+import { createOpencodeZenPlugin, OPENCODE_ZEN_MODEL_PATTERNS, OPENCODE_ZEN_RUNTIME_ARTIFACTS } from "@agent-proxy/opencode-zen";
 
 // src/process-log.ts
 import fs12 from "fs";
@@ -5377,10 +5397,10 @@ function writeStaticCatalog(paths, config, adapterModels, ownsModel = () => fals
 `);
   return catalog;
 }
-function applyModelCatalogToml(source, active, paths, catalogFile) {
+function applyModelCatalogToml(source, active, paths, catalogFile, managedFiles) {
   const configuredCatalog = readRootTomlString(source, "model_catalog_json");
   const legacyCatalogFile = path10.join(paths.codexHome, "cliproxy-catalog.json");
-  if (configuredCatalog && ![...managedCatalogFiles(paths), codexCatalogFile(paths), legacyCatalogFile].includes(configuredCatalog)) {
+  if (configuredCatalog && ![...managedFiles, codexCatalogFile(paths), legacyCatalogFile].includes(configuredCatalog)) {
     throw new Error(`Refusing to replace unmanaged model_catalog_json: ${configuredCatalog}`);
   }
   if (configuredCatalog === undefined && hasRootTomlKey(source, "model_catalog_json")) {
@@ -5392,7 +5412,11 @@ function applyModelCatalogToml(source, active, paths, catalogFile) {
   };
 }
 var hash = (source) => createHash2("sha256").update(source).digest("hex");
-async function updateCodexModelCatalog(paths, config, catalogSource, { refreshAdapters = false, manual: manualOverride } = {}) {
+async function updateCodexModelCatalog(paths, config, catalogSource, {
+  refreshAdapters = false,
+  manual: manualOverride,
+  managedFiles = managedCatalogFiles(paths)
+} = {}) {
   const stateSource = fs14.existsSync(paths.stateFile) ? fs14.readFileSync(paths.stateFile, "utf8") : undefined;
   const state = stateSource === undefined ? {} : JSON.parse(stateSource);
   const manual = manualOverride ?? state.codexConfigManaged === false;
@@ -5400,7 +5424,7 @@ async function updateCodexModelCatalog(paths, config, catalogSource, { refreshAd
   const source = tomlExisted ? fs14.readFileSync(paths.configToml, "utf8") : "";
   const catalogPath = codexCatalogFile(paths);
   const active = config.upstreamOnly === true;
-  const { patchedToml, previousCatalog } = manual ? { patchedToml: source, previousCatalog: readRootTomlString(source, "model_catalog_json") ?? null } : applyModelCatalogToml(source, active, paths, catalogPath);
+  const { patchedToml, previousCatalog } = manual ? { patchedToml: source, previousCatalog: readRootTomlString(source, "model_catalog_json") ?? null } : applyModelCatalogToml(source, active, paths, catalogPath, managedFiles);
   const tomlChanged = patchedToml !== source;
   const previousSnapshot = fs14.existsSync(catalogPath) ? fs14.readFileSync(catalogPath, "utf8") : undefined;
   let snapshotWritten = false;
@@ -7043,6 +7067,18 @@ var installedPatterns = [
 function isInstalledPluginModel(model) {
   return installedPatterns.some((pattern) => Boolean(pattern.match(model)));
 }
+function installedPluginArtifactFiles(runtimePaths = resolvePaths()) {
+  return [
+    ...ZCODE_RUNTIME_ARTIFACTS,
+    ...CODEBUDDY_RUNTIME_ARTIFACTS,
+    ...QODER_RUNTIME_ARTIFACTS,
+    ...AGY_RUNTIME_ARTIFACTS,
+    ...OPENCODE_ZEN_RUNTIME_ARTIFACTS
+  ].map((name) => path12.join(runtimePaths.runtimeHome, name));
+}
+function managedRuntimeCatalogFiles(runtimePaths = resolvePaths()) {
+  return [...managedCatalogFiles(runtimePaths), ...installedPluginArtifactFiles(runtimePaths)];
+}
 function createConfiguredPluginRegistry(config, dependencies = {}, processLog, runtimePaths = resolvePaths(), apiKey, catalogMode = config.upstreamOnly === true ? "manual" : "dynamic") {
   config = { ...config };
   const host = createGatewayHostServices(config, processLog, runtimePaths, apiKey);
@@ -7164,16 +7200,19 @@ function rebuildStaticCatalog2(paths, config, dependencies = {}, options = {}) {
   return rebuildStaticCatalog(paths, config, createCatalogSource(config, dependencies), options);
 }
 function updateCodexModelCatalog2(paths, config, dependencies = {}, options = {}) {
-  return updateCodexModelCatalog(paths, config, createCatalogSource(config, dependencies), options);
+  return updateCodexModelCatalog(paths, config, createCatalogSource(config, dependencies), {
+    ...options,
+    managedFiles: managedRuntimeCatalogFiles(paths)
+  });
 }
 // src/webui.ts
 import fs20 from "fs";
-import path13 from "path";
+import path14 from "path";
 import { randomBytes } from "crypto";
 
 // src/app-server.ts
 import fs18 from "fs";
-import path12 from "path";
+import path13 from "path";
 import { execFileSync as execFileSync4 } from "child_process";
 import { dlopen } from "bun:ffi";
 var GLOBAL_OPTIONS_WITH_VALUE = new Set([
@@ -7394,9 +7433,9 @@ function parseWindowsCommandLine(commandLine) {
 }
 function windowsSystemPath(...segments) {
   const systemRoot = process.env.SystemRoot || process.env.windir;
-  if (!systemRoot || !path12.win32.isAbsolute(systemRoot))
+  if (!systemRoot || !path13.win32.isAbsolute(systemRoot))
     throw new Error("Windows system root is unavailable");
-  return path12.win32.join(systemRoot, ...segments);
+  return path13.win32.join(systemRoot, ...segments);
 }
 function listWindowsProcesses() {
   const powershell = windowsSystemPath("System32", "WindowsPowerShell", "v1.0", "powershell.exe");
@@ -7889,14 +7928,14 @@ var REQUEST_LOG_TAIL_BYTES = 64 * 1024;
 var REQUEST_LOG_DEFAULT_PAGE_SIZE = 100;
 var REQUEST_LOG_MAX_PAGE_SIZE = 500;
 var RESTART_DELAY_MS = 400;
-var UI_HTML_PATH = path13.resolve(import.meta.dir, "../dist/ui/index.html");
+var UI_HTML_PATH = path14.resolve(import.meta.dir, "../dist/ui/index.html");
 function webUiContextForInstance(configPath, defaultPaths) {
   const resolved = realPathOrResolve(configPath);
   if (resolved === realPathOrResolve(defaultPaths.gatewayConfig))
     return { paths: defaultPaths };
   return {
     paths: {
-      ...resolvePaths({ HOME: defaultPaths.home, CODEX_HOME: defaultPaths.codexHome }, path13.dirname(resolved)),
+      ...resolvePaths({ HOME: defaultPaths.home, CODEX_HOME: defaultPaths.codexHome }, path14.dirname(resolved)),
       gatewayConfig: resolved
     },
     instanceOnly: true
@@ -8133,7 +8172,7 @@ function configResponse(paths, providerDeps, instanceOnly = false) {
       excludedOther
     },
     detected: {
-      zcode: zcodeConfigPresent(providerDeps?.zcodeHome ?? path13.join(paths.home, ".zcode")),
+      zcode: zcodeConfigPresent(providerDeps?.zcodeHome ?? path14.join(paths.home, ".zcode")),
       codebuddy: codebuddyCredentialsPresent(codebuddyAuthDir),
       codebuddyAccountLabel: accountLabel ?? null,
       qoder: qoderSources.length > 0,
@@ -8193,7 +8232,7 @@ function requestLogsResponse(config, paths, url) {
   }
   const all = names.filter((name) => isRequestLogName(name)).flatMap((name) => {
     try {
-      const stat = fs20.statSync(path13.join(dir, name));
+      const stat = fs20.statSync(path14.join(dir, name));
       return [{
         name,
         size: stat.size,
@@ -8871,7 +8910,7 @@ function timestamp() {
   return new Date().toISOString().replace(/[-:]/g, "").slice(0, 15).replace("T", "");
 }
 function backupConfig(file) {
-  fs21.mkdirSync(path14.dirname(file), { recursive: true });
+  fs21.mkdirSync(path15.dirname(file), { recursive: true });
   const existed = fs21.existsSync(file);
   const backup = `${file}.bak-cliproxy-gateway-${timestamp()}`;
   if (existed)
@@ -8885,7 +8924,7 @@ function hash2(contents) {
 }
 function restoreBackup(file, record) {
   if (record.existed) {
-    fs21.mkdirSync(path14.dirname(file), { recursive: true });
+    fs21.mkdirSync(path15.dirname(file), { recursive: true });
     fs21.copyFileSync(record.backup, file);
   } else {
     fs21.rmSync(file, { force: true });
@@ -8947,12 +8986,12 @@ function removeManagedRuntimeFiles(paths, options = {}) {
   for (const file of [
     ...options.preserveGatewayConfig ? [] : [paths.gatewayConfig],
     ...options.preserveState ? [] : [paths.stateFile],
-    ...managedCatalogFiles(paths),
-    path14.join(paths.runtimeHome, "catalog-metadata.json"),
+    ...managedRuntimeCatalogFiles(paths),
+    path15.join(paths.runtimeHome, "catalog-metadata.json"),
     paths.modelMergeFile,
     paths.stdoutLog,
-    path14.join(paths.runtimeHome, "webui.log"),
-    path14.join(paths.runtimeHome, LEGACY_STDERR_LOG)
+    path15.join(paths.runtimeHome, "webui.log"),
+    path15.join(paths.runtimeHome, LEGACY_STDERR_LOG)
   ]) {
     fs21.rmSync(file, { force: true });
   }
@@ -9173,7 +9212,7 @@ async function installCurrent(options, completeMigration) {
   applyRoutingMode(config, paths, upstreamOnly);
   const installSelector = stringOption(options, "select");
   if (!manualCodexConfig) {
-    applyModelCatalogToml(currentToml, upstreamOnly && !isSelectNone(installSelector), paths, codexCatalogFile(paths));
+    applyModelCatalogToml(currentToml, upstreamOnly && !isSelectNone(installSelector), paths, codexCatalogFile(paths), managedRuntimeCatalogFiles(paths));
   }
   const previousApiKey = readApiKey(true);
   const apiKey = getInstallApiKey(config, previousConfig, stringOption(options, "key-env"), {
@@ -9203,7 +9242,7 @@ async function installCurrent(options, completeMigration) {
     console.log(`Selected ${selectedModels.length} ${upstreamLabel(config)} models.`);
   }
   config.selectedModels = selectedModels;
-  const { patchedToml: modelCatalogToml } = manualCodexConfig ? { patchedToml: currentToml } : applyModelCatalogToml(currentToml, upstreamOnly, paths, codexCatalogFile(paths));
+  const { patchedToml: modelCatalogToml } = manualCodexConfig ? { patchedToml: currentToml } : applyModelCatalogToml(currentToml, upstreamOnly, paths, codexCatalogFile(paths), managedRuntimeCatalogFiles(paths));
   const previousState = switching ? fs21.readFileSync(paths.stateFile, "utf8") : undefined;
   const priorState = switching ? loadJson(paths.stateFile) : undefined;
   const previousManaged = priorState ? isCodexConfigManaged(priorState) && priorState.uninstallClientRestored !== true : true;
@@ -9416,7 +9455,7 @@ async function uninstall(options) {
     assertCodexHomeAvailable(paths, false);
   uninstallLaunchAgent(paths.launchAgent);
   uninstallLaunchAgent(paths.webUiLaunchAgent);
-  const legacyCatalogFile = path14.join(paths.codexHome, "cliproxy-catalog.json");
+  const legacyCatalogFile = path15.join(paths.codexHome, "cliproxy-catalog.json");
   if (restoresClient) {
     const currentToml = fs21.existsSync(paths.configToml) ? fs21.readFileSync(paths.configToml, "utf8") : "";
     restoreManagedCodexToml(paths, state, currentToml);
@@ -9607,9 +9646,9 @@ async function models(options) {
   }
   const manualCodexConfig = fs21.existsSync(paths.stateFile) && !isCodexConfigManaged(loadJson(paths.stateFile));
   const source = fs21.existsSync(paths.configToml) ? fs21.readFileSync(paths.configToml, "utf8") : "";
-  const legacyCatalogFile = path14.join(paths.codexHome, "cliproxy-catalog.json");
+  const legacyCatalogFile = path15.join(paths.codexHome, "cliproxy-catalog.json");
   if (!manualCodexConfig) {
-    applyModelCatalogToml(source, upstreamOnly, paths, codexCatalogFile(paths));
+    applyModelCatalogToml(source, upstreamOnly, paths, codexCatalogFile(paths), managedRuntimeCatalogFiles(paths));
   }
   const { modelsConfigFile, rules } = await loadModelOverrideRules(paths, config, Boolean(modelMergeJson));
   const selectNone = isSelectNone(selector);
@@ -9703,7 +9742,7 @@ function serve(options) {
   if (!fs21.existsSync(configPath))
     throw new Error(`Gateway config not found: ${configPath}`);
   const config = loadGatewayConfig(configPath);
-  const isProductionInstance = configPath === realPathOrResolve(path14.join(paths.runtimeHome, "config.json"));
+  const isProductionInstance = configPath === realPathOrResolve(path15.join(paths.runtimeHome, "config.json"));
   const processLog = isProductionInstance ? { file: paths.stdoutLog, maxBytes: config.maxGatewayLogBytes ?? 0 } : undefined;
   startGateway(config, loadRealtimeProviderMode(paths.configToml), paths.upstreamModelsCacheFile, { codexModelsCacheFile: paths.modelsCacheFile }, processLog, { codexModelsCacheFile: paths.modelsCacheFile }, { codexModelsCacheFile: paths.modelsCacheFile }, { codexModelsCacheFile: paths.modelsCacheFile }, { codexModelsCacheFile: paths.modelsCacheFile });
   if (isProductionInstance)
@@ -9735,7 +9774,7 @@ async function waitForWebUi(port, timeoutMs = 1e4) {
   throw new Error(`Web UI did not come up on port ${port} within ${timeoutMs / 1000}s`);
 }
 function webUiLogPath(paths) {
-  return path14.join(paths.runtimeHome, "webui.log");
+  return path15.join(paths.runtimeHome, "webui.log");
 }
 function runWebUiForeground(paths, config, openBrowser) {
   const ctx = webUiContextForInstance(paths.gatewayConfig, paths);
@@ -10018,7 +10057,7 @@ async function configCommand(options) {
   const managesCodex = !fs21.existsSync(paths.stateFile) || isCodexConfigManaged(loadJson(paths.stateFile));
   if (managesCodex) {
     const source = fs21.existsSync(paths.configToml) ? fs21.readFileSync(paths.configToml, "utf8") : "";
-    applyModelCatalogToml(source, config.upstreamOnly === true, paths, codexCatalogFile(paths));
+    applyModelCatalogToml(source, config.upstreamOnly === true, paths, codexCatalogFile(paths), managedRuntimeCatalogFiles(paths));
   }
   if (zcodeTarget !== undefined) {
     config.zcode = zcodeTarget;
@@ -10157,7 +10196,7 @@ function ownsManagedCodexConfig(paths, state, legacyBaseUrl) {
 function syncGatewayConfigFile(paths, configFile = paths.gatewayConfig) {
   if (!fs21.existsSync(configFile))
     return;
-  const managesState = realPathOrResolve(configFile) === realPathOrResolve(path14.join(paths.runtimeHome, "config.json"));
+  const managesState = realPathOrResolve(configFile) === realPathOrResolve(path15.join(paths.runtimeHome, "config.json"));
   const raw = loadJson(configFile);
   if (!isJsonObject(raw))
     throw new Error(`Gateway config must be a JSON object: ${configFile}`);
@@ -10320,7 +10359,7 @@ async function runCli(args) {
   }
   const configOption = command === "serve" ? stringOption(options, "config") : undefined;
   const configPath = configOption ? realPathOrResolve(configOption) : undefined;
-  let paths = configPath ? { ...resolvePaths(process.env, path14.dirname(configPath)), gatewayConfig: configPath } : resolvePaths();
+  let paths = configPath ? { ...resolvePaths(process.env, path15.dirname(configPath)), gatewayConfig: configPath } : resolvePaths();
   const migration = command === "install" ? prepareDefaultInstallMigration(paths) : undefined;
   paths = migration?.paths ?? resolveInstalledCodexPaths(paths);
   return runWithInstancePaths(paths, async () => {