@agent-proxy/gateway 0.20.3 → 0.20.4

package/dist/index.js

@@ -220,8 +220,14 @@ function resolvePaths(env, runtimeHomeOverride) {
     logDir: path2.join(runtimeHome, "logs"),
     uiTokenFile: path2.join(runtimeHome, "ui-token"),
     credentialsFile: path2.join(runtimeHome, "credentials.json"),
-    launchAgent: runtimeHomeOverride ? path2.join(runtimeHome, "Library", "LaunchAgents", "codex-cliproxy-gateway-temp.plist") : path2.join(home, "Library", "LaunchAgents", `codex-cliproxy-gateway${instanceSuffix}.plist`),
-    webUiLaunchAgent: runtimeHomeOverride ? path2.join(runtimeHome, "Library", "LaunchAgents", "codex-cliproxy-webui-temp.plist") : path2.join(home, "Library", "LaunchAgents", `codex-cliproxy-webui${instanceSuffix}.plist`)
+    launchAgent: runtimeHomeOverride ? path2.join(runtimeHome, "Library", "LaunchAgents", "agent-proxy-gateway-temp.plist") : path2.join(home, "Library", "LaunchAgents", `agent-proxy-gateway${instanceSuffix}.plist`),
+    webUiLaunchAgent: runtimeHomeOverride ? path2.join(runtimeHome, "Library", "LaunchAgents", "agent-proxy-webui-temp.plist") : path2.join(home, "Library", "LaunchAgents", `agent-proxy-webui${instanceSuffix}.plist`)
+  };
+}
+function legacyLaunchAgentPaths(paths) {
+  return {
+    legacyGatewayPlist: path2.join(paths.home, "Library", "LaunchAgents", `codex-cliproxy-gateway${paths.instanceSuffix}.plist`),
+    legacyWebUiPlist: path2.join(paths.home, "Library", "LaunchAgents", `codex-cliproxy-webui${paths.instanceSuffix}.plist`)
   };
 }
 function catalogFileFor(paths, upstreamType) {
@@ -264,7 +270,8 @@ import path6 from "path";
 import fs3 from "fs";
 import path3 from "path";
 import { randomUUID } from "crypto";
-var OWNER_FILE = ".codex-cliproxy-owner.json";
+var OWNER_FILE = ".agent-proxy-owner.json";
+var LEGACY_OWNER_FILE = ".codex-cliproxy-owner.json";
 function readState(file) {
   if (!fs3.existsSync(file))
     return;
@@ -324,6 +331,36 @@ function resolveInstalledCodexPaths(paths, env = process.env) {
 function ownerPath(paths) {
   return path3.join(paths.codexHome, OWNER_FILE);
 }
+function legacyOwnerPath(paths) {
+  return path3.join(paths.codexHome, LEGACY_OWNER_FILE);
+}
+function readOwnerAny(paths) {
+  const file = ownerPath(paths);
+  if (!fs3.existsSync(file))
+    return readOwner(legacyOwnerPath(paths));
+  const owner = readOwner(file);
+  const legacy = legacyOwnerPath(paths);
+  if (fs3.existsSync(legacy) && readOwner(legacy) !== owner) {
+    throw new Error(`Codex ownership conflict between ${file} and ${legacy}; preserve both files and repair their ownership before retrying install`);
+  }
+  return owner;
+}
+function adoptOwnerFile(paths, acceptableLegacyOwner) {
+  const file = ownerPath(paths);
+  const legacy = legacyOwnerPath(paths);
+  if (!fs3.existsSync(legacy))
+    return;
+  if (!fs3.existsSync(file)) {
+    fs3.renameSync(legacy, file);
+    return;
+  }
+  const current = readOwner(file);
+  const previous = readOwner(legacy);
+  if (previous !== current && previous !== acceptableLegacyOwner) {
+    throw new Error(`Codex ownership conflict between ${file} and ${legacy}; preserve both files and repair their ownership before retrying install`);
+  }
+  fs3.rmSync(legacy);
+}
 function readOwner(file) {
   if (!fs3.existsSync(file))
     return;
@@ -338,10 +375,7 @@ function readOwner(file) {
   }
 }
 function codexOwnerRuntimeHome(paths) {
-  const file = ownerPath(paths);
-  if (!fs3.existsSync(file))
-    return;
-  return readOwner(file);
+  return readOwnerAny(paths);
 }
 function assertOwner(paths, owner) {
   if (owner && owner !== realPathOrResolve(paths.runtimeHome)) {
@@ -356,9 +390,10 @@ function xmlValue(plist, key) {
   return match?.[1] === undefined ? undefined : decodeXml(match[1]);
 }
 function resolveLegacyServiceCodexPaths(paths, env) {
-  if (!fs3.existsSync(paths.launchAgent))
+  const plistPath = fs3.existsSync(paths.launchAgent) ? paths.launchAgent : legacyLaunchAgentPaths(paths).legacyGatewayPlist;
+  if (!fs3.existsSync(plistPath))
     return resolveInstalledCodexPaths(paths, env);
-  const plist = fs3.readFileSync(paths.launchAgent, "utf8");
+  const plist = fs3.readFileSync(plistPath, "utf8");
   const args = plist.match(/<key>\s*ProgramArguments\s*<\/key>\s*<array>([\s\S]*?)<\/array>/)?.[1];
   const configArg = args?.match(/<string>--config<\/string>\s*<string>([^<]*)<\/string>/)?.[1];
   if (!configArg || decodeXml(configArg) !== paths.gatewayConfig)
@@ -380,8 +415,9 @@ function assertLegacyOwners(paths) {
   const clientForState = (state) => typeof state.codexHome === "string" ? normalizeCodexHome(state.codexHome, paths.home) : backupCodexHome(state, paths.home) ?? realPathOrResolve(path3.join(paths.home, ".codex"));
   const defaultTransferred = nextDefaultState?.defaultRuntimeMigratedFrom === realPathOrResolve(defaultRuntime) && legacyDefaultState !== undefined && clientForState(nextDefaultState) === clientForState(legacyDefaultState) && clientForState(nextDefaultState) === realPathOrResolve(paths.codexHome);
   const migratedFrom = readState(paths.stateFile)?.defaultRuntimeMigratedFrom;
-  const owner = readOwner(ownerPath(paths));
-  const ownerMigration = owner ? JSON.parse(fs3.readFileSync(ownerPath(paths), "utf8")).defaultRuntimeMigratedFrom : undefined;
+  const owner = readOwnerAny(paths);
+  const ownerFile = fs3.existsSync(ownerPath(paths)) ? ownerPath(paths) : legacyOwnerPath(paths);
+  const ownerMigration = owner ? JSON.parse(fs3.readFileSync(ownerFile, "utf8")).defaultRuntimeMigratedFrom : undefined;
   const migrated = defaultTransferred || (migratedFrom === realPathOrResolve(defaultRuntime) || ownerMigration === realPathOrResolve(defaultRuntime)) && owner === realPathOrResolve(paths.runtimeHome);
   for (const runtimeHome of [nextDefaultRuntime, defaultRuntime]) {
     if (migrated && runtimeHome === defaultRuntime)
@@ -397,7 +433,7 @@ function assertLegacyOwners(paths) {
   if (!fs3.existsSync(agentsDir))
     return;
   for (const entry of fs3.readdirSync(agentsDir)) {
-    if (!/^codex-cliproxy-gateway(?:-[0-9a-f]{8})?\.plist$/.test(entry))
+    if (!/^(?:codex-cliproxy|agent-proxy)-gateway(?:-[0-9a-f]{8})?\.plist$/.test(entry))
       continue;
     const plist = fs3.readFileSync(path3.join(agentsDir, entry), "utf8");
     const args = plist.match(/<key>\s*ProgramArguments\s*<\/key>\s*<array>([\s\S]*?)<\/array>/)?.[1];
@@ -415,9 +451,10 @@ function assertLegacyOwners(paths) {
   }
 }
 function hasLegacyCodexOwnership(paths, legacyRuntimeHome) {
-  return readOwner(ownerPath(paths)) === realPathOrResolve(legacyRuntimeHome);
+  return readOwnerAny(paths) === realPathOrResolve(legacyRuntimeHome);
 }
 function migrateCodexOwnership(paths, legacyRuntimeHome) {
+  adoptOwnerFile(paths, realPathOrResolve(legacyRuntimeHome));
   const file = ownerPath(paths);
   const owner = readOwner(file);
   const current = realPathOrResolve(paths.runtimeHome);
@@ -450,11 +487,12 @@ function assertCodexHomeAvailable(paths, manual) {
   if (paths.instanceSuffix && realPathOrResolve(paths.codexHome) === realPathOrResolve(path3.join(paths.home, ".codex"))) {
     throw new Error("Custom gateway instances must use a distinct CODEX_HOME; the default ~/.codex directory cannot be managed. Use --manual-codex-config instead");
   }
-  assertOwner(paths, readOwner(ownerPath(paths)));
+  assertOwner(paths, readOwnerAny(paths));
   assertLegacyOwners(paths);
 }
 function claimCodexHome(paths) {
   assertCodexHomeAvailable(paths, false);
+  adoptOwnerFile(paths, realPathOrResolve(paths.runtimeHome));
   const file = ownerPath(paths);
   const existingOwner = readOwner(file);
   assertOwner(paths, existingOwner);
@@ -487,10 +525,11 @@ function claimCodexHome(paths) {
   };
 }
 function releaseCodexHome(paths) {
-  const file = ownerPath(paths);
-  const owner = readOwner(file);
-  if (owner === realPathOrResolve(paths.runtimeHome))
-    fs3.rmSync(file);
+  const current = realPathOrResolve(paths.runtimeHome);
+  for (const file of [ownerPath(paths), legacyOwnerPath(paths)]) {
+    if (readOwner(file) === current)
+      fs3.rmSync(file);
+  }
 }
 
 // src/keychain.ts
@@ -696,7 +735,8 @@ function deleteUpstreamApiKey(file) {
 }
 
 // src/keychain.ts
-var KEYCHAIN_SERVICE = "codex-cliproxy-gateway";
+var KEYCHAIN_SERVICE = "agent-proxy-gateway";
+var LEGACY_KEYCHAIN_SERVICE = "codex-cliproxy-gateway";
 function keychainService() {
   return KEYCHAIN_SERVICE + resolvePaths().instanceSuffix;
 }
@@ -721,7 +761,7 @@ function saveApiKeyInKeychain(apiKey, account, service, execute) {
     apiKey
   ]);
 }
-function readApiKeyFromKeychain(optional, account, service, execute) {
+function findKeychainPassword(account, service, execute) {
   try {
     return execute([
       "find-generic-password",
@@ -732,9 +772,7 @@ function readApiKeyFromKeychain(optional, account, service, execute) {
       "-w"
     ]);
   } catch {
-    if (optional)
-      return "";
-    throw new Error(`Upstream API key was not found in macOS Keychain (service: ${service})`);
+    return;
   }
 }
 function deleteApiKeyFromKeychain(account, service, execute) {
@@ -751,11 +789,28 @@ function deleteApiKeyFromKeychain(account, service, execute) {
 function createApiKeyStore(platform = process.platform, credentialsFile = resolvePaths().credentialsFile, executeKeychain = security) {
   if (platform === "darwin") {
     const account = keychainAccount();
+    const instanceSuffix = resolvePaths().instanceSuffix;
     const service = keychainService();
     return {
       save: (apiKey) => saveApiKeyInKeychain(apiKey, account, service, executeKeychain),
-      read: (optional = false) => readApiKeyFromKeychain(optional, account, service, executeKeychain),
-      delete: () => deleteApiKeyFromKeychain(account, service, executeKeychain)
+      read: (optional = false) => {
+        const current = findKeychainPassword(account, service, executeKeychain);
+        if (current !== undefined)
+          return current;
+        if (instanceSuffix === "") {
+          const legacy = findKeychainPassword(account, LEGACY_KEYCHAIN_SERVICE, executeKeychain);
+          if (legacy !== undefined)
+            return legacy;
+        }
+        if (optional)
+          return "";
+        throw new Error(`Upstream API key was not found in macOS Keychain (service: ${service})`);
+      },
+      delete: () => {
+        deleteApiKeyFromKeychain(account, service, executeKeychain);
+        if (instanceSuffix === "")
+          deleteApiKeyFromKeychain(account, LEGACY_KEYCHAIN_SERVICE, executeKeychain);
+      }
     };
   }
   return {
@@ -779,14 +834,22 @@ import fs6 from "fs";
 import path5 from "path";
 import { randomUUID as randomUUID2 } from "crypto";
 import { execFileSync as execFileSync2 } from "child_process";
-var LAUNCHD_LABEL = "codex-cliproxy-gateway";
-var WEBUI_LAUNCHD_LABEL = "codex-cliproxy-webui";
+var LAUNCHD_LABEL = "agent-proxy-gateway";
+var WEBUI_LAUNCHD_LABEL = "agent-proxy-webui";
+var LEGACY_LAUNCHD_LABEL = "codex-cliproxy-gateway";
+var LEGACY_WEBUI_LAUNCHD_LABEL = "codex-cliproxy-webui";
 function gatewayServiceLabel(instanceSuffix) {
   return `${LAUNCHD_LABEL}${instanceSuffix}`;
 }
 function webUiServiceLabel(instanceSuffix) {
   return `${WEBUI_LAUNCHD_LABEL}${instanceSuffix}`;
 }
+function legacyGatewayServiceLabel(instanceSuffix) {
+  return `${LEGACY_LAUNCHD_LABEL}${instanceSuffix}`;
+}
+function legacyWebUiServiceLabel(instanceSuffix) {
+  return `${LEGACY_WEBUI_LAUNCHD_LABEL}${instanceSuffix}`;
+}
 function xmlEscape(value) {
   return String(value).replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;").replaceAll("'", "&apos;");
 }
@@ -868,6 +931,7 @@ function startWebUiLaunchAgent(plistPath, options) {
   fs6.mkdirSync(path5.dirname(plistPath), { recursive: true });
   atomicWrite(plistPath, renderWebUiAgent(options), 420);
   const domain = launchDomain();
+  launchctl(["bootout", `${domain}/${legacyLabelForLabel(options.label, "webui")}`], true);
   launchctl(["bootout", domain, plistPath], true);
   launchctl(["bootstrap", domain, plistPath]);
   launchctl(["kickstart", `${domain}/${options.label}`]);
@@ -875,6 +939,25 @@ function startWebUiLaunchAgent(plistPath, options) {
 function launchDomain() {
   return `gui/${process.getuid?.() ?? process.geteuid?.() ?? 0}`;
 }
+function adoptLegacyLaunchAgents(options) {
+  const renamed = [];
+  for (const [legacy, next] of [[options.legacyGatewayPlist, options.gatewayPlist], [options.legacyWebUiPlist, options.webUiPlist]]) {
+    if (!fs6.existsSync(legacy) || fs6.existsSync(next))
+      continue;
+    fs6.renameSync(legacy, next);
+    renamed.push(next);
+  }
+  return renamed;
+}
+function removeLegacyLaunchAgents(options, execute = launchctl) {
+  const domain = launchDomain();
+  execute(["bootout", `${domain}/${legacyGatewayServiceLabel(options.instanceSuffix)}`], true);
+  execute(["bootout", `${domain}/${legacyWebUiServiceLabel(options.instanceSuffix)}`], true);
+  for (const plistPath of [options.legacyGatewayPlist, options.legacyWebUiPlist]) {
+    execute(["bootout", domain, plistPath], true);
+    fs6.rmSync(plistPath, { force: true });
+  }
+}
 function decodePlistString(value) {
   return value.replaceAll("&lt;", "<").replaceAll("&gt;", ">").replaceAll("&quot;", '"').replaceAll("&apos;", "'").replaceAll("&amp;", "&");
 }
@@ -882,6 +965,9 @@ function plistString(source, key) {
   const value = source.match(new RegExp(`<key>\\s*${key}\\s*</key>\\s*<string>([^<]*)</string>`))?.[1];
   return value === undefined ? undefined : decodePlistString(value);
 }
+function plistServiceLabel(source, fallback) {
+  return plistString(source, "Label") ?? fallback;
+}
 function programArguments(source) {
   const array = source.match(/<key>\s*ProgramArguments\s*<\/key>\s*<array>([\s\S]*?)<\/array>/)?.[1];
   return array ? [...array.matchAll(/<string>([^<]*)<\/string>/g)].map((value) => decodePlistString(value[1])) : [];
@@ -895,7 +981,7 @@ function prepareManagedWebUiMigration(options, execute = launchctl) {
   const gatewayArgs = programArguments(gateway);
   if (plistString(before, "CODEX_CLIPROXY_HOME") !== undefined)
     return;
-  if (plistString(before, "Label") !== WEBUI_LAUNCHD_LABEL || plistString(before, "CODEX_CLIPROXY_UI_SERVICE") !== "1" || args.length !== 3 || args[2] !== "web" || gatewayArgs[2] !== "serve" || gatewayArgs[3] !== "--config" || gatewayArgs[4] !== path5.join(options.legacyRuntimeHome, "config.json") || args[0] !== gatewayArgs[0] || args[1] !== gatewayArgs[1] || !/(?:^|\/)(?:src|dist)\/index\.(?:js|ts)$/.test(args[1]))
+  if (plistString(before, "Label") !== WEBUI_LAUNCHD_LABEL && plistString(before, "Label") !== LEGACY_WEBUI_LAUNCHD_LABEL || plistString(before, "CODEX_CLIPROXY_UI_SERVICE") !== "1" || args.length !== 3 || args[2] !== "web" || gatewayArgs[2] !== "serve" || gatewayArgs[3] !== "--config" || gatewayArgs[4] !== path5.join(options.legacyRuntimeHome, "config.json") || args[0] !== gatewayArgs[0] || args[1] !== gatewayArgs[1] || !/(?:^|\/)(?:src|dist)\/index\.(?:js|ts)$/.test(args[1]))
     return;
   let after = before.replace(/(<key>\s*ProgramArguments\s*<\/key>\s*)<array>[\s\S]*?<\/array>/, (_, prefix) => `${prefix}${plistArray([options.bunPath, options.cliPath, "web"])}`);
   for (const key of ["StandardOutPath", "StandardErrorPath"]) {
@@ -906,11 +992,12 @@ function prepareManagedWebUiMigration(options, execute = launchctl) {
   if (after === before)
     return;
   const mode = fs6.statSync(options.plistPath).mode & 511;
+  const serviceLabel = plistServiceLabel(before, WEBUI_LAUNCHD_LABEL);
   return () => {
     const domain = launchDomain();
     let status;
     try {
-      status = execute(["print", `${domain}/${WEBUI_LAUNCHD_LABEL}`]);
+      status = execute(["print", `${domain}/${serviceLabel}`]);
     } catch {}
     const running = status !== undefined && /\bstate\s*=\s*running\b/.test(status);
     const backup = `${options.plistPath}.bak-agent-proxy-migration-${randomUUID2()}`;
@@ -919,10 +1006,11 @@ function prepareManagedWebUiMigration(options, execute = launchctl) {
     let touched = false;
     const reload = () => {
       execute(["bootout", domain, options.plistPath], true);
+      execute(["bootout", `${domain}/${serviceLabel}`], true);
       if (status !== undefined) {
         execute(["bootstrap", domain, options.plistPath]);
         if (running)
-          execute(["kickstart", `${domain}/${WEBUI_LAUNCHD_LABEL}`]);
+          execute(["kickstart", `${domain}/${serviceLabel}`]);
       }
     };
     const rollback = () => {
@@ -948,11 +1036,17 @@ function prepareManagedWebUiMigration(options, execute = launchctl) {
     }
   };
 }
+function legacyLabelForLabel(label, kind = "gateway") {
+  const current = kind === "gateway" ? LAUNCHD_LABEL : WEBUI_LAUNCHD_LABEL;
+  const legacy = kind === "gateway" ? LEGACY_LAUNCHD_LABEL : LEGACY_WEBUI_LAUNCHD_LABEL;
+  return label.startsWith(current) ? legacy + label.slice(current.length) : label;
+}
 function installLaunchAgent(options) {
   fs6.mkdirSync(path5.dirname(options.plistPath), { recursive: true });
   atomicWrite(options.plistPath, renderLaunchAgent(options), 420);
   const domain = launchDomain();
   launchctl(["bootout", domain, options.plistPath], true);
+  launchctl(["bootout", `${domain}/${legacyLabelForLabel(options.label)}`], true);
   launchctl(["bootstrap", domain, options.plistPath]);
   launchctl(["kickstart", "-k", `${domain}/${options.label}`]);
 }
@@ -961,16 +1055,26 @@ function uninstallLaunchAgent(plistPath) {
   launchctl(["bootout", domain, plistPath], true);
   fs6.rmSync(plistPath, { force: true });
 }
+function loadedPlistLabel(plistPath, fallback) {
+  return plistServiceLabel(fs6.existsSync(plistPath) ? fs6.readFileSync(plistPath, "utf8") : "", fallback);
+}
 function startLaunchAgent(plistPath, label) {
   if (!fs6.existsSync(plistPath))
     throw new Error("Gateway LaunchAgent is not installed");
   const domain = launchDomain();
-  if (!launchAgentStatus(label))
+  const actual = loadedPlistLabel(plistPath, label);
+  if (!launchAgentStatus(actual))
     launchctl(["bootstrap", domain, plistPath]);
-  launchctl(["kickstart", `${domain}/${label}`]);
+  launchctl(["kickstart", `${domain}/${actual}`]);
 }
 function stopLaunchAgent(plistPath) {
-  launchctl(["bootout", launchDomain(), plistPath], true);
+  const domain = launchDomain();
+  launchctl(["bootout", domain, plistPath], true);
+  if (fs6.existsSync(plistPath)) {
+    const actual = plistServiceLabel(fs6.readFileSync(plistPath, "utf8"), "");
+    if (actual)
+      launchctl(["bootout", `${domain}/${actual}`], true);
+  }
 }
 function restartLaunchAgent(plistPath, label) {
   const domain = launchDomain();
@@ -982,8 +1086,10 @@ function restartLaunchAgent(plistPath, label) {
 function reloadLaunchAgent(plistPath, label) {
   const domain = launchDomain();
   launchctl(["bootout", domain, plistPath], true);
+  launchctl(["bootout", `${domain}/${label}`], true);
   launchctl(["bootstrap", domain, plistPath]);
-  launchctl(["kickstart", `${domain}/${label}`]);
+  const actual = loadedPlistLabel(plistPath, label);
+  launchctl(["kickstart", `${domain}/${actual}`]);
 }
 function launchAgentStatus(label) {
   const domain = launchDomain();
@@ -8407,7 +8513,7 @@ function officialRealtimeNotImplementedResponse() {
     }
   }, {
     status: 426,
-    headers: { "x-codex-cliproxy-gateway": "official-realtime-not-implemented" }
+    headers: { "x-agent-proxy": "official-realtime-not-implemented" }
   });
 }
 function websocketNotSupportedResponse(marker = "websocket-not-supported") {
@@ -8415,7 +8521,7 @@ function websocketNotSupportedResponse(marker = "websocket-not-supported") {
     status: 426,
     headers: {
       connection: "close",
-      "x-codex-cliproxy-gateway": marker
+      "x-agent-proxy": marker
     }
   });
 }
@@ -8604,7 +8710,7 @@ function excludedModelResponse(model) {
       message: `Model "${model}" is excluded by the gateway's excludedModels configuration`,
       hint: "Remove or narrow the exclusion (agent-proxy models --exclude, or the Web UI) to use this model"
     }
-  }, { status: 404, headers: { "x-codex-cliproxy-gateway": "model-excluded" } });
+  }, { status: 404, headers: { "x-agent-proxy": "model-excluded" } });
 }
 async function availablePluginCatalog(registry, processLog, mountPath, operation) {
   const catalogs = await Promise.all(registry.plugins.map(async (plugin) => {
@@ -9115,7 +9221,7 @@ function startPluginGateway(config, registry, realtimeProviderMode = "invalid",
             });
             return new Response("Realtime upstream WebSocket failed", {
               status: 502,
-              headers: { "x-codex-cliproxy-gateway": "realtime-upstream-unavailable" }
+              headers: { "x-agent-proxy": "realtime-upstream-unavailable" }
             });
           });
         }
@@ -11753,6 +11859,12 @@ async function install(options) {
       return;
     }
   }
+  adoptLegacyLaunchAgents({
+    gatewayPlist: migration.paths.launchAgent,
+    webUiPlist: migration.paths.webUiLaunchAgent,
+    ...legacyLaunchAgentPaths(migration.paths),
+    instanceSuffix: migration.paths.instanceSuffix
+  });
   const rollback = migration.apply();
   try {
     await runWithInstancePaths(migration.paths, () => installCurrent({ ...options, yes: true }, () => migration.complete()));
@@ -11817,6 +11929,12 @@ async function installCurrent(options, completeMigration) {
       return;
     }
   }
+  adoptLegacyLaunchAgents({
+    gatewayPlist: paths.launchAgent,
+    webUiPlist: paths.webUiLaunchAgent,
+    ...legacyLaunchAgentPaths(paths),
+    instanceSuffix: paths.instanceSuffix
+  });
   const { config } = mergedGatewayConfig(paths, currentGatewayConfig, overrides);
   config.configVersion = GATEWAY_CONFIG_VERSION;
   config.$schema = GATEWAY_CONFIG_SCHEMA_URL;
@@ -11862,7 +11980,8 @@ async function installCurrent(options, completeMigration) {
   let installationTouched = false;
   let launchInstalled = false;
   const previousPlist = fs24.existsSync(paths.launchAgent) ? fs24.readFileSync(paths.launchAgent, "utf8") : undefined;
-  const previousServiceLoaded = previousPlist !== undefined && launchAgentStatus(gatewayServiceLabel(paths.instanceSuffix)) !== null;
+  const previousServiceLabel = previousPlist !== undefined ? plistServiceLabel(previousPlist, gatewayServiceLabel(paths.instanceSuffix)) : gatewayServiceLabel(paths.instanceSuffix);
+  const previousServiceLoaded = previousPlist !== undefined && launchAgentStatus(previousServiceLabel) !== null;
   let launchTouched = false;
   let tomlUnchanged = false;
   try {
@@ -11976,7 +12095,7 @@ async function installCurrent(options, completeMigration) {
           if (previousPlist !== undefined) {
             atomicWrite(paths.launchAgent, previousPlist, 420);
             if (previousServiceLoaded)
-              reloadLaunchAgent(paths.launchAgent, gatewayServiceLabel(paths.instanceSuffix));
+              reloadLaunchAgent(paths.launchAgent, previousServiceLabel);
             else
               stopLaunchAgent(paths.launchAgent);
           } else {
@@ -11996,7 +12115,7 @@ async function installCurrent(options, completeMigration) {
         if (previousPlist !== undefined) {
           atomicWrite(paths.launchAgent, previousPlist, 420);
           if (previousServiceLoaded)
-            reloadLaunchAgent(paths.launchAgent, gatewayServiceLabel(paths.instanceSuffix));
+            reloadLaunchAgent(paths.launchAgent, previousServiceLabel);
           else
             stopLaunchAgent(paths.launchAgent);
         } else {
@@ -12066,6 +12185,7 @@ async function uninstall(options) {
     assertCodexHomeAvailable(paths, false);
   uninstallLaunchAgent(paths.launchAgent);
   uninstallLaunchAgent(paths.webUiLaunchAgent);
+  removeLegacyLaunchAgents({ ...legacyLaunchAgentPaths(paths), instanceSuffix: paths.instanceSuffix });
   const legacyCatalogFile = path17.join(paths.codexHome, "cliproxy-catalog.json");
   if (restoresClient) {
     const currentToml = fs24.existsSync(paths.configToml) ? fs24.readFileSync(paths.configToml, "utf8") : "";
@@ -12360,7 +12480,7 @@ async function status() {
   const paths = resolvePaths();
   const installed = fs24.existsSync(paths.stateFile);
   const config = fs24.existsSync(paths.gatewayConfig) ? loadGatewayConfig(paths.gatewayConfig) : undefined;
-  const service = process.platform === "darwin" ? launchAgentStatus(gatewayServiceLabel(paths.instanceSuffix)) : null;
+  const service = process.platform === "darwin" ? launchAgentStatus(gatewayServiceLabel(paths.instanceSuffix)) ?? (fs24.existsSync(paths.launchAgent) ? launchAgentStatus(plistServiceLabel(fs24.readFileSync(paths.launchAgent, "utf8"), gatewayServiceLabel(paths.instanceSuffix))) : null) : null;
   const source = fs24.existsSync(paths.configToml) ? fs24.readFileSync(paths.configToml, "utf8") : "";
   const configuredBaseUrl = readRootTomlString(source, "openai_base_url");
   const configuredCatalog = readRootTomlString(source, "model_catalog_json");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-proxy/gateway",
-  "version": "0.20.3",
+  "version": "0.20.4",
   "description": "Agent Proxy 的 Bun 网关与 CLI 业务应用。",
   "type": "module",
   "bin": {
@@ -21,12 +21,12 @@
     "prepack": "bun ../../scripts/verify-package.ts ."
   },
   "dependencies": {
-    "@agent-proxy/agy": "0.20.3",
-    "@agent-proxy/codebuddy": "0.20.3",
-    "@agent-proxy/opencode-zen": "0.20.3",
-    "@agent-proxy/plugin-api": "0.20.2",
-    "@agent-proxy/qoder": "0.20.3",
-    "@agent-proxy/zcode": "0.20.3",
+    "@agent-proxy/agy": "0.20.4",
+    "@agent-proxy/codebuddy": "0.20.4",
+    "@agent-proxy/opencode-zen": "0.20.4",
+    "@agent-proxy/plugin-api": "0.20.4",
+    "@agent-proxy/qoder": "0.20.4",
+    "@agent-proxy/zcode": "0.20.4",
     "bytes": "^3.1.2",
     "i18next": "^26.4.2",
     "react": "^19.2.0",
@@ -35,7 +35,7 @@
     "yaml": "^2.9.0"
   },
   "devDependencies": {
-    "@agent-proxy/models": "0.20.2"
+    "@agent-proxy/models": "0.20.4"
   },
   "engines": {
     "bun": ">=1.2.0"
@@ -49,5 +49,5 @@
     "type": "git",
     "url": "git+https://github.com/aceHubert/codex-cliproxy-gateway.git"
   },
-  "gitHead": "b5922449d4fc9c2952b324031aee4f254e1b4d14"
+  "gitHead": "b7dc893fa999f8af0d53411a52adb06d20f83dfa"
 }