@ai-wendao/ant 0.5.3 → 0.5.5

package/client.js

@@ -220,6 +220,16 @@ window.__ModuleLoader__.load({
       }
       return false
     }
+    function safeInstallDiagnostic(value) {
+      const text = typeof value === 'string' ? value
+        : [value?.name, value?.code, value?.message].filter((part) => part != null).join(' ')
+      return String(text || '')
+        .replace(/\b(Bearer|Basic)\s+[^\s,;]+/giu, '$1 [REDACTED]')
+        .replace(/([?&](?:access[_-]?token|refresh[_-]?token|token|api[_-]?key|secret|password|signature|authorization)=)[^&#\s]*/giu, '$1[REDACTED]')
+        .replace(/(["']?(?:access[_-]?token|refresh[_-]?token|token|api[_-]?key|client[_-]?secret|secret|password|authorization)["']?\s*[:=]\s*["']?)[^,"';\s}]+/giu, '$1[REDACTED]')
+        .replace(/(https?:\/\/)[^/\s?#@]+:[^@\s/]+@/giu, '$1[REDACTED]@')
+        .slice(0, 180)
+    }
     const inject = ['slots', 'layout', 'pluginNavigation', 'remote', 'remote.credentials', 'remote.settings', 'remote.pluginManager']
 
     async function readLocalJsonResponse(response) {
@@ -1844,6 +1854,9 @@ window.__ModuleLoader__.load({
         }
         const local = bundles.find((bundle) => bundle.name === plugin.package_name && bundle.installed)
         const localAhead = local?.version && newerVersion(local.version, plugin.version)
+        const updatingInstalled = Boolean(local?.version && local.version !== plugin.version)
+        const replacingInstalled = Boolean(local?.version && (updatingInstalled
+          || artifactUrl && local.source !== artifactUrl))
         const action = localAhead ? '回退到团队版本' : local ? local.version === plugin.version ? '重新安装' : '更新' : '安装'
         const sourceNotice = artifactUrl
           ? 'DSH 将安装 ANT 固定的顶层制品。'
@@ -1862,23 +1875,128 @@ window.__ModuleLoader__.load({
             throw new Error('插件审核信息已变化，请刷新目录后重试。')
           }
           const requestId = crypto.randomUUID()
+          const requestReference = requestId.slice(0, 8).toUpperCase()
+          const previousSourceIsRegistry = Boolean(local && (!local.source
+            || local.source === plugin.package_name || local.source.startsWith(`${plugin.package_name}@`)))
+          const previousInstallSpec = local
+            ? previousSourceIsRegistry ? `${plugin.package_name}@${local.version}` : local.source || ''
+            : ''
+          const expectedPreviousSource = previousSourceIsRegistry ? previousInstallSpec : local?.source
+          const previousRegistry = previousSourceIsRegistry ? 'https://registry.npmjs.org/' : null
+          const currentBundle = async () => {
+            try {
+              const listed = await manager.listBundles()
+              if (listed.ok && Array.isArray(listed.value)) {
+                return listed.value.find((bundle) => bundle.name === plugin.package_name && bundle.installed) || null
+              }
+            } catch {}
+            return undefined
+          }
+          const isPreviousVersion = (bundle) => bundle?.version === local?.version
+            && (!expectedPreviousSource || bundle.source === expectedPreviousSource)
+          const restorePreviousVersion = async () => {
+            let installed = await currentBundle()
+            if (installed === undefined) return 'unknown'
+            if (isPreviousVersion(installed)) {
+              if (installed.enabled === (local.enabled !== false)) return 'restored'
+              if (typeof manager.setBundleEnabled !== 'function') return 'unknown'
+              try {
+                await manager.setBundleEnabled(plugin.package_name, local.enabled !== false)
+              } catch {}
+              installed = await currentBundle()
+              return isPreviousVersion(installed) && installed.enabled === (local.enabled !== false)
+                ? 'restored' : 'unknown'
+            }
+            if (installed?.installed) {
+              return installed.version === plugin.version
+                && (!artifactUrl || installed.source === artifactUrl) ? 'target' : 'unknown'
+            }
+            if (installed !== null || !previousInstallSpec) return 'unknown'
+            if (previousSourceIsRegistry && !previousRegistry) return 'unknown'
+            const restoreRequestId = crypto.randomUUID()
+            try {
+              const restoreOptions = {
+                enabled: local.enabled !== false, requestId: restoreRequestId,
+                saveExact: true,
+              }
+              if (previousSourceIsRegistry && previousRegistry) restoreOptions.registry = previousRegistry
+              await manager.installBundle(previousInstallSpec, restoreOptions)
+              if (typeof manager.waitForInstall === 'function') {
+                await manager.waitForInstall(restoreRequestId)
+              }
+            } catch {}
+            installed = await currentBundle()
+            return isPreviousVersion(installed) && installed.enabled === (local.enabled !== false)
+              ? 'restored' : 'unknown'
+          }
           let result
+          let installFailure = null
+          let updateRestore = null
+          let removedForUpdate = false
           const options = artifactUrl
-            ? { enabled: true, requestId }
-            : { enabled: true, requestId, registry: 'https://registry.npmjs.org/' }
-          try { result = await manager.installBundle(installSpec, options) }
-          catch { result = null }
+            ? { enabled: local ? local.enabled !== false : true, requestId }
+            : { enabled: local ? local.enabled !== false : true, requestId, registry: 'https://registry.npmjs.org/' }
+          if (replacingInstalled && !localAhead && !artifactUrl && local.updatable !== false
+            && typeof manager.updateBundle === 'function') {
+            try {
+              const update = await manager.updateBundle(plugin.package_name, plugin.version, {
+                requestId, registry: 'https://registry.npmjs.org/',
+              })
+              result = { ok: true, value: update?.result }
+              updateRestore = update?.restore || null
+            } catch (error) { installFailure = error; result = null }
+          } else {
+            if (replacingInstalled && typeof manager.removeBundle !== 'function') {
+              setMessage('当前 DSH 不支持通过 ANT 安全替换已安装插件。请在 DSH 插件管理查看状态，或联系管理员。')
+              return
+            }
+            if (replacingInstalled) {
+              let removed = null
+              let removeFailure = null
+              try { removed = await manager.removeBundle(plugin.package_name) }
+              catch (error) { removeFailure = error }
+              if (!removed?.ok || !['applied', 'restart-required'].includes(removed.value?.application)) {
+                const diagnostic = safeInstallDiagnostic(removed?.value?.error || removed?.error || removeFailure)
+                const recovery = await restorePreviousVersion()
+                if (recovery !== 'restored') setUncertainId(plugin.id)
+                const recoveryNotice = recovery === 'restored'
+                  ? `旧版本号和原启用状态已恢复。${previousSourceIsRegistry ? '恢复按团队目录使用 npm 官方源；若此前来自私有源，请联系管理员核对。' : ''}`
+                  : recovery === 'target' ? `本机列表显示审核版本 ${plugin.version} 已安装，请核对后再操作。`
+                    : '无法确认旧版本及启用状态，请先在 DSH 插件管理核对。'
+                setMessage(`无法开始更新 ${plugin.title}：DSH 未能确认旧版本移除完成。${diagnostic
+                  ? `DSH 诊断：${diagnostic}。` : ''}${recoveryNotice}`)
+                return
+              }
+              removedForUpdate = true
+            }
+            try { result = await manager.installBundle(installSpec, options) }
+            catch (error) { installFailure = error; result = null }
+          }
           if (!result?.ok) {
+            if (!installFailure && result?.error) installFailure = result.error
             let recovered = null
+            let waitFailure = null
             if (typeof manager.waitForInstall === 'function') {
               try {
                 const pending = await manager.waitForInstall(requestId)
                 if (pending.ok && pending.value) recovered = { ok: true, value: pending.value }
-              } catch {}
+                else if (pending?.error) waitFailure = pending.error
+              } catch (error) { waitFailure = error }
             }
             if (!recovered) {
               setUncertainId(plugin.id)
-              setMessage(`暂时无法确认 ${plugin.title} 的安装结果。请先在 DSH 插件列表核对，勿重复点击安装。`)
+              let restoreNotice = ''
+              if (removedForUpdate) {
+                const restoreState = await restorePreviousVersion()
+                restoreNotice = restoreState === 'restored'
+                  ? ` DSH 已恢复旧版本号 ${local.version}。${previousSourceIsRegistry ? '恢复按团队目录使用 npm 官方源；若此前来自私有源，请核对来源。' : ''}`
+                  : restoreState === 'target' ? ` 本机列表显示审核版本 ${plugin.version} 已安装，但操作结果未确认。`
+                    : ' DSH 未能确认旧版本恢复，请先在插件列表核对。'
+              }
+              const details = [installFailure && `installBundle：${safeInstallDiagnostic(installFailure)}`,
+                waitFailure && `waitForInstall：${safeInstallDiagnostic(waitFailure)}`].filter(Boolean)
+              setMessage(`暂时无法确认 ${plugin.title} 的安装结果（请求编号 ${requestReference}）。${details.length
+                ? `本机诊断：${details.join('；')}。` : ''}${restoreNotice}请先在 DSH 插件列表核对，勿重复点击安装。`)
               return
             }
             result = recovered
@@ -1894,9 +2012,22 @@ window.__ModuleLoader__.load({
               setMessage(`DSH 无法确定 ${plugin.title} 本次安装的唯一结果，未确认完成。请先在 DSH 插件列表核对；若已经正常使用同版则无需重复安装，仍需核对来源时请联系管理员。`)
               return
             }
-            const diagnostic = typeof outcome.error?.diagnostic === 'string'
-              ? outcome.error.diagnostic.slice(0, 180) : ''
-            setMessage(`${plugin.title} 安装未完成。请在 DSH 插件管理查看状态或联系管理员。${diagnostic ? `原因：${diagnostic}` : ''}`)
+            const diagnostic = safeInstallDiagnostic({ name: outcome.error?.name,
+              code: outcome.error?.code,
+              message: outcome.error?.diagnostic || outcome.error?.message || outcome.packageResult?.output })
+            let restoreNotice = ''
+            if (updateRestore) {
+              restoreNotice = ['applied', 'restart-required'].includes(updateRestore.application)
+                ? ` DSH 已恢复旧版本 ${local.version}。` : ' DSH 未能确认旧版本已恢复，请先在插件列表核对。'
+            } else if (removedForUpdate) {
+              const restoreState = await restorePreviousVersion()
+              restoreNotice = restoreState === 'restored'
+                ? ` DSH 已恢复旧版本号 ${local.version}。${previousSourceIsRegistry ? '恢复按团队目录使用 npm 官方源；若此前来自私有源，请核对来源。' : ''}`
+                : restoreState === 'target' ? ` 本机列表显示审核版本 ${plugin.version} 已安装，但结果未确认。`
+                  : ' DSH 未能确认旧版本恢复，请先在插件列表核对。'
+            }
+            setMessage(`${plugin.title} 安装未完成（请求编号 ${requestReference}）。${diagnostic
+              ? `DSH 诊断：${diagnostic}。` : 'DSH 没有返回失败诊断。'}${restoreNotice}请在 DSH 插件管理查看状态或联系管理员。`)
             return
           }
           if (outcome.bundle !== plugin.package_name
@@ -2319,17 +2450,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)
@@ -2346,8 +2475,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()
@@ -2898,6 +3032,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 团队账号'),
@@ -2994,16 +3150,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
@@ -3011,6 +3171,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.3",
+  "version": "0.5.5",
   "description": "ANT (AI-native Teams) connects a DeepSeek Harness Desktop profile to team identity and approved models.",
   "type": "module",
   "scripts": {