@khanglvm/ai-router 1.0.4 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@khanglvm/ai-router",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Generic AI Router Proxy (local + Cloudflare Worker)",
   "type": "module",
   "main": "src/index.js",
@@ -18,7 +18,7 @@
     "test:provider-smoke": "node ./scripts/provider-smoke-suite.mjs"
   },
   "dependencies": {
-    "@levu/snap": "^0.1.1"
+    "@levu/snap": "^0.3.0"
   },
   "devDependencies": {
     "wrangler": "^3.0.0"

package/src/cli/router-module.js

@@ -1,6 +1,7 @@
 import { promises as fsPromises } from "node:fs";
 import { spawnSync } from "node:child_process";
 import path from "node:path";
+import { SnapTui } from "@levu/snap/dist/index.js";
 import {
   applySetupChanges,
   buildProviderFromSetupInput,
@@ -92,41 +93,439 @@ function providerEndpointsFromConfig(provider) {
   return parseModelListInput(values.filter(Boolean).join(","));
 }
 
+function normalizeNameForCompare(value) {
+  return String(value || "").trim().toLowerCase();
+}
+
+function findProviderByFriendlyName(providers, name, { excludeId = "" } = {}) {
+  const needle = normalizeNameForCompare(name);
+  if (!needle) return null;
+  const excluded = String(excludeId || "").trim();
+  return (providers || []).find((provider) => {
+    if (!provider || typeof provider !== "object") return false;
+    const sameName = normalizeNameForCompare(provider.name) === needle;
+    if (!sameName) return false;
+    if (!excluded) return true;
+    return String(provider.id || "").trim() !== excluded;
+  }) || null;
+}
+
+function printProviderInputGuidance(context) {
+  if (!canPrompt()) return;
+  const info = typeof context?.terminal?.info === "function" ? context.terminal.info.bind(context.terminal) : null;
+  const line = typeof context?.terminal?.line === "function" ? context.terminal.line.bind(context.terminal) : null;
+  const warn = typeof context?.terminal?.warn === "function" ? context.terminal.warn.bind(context.terminal) : null;
+  if (!line) return;
+
+  info?.("Provider setup tips:");
+  line("  - Provider Friendly Name is shown in the management screen and must be unique.");
+  line("  - Provider ID is auto-generated by slugifying the friendly name; you can edit it.");
+  line("  - Examples:");
+  line("    Friendly Name: OpenRouter Primary, RamClouds Production");
+  line("    Provider ID: openrouterPrimary, ramcloudsProd");
+  line("    API Key: sk-or-v1-xxxxxxxx, sk-ant-api03-xxxxxxxx, sk-xxxxxxxx");
+}
+
+function trimOuterPunctuation(value) {
+  return String(value || "")
+    .trim()
+    .replace(/^[\s"'`([{<]+/, "")
+    .replace(/[\s"'`)\]}>.,;:]+$/, "")
+    .trim();
+}
+
+function dedupeList(values) {
+  return [...new Set((values || []).filter(Boolean).map((value) => String(value).trim()).filter(Boolean))];
+}
+
+function tokenizeLooseListInput(raw) {
+  if (Array.isArray(raw)) return dedupeList(raw.flatMap((item) => tokenizeLooseListInput(item)));
+  const text = String(raw || "")
+    .replace(/[\n\r\t]+/g, " ")
+    .replace(/[;,]+/g, " ");
+  return dedupeList(text.split(/\s+/g));
+}
+
+function normalizeEndpointToken(token) {
+  let value = trimOuterPunctuation(token);
+  if (!value) return "";
+
+  value = value
+    .replace(/^(?:openaiBaseUrl|claudeBaseUrl|anthropicBaseUrl|baseUrl)\s*=\s*/i, "")
+    .replace(/^url\s*=\s*/i, "");
+
+  const urlMatch = value.match(/https?:\/\/[^\s,;'"`<>()\]]+/i);
+  if (urlMatch) value = urlMatch[0];
+
+  // Common typo: missing colon after scheme.
+  if (/^http\/\/+/i.test(value) || /^https\/\/+/i.test(value)) {
+    value = value.replace(/^http\/\/+/i, "http://").replace(/^https\/\/+/i, "https://");
+  }
+  if (/^ttps?:\/\//i.test(value)) {
+    value = `h${value}`;
+  }
+  if (/^https?:\/\/$/i.test(value)) return "";
+
+  // Accept domain-like values pasted without scheme.
+  if (!/^https?:\/\//i.test(value) && /^(?:[a-z0-9-]+\.)+[a-z]{2,}(?::\d+)?(?:\/[^\s]*)?$/i.test(value)) {
+    value = `https://${value}`;
+  }
+
+  value = value.replace(/[)\]}>.,;:]+$/g, "");
+  return /^https?:\/\/.+/i.test(value) ? value : "";
+}
+
+function parseEndpointListInput(raw) {
+  const text = Array.isArray(raw) ? raw.join("\n") : String(raw || "");
+  const extracted = [];
+
+  const urlRegex = /https?:\/\/[^\s,;'"`<>()\]]+/gi;
+  for (const match of text.matchAll(urlRegex)) {
+    extracted.push(match[0]);
+  }
+
+  const typoUrlRegex = /\bhttps?:\/\/?[^\s,;'"`<>()\]]+/gi;
+  for (const match of text.matchAll(typoUrlRegex)) {
+    extracted.push(match[0]);
+  }
+
+  const domainRegex = /\b(?:[a-z0-9-]+\.)+[a-z]{2,}(?::\d+)?(?:\/[^\s,;'"`<>()\]]*)?/gi;
+  for (const match of text.matchAll(domainRegex)) {
+    extracted.push(match[0]);
+  }
+
+  const fallbackTokens = tokenizeLooseListInput(text);
+  const normalized = dedupeList([...(extracted.length > 0 ? extracted : []), ...fallbackTokens]
+    .map(normalizeEndpointToken)
+    .filter(Boolean));
+
+  return normalized;
+}
+
+const MODEL_INPUT_NOISE_TOKENS = new Set([
+  "discover",
+  "progress",
+  "endpoint",
+  "testing",
+  "formats",
+  "format",
+  "working",
+  "supported",
+  "auto-discovery",
+  "auto",
+  "discovery",
+  "completed",
+  "started",
+  "done",
+  "openai",
+  "claude",
+  "anthropic",
+  "skip",
+  "ok",
+  "tentative",
+  "network-error",
+  "format-mismatch",
+  "model-unsupported",
+  "auth-error",
+  "unconfirmed",
+  "error",
+  "errors",
+  "warning",
+  "warnings",
+  "failed",
+  "failure",
+  "invalid",
+  "request",
+  "response",
+  "http",
+  "https",
+  "status",
+  "probe",
+  "provider",
+  "models",
+  "model",
+  "on",
+  "at"
+]);
+
+function normalizeModelToken(token) {
+  let value = trimOuterPunctuation(token);
+  if (!value) return "";
+
+  value = value
+    .replace(/^(?:models?|modelSupport|modelPreferredFormat)\s*=\s*/i, "")
+    .replace(/\[(?:openai|claude)\]?$/i, "")
+    .replace(/[)\]}>.,;:]+$/g, "")
+    .trim();
+
+  if (!value) return "";
+  if (value.includes("://")) return "";
+  if (value.includes("@")) return "";
+  if (/^\d+(?:\/\d+)?$/.test(value)) return "";
+  if (/^https?$/i.test(value)) return "";
+  if (/^(?:openai|claude|anthropic)$/i.test(value)) return "";
+  if (MODEL_INPUT_NOISE_TOKENS.has(value.toLowerCase())) return "";
+
+  // Ignore obvious prose fragments. Keep model-like IDs with delimiters.
+  if (!/[._:/-]/.test(value) && !/\d/.test(value)) return "";
+  if (!/^[A-Za-z0-9][A-Za-z0-9._:/-]*$/.test(value)) return "";
+
+  return value;
+}
+
+function parseProviderModelListInput(raw) {
+  const text = Array.isArray(raw) ? raw.join("\n") : String(raw || "");
+  const extracted = [];
+
+  // "Progress ... - <model> on <format> @ <endpoint>"
+  const progressRegex = /-\s+([A-Za-z0-9][A-Za-z0-9._:/-]*)\s+on\s+(?:openai|claude)\s+@/gi;
+  for (const match of text.matchAll(progressRegex)) {
+    extracted.push(match[1]);
+  }
+
+  // "models=foo[openai], bar[claude]"
+  const modelsLineRegex = /\bmodels?\s*=\s*([^\n\r]+)/gi;
+  for (const match of text.matchAll(modelsLineRegex)) {
+    extracted.push(...tokenizeLooseListInput(match[1]));
+  }
+
+  const fallbackTokens = tokenizeLooseListInput(text);
+  return dedupeList([...(extracted.length > 0 ? extracted : []), ...fallbackTokens]
+    .map(normalizeModelToken)
+    .filter(Boolean));
+}
+
+function maybeReportInputCleanup(context, label, rawValue, cleanedValues) {
+  if (!canPrompt()) return;
+  const info = typeof context?.terminal?.info === "function" ? context.terminal.info.bind(context.terminal) : null;
+  const warn = typeof context?.terminal?.warn === "function" ? context.terminal.warn.bind(context.terminal) : null;
+  if (!info && !warn) return;
+
+  const raw = String(rawValue || "").trim();
+  if (!raw) return;
+
+  const normalizedRaw = raw.toLowerCase();
+  const looksMessy =
+    /[;\n\r\t]/.test(raw) ||
+    /\[discover\]|auto-discovery|error|warning|failed|models?=/i.test(raw) ||
+    /\s{2,}/.test(raw);
+
+  if (!looksMessy) return;
+
+  if ((cleanedValues || []).length > 0) {
+    info?.(`Cleaned ${label} input: parsed ${(cleanedValues || []).length} item(s) from free-form text.`);
+  } else {
+    warn?.(`Could not parse any ${label} from the provided text. Use comma/semicolon/space-separated values.`);
+  }
+}
+
+function truncateLogText(value, max = 160) {
+  const text = String(value || "").trim();
+  if (!text) return "";
+  if (text.length <= max) return text;
+  return `${text.slice(0, max - 3)}...`;
+}
+
+function describeModelCheckStatus(event) {
+  const statusCode = Number(event.status || 0);
+  const statusSuffix = statusCode > 0 ? ` (http ${statusCode})` : "";
+  const rawMessage = event.error || event.message || "";
+  const detail = truncateLogText(rawMessage === "ok" ? "" : rawMessage);
+  const outcome = String(event.outcome || "");
+
+  if (event.confirmed) {
+    return {
+      shortLabel: "ok",
+      fullLabel: `ok${statusSuffix}`,
+      detail,
+      isOk: true
+    };
+  }
+
+  if (outcome === "runtime-error") {
+    return {
+      shortLabel: "tentative",
+      fullLabel: `tentative${statusSuffix}`,
+      detail,
+      isOk: false
+    };
+  }
+  if (outcome === "model-unsupported") {
+    return {
+      shortLabel: "model-unsupported",
+      fullLabel: `model-unsupported${statusSuffix}`,
+      detail,
+      isOk: false
+    };
+  }
+  if (outcome === "format-mismatch") {
+    return {
+      shortLabel: "format-mismatch",
+      fullLabel: `format-mismatch${statusSuffix}`,
+      detail,
+      isOk: false
+    };
+  }
+  if (outcome === "network-error") {
+    return {
+      shortLabel: "network-error",
+      fullLabel: `network-error${statusSuffix}`,
+      detail,
+      isOk: false
+    };
+  }
+  if (outcome === "auth-error") {
+    return {
+      shortLabel: "auth-error",
+      fullLabel: `auth-error${statusSuffix}`,
+      detail,
+      isOk: false
+    };
+  }
+  if (outcome === "unconfirmed") {
+    return {
+      shortLabel: "unconfirmed",
+      fullLabel: `unconfirmed${statusSuffix}`,
+      detail,
+      isOk: false
+    };
+  }
+
+  return {
+    shortLabel: event.supported ? "tentative" : "skip",
+    fullLabel: `${event.supported ? "tentative" : "skip"}${statusSuffix}`,
+    detail,
+    isOk: false
+  };
+}
+
 function probeProgressReporter(context) {
   const line = typeof context?.terminal?.line === "function" ? context.terminal.line.bind(context.terminal) : null;
   if (!line) return () => {};
 
+  const info = typeof context?.terminal?.info === "function" ? context.terminal.info.bind(context.terminal) : line;
+  const success = typeof context?.terminal?.success === "function" ? context.terminal.success.bind(context.terminal) : line;
+  const warn = typeof context?.terminal?.warn === "function" ? context.terminal.warn.bind(context.terminal) : line;
+  const interactiveTerminal = canPrompt();
+  const progress = interactiveTerminal && typeof SnapTui?.createProgress === "function" ? SnapTui.createProgress() : null;
+  const endpointSpinner = interactiveTerminal && typeof SnapTui?.createSpinner === "function" ? SnapTui.createSpinner() : null;
+  const PROGRESS_UI_MIN_UPDATE_MS = 120;
+  const SPINNER_UI_MIN_UPDATE_MS = 120;
+
   let lastProgressPrinted = -1;
+  let totalChecks = 0;
+  let matrixStarted = false;
+  let endpointSpinnerRunning = false;
+  let lastProgressUiUpdateAt = 0;
+  let lastProgressUiMessage = "";
+  let lastSpinnerUiUpdateAt = 0;
+  let lastSpinnerUiMessage = "";
+
+  const clearSpinnerForLog = () => {
+    if (!endpointSpinner || !endpointSpinnerRunning) return;
+    if (typeof endpointSpinner.clear === "function") {
+      endpointSpinner.clear();
+    }
+  };
+
+  const maybeLine = (message, { forceInteractive = false } = {}) => {
+    if (!interactiveTerminal || forceInteractive) {
+      clearSpinnerForLog();
+      line(message);
+    }
+  };
+
+  const setSpinnerMessage = (message, { force = false } = {}) => {
+    if (!endpointSpinner || !endpointSpinnerRunning) return;
+    const next = String(message || "").trim();
+    if (!next) return;
+    const now = Date.now();
+    if (!force) {
+      if (next === lastSpinnerUiMessage) return;
+      if (now - lastSpinnerUiUpdateAt < SPINNER_UI_MIN_UPDATE_MS) return;
+    }
+    endpointSpinner.message(next);
+    lastSpinnerUiMessage = next;
+    lastSpinnerUiUpdateAt = now;
+  };
+
+  const setProgressMessage = (message, { force = false } = {}) => {
+    if (!progress) return;
+    const next = String(message || "").trim();
+    if (!next) return;
+    const now = Date.now();
+    if (!force) {
+      if (next === lastProgressUiMessage) return;
+      if (now - lastProgressUiUpdateAt < PROGRESS_UI_MIN_UPDATE_MS) return;
+    }
+    progress.message(next);
+    lastProgressUiMessage = next;
+    lastProgressUiUpdateAt = now;
+  };
+
   return (event) => {
     if (!event || typeof event !== "object") return;
     const phase = String(event.phase || "");
 
     if (phase === "matrix-start") {
-      line(`Auto-discovery started: ${event.endpointCount || 0} endpoint(s) x ${event.modelCount || 0} model(s).`);
+      const endpointCount = Number(event.endpointCount || 0);
+      const modelCount = Number(event.modelCount || 0);
+      totalChecks = endpointCount * modelCount * 2;
+      matrixStarted = true;
+
+      info(`Auto-discovery started: ${endpointCount} endpoint(s) x ${modelCount} model(s).`);
+      progress?.start(`Auto-discovery progress: 0/${totalChecks || 0}`);
+      lastProgressUiMessage = `Auto-discovery progress: 0/${totalChecks || 0}`;
+      lastProgressUiUpdateAt = Date.now();
       return;
     }
     if (phase === "endpoint-start") {
-      line(`[discover] Endpoint ${event.endpointIndex || "?"}/${event.endpointCount || "?"}: ${event.endpoint}`);
+      if (endpointSpinner && endpointSpinnerRunning) {
+        endpointSpinner.stop();
+      }
+      endpointSpinner?.start(`Endpoint ${event.endpointIndex || "?"}/${event.endpointCount || "?"}: ${event.endpoint}`);
+      endpointSpinnerRunning = Boolean(endpointSpinner);
+      lastSpinnerUiMessage = `Endpoint ${event.endpointIndex || "?"}/${event.endpointCount || "?"}: ${event.endpoint}`;
+      lastSpinnerUiUpdateAt = Date.now();
+      maybeLine(`[discover] Endpoint ${event.endpointIndex || "?"}/${event.endpointCount || "?"}: ${event.endpoint}`);
       return;
     }
     if (phase === "endpoint-formats") {
       const formats = Array.isArray(event.formatsToTest) && event.formatsToTest.length > 0
         ? event.formatsToTest.join(", ")
         : "(none)";
-      line(`[discover] Testing formats for ${event.endpoint}: ${formats}`);
+      setSpinnerMessage(`Testing ${event.endpoint}: ${formats}`, { force: true });
+      maybeLine(`[discover] Testing formats for ${event.endpoint}: ${formats}`);
       return;
     }
     if (phase === "format-start") {
-      line(`[discover] ${event.endpoint} -> ${event.format} (${event.modelCount || 0} model checks)`);
+      setSpinnerMessage(`${event.endpoint} -> ${event.format} (${event.modelCount || 0} model checks)`, { force: true });
+      maybeLine(`[discover] ${event.endpoint} -> ${event.format} (${event.modelCount || 0} model checks)`);
       return;
     }
     if (phase === "model-check") {
       const completed = Number(event.completedChecks || 0);
       const total = Number(event.totalChecks || 0);
       if (completed <= 0 || total <= 0) return;
-      if (completed === total || completed - lastProgressPrinted >= 3) {
+      const status = describeModelCheckStatus(event);
+      const shouldPrintLine = interactiveTerminal
+        ? (!status.isOk || completed === total)
+        : (!status.isOk || completed === total || completed - lastProgressPrinted >= 3);
+
+      if (matrixStarted) {
+        setProgressMessage(
+          `Auto-discovery progress: ${completed}/${total} (${event.model} on ${event.format} @ ${event.endpoint}: ${status.shortLabel})`,
+          { force: !status.isOk || completed === total }
+        );
+      }
+
+      if (shouldPrintLine) {
         lastProgressPrinted = completed;
-        line(`[discover] Progress ${completed}/${total} - ${event.model} on ${event.format} @ ${event.endpoint}: ${event.supported ? "ok" : "skip"}`);
+        const detailSuffix = status.detail ? ` - ${status.detail}` : "";
+        maybeLine(
+          `[discover] Progress ${completed}/${total} - ${event.model} on ${event.format} @ ${event.endpoint}: ${status.fullLabel}${detailSuffix}`,
+          { forceInteractive: !status.isOk || completed === total }
+        );
       }
       return;
     }
@@ -134,16 +533,40 @@ function probeProgressReporter(context) {
       const formats = Array.isArray(event.workingFormats) && event.workingFormats.length > 0
         ? event.workingFormats.join(", ")
         : "(none)";
-      line(`[discover] Endpoint done: ${event.endpoint} working formats=${formats}`);
+      if (endpointSpinner && endpointSpinnerRunning) {
+        endpointSpinner.stop();
+        endpointSpinnerRunning = false;
+      }
+      if (formats === "(none)") {
+        warn(`[discover] Endpoint done: ${event.endpoint} working formats=${formats}`);
+      } else {
+        success(`[discover] Endpoint done: ${event.endpoint} working formats=${formats}`);
+      }
       return;
     }
-    if (phase === "matrix-done") {
+      if (phase === "matrix-done") {
       const openaiBase = event.baseUrlByFormat?.openai || "(none)";
       const claudeBase = event.baseUrlByFormat?.claude || "(none)";
       const formats = Array.isArray(event.workingFormats) && event.workingFormats.length > 0
         ? event.workingFormats.join(", ")
         : "(none)";
-      line(`Auto-discovery completed: working formats=${formats}, models=${event.supportedModelCount || 0}, openaiBase=${openaiBase}, claudeBase=${claudeBase}`);
+      const finalMessage = `Auto-discovery completed: working formats=${formats}, models=${event.supportedModelCount || 0}, openaiBase=${openaiBase}, claudeBase=${claudeBase}`;
+      if (endpointSpinner && endpointSpinnerRunning) {
+        endpointSpinner.stop();
+        endpointSpinnerRunning = false;
+      }
+      if (matrixStarted) {
+        progress?.stop(`Auto-discovery progress: ${event.supportedModelCount || 0} model(s) confirmed`);
+        lastProgressUiMessage = "";
+      }
+      if (formats === "(none)") {
+        warn(finalMessage);
+      } else {
+        success(finalMessage);
+      }
+      matrixStarted = false;
+      totalChecks = 0;
+      lastSpinnerUiMessage = "";
     }
   };
 }
@@ -295,7 +718,7 @@ async function resolveUpsertInput(context, existingConfig) {
   const baseProviderId = argProviderId || selectedExisting?.id || "";
   const baseName = String(readArg(args, ["name"], selectedExisting?.name || "") || "");
   const baseUrl = String(readArg(args, ["base-url", "baseUrl"], selectedExisting?.baseUrl || "") || "");
-  const baseEndpoints = parseModelListInput(readArg(
+  const baseEndpoints = parseEndpointListInput(readArg(
     args,
     ["endpoints"],
     providerEndpointsFromConfig(selectedExisting).join(",")
@@ -334,7 +757,7 @@ async function resolveUpsertInput(context, existingConfig) {
       openaiBaseUrl: baseOpenAIBaseUrl,
       claudeBaseUrl: baseClaudeBaseUrl,
       apiKey: baseApiKey || selectedExisting?.apiKey || "",
-      models: parseModelListInput(baseModels),
+      models: parseProviderModelListInput(baseModels),
       format: baseFormat,
       formats: baseFormats,
       headers: parsedHeaders,
@@ -344,16 +767,34 @@ async function resolveUpsertInput(context, existingConfig) {
     };
   }
 
+  printProviderInputGuidance(context);
+
   const name = baseName || await context.prompts.text({
-    message: "Provider name",
+    message: "Provider Friendly Name (unique, shown in management screen)",
     required: true,
-    placeholder: "OpenRouter"
+    placeholder: "OpenRouter Primary",
+    validate: (value) => {
+      const candidate = String(value || "").trim();
+      if (!candidate) return "Provider Friendly Name is required.";
+      const duplicate = findProviderByFriendlyName(providers, candidate, { excludeId: selectedExisting?.id || baseProviderId });
+      if (duplicate) return `Provider Friendly Name '${candidate}' already exists (provider-id: ${duplicate.id}). Use a unique name.`;
+      return undefined;
+    }
   });
 
   const providerId = baseProviderId || await context.prompts.text({
-    message: "Provider id (slug/camelCase)",
+    message: "Provider ID (auto-slug from Friendly Name; editable)",
     required: true,
-    initialValue: slugifyId(name)
+    initialValue: slugifyId(name),
+    placeholder: "openrouterPrimary",
+    validate: (value) => {
+      const candidate = String(value || "").trim();
+      if (!candidate) return "Provider ID is required.";
+      if (!PROVIDER_ID_PATTERN.test(candidate)) {
+        return "Use slug/camelCase with letters, numbers, underscore, dot, or hyphen (e.g. openrouterPrimary).";
+      }
+      return undefined;
+    }
   });
 
   const askReplaceKey = selectedExisting?.apiKey ? await context.prompts.confirm({
@@ -363,21 +804,34 @@ async function resolveUpsertInput(context, existingConfig) {
 
   const apiKey = (baseApiKey || (!askReplaceKey ? selectedExisting?.apiKey : "")) || await context.prompts.text({
     message: "Provider API key",
-    required: true
+    required: true,
+    placeholder: "sk-or-v1-..., sk-ant-api03-..., or sk-...",
+    validate: (value) => {
+      const candidate = String(value || "").trim();
+      if (!candidate) return "Provider API key is required.";
+      return undefined;
+    }
   });
 
   const endpointsInput = await context.prompts.text({
-    message: "Provider endpoints (comma separated)",
+    message: "Provider endpoints (comma / ; / space separated; multiline paste supported)",
     required: true,
-    initialValue: baseEndpoints.join(",")
+    initialValue: baseEndpoints.join(","),
+    paste: true,
+    multiline: true
   });
-  const endpoints = parseModelListInput(endpointsInput);
+  const endpoints = parseEndpointListInput(endpointsInput);
+  maybeReportInputCleanup(context, "endpoint", endpointsInput, endpoints);
 
   const modelsInput = await context.prompts.text({
-    message: "Provider models (comma separated)",
+    message: "Provider models (comma / ; / space separated; multiline paste supported)",
     required: true,
-    initialValue: baseModels
+    initialValue: baseModels,
+    paste: true,
+    multiline: true
   });
+  const models = parseProviderModelListInput(modelsInput);
+  maybeReportInputCleanup(context, "model", modelsInput, models);
 
   const headersInput = await context.prompts.text({
     message: "Custom headers JSON (optional; default User-Agent included)",
@@ -422,7 +876,7 @@ async function resolveUpsertInput(context, existingConfig) {
     openaiBaseUrl: baseOpenAIBaseUrl,
     claudeBaseUrl: baseClaudeBaseUrl,
     apiKey,
-    models: parseModelListInput(modelsInput),
+    models,
     format: probe ? "" : manualFormat,
     formats: baseFormats,
     headers: interactiveHeaders,
@@ -437,7 +891,7 @@ async function doUpsertProvider(context) {
   const existingConfig = await readConfigFile(configPath);
   const input = await resolveUpsertInput(context, existingConfig);
 
-  const endpointCandidates = parseModelListInput([
+  const endpointCandidates = parseEndpointListInput([
     ...(input.endpoints || []),
     input.openaiBaseUrl,
     input.claudeBaseUrl,
@@ -462,6 +916,18 @@ async function doUpsertProvider(context) {
     };
   }
 
+  const duplicateFriendlyName = findProviderByFriendlyName(existingConfig.providers || [], input.name, {
+    excludeId: input.providerId
+  });
+  if (duplicateFriendlyName) {
+    return {
+      ok: false,
+      mode: context.mode,
+      exitCode: EXIT_VALIDATION,
+      errorMessage: `Provider Friendly Name '${input.name}' already exists (provider-id: ${duplicateFriendlyName.id}). Choose a unique name.`
+    };
+  }
+
   let probe = null;
   let selectedFormat = String(input.format || "").trim();
   let effectiveBaseUrl = String(input.baseUrl || "").trim();
@@ -1261,13 +1727,13 @@ const routerModule = {
         args: [
           { name: "operation", required: false, description: "Setup operation (optional; prompts if omitted).", example: "--operation=upsert-provider" },
           { name: "provider-id", required: false, description: "Provider id (slug/camelCase).", example: "--provider-id=openrouter" },
-          { name: "name", required: false, description: "Provider display name.", example: "--name=OpenRouter" },
-          { name: "endpoints", required: false, description: "Comma-separated provider endpoint candidates for auto-probe.", example: "--endpoints=https://ramclouds.me,https://ramclouds.me/v1" },
+          { name: "name", required: false, description: "Provider Friendly Name (must be unique; shown in management screen).", example: "--name=OpenRouter Primary" },
+          { name: "endpoints", required: false, description: "Provider endpoint candidates for auto-probe (comma/semicolon/space separated; TUI supports multiline paste).", example: "--endpoints=https://ramclouds.me,https://ramclouds.me/v1" },
           { name: "base-url", required: false, description: "Provider base URL.", example: "--base-url=https://openrouter.ai/api/v1" },
           { name: "openai-base-url", required: false, description: "OpenAI endpoint base URL (format-specific override).", example: "--openai-base-url=https://ramclouds.me/v1" },
           { name: "claude-base-url", required: false, description: "Anthropic endpoint base URL (format-specific override).", example: "--claude-base-url=https://ramclouds.me" },
-          { name: "api-key", required: false, description: "Provider API key.", example: "--api-key=sk-..." },
-          { name: "models", required: false, description: "Comma-separated model list.", example: "--models=gpt-4o,claude-3-5-sonnet-latest" },
+          { name: "api-key", required: false, description: "Provider API key.", example: "--api-key=sk-or-v1-..." },
+          { name: "models", required: false, description: "Model list (comma/semicolon/space separated; strips common log/error noise; TUI supports multiline paste).", example: "--models=gpt-4o,claude-3-5-sonnet-latest" },
           { name: "model", required: false, description: "Single model id (used by remove-model).", example: "--model=gpt-4o" },
           { name: "format", required: false, description: "Manual format if probe is skipped.", example: "--format=openai" },
           { name: "headers", required: false, description: "Custom provider headers as JSON object (default User-Agent applied when omitted).", example: "--headers={\"User-Agent\":\"Mozilla/5.0\"}" },

package/src/node/provider-probe.js

@@ -224,11 +224,105 @@ function isUnsupportedModelMessage(message) {
     /no such model/,
     /model .*does not exist/,
     /model .*not available/,
-    /unrecognized model/
+    /unrecognized model/,
+    /model .*is not supported/,
+    /not enabled for this model/,
+    /not available for this api/,
+    /not available in this api/,
+    /does not support .*api/,
+    /must use .*endpoint/,
+    /use .*\/v1/,
+    /only available via/
   ];
   return patterns.some((pattern) => pattern.test(text));
 }
 
+function isTransientModelRuntimeError(result, message) {
+  const status = Number(result?.status || 0);
+  if ([408, 409, 429, 500, 502, 503, 504].includes(status)) return true;
+
+  const text = String(message || "").toLowerCase();
+  if (!text) return false;
+  const patterns = [
+    /rate limit/,
+    /too many requests/,
+    /quota/,
+    /overloaded/,
+    /try again/,
+    /temporar/,
+    /service unavailable/,
+    /gateway timeout/,
+    /upstream/,
+    /timeout/
+  ];
+  return patterns.some((pattern) => pattern.test(text));
+}
+
+function classifyModelProbeResult(format, result) {
+  const message = getResultMessage(result);
+
+  if (result.error) {
+    return {
+      supported: false,
+      confirmed: false,
+      outcome: "network-error",
+      message: result.error
+    };
+  }
+
+  if (result.ok) {
+    return {
+      supported: true,
+      confirmed: true,
+      outcome: "ok",
+      message: "ok"
+    };
+  }
+
+  if (!looksExpectedFormat(format, result)) {
+    return {
+      supported: false,
+      confirmed: false,
+      outcome: "format-mismatch",
+      message: message || "Endpoint response does not match expected format."
+    };
+  }
+
+  if (!authLooksValid(result)) {
+    return {
+      supported: false,
+      confirmed: false,
+      outcome: "auth-error",
+      message: message || "Authentication failed for this format."
+    };
+  }
+
+  if (isUnsupportedModelMessage(message)) {
+    return {
+      supported: false,
+      confirmed: false,
+      outcome: "model-unsupported",
+      message: message || "Model is not supported on this endpoint."
+    };
+  }
+
+  if (isTransientModelRuntimeError(result, message)) {
+    return {
+      supported: true,
+      confirmed: false,
+      outcome: "runtime-error",
+      message: message || "Request reached endpoint but failed with transient runtime error."
+    };
+  }
+
+  return {
+    supported: false,
+    confirmed: false,
+    outcome: "unconfirmed",
+    message: message || "Could not confirm model support for this endpoint/format."
+  };
+}
+
 function looksExpectedFormat(format, result) {
   if (format === FORMATS.CLAUDE) return looksClaude(result);
   return looksOpenAI(result);
@@ -266,16 +360,6 @@ function makeProbeHeaders(format, extraHeaders, authHeaders = {}) {
   return headers;
 }
 
-function modelLooksSupported(format, result) {
-  if (result.ok) return true;
-  if (!looksExpectedFormat(format, result)) return false;
-  if (!authLooksValid(result)) return false;
-
-  const message = getResultMessage(result);
-  if (isUnsupportedModelMessage(message)) return false;
-  return true;
-}
-
 async function probeModelForFormat({
   baseUrl,
   format,
@@ -296,28 +380,33 @@ async function probeModelForFormat({
       body: JSON.stringify(buildProbeRequest(format, modelId))
     }, timeoutMs);
 
-    if (modelLooksSupported(format, result)) {
+    const classified = classifyModelProbeResult(format, result);
+    if (classified.supported) {
       return {
         supported: true,
+        confirmed: classified.confirmed,
+        outcome: classified.outcome,
         authType: variant.type,
         status: result.status,
-        message: result.ok ? "ok" : truncateMessage(getResultMessage(result)),
+        message: classified.outcome === "ok"
+          ? "ok"
+          : truncateMessage(classified.message || getResultMessage(result)),
         error: result.error || null
       };
     }
 
-    if (!authLooksValid(result)) {
+    if (classified.outcome === "auth-error") {
       continue;
     }
 
-    // Endpoint/format looks valid and auth seems valid, model is likely not available here.
-    const msg = getResultMessage(result);
-    if (isUnsupportedModelMessage(msg)) {
+    if (classified.outcome === "format-mismatch" || classified.outcome === "model-unsupported" || classified.outcome === "network-error") {
       return {
         supported: false,
+        confirmed: false,
+        outcome: classified.outcome,
         authType: variant.type,
         status: result.status,
-        message: truncateMessage(msg || "Model is not supported on this endpoint."),
+        message: truncateMessage(classified.message),
         error: result.error || null
       };
     }
@@ -325,6 +414,8 @@ async function probeModelForFormat({
 
   return {
     supported: false,
+    confirmed: false,
+    outcome: "unknown",
     authType: null,
     status: 0,
     message: "Could not validate model support for this endpoint/format.",
@@ -688,6 +779,8 @@ export async function probeProviderEndpointMatrix(options) {
           format,
           model: modelId,
           supported: check.supported,
+          confirmed: check.confirmed,
+          outcome: check.outcome,
           status: check.status,
           authType: check.authType,
           message: check.message,
@@ -700,7 +793,11 @@ export async function probeProviderEndpointMatrix(options) {
           format,
           model: modelId,
           supported: check.supported,
+          confirmed: check.confirmed,
+          outcome: check.outcome,
           status: check.status,
+          message: check.message,
+          error: check.error,
           completedChecks,
           totalChecks
         });