@ai-wendao/ant 0.3.12 → 0.3.14

package/index.js

@@ -1,5 +1,6 @@
 export const name = 'ant'
 
+import { createHash } from 'node:crypto'
 import { installSkill, listSkills, uninstallSkill } from './skill-install.js'
 
 export const inject = []
@@ -7,12 +8,14 @@ export const inject = []
 const MODEL_SYNC_PATH = '/api/ant-teams/models'
 const SERVICE_INFO_PATH = '/api/ant-teams/service-info'
 const BUNDLE_RELEASE_PATH = '/api/ant-teams/bundle-release'
+const CONNECTION_ORIGIN_PATH = '/api/ant-teams/connection-origin'
 const DISCONNECT_PATH = '/api/ant-teams/disconnect'
 const REQUEST_CODE_PATH = '/api/ant-teams/request-code'
 const CONNECT_PATH = '/api/ant-teams/connect'
 const SKILLS_PATH = '/api/ant-teams/skills'
 const SKILL_INSTALL_PATH = '/api/ant-teams/skills/install'
 const SKILL_UNINSTALL_PATH = '/api/ant-teams/skills/uninstall'
+const PLUGINS_PATH = '/api/ant-teams/plugins'
 const ANT_NPM_PACKAGE_NAME = '@ai-wendao/ant'
 const MAX_MODEL_RESPONSE_BYTES = 1024 * 1024
 const MODEL_TOKEN_REF = 'ANT_MODEL_API_KEY'
@@ -34,28 +37,50 @@ function normalizeServiceUrl(value) {
   return url.origin
 }
 
-function serviceUrlFromModelSettings(settings) {
+function modelServiceBinding(settings) {
   const descriptor = settings.describe().find((entry) => entry.ns === 'llm-pi-ai')
   const providers = descriptor?.value?.providers
-  if (!providers || typeof providers !== 'object') return null
+  if (!providers || typeof providers !== 'object') return { configured: false, serviceUrl: null }
   const origins = new Set()
+  let configured = false
   for (const provider of Object.values(providers)) {
-    if (provider?.apiKeyEnv !== MODEL_TOKEN_REF || typeof provider.baseURL !== 'string') continue
+    if (provider?.apiKeyEnv !== MODEL_TOKEN_REF) continue
+    configured = true
+    if (typeof provider.baseURL !== 'string') return { configured, serviceUrl: null }
     let url
-    try { url = new URL(provider.baseURL) } catch { return null }
+    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)) return null
+      || !['/model-gateway/openai/v1', '/model-gateway/anthropic'].includes(url.pathname)) {
+      return { configured, serviceUrl: null }
+    }
     origins.add(url.origin)
   }
-  return origins.size === 1 ? [...origins][0] : null
+  return { configured, serviceUrl: origins.size === 1 ? [...origins][0] : null }
+}
+
+function tokenHash(token) {
+  return createHash('sha256').update(token).digest('hex')
 }
 
-async function pinServiceUrl(credentials, serviceUrl) {
-  await credentials.modifyRecord(SERVICE_RECORD_KEY, async () => ({
-    kind: 'grant',
-    payload: { service_url: serviceUrl },
-  }))
+async function pinServiceUrl(credentials, serviceUrl, token, previousToken = null) {
+  const previousHash = previousToken ? tokenHash(previousToken) : null
+  await credentials.modifyRecord(SERVICE_RECORD_KEY, async (current) => {
+    if (previousHash && (current?.kind !== 'grant'
+      || normalizeServiceUrl(current.payload?.service_url) !== serviceUrl
+      || (current.payload?.token_sha256 && current.payload.token_sha256 !== previousHash
+        && current.payload?.previous_token_sha256 !== previousHash))) {
+      throw new Error('当前 ANT 凭证绑定已变化，请重试。')
+    }
+    return {
+      kind: 'grant',
+      payload: {
+        service_url: serviceUrl,
+        token_sha256: tokenHash(token),
+        ...(previousHash && previousHash !== tokenHash(token) ? { previous_token_sha256: previousHash } : {}),
+      },
+    }
+  })
 }
 
 async function readMemberConnection(credentials, settings) {
@@ -66,8 +91,15 @@ async function readMemberConnection(credentials, settings) {
   const pinnedUrl = record?.kind === 'grant' && typeof record.payload?.service_url === 'string'
     ? normalizeServiceUrl(record.payload.service_url)
     : null
-  const serviceUrl = pinnedUrl || serviceUrlFromModelSettings(settings)
-  return serviceUrl ? { serviceUrl, token } : null
+  if (!pinnedUrl) return null
+  const binding = modelServiceBinding(settings)
+  if (pinnedUrl && binding.configured && binding.serviceUrl !== pinnedUrl) return null
+  if (pinnedUrl && typeof record.payload?.token_sha256 === 'string') {
+    const currentHash = tokenHash(token)
+    if (record.payload.token_sha256 !== currentHash
+      && record.payload.previous_token_sha256 !== currentHash) return null
+  } else if (pinnedUrl && binding.serviceUrl !== pinnedUrl) return null
+  return { serviceUrl: pinnedUrl, token }
 }
 
 async function updateModelSession(serviceUrl, token, action) {
@@ -109,29 +141,23 @@ async function readLimitedBody(response) {
 
 async function fetchMemberModels(request, credentials, settings) {
   if (request.method !== 'POST') return jsonResponse(405, { message: '只支持 POST 请求' })
-  let token
-  let pinnedUrl
-  let serviceUrl
+  let connection
   try {
-    token = await credentials.resolve(MODEL_TOKEN_REF)
-    const record = await credentials.readRecord(SERVICE_RECORD_KEY)
-    pinnedUrl = record?.kind === 'grant' && typeof record.payload?.service_url === 'string'
-      ? normalizeServiceUrl(record.payload.service_url)
-      : null
-    serviceUrl = pinnedUrl || serviceUrlFromModelSettings(settings)
+    connection = await readMemberConnection(credentials, settings)
   } catch {
     return jsonResponse(500, { message: 'DSH 无法读取 ANT 连接配置。' })
   }
-  if (!token || !serviceUrl) return jsonResponse(401, { message: '当前 DSH 未连接 ANT，请验证工作邮箱。' })
+  if (!connection) return jsonResponse(401, { message: '当前 DSH 未连接 ANT，请验证工作邮箱。' })
+  const { serviceUrl, token } = connection
 
   try {
-    const session = await updateModelSession(serviceUrl, token.value, 'heartbeat')
+    const session = await updateModelSession(serviceUrl, token, 'heartbeat')
     if (session.status === 401 || session.status === 403) {
       return jsonResponse(401, { message: 'ANT 成员凭证已失效，请重新验证工作邮箱。' })
     }
     if (!session.ok) return jsonResponse(502, { message: '无法激活 ANT 模型会话。' })
     const upstream = await fetch(new URL('/api/me/models', serviceUrl), {
-      headers: { authorization: `Bearer ${token.value}`, accept: 'application/json' },
+      headers: { authorization: `Bearer ${token}`, accept: 'application/json' },
       redirect: 'manual',
       signal: AbortSignal.timeout(10_000),
     })
@@ -146,11 +172,6 @@ async function fetchMemberModels(request, credentials, settings) {
     if (!Array.isArray(result?.models) || normalizeServiceUrl(result.service_url) !== serviceUrl) {
       return jsonResponse(502, { message: 'ANT 团队模型目录与已连接服务不匹配。' })
     }
-    if (!pinnedUrl) {
-      try { await pinServiceUrl(credentials, serviceUrl) } catch {
-        return jsonResponse(500, { message: 'DSH 无法保存已连接的 ANT 服务地址' })
-      }
-    }
     return jsonResponse(200, { service_url: serviceUrl, models: result.models })
   } catch {
     return jsonResponse(502, { message: '无法连接 ANT 团队服务' })
@@ -246,6 +267,9 @@ async function fetchBundleRelease(request, credentials, settings) {
     if (request.headers.get('x-ant-bundle-capabilities') === 'direct-package-install') {
       headers['x-ant-bundle-capabilities'] = 'direct-package-install'
     }
+    if (request.headers.get('x-ant-bundle-update-mode') === 'check-only') {
+      headers['x-ant-bundle-update-mode'] = 'check-only'
+    }
     const upstream = await fetch(new URL('/api/me/bundle-release', connection.serviceUrl), {
       headers,
       redirect: 'manual',
@@ -255,7 +279,7 @@ async function fetchBundleRelease(request, credentials, settings) {
     if (text === null) return jsonResponse(502, { message: 'ANT 更新信息响应过大。' })
     if (upstream.status === 401 || upstream.status === 403) return jsonResponse(401, { message: 'ANT 成员凭证已失效。' })
     if (upstream.status === 426) {
-      return jsonResponse(426, { message: '当前 ANT 插件版本不能安全自动安装 scoped Bundle。请通过 DSH 官方插件管理器完成一次包名迁移。' })
+      return jsonResponse(426, { message: '当前 ANT 插件仍可能自动安装未经核验的制品。请联系团队管理员采用受控升级方式；旧 alias 还需在 DSH 插件管理器中迁移。' })
     }
     if (!upstream.ok) return jsonResponse(502, { message: 'ANT 暂时无法提供插件更新信息。' })
     let release
@@ -269,26 +293,47 @@ async function fetchBundleRelease(request, credentials, settings) {
     const directInstallSpec = release?.package_name && release?.version
       ? `${release.package_name}@${release.version}`
       : ''
+    const artifactPath = release?.version ? `/api/ant-bundles/${release.version}/package.tgz` : ''
+    const hasArtifact = release?.artifact_path === artifactPath
+      && /^[a-f0-9]{64}$/u.test(release?.artifact_sha256 || '')
+    const noArtifact = !release?.artifact_path && !release?.artifact_sha256
     if (release?.bundle_name !== 'ant' || !validPackageName || !validVersion
       || typeof release?.install_spec !== 'string' || typeof release?.release_notes !== 'string'
       || (release.version && release.install_spec !== installSpec)
       || (!release.version && release.install_spec !== '')
-      || (release.direct_install_spec !== undefined && release.direct_install_spec !== directInstallSpec)) {
+      || (release.direct_install_spec !== undefined && release.direct_install_spec !== directInstallSpec)
+      || (!hasArtifact && !noArtifact)) {
       return jsonResponse(502, { message: 'ANT 更新信息字段无效。' })
     }
-    return jsonResponse(200, release)
+    return jsonResponse(200, hasArtifact ? {
+      ...release,
+      artifact_url: new URL(artifactPath, connection.serviceUrl).href,
+    } : release)
   } catch {
     return jsonResponse(502, { message: '无法连接 ANT 更新服务。' })
   }
 }
 
+async function fetchConnectionOrigin(request, credentials, settings) {
+  if (request.method !== 'GET') return jsonResponse(405, { message: '只支持 GET 请求' })
+  try {
+    const connection = await readMemberConnection(credentials, settings)
+    return jsonResponse(200, { service_url: connection?.serviceUrl || null })
+  } catch {
+    return jsonResponse(500, { message: '无法核对已绑定的 ANT 团队地址。' })
+  }
+}
+
 async function disconnectMember(request, credentials, settings) {
   if (request.method !== 'POST') return jsonResponse(405, { message: '只支持 POST 请求' })
   let connection
   try { connection = await readMemberConnection(credentials, settings) } catch {
     return jsonResponse(500, { message: 'DSH 无法读取 ANT 连接配置。' })
   }
-  if (!connection) return jsonResponse(200, { revoked: false })
+  if (!connection) return jsonResponse(409, {
+    code: 'LEGACY_DEVICE_REVOKE_REQUIRED',
+    message: '无法确认旧凭证所属服务或当前设备令牌。请先让原团队管理员撤销此设备，再仅清理本机。',
+  })
   try {
     const response = await fetch(new URL('/auth/dsh-session/disconnect', connection.serviceUrl), {
       method: 'POST',
@@ -296,12 +341,13 @@ async function disconnectMember(request, credentials, settings) {
       redirect: 'manual',
       signal: AbortSignal.timeout(10_000),
     })
-    if (response.status === 204 || response.status === 401 || response.status === 403) {
-      return jsonResponse(200, { revoked: response.status === 204 })
+    if (response.status === 204) return jsonResponse(200, { revoked: true })
+    if (response.status === 401 || response.status === 403) {
+      return jsonResponse(409, { message: '服务端未确认撤销当前令牌。它可能已被停用或更换；请让原团队管理员确认远端状态，再选择仅清理本机。' })
     }
-    return jsonResponse(200, { revoked: false })
+    return jsonResponse(502, { message: '服务端未确认永久撤销，本机凭证仍保留。请稍后重试。' })
   } catch {
-    return jsonResponse(200, { revoked: false })
+    return jsonResponse(502, { message: '无法连接团队服务确认永久撤销，本机凭证仍保留。请稍后重试。' })
   }
 }
 
@@ -313,18 +359,18 @@ async function memberSkillConnection(credentials, settings) {
   return connection
 }
 
-async function fetchMemberSkills(request, credentials, settings, registry) {
+async function fetchMemberSkills(request, credentials, settings) {
   if (request.method !== 'GET') return jsonResponse(405, { message: '只支持 GET 请求' })
   try {
     const connection = await memberSkillConnection(credentials, settings)
     if (!connection) return jsonResponse(401, { message: '请先连接 ANT 团队，或重新验证工作邮箱。' })
-    return jsonResponse(200, { skills: await listSkills(connection, registry) })
+    return jsonResponse(200, { skills: await listSkills(connection) })
   } catch (error) {
     return jsonResponse(502, { message: error instanceof Error ? error.message : '无法读取企业精选技能。' })
   }
 }
 
-async function installMemberSkill(request, credentials, settings, registry) {
+async function installMemberSkill(request, credentials, settings) {
   if (request.method !== 'POST') return jsonResponse(405, { message: '只支持 POST 请求' })
   let body
   try {
@@ -335,7 +381,7 @@ async function installMemberSkill(request, credentials, settings, registry) {
   try {
     const connection = await memberSkillConnection(credentials, settings)
     if (!connection) return jsonResponse(401, { message: '请先连接 ANT 团队，或重新验证工作邮箱。' })
-    return jsonResponse(200, await installSkill(connection, body?.skill_id, registry))
+    return jsonResponse(200, await installSkill(connection, body?.skill_id))
   } catch (error) {
     return jsonResponse(409, { message: error instanceof Error ? error.message : '技能安装失败。' })
   }
@@ -355,7 +401,38 @@ async function uninstallMemberSkill(request) {
   }
 }
 
-async function fetchAuthRequest(request, endpoint, credentials) {
+async function fetchMemberPlugins(request, credentials, settings) {
+  if (request.method !== 'GET') return jsonResponse(405, { message: '只支持 GET 请求' })
+  try {
+    const connection = await memberSkillConnection(credentials, settings)
+    if (!connection) return jsonResponse(401, { message: '请先连接 ANT 团队，或重新验证工作邮箱。' })
+    const upstream = await fetch(new URL('/api/me/plugins', connection.serviceUrl), {
+      headers: { authorization: `Bearer ${connection.token}`, accept: 'application/json' },
+      redirect: 'manual', signal: AbortSignal.timeout(10_000),
+    })
+    const text = await readLimitedBody(upstream)
+    if (text === null) return jsonResponse(502, { message: '插件目录响应过大。' })
+    if (!upstream.ok) return jsonResponse(upstream.status === 401 || upstream.status === 403 ? 401 : 502,
+      { message: '无法读取企业精选插件目录。' })
+    const plugins = JSON.parse(text)
+    if (!Array.isArray(plugins)) throw new Error('插件目录格式无效。')
+    return jsonResponse(200, { plugins: plugins.map((plugin) => {
+      const validId = typeof plugin?.id === 'string'
+        && /^[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$/iu.test(plugin.id)
+      const validDigest = /^[0-9a-f]{64}$/u.test(plugin?.artifact_sha256 || '')
+      if (plugin?.status !== 'published' || !validId || !validDigest) {
+        return { ...plugin, artifact_sha256: null }
+      }
+      const artifactPath = `/api/plugin-artifacts/${plugin.id}/package.tgz`
+      return { ...plugin, artifact_path: artifactPath,
+        artifact_url: new URL(artifactPath, connection.serviceUrl).href }
+    }) })
+  } catch {
+    return jsonResponse(502, { message: '无法读取企业精选插件目录。' })
+  }
+}
+
+async function fetchAuthRequest(request, endpoint, credentials, settings) {
   if (request.method !== 'POST') return jsonResponse(405, { message: '只支持 POST 请求' })
   let body
   try { body = await request.json() } catch { return jsonResponse(400, { message: '请求格式无效' }) }
@@ -369,6 +446,33 @@ async function fetchAuthRequest(request, endpoint, credentials) {
     return jsonResponse(400, { message: '团队服务地址或邮箱验证信息无效' })
   }
 
+  let previousToken = null
+  try {
+    const existing = await credentials.resolve(MODEL_TOKEN_REF)
+    const current = existing?.value ? await readMemberConnection(credentials, settings) : null
+    const binding = modelServiceBinding(settings)
+    const record = existing?.value ? await credentials.readRecord(SERVICE_RECORD_KEY) : null
+    const pinnedUrl = record?.kind === 'grant' && typeof record.payload?.service_url === 'string'
+      ? normalizeServiceUrl(record.payload.service_url) : null
+    if (existing?.value && !pinnedUrl && !binding.configured) {
+      return jsonResponse(409, {
+        code: 'LEGACY_DEVICE_REVOKE_REQUIRED',
+        message: '旧 ANT 凭证没有可核实的团队服务地址。请先让原团队管理员撤销此设备，再仅清理本机并连接新团队。',
+      })
+    }
+    if ((existing?.value && pinnedUrl && pinnedUrl !== serviceUrl)
+      || (current && current.serviceUrl !== serviceUrl)
+      || (binding.configured && binding.serviceUrl !== serviceUrl)) {
+      return jsonResponse(409, {
+        code: 'ANT_CONNECTION_CLEANUP_REQUIRED',
+        message: '本机仍有旧团队的凭证或模型设置。请先让原团队管理员确认旧设备已撤销，再清理本机配置后连接。',
+      })
+    }
+    if (endpoint === 'dsh-connect' && current?.serviceUrl === serviceUrl) previousToken = existing.value
+  } catch {
+    return jsonResponse(500, { message: 'DSH 无法确认当前 ANT 凭证和服务地址。' })
+  }
+
   try {
     const upstream = await fetch(new URL(`/auth/${endpoint}`, serviceUrl), {
       method: 'POST',
@@ -389,17 +493,17 @@ async function fetchAuthRequest(request, endpoint, credentials) {
       if (typeof result?.token !== 'string' || !result.token.startsWith('antm_') || !Array.isArray(result.models)) {
         return jsonResponse(502, { message: 'ANT 连接响应格式无效' })
       }
-      try {
-        await pinServiceUrl(credentials, serviceUrl)
-      } catch {
-        return jsonResponse(500, { message: 'DSH 无法保存已连接的 ANT 服务地址' })
-      }
       try {
         const session = await updateModelSession(serviceUrl, result.token, 'heartbeat')
         if (!session.ok) return jsonResponse(502, { message: '无法激活 ANT 模型会话。' })
       } catch {
         return jsonResponse(502, { message: '无法连接 ANT 模型会话服务。' })
       }
+      try {
+        await pinServiceUrl(credentials, serviceUrl, result.token, previousToken)
+      } catch {
+        return jsonResponse(500, { message: 'DSH 无法保存已连接的 ANT 服务地址' })
+      }
     }
     return new Response(text, {
       status: upstream.status,
@@ -411,8 +515,6 @@ async function fetchAuthRequest(request, endpoint, credentials) {
 }
 
 export function apply(ctx) {
-  let skillRegistry
-  ctx.inject(['skills'], (skillCtx) => { skillRegistry = skillCtx.skills })
   ctx.inject(['connection', 'credentials', 'settings'], (connectionCtx) => {
     connectionCtx.effect(() => connectionCtx.connection.fetch.register({
       path: SERVICE_INFO_PATH,
@@ -432,18 +534,28 @@ export function apply(ctx) {
       requestBody: 'buffered',
       fetch: (request) => fetchBundleRelease(request, connectionCtx.credentials, connectionCtx.settings),
     }), 'ant-teams: authenticated Bundle release relay')
+    connectionCtx.effect(() => connectionCtx.connection.fetch.register({
+      path: CONNECTION_ORIGIN_PATH,
+      methods: ['GET'],
+      requestBody: 'buffered',
+      fetch: (request) => fetchConnectionOrigin(request, connectionCtx.credentials, connectionCtx.settings),
+    }), 'ant-teams: pinned connection origin for update guide')
     connectionCtx.effect(() => connectionCtx.connection.fetch.register({
       path: SKILLS_PATH, methods: ['GET'], requestBody: 'buffered',
-      fetch: (request) => fetchMemberSkills(request, connectionCtx.credentials, connectionCtx.settings, skillRegistry),
+      fetch: (request) => fetchMemberSkills(request, connectionCtx.credentials, connectionCtx.settings),
     }), 'ant-teams: enterprise skill catalog')
     connectionCtx.effect(() => connectionCtx.connection.fetch.register({
       path: SKILL_INSTALL_PATH, methods: ['POST'], requestBody: 'buffered',
-      fetch: (request) => installMemberSkill(request, connectionCtx.credentials, connectionCtx.settings, skillRegistry),
+      fetch: (request) => installMemberSkill(request, connectionCtx.credentials, connectionCtx.settings),
     }), 'ant-teams: install approved skill into DSH')
     connectionCtx.effect(() => connectionCtx.connection.fetch.register({
       path: SKILL_UNINSTALL_PATH, methods: ['POST'], requestBody: 'buffered',
       fetch: (request) => uninstallMemberSkill(request),
     }), 'ant-teams: remove managed DSH skill')
+    connectionCtx.effect(() => connectionCtx.connection.fetch.register({
+      path: PLUGINS_PATH, methods: ['GET'], requestBody: 'buffered',
+      fetch: (request) => fetchMemberPlugins(request, connectionCtx.credentials, connectionCtx.settings),
+    }), 'ant-teams: enterprise plugin catalog')
     connectionCtx.effect(() => connectionCtx.connection.fetch.register({
       path: DISCONNECT_PATH,
       methods: ['POST'],
@@ -453,13 +565,13 @@ export function apply(ctx) {
       path: REQUEST_CODE_PATH,
       methods: ['POST'],
       requestBody: 'buffered',
-      fetch: (request) => fetchAuthRequest(request, 'request-code', connectionCtx.credentials),
+      fetch: (request) => fetchAuthRequest(request, 'request-code', connectionCtx.credentials, connectionCtx.settings),
     }), 'ant-teams: relay email verification code request')
     connectionCtx.effect(() => connectionCtx.connection.fetch.register({
       path: CONNECT_PATH,
       methods: ['POST'],
       requestBody: 'buffered',
-      fetch: (request) => fetchAuthRequest(request, 'dsh-connect', connectionCtx.credentials),
+      fetch: (request) => fetchAuthRequest(request, 'dsh-connect', connectionCtx.credentials, connectionCtx.settings),
     }), 'ant-teams: relay DSH account connection')
     connectionCtx.effect(() => {
       let stopped = false

package/package.json

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

package/skill-install.js

@@ -12,19 +12,6 @@ const MAX_PACKAGE_BYTES = 80 * 1024 * 1024
 const MAX_JSON_BYTES = 4 * 1024 * 1024
 const activeSkills = new Set()
 
-async function assertDiscovered(registry, root, name) {
-  if (typeof registry?.list !== 'function') throw new Error('DSH 技能服务不可用，无法确认安装结果。')
-  const expected = resolve(root, name, 'SKILL.md')
-  for (let attempt = 0; attempt < 6; attempt++) {
-    const entries = await registry.list()
-    if (Array.isArray(entries) && entries.some((entry) => entry.name === name
-      && typeof entry.path === 'string'
-      && (process.platform === 'win32' ? resolve(entry.path).toLowerCase() === expected.toLowerCase() : resolve(entry.path) === expected))) return
-    if (attempt < 5) await new Promise((done) => setTimeout(done, 300))
-  }
-  throw new Error('DSH 没有发现此技能；请检查 DSH 技能目录配置。')
-}
-
 const hash = (bytes) => createHash('sha256').update(bytes).digest('hex')
 const safeName = (name) => typeof name === 'string' && /^ant-[a-z0-9]+(?:-[a-z0-9]+)*$/u.test(name) && name.length <= 64
 const safePath = (name) => typeof name === 'string' && name.length > 0 && name.length <= 1024
@@ -164,7 +151,7 @@ async function fetchJson(url, token) {
   try { return JSON.parse(bytes.toString('utf8')) } catch { throw new Error('团队技能目录格式无效。') }
 }
 
-export async function listSkills(connection, registry) {
+export async function listSkills(connection) {
   const skills = await fetchJson(new URL('/api/me/skills', connection.serviceUrl), connection.token)
   if (!Array.isArray(skills)) throw new Error('团队技能目录格式无效。')
   const { root, conflicts } = await safeRoot()
@@ -180,10 +167,6 @@ export async function listSkills(connection, registry) {
         local_status = marker.content_sha256 === skill.content_sha256 ? 'installed' : 'update-available'
       }
     } catch { local_status = 'conflict' }
-    if (local_status === 'installed' || local_status === 'update-available') {
-      try { await assertDiscovered(registry, root, skill.dsh_name) }
-      catch { local_status = 'not-discovered' }
-    }
     return { ...skill, local_status }
   }))
 }
@@ -220,7 +203,7 @@ function contentDigest(files) {
   return digest.digest('hex')
 }
 
-export async function installSkill(connection, skillId, registry) {
+export async function installSkill(connection, skillId) {
   if (typeof skillId !== 'string' || !/^[0-9a-f-]{36}$/iu.test(skillId)) throw new Error('技能编号无效。')
   const manifest = await fetchJson(new URL(`/api/me/skills/${skillId}/files`, connection.serviceUrl), connection.token)
   validateManifest(manifest, skillId)
@@ -228,18 +211,17 @@ export async function installSkill(connection, skillId, registry) {
   if (conflicts.has(manifest.dsh_name)) throw new Error('本机技能备份已损坏；请联系管理员处理，ANT 不会覆盖。')
   if (activeSkills.has(manifest.dsh_name)) throw new Error('这个技能正在安装或卸载，请稍后重试。')
   activeSkills.add(manifest.dsh_name)
-  try { return await installValidatedSkill(connection, skillId, manifest, root, registry) }
+  try { return await installValidatedSkill(connection, skillId, manifest, root) }
   finally { activeSkills.delete(manifest.dsh_name) }
 }
 
-async function installValidatedSkill(connection, skillId, manifest, root, registry) {
+async function installValidatedSkill(connection, skillId, manifest, root) {
   const target = join(root, manifest.dsh_name)
   const oldMarker = await readManaged(root, manifest.dsh_name)
   if (oldMarker) {
     if (oldMarker.service_url !== connection.serviceUrl) throw new Error('同名技能属于另一个 ANT 服务，无法覆盖。')
     await verifyManagedTree(root, manifest.dsh_name, oldMarker)
     if (oldMarker.content_sha256 === manifest.content_sha256) {
-      await assertDiscovered(registry, root, manifest.dsh_name)
       return { status: 'installed', dsh_name: manifest.dsh_name }
     }
   }
@@ -268,8 +250,10 @@ async function installValidatedSkill(connection, skillId, manifest, root, regist
   const stagingStat = await isPresent(stagingRoot)
   if (stagingStat && (!stagingStat.isDirectory() || stagingStat.isSymbolicLink())) throw new Error('ANT 暂存目录不是普通目录。')
   await mkdir(stagingRoot, { recursive: true, mode: 0o700 })
-  const staging = join(stagingRoot, `new-${randomUUID()}`)
+  const stagingName = `new-${randomUUID()}`
+  const staging = join(stagingRoot, stagingName)
   const backup = join(stagingRoot, `old-${manifest.dsh_name}-${randomUUID()}`)
+  const managedFiles = manifest.files.map(({ path, sha256, executable }) => ({ path, sha256, executable }))
   await mkdir(staging, { mode: 0o700 })
   let backedUp = false
   let installedNew = false
@@ -283,29 +267,25 @@ async function installValidatedSkill(connection, skillId, manifest, root, regist
     await writeFile(join(staging, MARKER), JSON.stringify({
       dsh_name: manifest.dsh_name, skill_id: skillId, service_url: connection.serviceUrl,
       content_sha256: manifest.content_sha256,
-      files: manifest.files.map(({ path, sha256, executable }) => ({ path, sha256, executable })),
+      files: managedFiles,
     }), { flag: 'wx', mode: 0o600 })
+    await verifyManagedTree(stagingRoot, stagingName, { files: managedFiles })
     if (oldMarker) { await verifyManagedTree(root, manifest.dsh_name, oldMarker); await rename(target, backup); backedUp = true }
     else if (await isPresent(target)) throw new Error('同名技能已经存在，ANT 不会覆盖。')
     await rename(staging, target)
     installedNew = true
-    await assertDiscovered(registry, root, manifest.dsh_name)
     if (backedUp) await rm(backup, { recursive: true }).catch(() => {})
     return { status: oldMarker ? 'updated' : 'installed', dsh_name: manifest.dsh_name }
   } catch (error) {
     if (backedUp && await isPresent(backup)) {
       if (await isPresent(target)) {
-        await verifyManagedTree(root, manifest.dsh_name, {
-          dsh_name: manifest.dsh_name,
-          files: manifest.files.map(({ path, sha256, executable }) => ({ path, sha256, executable })),
-        }).then(() => rename(target, staging)).catch(() => {})
+        await verifyManagedTree(root, manifest.dsh_name, { files: managedFiles })
+          .then(() => rename(target, staging)).catch(() => {})
       }
       if (!(await isPresent(target))) await rename(backup, target).catch(() => {})
     } else if (installedNew) {
-      await verifyManagedTree(root, manifest.dsh_name, {
-        dsh_name: manifest.dsh_name,
-        files: manifest.files.map(({ path, sha256, executable }) => ({ path, sha256, executable })),
-      }).then(() => rm(target, { recursive: true })).catch(() => {})
+      await verifyManagedTree(root, manifest.dsh_name, { files: managedFiles })
+        .then(() => rm(target, { recursive: true })).catch(() => {})
     }
     throw error
   } finally { await rm(staging, { recursive: true, force: true }).catch(() => {}) }

package/tools/migrate-legacy.mjs

@@ -443,11 +443,13 @@ async function invokeDsh(cli, args, label, dshHome) {
   if (result.status !== 0) throw new Error(`${label}失败，退出码 ${String(result.status)}`)
 }
 
-async function rollbackWithCli(cli, profile, aliasSpec) {
+async function rollbackWithCli(cli, profile, aliasSpec, targetVersion) {
   let current = await readProfile(profile.dshHome)
-  if (current.state === 'both') {
-    await invokeDsh(cli, ['remove', PACKAGE_NAME], '移除未完成的 scoped Bundle', profile.dshHome)
+  if (current.state !== 'both' || current.aliasSpec !== aliasSpec
+    || !directSpecMatchesTarget(current.directSpec, targetVersion)) {
+    throw new Error('scoped ANT 已与迁移记录目标不同；工具不会删除现有版本。')
   }
+  await invokeDsh(cli, ['remove', PACKAGE_NAME], '移除未完成的 scoped Bundle', profile.dshHome)
   current = await readProfile(profile.dshHome)
   if (current.aliasSpec === undefined) {
     await invokeDsh(cli, ['add', `${ALIAS_NAME}@${aliasSpec}`], '恢复旧 ANT alias', profile.dshHome)
@@ -595,6 +597,9 @@ async function rollback(options) {
     if (profile.state !== 'both' || profile.aliasSpec !== record.originalAliasSpec) {
       throw new Error('当前状态无法无损取消迁移；该工具不会重建旧 alias 或覆盖现有依赖。优先继续 migrate --apply。')
     }
+    if (!directSpecMatchesTarget(profile.directSpec, record.targetVersion)) {
+      throw new Error('scoped ANT 已与迁移记录目标不同；工具不会删除现有版本。')
+    }
     if (!options.apply) {
       process.stdout.write(`预检完成。确认 DSH 已完全退出后运行：ant-migrate rollback --backup "${absolute}" --apply\n`)
       return
@@ -607,10 +612,11 @@ async function rollback(options) {
     showDshOutput(listResult)
     if (listResult.error || listResult.status !== 0) throw new Error('DSH Desktop CLI 未能读取 desktop profile。')
     const beforeRollback = await readProfile(dshHome)
-    if (beforeRollback.state !== 'both' || beforeRollback.aliasSpec !== record.originalAliasSpec) {
+    if (beforeRollback.state !== 'both' || beforeRollback.aliasSpec !== record.originalAliasSpec
+      || !directSpecMatchesTarget(beforeRollback.directSpec, record.targetVersion)) {
       throw new Error('执行回退前 profile 已变化；工具不会继续。')
     }
-    await rollbackWithCli(cli, { dshHome }, record.originalAliasSpec)
+    await rollbackWithCli(cli, { dshHome }, record.originalAliasSpec, record.targetVersion)
     record.status = 'rolled-back'
     record.phase = 'rolled-back'
     await saveBackupRecord(absolute, record)