@khanglvm/llm-router 2.3.5 → 2.3.7

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";
@@ -444,8 +443,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 +473,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 +813,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 +825,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
@@ -882,6 +892,14 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
     : loadWebConsoleDevAssets;
   const resolvedRouterCliPath = String(cliPathForRouter || process.env.LLM_ROUTER_CLI_PATH || process.argv[1] || "").trim();
   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;
@@ -1488,7 +1506,8 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
     const endpointUrl = buildAmpClientEndpointUrl(settings);
     try {
       const state = await readFactoryDroidRoutingState({
-        endpointUrl
+        endpointUrl,
+        config
       });
       return {
         ...state,
@@ -1512,6 +1531,13 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
           missionValidatorModel: "",
           reasoningEffort: ""
         },
+        bindingIds: {
+          defaultModel: "",
+          missionOrchestratorModel: "",
+          missionWorkerModel: "",
+          missionValidatorModel: "",
+          reasoningEffort: ""
+        },
         endpointUrl,
         error: error instanceof Error ? error.message : String(error)
       };
@@ -1551,6 +1577,7 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
         endpointUrl: nextEndpointUrl,
         apiKey: nextMasterKey,
         bindings,
+        config: nextConfig,
         captureBackup: false
       });
       if (endpointOrKeyChanged) {
@@ -1709,11 +1736,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: ""
   };
 
@@ -1978,6 +2005,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();
@@ -1987,6 +2015,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,
@@ -2049,7 +2083,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 {
@@ -2066,7 +2100,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}.`
       });
@@ -2261,13 +2295,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);
@@ -2306,9 +2348,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
@@ -2464,8 +2509,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);
 
@@ -2492,7 +2537,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."
       });
@@ -3487,6 +3532,7 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
           endpointUrl,
           apiKey,
           bindings,
+          config: nextConfig,
           captureBackup: true
         });
         addLog("success", "Factory Droid routing enabled.", patchResult.baseUrl);
@@ -3537,6 +3583,7 @@ export async function startWebConsoleServer(options = {}, deps = {}) {
           endpointUrl,
           apiKey,
           bindings,
+          config: configState.normalizedConfig,
           captureBackup: false
         });
         addLog("success", "Factory Droid model bindings updated.", patchResult.bindings.defaultModel || "Default");
@@ -3722,6 +3769,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) {
@@ -3784,6 +3835,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) {
@@ -4234,6 +4289,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/shared/coding-tool-bindings.js

@@ -64,6 +64,160 @@ export const FACTORY_DROID_REASONING_EFFORT_VALUES = Object.freeze([
   "high"
 ]);
 
+function stripFactoryDroidRouterModelIdPrefix(value) {
+  const normalized = String(value || "").trim();
+  if (normalized.startsWith("custom:")) return normalized.slice("custom:".length).trim();
+  return normalized;
+}
+
+function sanitizeFactoryDroidRouterModelIdPart(value) {
+  return String(value || "")
+    .trim()
+    .replace(/[/:]+/g, "-")
+    .replace(/\s+/g, "-")
+    .replace(/[^A-Za-z0-9._-]+/g, "-")
+    .replace(/-+/g, "-")
+    .replace(/^-+|-+$/g, "");
+}
+
+function formatFactoryDroidDisplayNameBase(value) {
+  const normalized = String(value || "").trim();
+  if (!normalized) return "";
+  let next = normalized;
+  if (/^gpt(?=[-\s.]|$)/i.test(next)) next = `GPT${next.slice(3)}`;
+  else if (/^glm(?=[-\s.]|$)/i.test(next)) next = `GLM${next.slice(3)}`;
+  else if (/^claude(?=[-\s.]|$)/i.test(next)) next = `Claude${next.slice(6)}`;
+
+  return next
+    .replace(/(\d)-(\d)(?=(?:-|$))/g, "$1.$2")
+    .replace(/[_-]+/g, " ")
+    .replace(/\s+/g, " ")
+    .trim();
+}
+
+function formatFactoryDroidProviderLabel(value) {
+  const normalized = String(value || "").trim();
+  if (!normalized) return "Provider";
+  if (normalized.toLowerCase() === "openrouter") return "OpenRouter";
+  if (normalized.toLowerCase() === "deepseek") return "DeepSeek";
+  if (/^[A-Za-z]{2,5}$/.test(normalized)) return normalized.toUpperCase();
+  return normalized
+    .replace(/[_-]+/g, " ")
+    .replace(/\s+/g, " ")
+    .split(" ")
+    .filter(Boolean)
+    .map((part) => part[0].toUpperCase() + part.slice(1))
+    .join(" ");
+}
+
+export function isFactoryDroidRouterModelId(value) {
+  const normalized = stripFactoryDroidRouterModelIdPrefix(value);
+  return normalized.startsWith("llm-");
+}
+
+export function parseFactoryDroidRouterModelId(value) {
+  const normalized = stripFactoryDroidRouterModelIdPrefix(value);
+  if (!normalized.startsWith("llm-")) return null;
+
+  if (normalized.startsWith("llm-alias:")) {
+    const aliasId = normalized.slice("llm-alias:".length).trim();
+    return aliasId
+      ? {
+          kind: "alias",
+          aliasId,
+          routeRef: aliasId
+        }
+      : null;
+  }
+
+  if (normalized.startsWith("llm-alias-")) {
+    const aliasId = normalized.slice("llm-alias-".length).trim();
+    return aliasId
+      ? {
+          kind: "alias",
+          aliasId,
+          routeRef: ""
+        }
+      : null;
+  }
+
+  const body = normalized.slice("llm-".length);
+  const separatorIndex = body.indexOf(":");
+  if (separatorIndex <= 0) return null;
+
+  const providerId = body.slice(0, separatorIndex).trim();
+  const modelId = body.slice(separatorIndex + 1).trim();
+  if (!providerId || !modelId) return null;
+
+  return {
+    kind: "model",
+    providerId,
+    modelId,
+    routeRef: `${providerId}/${modelId}`
+  };
+}
+
+export function resolveFactoryDroidRouterModelRef(value) {
+  const normalized = String(value || "").trim();
+  if (!normalized) return "";
+  return parseFactoryDroidRouterModelId(normalized)?.routeRef || normalized;
+}
+
+export function buildFactoryDroidRouterModelId(modelRef, { kind = "" } = {}) {
+  const normalizedModelRef = String(modelRef || "").trim();
+  if (!normalizedModelRef) return "";
+  if (normalizedModelRef.startsWith("custom:llm-")) {
+    const parsed = parseFactoryDroidRouterModelId(normalizedModelRef);
+    return parsed?.routeRef
+      ? buildFactoryDroidRouterModelId(parsed.routeRef, { kind: parsed.kind })
+      : normalizedModelRef;
+  }
+  if (normalizedModelRef.startsWith("llm-")) {
+    const parsed = parseFactoryDroidRouterModelId(normalizedModelRef);
+    return parsed?.routeRef
+      ? buildFactoryDroidRouterModelId(parsed.routeRef, { kind: parsed.kind })
+      : `custom:${normalizedModelRef}`;
+  }
+
+  const explicitKind = String(kind || "").trim().toLowerCase();
+  if (explicitKind === "alias") {
+    const aliasId = sanitizeFactoryDroidRouterModelIdPart(normalizedModelRef);
+    return aliasId ? `custom:llm-alias-${aliasId}` : "";
+  }
+
+  if (explicitKind === "model") {
+    const separatorIndex = normalizedModelRef.indexOf("/");
+    if (separatorIndex <= 0 || separatorIndex >= normalizedModelRef.length - 1) return "";
+    const providerId = normalizedModelRef.slice(0, separatorIndex).trim();
+    const modelId = normalizedModelRef.slice(separatorIndex + 1).trim();
+    const providerSlug = sanitizeFactoryDroidRouterModelIdPart(providerId);
+    const modelSlug = sanitizeFactoryDroidRouterModelIdPart(modelId);
+    return providerSlug && modelSlug ? `custom:llm-${providerSlug}-${modelSlug}` : "";
+  }
+
+  if (!normalizedModelRef.includes("/")) {
+    return buildFactoryDroidRouterModelId(normalizedModelRef, { kind: "alias" });
+  }
+
+  return buildFactoryDroidRouterModelId(normalizedModelRef, { kind: "model" });
+}
+
+export function buildFactoryDroidRouterDisplayName(modelRef, { kind = "", providerName = "" } = {}) {
+  const normalizedModelRef = String(modelRef || "").trim();
+  if (!normalizedModelRef) return "";
+
+  const explicitKind = String(kind || "").trim().toLowerCase();
+  const inferredKind = explicitKind || (normalizedModelRef.includes("/") ? "model" : "alias");
+  if (inferredKind === "alias") {
+    return `${formatFactoryDroidDisplayNameBase(normalizedModelRef)} - LLM Router (Alias)`;
+  }
+
+  const modelName = normalizedModelRef.includes("/")
+    ? normalizedModelRef.slice(normalizedModelRef.indexOf("/") + 1).trim()
+    : normalizedModelRef;
+  return `${formatFactoryDroidDisplayNameBase(modelName)} - LLM Router (${formatFactoryDroidProviderLabel(providerName)})`;
+}
+
 export function normalizeFactoryDroidReasoningEffort(value) {
   const normalized = String(value || "").trim().toLowerCase();
   return FACTORY_DROID_REASONING_EFFORT_VALUES.includes(normalized) ? normalized : "";

package/src/shared/local-router-defaults.js

@@ -20,16 +20,29 @@ function isPlainObject(value) {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 
+function normalizeHost(value, fallback = LOCAL_ROUTER_HOST) {
+  const text = String(value || fallback).trim();
+  return text || fallback;
+}
+
+function normalizePort(value, fallback = LOCAL_ROUTER_PORT) {
+  const parsed = Number.parseInt(String(value ?? ""), 10);
+  if (!Number.isInteger(parsed) || parsed <= 0 || parsed > 65535) return fallback;
+  return parsed;
+}
+
 export function buildLocalRouterSettings(source = {}, fallback = {}) {
   const base = {
+    host: normalizeHost(fallback?.host, LOCAL_ROUTER_HOST),
+    port: normalizePort(fallback?.port, LOCAL_ROUTER_PORT),
     watchConfig: toBoolean(fallback?.watchConfig, true),
     watchBinary: toBoolean(fallback?.watchBinary, true),
     requireAuth: toBoolean(fallback?.requireAuth, false)
   };
 
   return {
-    host: LOCAL_ROUTER_HOST,
-    port: LOCAL_ROUTER_PORT,
+    host: normalizeHost(source?.host, base.host),
+    port: normalizePort(source?.port, base.port),
     watchConfig: toBoolean(source?.watchConfig, base.watchConfig),
     watchBinary: toBoolean(source?.watchBinary, base.watchBinary),
     requireAuth: toBoolean(source?.requireAuth, base.requireAuth)

package/src/shared/timeout-signal.js

@@ -3,14 +3,13 @@ export function buildTimeoutSignal(timeoutMs) {
     return { signal: undefined, cleanup: () => {} };
   }
 
-  if (typeof AbortSignal !== "undefined" && typeof AbortSignal.timeout === "function") {
-    return {
-      signal: AbortSignal.timeout(timeoutMs),
-      cleanup: () => {}
-    };
-  }
-
   if (typeof AbortController === "undefined") {
+    if (typeof AbortSignal !== "undefined" && typeof AbortSignal.timeout === "function") {
+      return {
+        signal: AbortSignal.timeout(timeoutMs),
+        cleanup: () => {}
+      };
+    }
     return { signal: undefined, cleanup: () => {} };
   }