@khanglvm/llm-router 2.3.6 → 2.4.0

package/src/node/web-console-server.js

@@ -12,7 +12,6 @@ import {
   areLocalServerSettingsEqual,
   formatStartupDetail,
   formatStartupLabel,
-  getFixedLocalRouterOrigin,
   readLocalServerSettings
 } from "./local-server-settings.js";
 import { appendActivityLogEntry, clearActivityLogFile, createActivityLogEntry, readActivityLogEntries, resolveActivityLogPath } from "./activity-log.js";
@@ -69,6 +68,7 @@ import {
   OLLAMA_KEEP_ALIVE_PATTERN,
   OLLAMA_PROVIDER_TYPE,
   configHasProvider,
+  normalizeClaudeCodeWebSearchProvider,
   normalizeOllamaConfig,
   normalizeRuntimeConfig,
   resolveProviderApiKey,
@@ -444,8 +444,17 @@ function formatHostForUrl(host, port) {
   return `[${value}]:${port}`;
 }
 
+function buildManagedRouterOrigin(settings = {}) {
+  const port = Number.isInteger(Number(settings?.port)) ? Number(settings.port) : FIXED_LOCAL_ROUTER_PORT;
+  const configuredHost = normalizeRuntimeHost(settings?.host || FIXED_LOCAL_ROUTER_HOST);
+  const host = isWildcardRuntimeHost(configuredHost) || isLoopbackRuntimeHost(configuredHost)
+    ? FIXED_LOCAL_ROUTER_HOST
+    : configuredHost;
+  return `http://${formatHostForUrl(host, port)}`;
+}
+
 function buildAmpClientEndpointUrl(settings = {}) {
-  return getFixedLocalRouterOrigin();
+  return buildManagedRouterOrigin(settings);
 }
 
 function buildCodexCliEndpointUrl(settings = {}) {
@@ -465,7 +474,7 @@ function buildFactoryDroidEndpointUrl(settings = {}) {
 
 function buildRouterEndpoints({ host, port, running }) {
   if (!running) return [];
-  const origin = getFixedLocalRouterOrigin();
+  const origin = buildManagedRouterOrigin({ host, port });
   return [
     { label: "Unified", url: `${origin}/route` },
     { label: "Anthropic", url: `${origin}/anthropic` },
@@ -805,8 +814,10 @@ function writeJsonLine(res, payload) {
 
 function resolveRouterOptions(current, body) {
   return {
-    host: FIXED_LOCAL_ROUTER_HOST,
-    port: FIXED_LOCAL_ROUTER_PORT,
+    host: normalizeRuntimeHost(body?.host || current?.host || FIXED_LOCAL_ROUTER_HOST),
+    port: Number.isInteger(Number(body?.port))
+      ? Number(body.port)
+      : (Number.isInteger(Number(current?.port)) ? Number(current.port) : FIXED_LOCAL_ROUTER_PORT),
     watchConfig: body?.watchConfig === undefined ? current.watchConfig : body.watchConfig === true,
     requireAuth: body?.requireAuth === undefined ? current.requireAuth : body.requireAuth === true,
     watchBinary: body?.watchBinary === undefined ? current.watchBinary : body.watchBinary === true
@@ -815,8 +826,8 @@ function resolveRouterOptions(current, body) {
 
 function getRouterStateSettings(routerState) {
   return {
-    host: FIXED_LOCAL_ROUTER_HOST,
-    port: FIXED_LOCAL_ROUTER_PORT,
+    host: normalizeRuntimeHost(routerState?.host || FIXED_LOCAL_ROUTER_HOST),
+    port: Number.isInteger(Number(routerState?.port)) ? Number(routerState.port) : FIXED_LOCAL_ROUTER_PORT,
     watchConfig: routerState?.watchConfig !== false,
     watchBinary: routerState?.watchBinary !== false,
     requireAuth: routerState?.requireAuth === true
@@ -840,6 +851,7 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
     host = "127.0.0.1",
     port = 8788,
     configPath = getDefaultConfigPath(),
+    productionConfigPath = getDefaultConfigPath(),
     activityLogPath = "",
     routerHost = FIXED_LOCAL_ROUTER_HOST,
     routerPort = FIXED_LOCAL_ROUTER_PORT,
@@ -881,7 +893,17 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
     ? deps.loadWebConsoleDevAssets
     : loadWebConsoleDevAssets;
   const resolvedRouterCliPath = String(cliPathForRouter || process.env.LLM_ROUTER_CLI_PATH || process.argv[1] || "").trim();
+  const resolvedConfigPath = path.resolve(String(configPath || getDefaultConfigPath()).trim() || getDefaultConfigPath());
+  const resolvedProductionConfigPath = path.resolve(String(productionConfigPath || getDefaultConfigPath()).trim() || getDefaultConfigPath());
   const resolvedActivityLogPath = resolveActivityLogPath(configPath, activityLogPath);
+  const startupControlsEnabled = !devMode;
+  const defaultRouterSettings = {
+    host: normalizeRuntimeHost(routerHost || FIXED_LOCAL_ROUTER_HOST),
+    port: Number.isInteger(Number(routerPort)) ? Number(routerPort) : FIXED_LOCAL_ROUTER_PORT,
+    watchConfig: routerWatchConfig !== false,
+    watchBinary: routerWatchBinary !== false,
+    requireAuth: routerRequireAuth === true
+  };
 
   async function readWebSearchState(config = null) {
     if (!config || typeof config !== "object") return null;
@@ -1308,6 +1330,7 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
   async function readClaudeCodeGlobalRoutingState(settings = {}, config = null) {
     const endpointUrl = buildAmpClientEndpointUrl(settings);
     const apiKey = String(config?.masterKey || "").trim();
+    const webSearchProvider = normalizeClaudeCodeWebSearchProvider(config?.claudeCode?.webSearchProvider);
     try {
       const state = await readClaudeCodeRoutingState({
         endpointUrl,
@@ -1316,6 +1339,7 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
       });
       return {
         ...state,
+        webSearchProvider,
         endpointUrl,
         error: ""
       };
@@ -1336,6 +1360,7 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
           subagentModel: "",
           thinkingLevel: ""
         },
+        webSearchProvider,
         endpointUrl,
         error: error instanceof Error ? error.message : String(error)
       };
@@ -1718,11 +1743,11 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
   let activityLogEnabled = true;
 
   const routerState = {
-    host: FIXED_LOCAL_ROUTER_HOST,
-    port: FIXED_LOCAL_ROUTER_PORT,
-    watchConfig: routerWatchConfig,
-    watchBinary: routerWatchBinary,
-    requireAuth: routerRequireAuth,
+    host: defaultRouterSettings.host,
+    port: defaultRouterSettings.port,
+    watchConfig: defaultRouterSettings.watchConfig,
+    watchBinary: defaultRouterSettings.watchBinary,
+    requireAuth: defaultRouterSettings.requireAuth,
     lastError: ""
   };
 
@@ -1987,6 +2012,7 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
   }
 
   async function stopUntrackedStartupRuntime({ reason = "Stopped startup-managed LLM Router." } = {}) {
+    if (!startupControlsEnabled) return false;
     const startup = await startupStatusFn().catch(() => null);
     if (!startup?.running) return false;
     await stopStartupFn();
@@ -1996,6 +2022,12 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
   }
 
   async function startStartupOwnedRouter(settings, { restart = false } = {}) {
+    if (!startupControlsEnabled) {
+      const error = new Error("Startup service controls are disabled in dev mode.");
+      error.statusCode = 409;
+      throw error;
+    }
+
     await clearRuntimeStateFn();
     const detail = await installStartupFn({
       configPath,
@@ -2058,7 +2090,7 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
       };
     }
 
-    const startup = await startupStatusFn().catch(() => null);
+    const startup = startupControlsEnabled ? await startupStatusFn().catch(() => null) : null;
     const activeRuntime = await readManagedRuntime(configLocalServer);
     if (activeRuntime) {
       return {
@@ -2075,7 +2107,7 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
       await stopExternalRuntime(externalRuntime, {
         reason: `Stopped an existing LLM Router instance so the web console can manage ${configLocalServer.host}:${configLocalServer.port} during ${reason}.`
       });
-    } else {
+    } else if (startupControlsEnabled) {
       await stopUntrackedStartupRuntime({
         reason: `Stopped the startup-managed LLM Router instance so the web console can manage ${configLocalServer.host}:${configLocalServer.port} during ${reason}.`
       });
@@ -2156,7 +2188,11 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
     return savedConfig;
   }
 
-  async function writeAndBroadcastConfig(parsed, { source = "" } = {}) {
+  async function writeAndBroadcastConfig(parsed, {
+    source = "",
+    preserveMissingKeys = true,
+    successMessage = ""
+  } = {}) {
     const previousConfigState = await readConfigState(configPath);
     const previousConfig = previousConfigState.normalizedConfig || buildDefaultConfigObject();
     const previousLocalServer = getConfigLocalServer(previousConfigState);
@@ -2165,7 +2201,7 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
     // This prevents partial writes (e.g. from scoped Ollama endpoints) from wiping
     // unrelated config sections like masterKey, modelAliases, amp, metadata, etc.
     const previousRaw = previousConfigState.rawConfig;
-    if (previousRaw && typeof previousRaw === "object" && parsed && typeof parsed === "object") {
+    if (preserveMissingKeys && previousRaw && typeof previousRaw === "object" && parsed && typeof parsed === "object") {
       for (const key of Object.keys(previousRaw)) {
         if (!(key in parsed)) {
           parsed[key] = previousRaw[key];
@@ -2179,7 +2215,7 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
     const nextLocalServer = readLocalServerSettings(savedConfig, previousLocalServer);
 
     if (source !== "autosave") {
-      addLog("success", `Config saved to ${path.basename(configPath)}.`);
+      addLog("success", successMessage || `Config saved to ${path.basename(configPath)}.`);
     }
 
     const managedRuntime = await readManagedRuntime(previousLocalServer);
@@ -2244,6 +2280,54 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
     };
   }
 
+  async function syncConfigFromProduction() {
+    if (!devMode) {
+      const error = new Error("Production config sync is only available in dev mode.");
+      error.statusCode = 409;
+      throw error;
+    }
+
+    if (resolvedConfigPath === resolvedProductionConfigPath) {
+      const error = new Error("Current config already points to the production config file.");
+      error.statusCode = 409;
+      throw error;
+    }
+
+    const currentConfigState = await readConfigState(configPath);
+    const currentLocalServer = getConfigLocalServer(currentConfigState);
+    const productionConfigState = await readConfigState(resolvedProductionConfigPath);
+
+    if (!productionConfigState.summary?.exists) {
+      const error = new Error(`Production config file was not found at ${resolvedProductionConfigPath}.`);
+      error.statusCode = 404;
+      throw error;
+    }
+
+    if (productionConfigState.parseError) {
+      const error = new Error(`Production config JSON must parse before syncing: ${productionConfigState.parseError}`);
+      error.statusCode = 400;
+      throw error;
+    }
+
+    const clonedConfig = applyLocalServerSettings(
+      productionConfigState.normalizedConfig || buildDefaultConfigObject(),
+      currentLocalServer
+    );
+
+    const result = await writeAndBroadcastConfig(clonedConfig, {
+      source: "production-sync",
+      preserveMissingKeys: false,
+      successMessage: `Synced ${path.basename(resolvedConfigPath)} from ${path.basename(resolvedProductionConfigPath)}.`
+    });
+
+    return {
+      ...result,
+      message: `Synced dev config from ${resolvedProductionConfigPath}.`,
+      syncedFrom: resolvedProductionConfigPath,
+      syncedTo: resolvedConfigPath
+    };
+  }
+
   let routerRestartPromise = null;
 
   async function restartManagedRouterWithSettings(settings, {
@@ -2270,13 +2354,21 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
     const configState = await readConfigState(configPath);
     const configLocalServer = getConfigLocalServer(configState);
     const activityLog = resolveActivityLogSnapshot(configState.normalizedConfig);
-    const startup = await startupStatusFn().catch((error) => ({
-      manager: "unknown",
-      serviceId: "llm-router",
-      installed: false,
-      running: false,
-      detail: error instanceof Error ? error.message : String(error)
-    }));
+    const startup = startupControlsEnabled
+      ? await startupStatusFn().catch((error) => ({
+        manager: "unknown",
+        serviceId: "llm-router",
+        installed: false,
+        running: false,
+        detail: error instanceof Error ? error.message : String(error)
+      }))
+      : {
+        manager: "disabled",
+        serviceId: "llm-router",
+        installed: false,
+        running: false,
+        detail: "Startup service controls are disabled in dev mode."
+      };
     const managedRuntime = await readManagedRuntime(configLocalServer);
     const externalRuntime = managedRuntime ? null : await readExternalRuntime(configLocalServer);
     const portProbe = probeRouterPort(configLocalServer);
@@ -2301,6 +2393,12 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
       : { ok: false };
 
     return {
+      environment: {
+        devMode,
+        configPath: resolvedConfigPath,
+        productionConfigPath: resolvedProductionConfigPath,
+        canSyncProductionConfig: devMode && resolvedConfigPath !== resolvedProductionConfigPath
+      },
       web: {
         host,
         port: actualWebPort,
@@ -2315,9 +2413,12 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
       router: routerSnapshot,
       startup: {
         ...startup,
-        label: formatStartupLabel(startup),
-        friendlyDetail: formatStartupDetail(startup),
-        defaults: configLocalServer
+        label: startupControlsEnabled ? formatStartupLabel(startup) : "Startup disabled in dev mode",
+        friendlyDetail: startupControlsEnabled
+          ? formatStartupDetail(startup)
+          : "Development web console will not install, stop, or replace startup-managed routers.",
+        defaults: configLocalServer,
+        available: startupControlsEnabled
       },
       ampClient: {
         global: ampClientGlobal
@@ -2473,8 +2574,8 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
       nextOptions = persisted.savedSettings;
     }
 
-    const startup = await startupStatusFn().catch(() => null);
-    const preferStartupOwnership = Boolean(startup?.installed);
+    const startup = startupControlsEnabled ? await startupStatusFn().catch(() => null) : null;
+    const preferStartupOwnership = startupControlsEnabled && Boolean(startup?.installed);
     const runningRuntime = await readManagedRuntime(nextOptions);
     const webConsoleConflict = getWebConsoleConflictMessage(nextOptions);
 
@@ -2501,7 +2602,7 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
       await stopExternalRuntime(externalRuntime, {
         reason: "Stopped another LLM Router instance before starting the managed router."
       });
-    } else {
+    } else if (startupControlsEnabled) {
       await stopUntrackedStartupRuntime({
         reason: "Stopped the startup-managed LLM Router instance before starting the managed router."
       });
@@ -2791,6 +2892,17 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
         return;
       }
 
+      if (method === "POST" && requestUrl.pathname === "/api/config/sync-production") {
+        const synced = await syncConfigFromProduction();
+        sendJson(res, 200, {
+          ...synced.snapshot,
+          message: synced.message,
+          syncedFrom: synced.syncedFrom,
+          syncedTo: synced.syncedTo
+        });
+        return;
+      }
+
       if (method === "POST" && requestUrl.pathname === "/api/config/test-provider") {
         const body = await readJsonBody(req);
         const endpoints = Array.isArray(body?.endpoints) ? body.endpoints.map((entry) => String(entry || "").trim()).filter(Boolean) : [];
@@ -3418,6 +3530,102 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
         return;
       }
 
+      if (method === "POST" && requestUrl.pathname === "/api/claude-code/search-provider") {
+        const body = await readJsonBody(req);
+        const currentConfigState = await readConfigState(configPath);
+
+        let parsed;
+        try {
+          if (body?.config && typeof body.config === "object" && !Array.isArray(body.config)) {
+            parsed = body.config;
+          } else if (typeof body?.rawText === "string") {
+            const rawText = String(body.rawText || "");
+            parsed = rawText.trim() ? JSON.parse(rawText) : {};
+          } else {
+            parsed = currentConfigState.rawConfig && typeof currentConfigState.rawConfig === "object" && !Array.isArray(currentConfigState.rawConfig)
+              ? { ...currentConfigState.rawConfig }
+              : {};
+          }
+        } catch (error) {
+          sendJson(res, 400, {
+            error: `Config JSON parse failed: ${error instanceof Error ? error.message : String(error)}`
+          });
+          return;
+        }
+
+        const nextConfig = parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
+        const selectedProvider = normalizeClaudeCodeWebSearchProvider(
+          body?.webSearchProvider
+          ?? body?.searchProvider
+          ?? body?.providerId
+        );
+
+        if (selectedProvider) {
+          let normalizedConfig;
+          try {
+            normalizedConfig = normalizeRuntimeConfig(nextConfig, { migrateToVersion: CONFIG_VERSION });
+          } catch (error) {
+            sendJson(res, 400, {
+              error: `Config normalization failed: ${error instanceof Error ? error.message : String(error)}`
+            });
+            return;
+          }
+          const configuredProviders = Array.isArray(normalizedConfig?.webSearch?.providers) ? normalizedConfig.webSearch.providers : [];
+          const selectedExists = configuredProviders.some((provider) => normalizeClaudeCodeWebSearchProvider(provider?.id) === selectedProvider);
+          if (!selectedExists) {
+            sendJson(res, 400, {
+              error: `Claude Code web search provider '${selectedProvider}' must reference a configured webSearch provider.`
+            });
+            return;
+          }
+        }
+
+        if (selectedProvider) {
+          const currentClaudeCode = nextConfig?.claudeCode && typeof nextConfig.claudeCode === "object" && !Array.isArray(nextConfig.claudeCode)
+            ? nextConfig.claudeCode
+            : (nextConfig?.["claude-code"] && typeof nextConfig["claude-code"] === "object" && !Array.isArray(nextConfig["claude-code"])
+              ? nextConfig["claude-code"]
+              : null);
+          const nextClaudeCode = currentClaudeCode
+            ? { ...currentClaudeCode }
+            : {};
+          nextClaudeCode.webSearchProvider = selectedProvider;
+          nextConfig.claudeCode = nextClaudeCode;
+          delete nextConfig["claude-code"];
+        } else {
+          const currentClaudeCode = nextConfig?.claudeCode && typeof nextConfig.claudeCode === "object" && !Array.isArray(nextConfig.claudeCode)
+            ? nextConfig.claudeCode
+            : (nextConfig?.["claude-code"] && typeof nextConfig["claude-code"] === "object" && !Array.isArray(nextConfig["claude-code"])
+              ? nextConfig["claude-code"]
+              : null);
+          if (currentClaudeCode) {
+            const nextClaudeCode = { ...currentClaudeCode };
+            delete nextClaudeCode.webSearchProvider;
+            delete nextClaudeCode["web-search-provider"];
+            delete nextClaudeCode.searchProvider;
+            delete nextClaudeCode["search-provider"];
+            if (Object.keys(nextClaudeCode).length > 0) {
+              nextConfig.claudeCode = nextClaudeCode;
+            } else {
+              nextConfig.claudeCode = {};
+            }
+            delete nextConfig["claude-code"];
+          }
+        }
+
+        const { snapshot } = await writeAndBroadcastConfig(nextConfig, { source: "claude-code-search-provider" });
+        addLog(
+          "success",
+          selectedProvider ? "Claude Code search capability updated." : "Claude Code search capability cleared.",
+          selectedProvider || "Default router search order"
+        );
+        sendJson(res, 200, {
+          ...snapshot,
+          message: selectedProvider ? "Claude Code search capability updated." : "Claude Code search capability cleared."
+        });
+        return;
+      }
+
       if (method === "POST" && requestUrl.pathname === "/api/claude-code/effort-level") {
         const body = await readJsonBody(req);
         const effortLevel = String(body?.effortLevel || body?.thinkingLevel || "").trim();
@@ -3733,6 +3941,10 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
       }
 
       if (method === "POST" && requestUrl.pathname === "/api/startup/enable") {
+        if (!startupControlsEnabled) {
+          sendJson(res, 409, { error: "Startup service controls are unavailable in dev mode." });
+          return;
+        }
         const body = await readJsonBody(req);
         const configState = await readConfigState(configPath);
         if (configState.parseError) {
@@ -3795,6 +4007,10 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
       }
 
       if (method === "POST" && requestUrl.pathname === "/api/startup/disable") {
+        if (!startupControlsEnabled) {
+          sendJson(res, 409, { error: "Startup service controls are unavailable in dev mode." });
+          return;
+        }
         await readJsonBody(req);
         const statusBefore = await startupStatusFn().catch(() => null);
         if (!statusBefore?.installed) {
@@ -4245,6 +4461,7 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
 
   addLog("info", `Web console listening on http://${formatHostForUrl(host, actualWebPort)}`);
   if (devMode) addLog("info", "Development mode enabled for web assets.");
+  if (!startupControlsEnabled) addLog("info", "Startup service controls disabled in dev mode.");
   startConfigWatcher();
   startActivityLogWatcher();
 

package/src/node/web-console-ui/web-search-utils.js

@@ -306,6 +306,48 @@ export function buildWebSearchProviderRows(config = {}, snapshot = null) {
   });
 }
 
+export function buildClaudeCodeWebSearchProviderOptions(providerRows = [], selectedProviderId = "") {
+  const options = [];
+  const seen = new Set();
+
+  for (const row of Array.isArray(providerRows) ? providerRows : []) {
+    if (!row?.configured) continue;
+    const optionValue = String(row?.id || "").trim();
+    const optionKey = normalizeWebSearchProviderKey(optionValue);
+    if (!optionValue || !optionKey || seen.has(optionKey)) continue;
+
+    const label = row.kind === "hosted"
+      ? [String(row?.label || "").trim(), String(row?.modelId || "").trim()].filter(Boolean).join(" · ")
+      : (String(row?.label || optionValue).trim() || optionValue);
+    const hint = row.kind === "hosted"
+      ? (String(row?.routeId || optionValue).trim() || "Hosted web search route")
+      : (row.active === false ? "Configured but not ready" : "Configured provider");
+
+    options.push({
+      value: optionValue,
+      label,
+      hint,
+      groupKey: row.kind === "hosted" ? "hosted-web-search-routes" : "builtin-web-search-providers",
+      groupLabel: row.kind === "hosted" ? "Hosted search routes" : "Built-in search providers"
+    });
+    seen.add(optionKey);
+  }
+
+  const selectedValue = String(selectedProviderId || "").trim();
+  const selectedKey = normalizeWebSearchProviderKey(selectedValue);
+  if (selectedValue && selectedKey && !seen.has(selectedKey)) {
+    options.unshift({
+      value: selectedValue,
+      label: selectedValue,
+      hint: "Current config (not configured)",
+      groupKey: "current-claude-selection",
+      groupLabel: "Current selection"
+    });
+  }
+
+  return options;
+}
+
 export function updateWebSearchConfig(config = {}, updates = {}) {
   const next = ensureAmpDraftConfigShape(config);
   const webSearch = ensureWebSearchConfigShape(next);

package/src/runtime/config.js

@@ -559,6 +559,12 @@ function normalizeAmpWebSearchProviderId(value) {
   return AMP_WEB_SEARCH_PROVIDER_IDS.includes(normalized) ? normalized : "";
 }
 
+export function normalizeClaudeCodeWebSearchProvider(value) {
+  const normalized = String(value || "").trim();
+  if (!normalized) return "";
+  return normalizeAmpWebSearchProviderId(normalized) || normalized;
+}
+
 function normalizeAmpWebSearchStrategy(value) {
   const normalized = String(value || "").trim().toLowerCase();
   if (!normalized) return "ordered";
@@ -750,6 +756,32 @@ function normalizeAmpWebSearchConfig(rawWebSearch) {
   };
 }
 
+function normalizeClaudeCodeConfig(rawClaudeCode) {
+  if (!rawClaudeCode || typeof rawClaudeCode !== "object" || Array.isArray(rawClaudeCode)) {
+    return undefined;
+  }
+
+  const source = rawClaudeCode;
+  const hasWebSearchProvider = hasOwn(source, "webSearchProvider")
+    || hasOwn(source, "web-search-provider")
+    || hasOwn(source, "searchProvider")
+    || hasOwn(source, "search-provider");
+  const webSearchProvider = normalizeClaudeCodeWebSearchProvider(
+    source.webSearchProvider
+    ?? source["web-search-provider"]
+    ?? source.searchProvider
+    ?? source["search-provider"]
+  );
+
+  if (!hasWebSearchProvider) {
+    return undefined;
+  }
+
+  return webSearchProvider
+    ? { webSearchProvider }
+    : {};
+}
+
 function supportsOpenAIHostedWebSearchRoute(provider, model) {
   const providerFormats = dedupeStrings([...(provider?.formats || []), provider?.format]);
   if (!providerFormats.includes(FORMATS.OPENAI)) return false;
@@ -1759,11 +1791,13 @@ export function normalizeRuntimeConfig(rawConfig, options = {}) {
     ? rawAmp
     : {};
   const rawWebSearch = raw.webSearch ?? raw["web-search"];
+  const rawClaudeCode = raw.claudeCode ?? raw["claude-code"];
   const amp = normalizeAmpConfig(rawAmp);
   const webSearch = normalizeAmpWebSearchConfig(rawWebSearch)
     ?? (amp?.webSearch && typeof amp.webSearch === "object" && !Array.isArray(amp.webSearch)
       ? amp.webSearch
       : undefined);
+  const claudeCode = normalizeClaudeCodeConfig(rawClaudeCode);
   const normalizedAmp = webSearch && amp?.webSearch && typeof amp.webSearch === "object" && !Array.isArray(amp.webSearch)
     ? Object.fromEntries(
         Object.entries(amp).filter(([key]) => key !== "webSearch")
@@ -1780,6 +1814,7 @@ export function normalizeRuntimeConfig(rawConfig, options = {}) {
     modelAliases,
     amp: normalizedAmp,
     ...(webSearch ? { webSearch } : {}),
+    ...(claudeCode && Object.keys(claudeCode).length > 0 ? { claudeCode } : {}),
     ollama,
     metadata: sanitizeRuntimeMetadata(raw.metadata)
   };
@@ -2085,6 +2120,21 @@ function validateAmpConfig(config, routingIndex, errors) {
       }
     }
   }
+
+  const claudeCode = config?.claudeCode;
+  if (claudeCode && typeof claudeCode === "object" && !Array.isArray(claudeCode)) {
+    const selectedWebSearchProvider = normalizeClaudeCodeWebSearchProvider(claudeCode.webSearchProvider);
+    if (selectedWebSearchProvider) {
+      const configuredProviders = Array.isArray(webSearch?.providers) ? webSearch.providers : [];
+      const selectedExists = configuredProviders.some((provider) => {
+        const providerId = normalizeClaudeCodeWebSearchProvider(provider?.id);
+        return providerId && providerId === selectedWebSearchProvider;
+      });
+      if (!selectedExists) {
+        errors.push(`claudeCode.webSearchProvider '${selectedWebSearchProvider}' must reference a configured webSearch provider.`);
+      }
+    }
+  }
 }
 
 export function validateRuntimeConfig(config, { requireMasterKey = false, requireProvider = false } = {}) {
@@ -2325,6 +2375,9 @@ export function sanitizeConfigForDisplay(config) {
     ...config,
     masterKey: config.masterKey ? maskSecret(config.masterKey) : undefined,
     ...(sanitizedWebSearch ? { webSearch: sanitizedWebSearch } : {}),
+    ...(config.claudeCode && typeof config.claudeCode === "object" && !Array.isArray(config.claudeCode)
+      ? { claudeCode: { ...config.claudeCode } }
+      : {}),
     amp: sanitizedAmp,
     providers: (config.providers || []).map((provider) => ({
       ...provider,