Merge pull request #68 from deepagent-ltd/dev

v4.0.1

Author: deepagent-ai

.gitignore

@@ -13,6 +13,10 @@ tmp
 dist
 ts-dist
 .turbo
+# Web/edge build artifacts (nitro .output, cloudflare .wrangler) — e.g. packages/console, packages/stats
+.output
+.wrangler
+packages/console/app/public/sitemap.xml
 **/.serena
 .serena/
 **/.omo

README.md

@@ -1,6 +1,6 @@
 {
   "name": "@deepagent-code/app",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "",
   "type": "module",
   "exports": {

README.zh.md

@@ -1,5 +1,33 @@
+import { isOfficialProvider } from "@deepagent-code/core/provider-official"
+
 const PROVIDER_ID = /^[a-z0-9][a-z0-9-_]*$/
 const OPENAI_COMPATIBLE = "@ai-sdk/openai-compatible"
+const ANTHROPIC = "@ai-sdk/anthropic"
+
+export type ProviderProtocol = "openai-compatible" | "anthropic"
+
+// The config payload written under `provider.<id>`. `discovery` and `models` are mutually exclusive
+// in practice (discovery mode emits an empty models map), but both are typed optional so the emitted
+// object has one consistent shape instead of a union callers must narrow.
+export type CustomProviderConfig = {
+  npm: string
+  name: string
+  env?: string[]
+  options: {
+    baseURL: string
+    apiKey?: string
+    headers?: Record<string, string>
+  }
+  discovery?: boolean
+  models: Record<string, { name: string }>
+}
+
+const npmForProtocol = (kind: ProviderProtocol | undefined) => (kind === "anthropic" ? ANTHROPIC : OPENAI_COMPATIBLE)
+
+// Leading host labels that are generic service prefixes and make a poor provider id, so we skip past
+// them to reach the brand label (api.deepseek.com -> "deepseek", not "api"). Kept deliberately small:
+// only unambiguous service prefixes, never anything that could be a brand.
+const GENERIC_HOST_LABELS = new Set(["api", "www", "app", "gateway", "proxy", "open"])
 
 type Translator = (key: string, vars?: Record<string, string | number | boolean>) => string
 
@@ -46,29 +74,108 @@ type ValidateArgs = {
   t: Translator
   disabledProviders: string[]
   existingProviderIDs: Set<string>
+  // Protocol detected during model discovery; decides the SDK npm written to config. Defaults to
+  // openai-compatible when omitted (backward compatible with the manual form).
+  protocol?: ProviderProtocol
+  // Runtime discovery mode: when true AND the user listed no manual models, persist `discovery: true`
+  // with an empty model list so the backend refreshes models from the provider's /models endpoint on
+  // every load instead of freezing them into config. Manual models always take precedence and turn
+  // this off for that provider.
+  discovery?: boolean
+}
+
+// Turn a base URL into a stable, unique provider id + a human display name so the user only has to
+// enter URL + key. Rules:
+//   - id is derived from the registrable host label (api.deepseek.com -> "deepseek",
+//     open.bigmodel.cn -> "bigmodel"), slugified to satisfy PROVIDER_ID.
+//   - reserved official ids (openai/deepseek/anthropic/zhipuai/xai/google/...) and any id already in
+//     use are avoided by appending a numeric suffix, since a third-party id that collides with an
+//     official one is rejected by the backend (THIRD_PARTY_PROVIDER_CONFLICT).
+//   - `disabledProviders` do NOT count as taken: re-adding a previously disabled provider should be
+//     able to reuse its id.
+export function deriveProviderIdentity(input: {
+  baseURL: string
+  existingProviderIDs: Set<string>
+  disabledProviders?: string[]
+}): { providerID: string; name: string } {
+  const disabled = new Set(input.disabledProviders ?? [])
+  const taken = (id: string) =>
+    (input.existingProviderIDs.has(id) && !disabled.has(id)) || (isOfficialProvider(id) && !disabled.has(id))
+
+  const base = baseSlug(input.baseURL)
+  let providerID = base
+  let n = 2
+  while (taken(providerID)) {
+    providerID = `${base}-${n}`
+    n++
+  }
+  return { providerID, name: displayName(base) }
+}
+
+function baseSlug(baseURL: string): string {
+  let host = ""
+  try {
+    host = new URL(baseURL.trim()).hostname
+  } catch {
+    host = ""
+  }
+  const labels = host.split(".").filter(Boolean)
+  // Drop leading generic service labels (api., www., ...) so we land on the brand label.
+  while (labels.length > 1 && GENERIC_HOST_LABELS.has(labels[0].toLowerCase())) labels.shift()
+  // Prefer the registrable label: for a.b.com pick "b"; for single-label/localhost keep as-is.
+  const label = labels.length >= 2 ? labels[labels.length - 2] : (labels[0] ?? "")
+  const slug = label
+    .toLowerCase()
+    .replace(/[^a-z0-9-_]+/g, "-")
+    .replace(/^-+|-+$/g, "")
+  // Must satisfy PROVIDER_ID (starts alphanumeric). Fall back to a safe default.
+  return slug && PROVIDER_ID.test(slug) ? slug : "custom-provider"
+}
+
+function displayName(slug: string): string {
+  const cleaned = slug.replace(/[-_]+/g, " ").trim()
+  if (!cleaned) return "Custom Provider"
+  return cleaned
+    .split(" ")
+    .map((word) => (word ? word[0].toUpperCase() + word.slice(1) : word))
+    .join(" ")
 }
 
 export function validateCustomProvider(input: ValidateArgs) {
-  const providerID = input.form.providerID.trim()
-  const name = input.form.name.trim()
+  const typedID = input.form.providerID.trim()
+  const typedName = input.form.name.trim()
   const baseURL = input.form.baseURL.trim()
   const apiKey = input.form.apiKey.trim()
 
   const env = apiKey.match(/^\{env:([^}]+)\}$/)?.[1]?.trim()
   const key = apiKey && !env ? apiKey : undefined
 
+  const urlError = !baseURL
+    ? input.t("provider.custom.error.baseURL.required")
+    : !/^https?:\/\//.test(baseURL)
+      ? input.t("provider.custom.error.baseURL.format")
+      : undefined
+
+  // Zero-config path: when the user leaves id/name blank we derive them from the URL, so those
+  // fields are no longer required. Derivation needs a usable URL — if the URL itself is invalid we
+  // skip it and let urlError drive the failure instead of emitting a spurious id/name error.
+  const derived = !urlError && (!typedID || !typedName) ? deriveProviderIdentity({
+    baseURL,
+    existingProviderIDs: input.existingProviderIDs,
+    disabledProviders: input.disabledProviders,
+  }) : undefined
+  const providerID = typedID || derived?.providerID || ""
+  const name = typedName || derived?.name || ""
+
+  // Only the user's explicitly-typed id is format-checked; a derived id is always valid by
+  // construction. A blank id with no derivable URL still surfaces as "required".
   const idError = !providerID
     ? input.t("provider.custom.error.providerID.required")
-    : !PROVIDER_ID.test(providerID)
+    : typedID && !PROVIDER_ID.test(typedID)
       ? input.t("provider.custom.error.providerID.format")
       : undefined
 
   const nameError = !name ? input.t("provider.custom.error.name.required") : undefined
-  const urlError = !baseURL
-    ? input.t("provider.custom.error.baseURL.required")
-    : !/^https?:\/\//.test(baseURL)
-      ? input.t("provider.custom.error.baseURL.format")
-      : undefined
 
   const disabled = input.disabledProviders.includes(providerID)
   const existsError = idError
@@ -77,6 +184,11 @@ export function validateCustomProvider(input: ValidateArgs) {
       ? input.t("provider.custom.error.providerID.exists")
       : undefined
 
+  // Discovery mode is only active when the user listed no manual models: the model list then comes
+  // from the backend at runtime, so the empty model rows must not fail validation.
+  const hasManualModels = input.form.models.some((m) => m.id.trim().length > 0)
+  const discoveryMode = !!input.discovery && !hasManualModels
+
   const seenModels = new Set<string>()
   const models = input.form.models.map((m) => {
     const id = m.id.trim()
@@ -91,7 +203,7 @@ export function validateCustomProvider(input: ValidateArgs) {
     const nameError = !m.name.trim() ? input.t("provider.custom.error.required") : undefined
     return { id: idError, name: nameError }
   })
-  const modelsValid = models.every((m) => !m.id && !m.name)
+  const modelsValid = discoveryMode || models.every((m) => !m.id && !m.name)
   const modelConfig = Object.fromEntries(input.form.models.map((m) => [m.id.trim(), { name: m.name.trim() }]))
 
   const seenHeaders = new Set<string>()
@@ -128,26 +240,25 @@ export function validateCustomProvider(input: ValidateArgs) {
   const ok = !idError && !existsError && !nameError && !urlError && modelsValid && headersValid
   if (!ok) return { err, models, headers }
 
+  const config: CustomProviderConfig = {
+    npm: npmForProtocol(input.protocol),
+    name,
+    ...(env ? { env: [env] } : {}),
+    options: {
+      baseURL,
+      ...(key ? { apiKey: key } : {}),
+      ...(Object.keys(headerConfig).length ? { headers: headerConfig } : {}),
+    },
+    // Discovery mode: persist the opt-in flag and an empty model list (backend refreshes at runtime).
+    // Manual mode: freeze the listed models and leave discovery off.
+    ...(discoveryMode ? { discovery: true, models: {} } : { models: modelConfig }),
+  }
+
   return {
     err,
     models,
     headers,
-    result: {
-      providerID,
-      name,
-      key,
-      config: {
-        npm: OPENAI_COMPATIBLE,
-        name,
-        ...(env ? { env: [env] } : {}),
-        options: {
-          baseURL,
-          ...(key ? { apiKey: key } : {}),
-          ...(Object.keys(headerConfig).length ? { headers: headerConfig } : {}),
-        },
-        models: modelConfig,
-      },
-    },
+    result: { providerID, name, key, config },
   }
 }