@agent-proxy/gateway 0.12.0 → 0.12.2

package/dist/index.js

@@ -1020,8 +1020,8 @@ function readObject(file) {
 }
 function migrateManagedDefaultPaths(config, legacyHome, nextHome) {
   const result = structuredClone(config);
-  if (result.model_merge_json === path6.join(legacyHome, "models.json"))
-    result.model_merge_json = path6.join(nextHome, "models.json");
+  if (result.modelMergeJson === path6.join(legacyHome, "models.json"))
+    result.modelMergeJson = path6.join(nextHome, "models.json");
   return result;
 }
 function prepareDefaultInstallMigration(paths, env = process.env, platform = process.platform, launchctlExecutor, manualCodexConfig = false) {
@@ -6005,12 +6005,12 @@ async function resolveModelMergeJson(cacheFile, bundledFile, url, refresh = fals
     try {
       source = new URL(url);
     } catch {
-      throw new Error(`Invalid model_merge_json URL: ${url}`);
+      throw new Error(`Invalid modelMergeJson URL: ${url}`);
     }
     const parts = source.pathname.split("/").filter(Boolean);
     const githubRepository = ["github.com", "www.github.com"].includes(source.hostname) && parts.length === 2;
     if (!["http:", "https:"].includes(source.protocol) || source.username || source.password || parts.length === 0 || !githubRepository && source.pathname.endsWith("/")) {
-      throw new Error("model_merge_json must be a GitHub repository or an HTTP(S) URL with a file name");
+      throw new Error("modelMergeJson must be a GitHub repository or an HTTP(S) URL with a file name");
     }
     if (githubRepository) {
       source.hostname = "github.com";
@@ -6020,10 +6020,10 @@ async function resolveModelMergeJson(cacheFile, bundledFile, url, refresh = fals
     }
     const response = await fetch(source, { redirect: "follow" });
     if (!response.ok)
-      throw new Error(`model_merge_json download returned HTTP ${response.status}`);
+      throw new Error(`modelMergeJson download returned HTTP ${response.status}`);
     const contents = await response.text();
     if (Buffer.byteLength(contents) > 16 * 1024 * 1024) {
-      throw new Error("model_merge_json download exceeds 16 MiB");
+      throw new Error("modelMergeJson download exceeds 16 MiB");
     }
     const stagingFile = `${cacheFile}.download`;
     try {
@@ -6680,7 +6680,7 @@ function upstreamClientVersion(paths, type) {
   return type === "cliproxy" ? resolveCodexClientVersion(paths.upstreamModelsCacheFile) : FALLBACK_CLIENT_VERSION;
 }
 async function loadModelOverrideRules(paths, config, refreshModelMerge) {
-  const modelsConfigFile = await resolveModelMergeJson(paths.modelMergeFile, undefined, config.model_merge_json, refreshModelMerge);
+  const modelsConfigFile = await resolveModelMergeJson(paths.modelMergeFile, undefined, config.modelMergeJson, refreshModelMerge);
   return {
     modelsConfigFile,
     rules: modelsConfigFile === undefined ? compileModelOverrides(models_default, "bundled models.json") : loadModelOverrides(modelsConfigFile)
@@ -6720,6 +6720,33 @@ import { createQoderPlugin, QODER_MODEL_PATTERNS, QODER_RUNTIME_ARTIFACTS } from
 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/plugin-config.ts
+import { validateZcodeConfig } from "@agent-proxy/zcode";
+import { validateCodebuddyAccount, validateCodebuddyConfig } from "@agent-proxy/codebuddy";
+import { validateQoderConfig } from "@agent-proxy/qoder";
+import { validateAgyConfig } from "@agent-proxy/agy";
+import { validateOpencodeZenConfig } from "@agent-proxy/opencode-zen";
+var validators = {
+  zcode: validateZcodeConfig,
+  codebuddy: validateCodebuddyConfig,
+  qoder: validateQoderConfig,
+  agy: validateAgyConfig,
+  opencodeZen: validateOpencodeZenConfig
+};
+function validateConfiguredPlugins(config) {
+  const keys = Object.keys(AGENT_DEFAULTS);
+  for (const key of keys) {
+    if (config[key] !== undefined && typeof config[key] !== "boolean") {
+      throw new Error(`${key} \u5FC5\u987B\u4E3A boolean`);
+    }
+  }
+  validateCodebuddyAccount(config.codebuddyAccount);
+  for (const key of keys) {
+    if (agentConfigEnabled(config, key))
+      validators[key](config);
+  }
+}
+
 // src/process-log.ts
 import fs12 from "fs";
 import path9 from "path";
@@ -6985,14 +7012,11 @@ function logRequestSummary(target, entry) {
 }
 
 // src/host-services.ts
-function agentConfigView(config) {
-  return { ...config, prefix: configuredModelPrefix(config) };
-}
 function createGatewayHostServices(config, processLog, runtimePaths, apiKey) {
   const getPaths = () => runtimePaths ?? resolvePaths();
   return {
     runtimeDirectory: getPaths().runtimeHome,
-    getConfig: () => agentConfigView(config),
+    getConfig: () => ({ ...config }),
     getPaths,
     fetch: globalThis.fetch,
     getApiKey: () => apiKey,
@@ -8816,7 +8840,7 @@ function createPluginGatewayHandler(config, registry, apiKey = readApiKey(), rea
       return catalogModelsResponse(request, config, clientVersionFile, registry, config.upstreamOnly === true ? { models: [] } : await registry.getCatalog(), codexCatalogFile(effectivePaths), ownsLocalModel, effectivePaths);
     }
     const endpoint = identifyClientEndpoint(incomingUrl.pathname, mountPath);
-    const responsePath = endpoint?.from === "responses" && endpoint.operation === "generate";
+    const responsePath = endpoint?.to === "responses" && endpoint.operation === "generate";
     const compactPath = endpoint?.operation === "compact";
     const hintedModel = modelFromRoutingHint(request);
     if (endpoint && request.headers.get("upgrade")?.toLowerCase() === "websocket" && hintedModel) {
@@ -8848,7 +8872,7 @@ function createPluginGatewayHandler(config, registry, apiKey = readApiKey(), rea
         }
       }
       preparedBodies.set(request, { bytes: bytes2, json: json2 });
-      const model = typeof json2?.model === "string" ? json2.model : hintedModel;
+      const model = typeof json2?.model === "string" ? json2.model : endpoint.pathModel ?? hintedModel;
       if (model && ownsLocalModel(model) && modelExclusion.isExcluded(model)) {
         pluginRequests.add(request);
         logGatewayError(processLog, {
@@ -9338,6 +9362,7 @@ function managedRuntimeCatalogFiles(runtimePaths = resolvePaths()) {
 }
 function createConfiguredPluginRegistry(config, dependencies = {}, processLog, runtimePaths = resolvePaths(), apiKey, catalogMode = config.upstreamOnly === true ? "manual" : "dynamic") {
   config = { ...config };
+  validateConfiguredPlugins(config);
   const host = createGatewayHostServices(config, processLog, runtimePaths, apiKey);
   const factories = [];
   if (agentConfigEnabled(config, "zcode"))
@@ -9373,7 +9398,7 @@ function bodyWithJson(context, json) {
 function withCodexCompaction(plugin) {
   const handleHttp = plugin.handleHttp.bind(plugin);
   return { ...plugin, async handleHttp(context) {
-    if (context.from === "chat")
+    if (context.to !== "responses")
       return handleHttp(context);
     const payload = await context.body.json();
     if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
@@ -9821,15 +9846,11 @@ async function stopCodexAppServers(runtime = SYSTEM_RUNTIME) {
 // src/config-update.ts
 import fs19 from "fs";
 import bytes from "bytes";
-import { validateZcodeConfig } from "@agent-proxy/zcode";
 import { isZcodeModel, zcodeStaticModelPrefixes } from "@agent-proxy/zcode/catalog";
-import { validateCodebuddyConfig } from "@agent-proxy/codebuddy";
 import { isCodebuddyAccountValue } from "@agent-proxy/codebuddy/credentials";
 import { CODEBUDDY_PREFIX, isCodebuddyModel, WORKBUDDY_PREFIX, codebuddyModelPrefixes } from "@agent-proxy/codebuddy/catalog";
-import { validateQoderConfig } from "@agent-proxy/qoder";
 import { isQoderModel, QODER_CN_PREFIX, QODER_INTL_PREFIX } from "@agent-proxy/qoder/catalog";
-import { validateAgyConfig, isAgyModel } from "@agent-proxy/agy";
-import { validateOpencodeZenConfig } from "@agent-proxy/opencode-zen";
+import { isAgyModel } from "@agent-proxy/agy";
 import { isOpencodeZenModel, OPENCODE_ZEN_PREFIX } from "@agent-proxy/opencode-zen/catalog";
 function parseMaxRequestLogs(value) {
   if (!/^\d+$/.test(value) || !Number.isSafeInteger(Number(value))) {
@@ -10022,12 +10043,7 @@ function applySelectedModelsPatch(paths, selectedModels, syncState = true) {
     return { applied: [] };
   }
   config.selectedModels = selectedModels;
-  const agentConfig = agentConfigView(config);
-  validateZcodeConfig(agentConfig);
-  validateCodebuddyConfig(agentConfig);
-  validateQoderConfig(agentConfig);
-  validateAgyConfig(agentConfig);
-  validateOpencodeZenConfig(agentConfig);
+  validateConfiguredPlugins(config);
   writeGatewayConfigFile(paths.gatewayConfig, config);
   if (syncState && fs19.existsSync(paths.stateFile)) {
     const state = JSON.parse(fs19.readFileSync(paths.stateFile, "utf8"));
@@ -10144,12 +10160,7 @@ function applyWebUiConfigPatch(paths, patch, syncState = true, { write = true }
   if (applied.length === 0) {
     return { config, applied };
   }
-  const agentConfig = agentConfigView(config);
-  validateZcodeConfig(agentConfig);
-  validateCodebuddyConfig(agentConfig);
-  validateQoderConfig(agentConfig);
-  validateAgyConfig(agentConfig);
-  validateOpencodeZenConfig(agentConfig);
+  validateConfiguredPlugins(config);
   if (!write)
     return { config, applied };
   writeGatewayConfigFile(paths.gatewayConfig, config);
@@ -10464,8 +10475,8 @@ function configResponse(paths, providerDeps, instanceOnly = false) {
       routerMode: live.upstreamOnly === true ? "upstream-only" : "dynamic",
       host: live.host,
       port: live.port,
-      mountPath: live.mountPath,
-      officialBaseUrl: sanitizeUrlValue(live.officialBaseUrl),
+      mountPath: MOUNT_PATH,
+      officialBaseUrl: sanitizeUrlValue(OFFICIAL_BASE_URL),
       codexConfigManaged,
       ...codexConfigManaged ? {} : { manualCodexConfig: manualCodexConfigGuidance(paths, live) }
     },
@@ -10821,24 +10832,12 @@ async function handleWebUiRequestCore(request, config, ctx, port) {
   }
   return notFound();
 }
-
 // src/cli.ts
-import { validateZcodeConfig as validateZcodeConfig2, zcodeEnabled } from "@agent-proxy/zcode";
-import {
-  codebuddyEnabled,
-  validateCodebuddyConfig as validateCodebuddyConfig2
-} from "@agent-proxy/codebuddy";
 import {
   defaultAuthDirectory as defaultAuthDirectory2,
   listCodebuddyAccounts as listCodebuddyAccounts2,
   resolveCodebuddyAccountFile as resolveCodebuddyAccountFile2
 } from "@agent-proxy/codebuddy/credentials";
-import {
-  qoderEnabled,
-  validateQoderConfig as validateQoderConfig2
-} from "@agent-proxy/qoder";
-import { agyEnabled, validateAgyConfig as validateAgyConfig2 } from "@agent-proxy/agy";
-import { opencodeZenEnabled, validateOpencodeZenConfig as validateOpencodeZenConfig2 } from "@agent-proxy/opencode-zen";
 var DEFAULTS = {
   host: "127.0.0.1",
   port: 8320,
@@ -11336,7 +11335,7 @@ var AUDITED_FIELDS = [
   "port",
   "upstreamBaseUrl",
   "upstreamType",
-  "model_merge_json",
+  "modelMergeJson",
   "selectedModels",
   "excludedModels"
 ];
@@ -11473,7 +11472,7 @@ async function installCurrent(options, completeMigration) {
   if (upstreamType)
     overrides.upstreamType = upstreamType;
   if (modelMergeJson)
-    overrides.model_merge_json = modelMergeJson;
+    overrides.modelMergeJson = modelMergeJson;
   if (switching && options.yes !== true) {
     if (!process.stdin.isTTY) {
       console.log("An installation already exists; rerun with --yes to update it in place.");
@@ -11914,7 +11913,7 @@ async function models(options) {
   const auditBefore = { ...config };
   const upstreamOnly = config.upstreamOnly === true;
   if (modelMergeJson)
-    config.model_merge_json = modelMergeJson;
+    config.modelMergeJson = modelMergeJson;
   const currentSelection = configuredSelectedModels(paths, config);
   if (options.exclude !== undefined) {
     if (options.sync === true)
@@ -12246,12 +12245,7 @@ function codebuddyAccountApplied(account) {
   return account === "auto" ? "CodeBuddy account set to auto (follows the most recently refreshed login)." : `CodeBuddy account locked to ${account}.`;
 }
 async function writeConfigAndRestart(paths, config, auditBefore, command, applied, options = {}) {
-  const agentConfig = agentConfigView(config);
-  validateZcodeConfig2(agentConfig);
-  validateCodebuddyConfig2(agentConfig);
-  validateQoderConfig2(agentConfig);
-  validateAgyConfig2(agentConfig);
-  validateOpencodeZenConfig2(agentConfig);
+  validateConfiguredPlugins(config);
   const persist = async () => {
     writeGatewayConfig(paths.gatewayConfig, config);
     if (fs21.existsSync(paths.stateFile)) {
@@ -12303,12 +12297,11 @@ async function configCommand(options) {
   const config = loadGatewayConfig(paths.gatewayConfig);
   const auditBefore = { ...config };
   if (upstreamOnlyTarget === undefined && zcodeTarget === undefined && codebuddyTarget === undefined && qoderTarget === undefined && agyTarget === undefined && opencodeZenTarget === undefined && logTarget === undefined && debugTarget === undefined && maxLogsOption === undefined && maxLogSizeOption === undefined) {
-    const agentConfig = agentConfigView(config);
-    const zcodeActive = zcodeEnabled(agentConfig);
-    const codebuddyActive = codebuddyEnabled(agentConfig);
-    const qoderActive = qoderEnabled(agentConfig);
-    const agyActive = agyEnabled(agentConfig);
-    const opencodeZenActive = opencodeZenEnabled(agentConfig);
+    const zcodeActive = agentConfigEnabled(config, "zcode");
+    const codebuddyActive = agentConfigEnabled(config, "codebuddy");
+    const qoderActive = agentConfigEnabled(config, "qoder");
+    const agyActive = agentConfigEnabled(config, "agy");
+    const opencodeZenActive = agentConfigEnabled(config, "opencodeZen");
     console.log(JSON.stringify({
       upstreamOnly: config.upstreamOnly === true,
       zcode: zcodeActive,