@ai-wendao/ant 0.4.11 → 0.4.12

package/client.js

@@ -6,6 +6,7 @@ window.__ModuleLoader__.load({
     const { createElement, useEffect, useRef, useState } = require('react')
     const h = createElement
     const SERVICE_URL_STORAGE_KEY = 'ant-team-service-url'
+    const PROVIDER_ROUTES_STORAGE_KEY = 'ant-team-provider-routes'
     const DEVICE_ID_STORAGE_KEY = 'ant-team-device-id'
     const DEFAULT_MODEL_INITIALIZED_KEY = 'ant-team-default-model-initialized'
     const ANT_BUNDLE_PACKAGE_NAME = '@ai-wendao/ant'
@@ -1989,9 +1990,12 @@ window.__ModuleLoader__.load({
         return status
       }
 
-      const modelProvider = (model) => model.protocol === 'anthropic' ? 'ant-team-anthropic'
-        : model.openai_api_mode === 'responses' ? 'ant-team-openai-responses' : 'ant-team-openai-chat-completions'
-      const modelSelectionKey = (model) => JSON.stringify({ protocol: model.protocol, model_id: model.model_id })
+      const modelProvider = (model) => model.protocol === 'anthropic'
+        ? model.provider_id === 'anthropic-default' || !model.provider_id ? 'ant-team-anthropic' : `ant-team-anthropic-${model.provider_id}`
+        : model.provider_id === 'openai-default' || !model.provider_id
+          ? model.openai_api_mode === 'responses' ? 'ant-team-openai-responses' : 'ant-team-openai-chat-completions'
+          : `ant-team-openai-${model.provider_id}`
+      const modelSelectionKey = (model) => JSON.stringify({ provider_id: model.provider_id || '', protocol: model.protocol, model_id: model.model_id })
       const defaultPreferenceKey = (rawServiceUrl) => `${DEFAULT_MODEL_INITIALIZED_KEY}:${normalizeServiceUrl(rawServiceUrl)}:${savedDeviceId() || ''}`
       const readDefaultPreference = (rawServiceUrl) => {
         try { return JSON.parse(localStorage.getItem(defaultPreferenceKey(rawServiceUrl)) || 'null') } catch { return null }
@@ -2003,9 +2007,9 @@ window.__ModuleLoader__.load({
         if (!selection) return null
         const exact = models.find((model) => model.model_id === selection.model && modelProvider(model) === selection.provider)
         if (exact) return exact
-        const legacyProtocol = selection.provider === 'ant-team-openai' || selection.provider?.startsWith('ant-team-openai-')
-          ? 'openai' : selection.provider === 'ant-team-anthropic' ? 'anthropic' : null
-        return legacyProtocol ? models.find((model) => model.protocol === legacyProtocol && model.model_id === selection.model) : null
+        const legacyProvider = ['ant-team-openai', 'ant-team-openai-chat-completions', 'ant-team-openai-responses'].includes(selection.provider)
+          ? 'openai-default' : selection.provider === 'ant-team-anthropic' ? 'anthropic-default' : null
+        return legacyProvider ? models.find((model) => model.provider_id === legacyProvider && model.model_id === selection.model) : null
       }
       const readDshDefaultSelection = async () => {
         if (typeof remote?.settings?.describe !== 'function') throw new Error('当前 DSH 未提供全局默认模型读取接口。')
@@ -2051,34 +2055,69 @@ window.__ModuleLoader__.load({
         const normalized = normalizeServiceUrl(rawServiceUrl)
         if (!normalized || !Array.isArray(models)) throw new Error('ANT 返回的团队模型目录格式无效。')
         if (typeof remote?.settings?.mutate !== 'function') throw new Error('当前 DSH 版本未提供模型设置接口。')
-        const groups = [
-          { route: 'ant-team-openai-chat-completions', protocol: 'openai', mode: 'chat_completions', api: 'openai-completions' },
-          { route: 'ant-team-openai-responses', protocol: 'openai', mode: 'responses', api: 'openai-responses' },
-          { route: 'ant-team-anthropic', protocol: 'anthropic', api: 'anthropic-messages' },
-        ]
-        const ops = [{ op: 'unset', path: ['providers', 'ant-team-openai'] }]
-        for (const group of groups) {
-          const protocolModels = models.filter((model) => model.protocol === group.protocol
-            && (group.protocol !== 'openai' || (model.openai_api_mode || 'chat_completions') === group.mode))
-          const route = group.route
-          if (protocolModels.length === 0) {
-            ops.push({ op: 'unset', path: ['providers', route] })
-            continue
+        const grouped = new Map()
+        for (const model of models) {
+          const protocol = model.protocol
+          if (!['openai', 'anthropic'].includes(protocol)) continue
+          const providerId = model.provider_id || (protocol === 'openai' ? 'openai-default' : 'anthropic-default')
+          const key = `${providerId}\u0000${protocol}`
+          let provider = grouped.get(key)
+          if (!provider) {
+            provider = {
+              providerId,
+              providerName: model.provider_name || (protocol === 'openai'
+                ? `ANT 团队 · OpenAI · ${model.openai_api_mode === 'responses' ? 'Responses' : 'Chat Completions'}`
+                : 'ANT 团队 · Anthropic'),
+              protocol,
+              apiMode: model.openai_api_mode === 'responses' ? 'responses' : 'chat_completions',
+              legacyEndpoint: typeof model.provider_id !== 'string' || !model.provider_id,
+              models: [],
+            }
+            grouped.set(key, provider)
           }
+          provider.models.push(model)
+        }
+        const providers = [...grouped.values()]
+        const routeForProvider = (provider) => provider.providerId === 'openai-default'
+          ? provider.apiMode === 'responses' ? 'ant-team-openai-responses' : 'ant-team-openai-chat-completions'
+          : provider.providerId === 'anthropic-default'
+            ? 'ant-team-anthropic' : `ant-team-${provider.protocol}-${provider.providerId}`
+        const routes = providers.map(routeForProvider)
+        const ops = []
+        let previousRoutes = []
+        try {
+          const parsed = JSON.parse(localStorage.getItem(PROVIDER_ROUTES_STORAGE_KEY) || '[]')
+          if (Array.isArray(parsed)) previousRoutes = parsed.filter((route) => typeof route === 'string')
+        } catch {}
+        const knownRoutes = new Set([...previousRoutes, 'ant-team-openai', 'ant-team-openai-chat-completions',
+          'ant-team-openai-responses', 'ant-team-anthropic'])
+        for (const route of knownRoutes) {
+          if (!routes.includes(route)) ops.push({ op: 'unset', path: ['providers', route] })
+        }
+        for (const provider of providers) {
+          const route = routeForProvider(provider)
+          const api = provider.protocol === 'openai'
+            ? provider.apiMode === 'responses' ? 'openai-responses' : 'openai-completions'
+            : 'anthropic-messages'
+          const baseURL = provider.legacyEndpoint
+            ? new URL(provider.protocol === 'openai' ? '/model-gateway/openai/v1' : '/model-gateway/anthropic', normalized).toString()
+            : provider.protocol === 'openai'
+              ? new URL(`/model-gateway/openai/providers/${encodeURIComponent(provider.providerId)}/v1`, normalized).toString()
+              : new URL(`/model-gateway/anthropic/providers/${encodeURIComponent(provider.providerId)}`, normalized).toString()
           ops.push({ op: 'set', path: ['providers', route], value: {
-            displayName: group.protocol === 'anthropic' ? 'ANT 团队 · Anthropic' : `ANT 团队 · OpenAI · ${group.mode === 'responses' ? 'Responses' : 'Chat Completions'}`,
+            displayName: provider.providerName,
             apiKeyEnv: 'ANT_MODEL_API_KEY',
-            api: group.api,
-            baseURL: group.protocol === 'openai'
-              ? new URL('/model-gateway/openai/v1', normalized).toString()
-              : new URL('/model-gateway/anthropic', normalized).toString(),
-            models: protocolModels.map((model) => ({ id: model.model_id, name: model.display_name })),
+            api,
+            baseURL,
+            models: provider.models.map((model) => ({ id: model.model_id, name: model.display_name })),
           } })
         }
         const settingsWrite = await remote.settings.mutate('llm-pi-ai', ops, undefined)
         if (!settingsWrite.ok) throw new Error(settingsWrite.error?.message || 'DSH 无法更新团队模型设置。')
-        const defaultMatch = rawDefaultModel && models.find((model) => model.protocol === rawDefaultModel.protocol
-          && model.model_id === rawDefaultModel.model_id)
+        try { localStorage.setItem(PROVIDER_ROUTES_STORAGE_KEY, JSON.stringify(routes)) } catch {}
+        const defaultMatch = rawDefaultModel && models.find((model) =>
+          (rawDefaultModel.provider_id ? model.provider_id === rawDefaultModel.provider_id : model.protocol === rawDefaultModel.protocol)
+          && model.protocol === rawDefaultModel.protocol && model.model_id === rawDefaultModel.model_id)
         const serverDefault = defaultMatch || null
         const initialDefault = defaultMatch || (rawDefaultModel == null ? models[0] : null)
         setServerDefaultModel(serverDefault)
@@ -2138,7 +2177,9 @@ window.__ModuleLoader__.load({
         setModelMessage('正在从 ANT 刷新获准模型…')
         try {
           await requireCompatibleService(serviceUrl, true)
-          const response = await fetch('/api/ant-teams/models', { method: 'POST' })
+          const response = await fetch('/api/ant-teams/models', {
+            method: 'POST', headers: { 'x-ant-model-provider-config': '1' },
+          })
           const result = await readLocalJsonResponse(response)
           if (!response.ok) {
             if (response.status === 401) setNeedsReconnect(true)
@@ -2327,13 +2368,26 @@ window.__ModuleLoader__.load({
           ], undefined)
           if (!reset.ok) throw new Error(reset.error?.message || 'DSH 全局默认模型未能恢复。')
         }
-        const settingsResult = await remote.settings.mutate('llm-pi-ai', [
-          { op: 'unset', path: ['providers', 'ant-team-openai-chat-completions'] },
-          { op: 'unset', path: ['providers', 'ant-team-openai-responses'] },
-          { op: 'unset', path: ['providers', 'ant-team-openai'] },
-          { op: 'unset', path: ['providers', 'ant-team-anthropic'] },
-        ], undefined)
+        let managedRoutes = []
+        try {
+          const parsed = JSON.parse(localStorage.getItem(PROVIDER_ROUTES_STORAGE_KEY) || '[]')
+          if (Array.isArray(parsed)) managedRoutes = parsed.filter((route) => typeof route === 'string')
+        } catch {}
+        if (typeof remote?.settings?.describe === 'function') {
+          const described = await remote.settings.describe()
+          if (!described?.ok) throw new Error(described?.error?.message || '无法读取 DSH 中的 ANT 提供方列表。')
+          const providers = described.value?.namespaces?.find((item) => item.ns === 'llm-pi-ai')?.value?.providers
+          for (const [route, provider] of Object.entries(providers || {})) {
+            if (route.startsWith('ant-team-') && provider?.apiKeyEnv === 'ANT_MODEL_API_KEY') managedRoutes.push(route)
+          }
+        }
+        const routes = new Set([...managedRoutes, 'ant-team-openai-chat-completions', 'ant-team-openai-responses',
+          'ant-team-openai', 'ant-team-anthropic'])
+        const settingsResult = await remote.settings.mutate('llm-pi-ai', [...routes].map((route) => ({
+          op: 'unset', path: ['providers', route],
+        })), undefined)
         if (!settingsResult.ok) throw new Error(settingsResult.error?.message || 'ANT 模型设置未能清除。')
+        try { localStorage.removeItem(PROVIDER_ROUTES_STORAGE_KEY) } catch {}
         if (typeof remote?.credentials?.unset !== 'function') throw new Error('DSH 未提供凭证删除接口。')
         const credentialResult = await remote.credentials.unset('ANT_MODEL_API_KEY')
         if (!credentialResult.ok) throw new Error(credentialResult.error?.message || 'ANT 成员凭证未能清除。')
@@ -2500,7 +2554,7 @@ window.__ModuleLoader__.load({
           localStorage.setItem(SERVICE_URL_STORAGE_KEY, normalized)
           const response = await fetch('/api/ant-teams/connect', {
             method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
+            headers: { 'Content-Type': 'application/json', 'x-ant-model-provider-config': '1' },
             body: JSON.stringify({
               service_url: normalized,
               email: normalizedEmail,
@@ -2551,13 +2605,13 @@ window.__ModuleLoader__.load({
       const updateGuideUrl = pinnedServiceUrl
         ? new URL('/ant-update', pinnedServiceUrl).href : null
       const currentDshDefaultModel = modelForProviderSelection(dshDefaultSelection, authorizedModels)
-      const modelRows = authorizedModels.map((model) => h('div', { key: `${model.protocol}:${model.model_id}`, role: 'listitem',
+      const modelRows = authorizedModels.map((model) => h('div', { key: `${model.provider_id || ''}:${model.protocol}:${model.model_id}`, role: 'listitem',
         style: { display: 'grid', gridTemplateColumns: 'minmax(0, 1fr) minmax(120px, auto) minmax(130px, auto)',
           gap: 12, alignItems: 'center', padding: '10px 2px', borderBottom: '1px solid var(--dsw-alias-border-l2)' } },
-        h('strong', { style: { minWidth: 0, overflowWrap: 'anywhere' } }, model.display_name || model.model_id),
+        h('strong', { style: { minWidth: 0, overflowWrap: 'anywhere' } }, `${model.provider_name ? `${model.provider_name} · ` : ''}${model.display_name || model.model_id}`),
         h('span', { style: { display: 'inline-flex', justifySelf: 'start', padding: '3px 8px', borderRadius: 999,
           backgroundColor: 'var(--dsw-alias-bg-layer-2)', color: 'var(--dsw-alias-label-secondary)', fontSize: 12 } },
-        model.protocol === 'anthropic' ? 'Anthropic Messages' : `OpenAI · ${(model.openai_api_mode || 'chat_completions') === 'responses' ? 'Responses' : 'Chat Completions'}`),
+        model.protocol === 'anthropic' ? 'Anthropic Messages' : `OpenAI · ${model.openai_api_mode === 'responses' ? 'Responses' : 'Chat Completions'}`),
         h('span', { style: { ...mutedTextStyle, textAlign: 'right' } }, '已同步到 DSH')))
       const connectionPanel = h('section', { style: { ...settingsPanelStyle, display: activeTab === 'connection' ? 'grid' : 'none' } },
         h('div', null,
@@ -2634,7 +2688,7 @@ window.__ModuleLoader__.load({
               onChange: (event) => setDefaultModelDraft(event.target.value), style: inputStyle },
               h('option', { value: '' }, '选择获准模型'),
               ...authorizedModels.map((model) => h('option', { key: modelSelectionKey(model), value: modelSelectionKey(model) },
-                `${model.display_name || model.model_id} · ${model.protocol === 'anthropic' ? 'Anthropic' : (model.openai_api_mode || 'chat_completions') === 'responses' ? 'OpenAI Responses' : 'OpenAI Chat Completions'}`)))),
+                `${model.provider_name ? `${model.provider_name} · ` : ''}${model.display_name || model.model_id} · ${model.protocol === 'anthropic' ? 'Anthropic' : model.openai_api_mode === 'responses' ? 'OpenAI Responses' : 'OpenAI Chat Completions'}`)))),
           h('div', { style: { display: 'flex', gap: 8, flexWrap: 'wrap', alignItems: 'center' } },
             h('button', { type: 'button', disabled: defaultModelBusy || !defaultModelDraft,
               onClick: () => { const chosen = authorizedModels.find((model) => modelSelectionKey(model) === defaultModelDraft); void applyUserDefaultModel(chosen) },

package/conversation.js

@@ -167,8 +167,14 @@ async function prompt(ctx, sessionId, content, signal) {
 }
 
 export function teamModelProvider(model) {
-  if (model.protocol === 'anthropic') return 'ant-team-anthropic'
-  return model.openai_api_mode === 'responses' ? 'ant-team-openai-responses' : 'ant-team-openai-chat-completions'
+  if (model.protocol === 'anthropic') {
+    return !model.provider_id || model.provider_id === 'anthropic-default'
+      ? 'ant-team-anthropic' : `ant-team-anthropic-${model.provider_id}`
+  }
+  if (!model.provider_id || model.provider_id === 'openai-default') {
+    return model.openai_api_mode === 'responses' ? 'ant-team-openai-responses' : 'ant-team-openai-chat-completions'
+  }
+  return `ant-team-openai-${model.provider_id}`
 }
 
 function dshDefaultSelection(ctx) {
@@ -182,8 +188,9 @@ export async function modelFor(ctx, memberJson, connection) {
   const selection = dshDefaultSelection(ctx)
   const localDefault = selection && models.find((item) => item.model_id === selection.model
     && teamModelProvider(item) === selection.provider)
-  const serverDefault = catalog.default_model && models.find((item) => item.protocol === catalog.default_model.protocol
-    && item.model_id === catalog.default_model.model_id)
+  const serverDefault = catalog.default_model && models.find((item) =>
+    (catalog.default_model.provider_id ? item.provider_id === catalog.default_model.provider_id : item.protocol === catalog.default_model.protocol)
+    && item.protocol === catalog.default_model.protocol && item.model_id === catalog.default_model.model_id)
   const model = localDefault || serverDefault || (!Object.hasOwn(catalog, 'default_model') ? models[0] : null)
   if (!model && models.length) throw new Error('当前没有可用的 ANT 默认模型；请在插件“团队模型”中选择本机默认，或联系管理员检查授权。')
   if (!model) throw new Error('当前没有可用的团队模型。')

package/index.js

@@ -69,8 +69,10 @@ function modelServiceBinding(settings) {
     let url
     try { url = new URL(provider.baseURL) } catch { return { configured, serviceUrl: null } }
     const localHttp = url.protocol === 'http:' && ['localhost', '127.0.0.1', '[::1]'].includes(url.hostname)
-    if ((url.protocol !== 'https:' && !localHttp) || url.username || url.password || url.search || url.hash
-      || !['/model-gateway/openai/v1', '/model-gateway/anthropic'].includes(url.pathname)) {
+    const knownRoute = ['/model-gateway/openai/v1', '/model-gateway/anthropic'].includes(url.pathname)
+      || /^\/model-gateway\/openai\/providers\/[A-Za-z0-9-]{1,64}\/v1$/u.test(url.pathname)
+      || /^\/model-gateway\/anthropic\/providers\/[A-Za-z0-9-]{1,64}$/u.test(url.pathname)
+    if ((url.protocol !== 'https:' && !localHttp) || url.username || url.password || url.search || url.hash || !knownRoute) {
       return { configured, serviceUrl: null }
     }
     origins.add(url.origin)
@@ -178,7 +180,11 @@ async function fetchMemberModels(request, credentials, settings) {
     }
     if (!session.ok) return jsonResponse(502, { message: '无法激活 ANT 模型会话。' })
     const upstream = await fetch(new URL('/api/me/models', serviceUrl), {
-      headers: { authorization: `Bearer ${token}`, accept: 'application/json' },
+      headers: {
+        authorization: `Bearer ${token}`,
+        accept: 'application/json',
+        ...(request.headers.get('x-ant-model-provider-config') === '1' ? { 'x-ant-model-provider-config': '1' } : {}),
+      },
       redirect: 'manual',
       signal: AbortSignal.timeout(10_000),
     })
@@ -865,6 +871,8 @@ async function fetchAuthRequest(request, endpoint, credentials, settings) {
         accept: 'application/json',
         'content-type': 'application/json',
         origin: serviceUrl,
+        ...(endpoint === 'dsh-connect' && request.headers.get('x-ant-model-provider-config') === '1'
+          ? { 'x-ant-model-provider-config': '1' } : {}),
       },
       body: JSON.stringify(payload),
       redirect: 'manual',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-wendao/ant",
-  "version": "0.4.11",
+  "version": "0.4.12",
   "description": "ANT (AI-native Teams) connects a DeepSeek Harness Desktop profile to team identity and approved models.",
   "type": "module",
   "scripts": {