@khanglvm/llm-router 2.3.7 → 2.4.1

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,

package/src/runtime/handler/amp-web-search.js

@@ -5,6 +5,7 @@ import { buildCandidateKey } from "../state-store.js";
 import { consumeCandidateRateLimits, resolveWindowRange } from "../rate-limits.js";
 import {
   buildProviderHeaders,
+  normalizeClaudeCodeWebSearchProvider,
   resolveProviderFormat,
   resolveProviderUrl,
   resolveRouteReference
@@ -311,16 +312,29 @@ function hasSearchToolType(type) {
   if (!normalized) return false;
   return normalized === SEARCH_TOOL_NAME
     || normalized.startsWith("web_search_preview")
-    || normalized === "web_search_20250305";
+    || normalized.startsWith("web_search_");
 }
 
 function hasSearchToolName(name) {
-  const normalized = String(name || "").trim().toLowerCase();
-  return normalized === SEARCH_TOOL_NAME || normalized === "web_search_preview";
+  const normalized = String(name || "").trim().toLowerCase().replace(/\s+/g, "_");
+  return normalized === SEARCH_TOOL_NAME
+    || normalized === "web_search_preview"
+    || normalized === "websearch";
+}
+
+function hasReadWebPageToolType(type) {
+  const normalized = String(type || "").trim().toLowerCase();
+  if (!normalized) return false;
+  return normalized === READ_WEB_PAGE_TOOL_NAME
+    || normalized === "web_fetch"
+    || normalized.startsWith("web_fetch_");
 }
 
 function hasReadWebPageToolName(name) {
-  return String(name || "").trim().toLowerCase() === READ_WEB_PAGE_TOOL_NAME;
+  const normalized = String(name || "").trim().toLowerCase().replace(/\s+/g, "_");
+  return normalized === READ_WEB_PAGE_TOOL_NAME
+    || normalized === "web_fetch"
+    || normalized === "webfetch";
 }
 
 function hasInterceptableTool(tool) {
@@ -338,7 +352,7 @@ function hasInterceptableToolName(name) {
 
 function getToolName(tool) {
   if (!tool || typeof tool !== "object") return "";
-  if (hasReadWebPageToolName(tool.name) || hasReadWebPageToolName(tool.function?.name)) {
+  if (hasReadWebPageToolType(tool.type) || hasReadWebPageToolName(tool.name) || hasReadWebPageToolName(tool.function?.name)) {
     return READ_WEB_PAGE_TOOL_NAME;
   }
   if (hasSearchToolType(tool.type) || hasSearchToolName(tool.name) || hasSearchToolName(tool.function?.name)) {
@@ -405,6 +419,28 @@ function normalizeSearchProviderId(value) {
   return AMP_WEB_SEARCH_PROVIDER_META.has(normalized) ? normalized : "";
 }
 
+function normalizeSearchProviderSelection(value) {
+  return normalizeClaudeCodeWebSearchProvider(value) || "";
+}
+
+function hasNativeClaudeWebSearchTool(tool) {
+  const normalizedType = String(tool?.type || "").trim().toLowerCase();
+  return normalizedType === "web_search"
+    || (normalizedType.startsWith("web_search_") && !normalizedType.startsWith("web_search_preview"));
+}
+
+function hasNativeClaudeWebFetchTool(tool) {
+  const normalizedType = String(tool?.type || "").trim().toLowerCase();
+  return normalizedType === "web_fetch" || normalizedType.startsWith("web_fetch_");
+}
+
+function shouldUseClaudeCodeWebSearchSelection(runtimeConfig = {}, originalBody = {}) {
+  const selectedProvider = normalizeSearchProviderSelection(runtimeConfig?.claudeCode?.webSearchProvider);
+  if (!selectedProvider) return false;
+  const tools = Array.isArray(originalBody?.tools) ? originalBody.tools : [];
+  return tools.some((tool) => hasNativeClaudeWebSearchTool(tool) || hasNativeClaudeWebFetchTool(tool));
+}
+
 function normalizeSearchRoutingStrategy(value) {
   const normalized = String(value || "").trim().toLowerCase();
   if (!normalized) return "ordered";
@@ -561,7 +597,7 @@ function normalizeConfiguredSearchProviders(rawProviders, raw = {}, env = {}) {
   ];
 }
 
-export function resolveAmpWebSearchConfig(runtimeConfig = {}, env = {}) {
+export function resolveAmpWebSearchConfig(runtimeConfig = {}, env = {}, options = {}) {
   const amp = runtimeConfig?.amp && typeof runtimeConfig.amp === "object" ? runtimeConfig.amp : {};
   const raw = runtimeConfig?.webSearch && typeof runtimeConfig.webSearch === "object" && !Array.isArray(runtimeConfig.webSearch)
     ? runtimeConfig.webSearch
@@ -574,11 +610,17 @@ export function resolveAmpWebSearchConfig(runtimeConfig = {}, env = {}) {
     { min: MIN_SEARCH_COUNT, max: MAX_SEARCH_COUNT }
   );
   const providers = normalizeConfiguredSearchProviders(raw.providers, raw, env);
+  const selectedProviderId = shouldUseClaudeCodeWebSearchSelection(runtimeConfig, options?.originalBody)
+    ? normalizeSearchProviderSelection(runtimeConfig?.claudeCode?.webSearchProvider)
+    : "";
+  const selectedProviders = selectedProviderId
+    ? providers.filter((provider) => normalizeSearchProviderSelection(provider?.id) === selectedProviderId)
+    : [];
 
   return {
     strategy: normalizeSearchRoutingStrategy(raw.strategy ?? env.AMP_WEB_SEARCH_STRATEGY),
     count,
-    providers
+    providers: selectedProviders.length > 0 ? selectedProviders : providers
   };
 }
 
@@ -895,8 +937,8 @@ function buildSearchProviderStatus(provider, evaluation, runtimeConfig = {}) {
   };
 }
 
-export async function buildAmpWebSearchSnapshot(runtimeConfig = {}, { env = {}, stateStore = null, now = Date.now() } = {}) {
-  const settings = resolveAmpWebSearchConfig(runtimeConfig, env);
+export async function buildAmpWebSearchSnapshot(runtimeConfig = {}, { env = {}, stateStore = null, now = Date.now(), originalBody = null } = {}) {
+  const settings = resolveAmpWebSearchConfig(runtimeConfig, env, { originalBody });
   const effectiveStateStore = resolveSearchStateStore(stateStore);
   const providers = [];
 
@@ -1198,7 +1240,8 @@ export async function executeAmpWebSearch(query, runtimeConfig = {}, env = {}, o
   const snapshot = await buildAmpWebSearchSnapshot(runtimeConfig, {
     env,
     stateStore: options.stateStore,
-    now: options.now
+    now: options.now,
+    originalBody: options.originalBody
   });
   const stateStore = resolveSearchStateStore(options.stateStore);
   const configuredProviders = snapshot.providers.filter((provider) => provider.ready);
@@ -1227,7 +1270,8 @@ export async function executeAmpWebSearch(query, runtimeConfig = {}, env = {}, o
       const refreshedSnapshot = await buildAmpWebSearchSnapshot(runtimeConfig, {
         env,
         stateStore,
-        now: options.now
+        now: options.now,
+        originalBody: options.originalBody
       });
       const refreshedProvider = refreshedSnapshot.providers.find((entry) => entry.id === providerStatus.id) || providerStatus;
       return {
@@ -1271,12 +1315,29 @@ export function shouldInterceptAmpWebSearch({ clientType, originalBody, runtimeC
   if (requestedToolNames.length === 0) {
     return false;
   }
+  const requestsWebSearch = requestedToolNames.includes(SEARCH_TOOL_NAME);
+  const requestsReadWebPage = requestedToolNames.includes(READ_WEB_PAGE_TOOL_NAME);
   const readyProviders = resolveAmpWebSearchConfig(runtimeConfig, env).providers.filter((provider) => {
     if (!isSearchProviderConfigured(provider)) return false;
     if (!isHostedSearchProvider(provider)) return true;
     const resolvedRoute = getResolvedHostedSearchRoute(runtimeConfig, provider);
     return Boolean(resolvedRoute && supportsResolvedHostedSearchRoute(resolvedRoute.provider, resolvedRoute.model));
   });
+  if (
+    clientType === "amp"
+    && requestsWebSearch
+    && !requestsReadWebPage
+    && readyProviders.length === 0
+    && runtimeConfig?.amp?.proxyWebSearchToUpstream === true
+    && String(runtimeConfig?.amp?.upstreamUrl || "").trim()
+    && String(runtimeConfig?.amp?.upstreamApiKey || "").trim()
+  ) {
+    return false;
+  }
+  const hasNativeClaudeWebTool = tools.some((tool) => hasNativeClaudeWebSearchTool(tool) || hasNativeClaudeWebFetchTool(tool));
+  if (hasNativeClaudeWebTool) {
+    return true;
+  }
   if (readyProviders.length === 0) {
     return clientType === "amp" && requestedToolNames.includes(READ_WEB_PAGE_TOOL_NAME);
   }
@@ -2324,6 +2385,7 @@ export async function maybeInterceptAmpWebSearch({
   runtimeConfig,
   env,
   stateStore,
+  originalBody,
   executeProviderRequest
 } = {}) {
   if (!(response instanceof Response)) {
@@ -2362,7 +2424,8 @@ export async function maybeInterceptAmpWebSearch({
       runtimeConfig,
       env,
       {
-        stateStore
+        stateStore,
+        originalBody
       }
     ));
   }

package/src/runtime/handler/provider-call.js

@@ -920,6 +920,7 @@ export async function makeProviderCall({
         runtimeConfig,
         env,
         stateStore,
+        originalBody: body,
         executeProviderRequest: async (followUpBody) => {
           const followUpResult = await executeSubscriptionRequest(followUpBody);
           return followUpResult?.response instanceof Response ? followUpResult.response : null;
@@ -1219,6 +1220,7 @@ export async function makeProviderCall({
       runtimeConfig,
       env,
       stateStore,
+      originalBody: body,
       executeProviderRequest: async (followUpBody) => {
         try {
           return await executeHttpProviderRequest({