@ai-wendao/ant 0.5.2 → 0.5.4

package/client.js

@@ -183,19 +183,40 @@ window.__ModuleLoader__.load({
       return normalized ? new URL('/console', normalized).toString() : null
     }
     const versionParts = (value) => {
-      if (typeof value !== 'string' || !/^\d+\.\d+\.\d+$/u.test(value)) return null
-      return value.split('.')
+      if (typeof value !== 'string') return null
+      const match = /^(\d+)\.(\d+)\.(\d+)(?:-((?:0|[1-9]\d*|[0-9A-Za-z-]*[A-Za-z-][0-9A-Za-z-]*)(?:\.(?:0|[1-9]\d*|[0-9A-Za-z-]*[A-Za-z-][0-9A-Za-z-]*))*))?(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?$/u.exec(value)
+      if (!match) return null
+      return { core: match.slice(1, 4), prerelease: match[4]?.split('.') ?? null }
+    }
+    const compareNumericVersionIdentifiers = (left, right) => {
+      const normalizedLeft = left.replace(/^0+(?=\d)/u, '')
+      const normalizedRight = right.replace(/^0+(?=\d)/u, '')
+      if (normalizedLeft.length !== normalizedRight.length) return normalizedLeft.length < normalizedRight.length ? -1 : 1
+      return normalizedLeft === normalizedRight ? 0 : normalizedLeft < normalizedRight ? -1 : 1
     }
     const newerVersion = (candidate, current) => {
       const next = versionParts(candidate)
       const installed = versionParts(current)
       if (!next || !installed) return false
-      for (let index = 0; index < next.length; index += 1) {
-        if (next[index] !== installed[index]) {
-          return next[index].length === installed[index].length
-            ? next[index] > installed[index]
-            : next[index].length > installed[index].length
-        }
+      for (let index = 0; index < next.core.length; index += 1) {
+        const order = compareNumericVersionIdentifiers(next.core[index], installed.core[index])
+        if (order !== 0) return order > 0
+      }
+      if (!next.prerelease) return Boolean(installed.prerelease)
+      if (!installed.prerelease) return false
+      for (let index = 0; index < Math.max(next.prerelease.length, installed.prerelease.length); index += 1) {
+        const nextIdentifier = next.prerelease[index]
+        const installedIdentifier = installed.prerelease[index]
+        if (nextIdentifier === undefined) return false
+        if (installedIdentifier === undefined) return true
+        if (nextIdentifier === installedIdentifier) continue
+        const nextIsNumeric = /^\d+$/u.test(nextIdentifier)
+        const installedIsNumeric = /^\d+$/u.test(installedIdentifier)
+        if (nextIsNumeric && installedIsNumeric) {
+          return compareNumericVersionIdentifiers(nextIdentifier, installedIdentifier) > 0
+        }
+        if (nextIsNumeric !== installedIsNumeric) return !nextIsNumeric
+        return nextIdentifier > installedIdentifier
       }
       return false
     }
@@ -2298,17 +2319,15 @@ window.__ModuleLoader__.load({
           legacy: true,
         }] : []
         const allGroups = [...providerGroups, ...compatibilityGroup]
+        let savedExcludedGroups = null
+        try {
+          const saved = JSON.parse(localStorage.getItem(providerSyncPreferenceKey(normalized)) || 'null')
+          if (Array.isArray(saved)) savedExcludedGroups = saved
+        } catch {}
         let excludedGroups = options.excludedGroups
+        if (!Array.isArray(excludedGroups) && savedExcludedGroups) excludedGroups = savedExcludedGroups
         if (!Array.isArray(excludedGroups)) {
-          try {
-            const saved = JSON.parse(localStorage.getItem(providerSyncPreferenceKey(normalized)) || 'null')
-            if (Array.isArray(saved)) excludedGroups = saved
-          } catch {}
-        }
-        if (!Array.isArray(excludedGroups)) {
-          // Existing installs keep their current legacy alias group; first-time installs get all routes.
-          excludedGroups = previousRoutes.length && compatibilityRoutes.length
-            && !compatibilityRoutes.some((route) => previousRoutes.includes(route)) ? ['legacy-openai-chat'] : []
+          excludedGroups = []
         }
         excludedGroups = [...new Set(excludedGroups.filter((key) => allGroups.some((group) => group.key === key)))]
         const excludedGroupSet = new Set(excludedGroups)
@@ -2325,8 +2344,13 @@ window.__ModuleLoader__.load({
         const initialDefault = syncedDefaultMatch || (rawDefaultModel == null ? syncedModels[0] : null)
         if (Array.isArray(options.excludedGroups)) {
           const intentionallyRemovedRoutes = [...excluded].filter((route) => previousRoutes.includes(route))
-          if (intentionallyRemovedRoutes.length && !window.confirm(
-            '关闭这些 provider 会从本机 DSH 移除对应模型路由。保存了这些路由的历史会话可能暂时无法继续；重新开启同步可以恢复。仍要应用吗？')) {
+          const disablingLegacyCompatibility = excludedGroupSet.has('legacy-openai-chat')
+            && !savedExcludedGroups?.includes('legacy-openai-chat')
+          const needsConfirmation = intentionallyRemovedRoutes.length > 0 || disablingLegacyCompatibility
+          const confirmationMessage = disablingLegacyCompatibility
+            ? '关闭旧会话兼容会从本机 DSH 移除兼容路由，可能影响历史会话。重新勾选并刷新可恢复。仍要应用吗？'
+            : '关闭这些 provider 会从本机 DSH 移除对应模型路由，可能影响历史会话。重新勾选并刷新可恢复。仍要应用吗？'
+          if (needsConfirmation && !window.confirm(confirmationMessage)) {
             throw new Error('已取消同步范围更改；本机 DSH 设置未修改。')
           }
           const currentSelection = await readDshDefaultSelection()
@@ -2877,6 +2901,28 @@ window.__ModuleLoader__.load({
             ? isSynced ? '刷新后同步到 DSH' : '刷新后从 DSH 移除'
             : isSynced ? '已同步到 DSH' : '未同步到 DSH'))
       })
+      const legacyCompatibilityGroup = providerSyncGroups.find((group) => group.legacy)
+      const legacyCompatibilityModels = legacyCompatibilityGroup
+        ? authorizedModels.filter((model) => model.protocol === 'openai'
+          && (model.provider_id || 'openai-default') === 'openai-default') : []
+      const legacyCompatibilityExcluded = legacyCompatibilityGroup
+        ? excludedGroupSet.has(legacyCompatibilityGroup.key) : true
+      const legacyCompatibilityAppliedExcluded = legacyCompatibilityGroup
+        ? appliedExcludedGroupSet.has(legacyCompatibilityGroup.key) : true
+      const legacyCompatibilityStatus = legacyCompatibilityExcluded === legacyCompatibilityAppliedExcluded
+        ? legacyCompatibilityExcluded ? '未同步到 DSH' : '已同步到 DSH'
+        : legacyCompatibilityExcluded ? '刷新后从 DSH 移除' : '刷新后同步到 DSH'
+      const legacyCompatibilityRows = legacyCompatibilityModels.map((model) => h('div', {
+        key: `legacy-openai-chat:${model.provider_id || ''}:${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('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 } },
+      'OpenAI · Chat（旧会话兼容）'),
+      h('span', { style: { ...mutedTextStyle, textAlign: 'right' } }, legacyCompatibilityStatus)))
       const connectionPanel = h('section', { style: { ...settingsPanelStyle, display: activeTab === 'connection' ? 'grid' : 'none' } },
         h('div', null,
           h('h3', { style: sectionTitleStyle }, 'ANT 团队账号'),
@@ -2973,16 +3019,20 @@ window.__ModuleLoader__.load({
           defaultModelMessage ? h('p', { role: 'status', style: mutedTextStyle }, defaultModelMessage) : null),
         providerSyncGroups.length ? h('section', { style: { ...infoNoticeStyle, gap: 8 } },
           h('strong', null, '同步到本机 DSH 的 provider'),
-          h('p', { style: mutedTextStyle }, '首次升级会保留当前已同步的旧会话兼容路由。取消勾选并刷新后，该 provider 会从本机 DSH 移除；使用它的历史会话可能暂时无法继续，重新勾选并刷新可恢复。'),
+          h('p', { style: mutedTextStyle }, '旧会话兼容路由默认开启。取消勾选并刷新后，该 provider 会从本机 DSH 移除；使用它的历史会话可能暂时无法继续，重新勾选并刷新可恢复。'),
           h('p', { style: mutedTextStyle }, '至少保留一个常规模型 provider；旧会话兼容组只供已有会话使用。'),
           hasPendingSyncChanges ? h('p', { role: 'status', style: mutedTextStyle }, '同步范围尚未应用；点击“刷新团队模型”后生效。') : null,
-          ...providerSyncGroups.map((group) => h('label', { key: group.key,
-            style: { display: 'flex', alignItems: 'center', gap: 9, padding: '5px 0', cursor: busy ? 'default' : 'pointer' } },
-          h('input', { type: 'checkbox', 'aria-label': group.label,
-            checked: !excludedGroupSet.has(group.key), disabled: busy
-              || (!group.legacy && !excludedGroupSet.has(group.key) && activePrimaryGroupCount <= 1),
-            onChange: (event) => toggleProviderSyncGroup(group, event.target.checked) }),
-          h('span', null, `${group.label} · ${group.modelCount} 个模型`)))) : null,
+          ...providerSyncGroups.map((group) => {
+            const label = group.legacy
+              ? group.label.replace('（旧会话兼容）', '（旧会话兼容，可选）') : group.label
+            return h('label', { key: group.key,
+              style: { display: 'flex', alignItems: 'center', gap: 9, padding: '5px 0', cursor: busy ? 'default' : 'pointer' } },
+            h('input', { type: 'checkbox', 'aria-label': label,
+              checked: !excludedGroupSet.has(group.key), disabled: busy
+                || (!group.legacy && !excludedGroupSet.has(group.key) && activePrimaryGroupCount <= 1),
+              onChange: (event) => toggleProviderSyncGroup(group, event.target.checked) }),
+            h('span', null, `${label} · ${group.modelCount} 个模型`))
+          })) : null,
         h('div', { role: 'list', 'aria-label': '获准模型', style: { display: 'grid', gap: 0, borderTop: '1px solid var(--dsw-alias-border-l2)' } },
           modelRows.length ? modelRows : h('div', { style: { display: 'grid', gap: 8, padding: '12px 0' } },
             h('p', { style: mutedTextStyle }, credentialConfigured === true && modelMessage.startsWith('正在') ? modelMessage
@@ -2990,6 +3040,11 @@ window.__ModuleLoader__.load({
                 : '连接并验证工作邮箱后，这里会列出逐个获准模型。'),
             credentialConfigured !== true ? h('button', { type: 'button', onClick: () => onSelectTab('connection'),
               style: secondaryButtonStyle }, '前往团队连接') : null)),
+        legacyCompatibilityGroup ? h('section', { style: { ...infoNoticeStyle, gap: 6, marginTop: 14 } },
+          h('strong', null, `旧会话兼容路由 · ${legacyCompatibilityModels.length} 个模型`),
+          h('p', { style: mutedTextStyle }, '复用已获准的 OpenAI 模型，仅供已有会话使用，不增加获准模型数量。'),
+          h('div', { role: 'list', 'aria-label': '旧会话兼容模型',
+            style: { display: 'grid', gap: 0, borderTop: '1px solid var(--dsw-alias-border-l2)' } }, legacyCompatibilityRows)) : null,
         h('div', { style: { display: 'flex', flexWrap: 'wrap', alignItems: 'center', gap: 10 } },
           h('button', { type: 'button', disabled: busy || defaultModelBusy || !bindingReady || credentialConfigured !== true,
             onClick: () => void refreshModels(true), style: primaryButtonStyle }, busy ? '刷新中…' : '刷新团队模型'),

package/conversation.js

@@ -224,7 +224,9 @@ function dshDefaultSelection(ctx) {
 }
 
 export async function modelFor(ctx, memberJson, connection) {
-  const catalog = await memberJson(connection, '/api/me/models')
+  const catalog = await memberJson(connection, '/api/me/models', {
+    headers: { 'x-ant-model-provider-config': '1' },
+  })
   const models = catalog.models?.filter((item) => ['openai', 'anthropic'].includes(item.protocol)) || []
   const selection = dshDefaultSelection(ctx)
   const localDefault = selection && models.find((item) => item.model_id === selection.model

package/delegation.js

@@ -1035,7 +1035,7 @@ function parseGroupPrRequest(text) {
 export async function memberJson(connection, path, init = {}) {
   const response = await fetch(new URL(path, connection.serviceUrl), {
     ...init,
-    headers: { authorization: `Bearer ${connection.token}`, accept: 'application/json',
+    headers: { ...(init.headers || {}), authorization: `Bearer ${connection.token}`, accept: 'application/json',
       ...(init.body ? { origin: new URL(connection.serviceUrl).origin, 'content-type': 'application/json' } : {}) },
     redirect: 'manual', signal: init.signal
       ? AbortSignal.any([init.signal, AbortSignal.timeout(12_000)]) : AbortSignal.timeout(12_000),

package/index.js

@@ -1104,7 +1104,7 @@ export function apply(ctx) {
         } catch {}
       }
     }, 'ant-teams: ANT model activity session')
-    connectionCtx.inject?.(['dshIm', 'sessionController', 'sessions', 'agents', 'tools'], (delegationCtx) => {
+    connectionCtx.inject?.(['dshIm', 'sessionController', 'sessions', 'agents', 'tools', 'agentDefaultModel'], (delegationCtx) => {
       delegationCtx.effect(() => {
         const host = startDelegationHost(delegationCtx,
           () => readMemberConnection(delegationCtx.credentials, delegationCtx.settings))

package/package.json

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