@ai-wendao/ant 0.5.4 → 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

package/package.json

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