dsh-ant 0.6.0 → 0.6.3

package/index.js

@@ -6,6 +6,7 @@ import { readFile } from 'node:fs/promises'
 import { installSkill, listSkills, uninstallSkill } from './skill-install.js'
 import { readLocalDelegationSettings, recentDelegationStatus, startDelegationHost,
   writeLocalDelegationSettings } from './delegation.js'
+import { waitForSignal } from './conversation.js'
 
 export const inject = []
 
@@ -29,6 +30,7 @@ const DELEGATION_GRANTS_PATH = '/api/ant-teams/delegation/grants'
 const DELEGATION_ENROLLED_BOTS_PATH = '/api/ant-teams/delegation/enrolled-bots'
 const DELEGATION_GROUPS_PATH = '/api/ant-teams/delegation/groups'
 const DELEGATION_DM_CHAT_PATH = '/api/ant-teams/delegation/dm-chat'
+const DELEGATION_OWNER_CHALLENGE_PATH = '/api/ant-teams/delegation/owner-challenge'
 const DELEGATION_STATUS_PATH = '/api/ant-teams/delegation/status'
 const DELEGATION_CARDS_PATH = '/api/ant-teams/delegation/cards'
 const DELEGATION_RULE_RECOGNITION_PATH = '/api/ant-teams/delegation/recognize'
@@ -319,7 +321,7 @@ async function fetchDelegationBots(request, ctx) {
       try {
         const details = await service.describeBot(bot.botId)
         return {
-          bot_id: bot.botId, name: details.account?.name || bot.botId,
+          bot_id: bot.botId, channel: bot.channel, name: details.account?.name || bot.botId,
           fingerprint: details.account?.fingerprint,
           connected: details.connected === true,
           available: details.capabilities?.includes('exclusive-text-consumer')
@@ -384,14 +386,33 @@ async function fetchDelegationGrants(request, ctx, credentials, settings) {
 }
 
 async function fetchDelegationGroupSettings(request, ctx, credentials, settings, kind, getHost) {
-  const methods = kind === 'groups' ? ['GET', 'PUT'] : kind === 'dm-chat' ? ['PUT']
-    : kind === 'challenge' ? ['POST'] : ['GET', 'POST', 'DELETE']
+  const methods = kind === 'groups' ? ['GET', 'PUT'] : kind === 'dm-chat' ? ['PUT'] : ['GET', 'POST', 'DELETE']
   if (!methods.includes(request.method)) return jsonResponse(405, { message: '请求方式不支持。' })
+  if (kind === 'challenge' && request.method === 'DELETE') {
+    const fingerprint = new URL(request.url).searchParams.get('bot_fingerprint')
+    if (typeof fingerprint !== 'string' || !/^[a-f0-9]{64}$/iu.test(fingerprint)) {
+      return jsonResponse(400, { message: '请求格式无效。' })
+    }
+    const host = getHost?.()
+    if (!host?.cancelOwnerChallenge) {
+      return jsonResponse(503, { message: '本机协作收件尚未就绪，请稍后刷新后重新生成绑定码。' })
+    }
+    return jsonResponse(200, { cancelled: host.cancelOwnerChallenge(fingerprint) })
+  }
   let connection
   try { connection = await readMemberConnection(credentials, settings) } catch {
     return jsonResponse(500, { message: '无法读取 ANT 连接。' })
   }
   if (!connection) return jsonResponse(401, { message: '请先连接 ANT 团队。' })
+  if (kind === 'challenge' && request.method === 'GET') {
+    const fingerprint = new URL(request.url).searchParams.get('bot_fingerprint')
+    if (typeof fingerprint !== 'string' || !/^[a-f0-9]{64}$/iu.test(fingerprint)) {
+      return jsonResponse(400, { message: '请求格式无效。' })
+    }
+    const status = getHost?.()?.ownerChallengeStatus?.(fingerprint)
+    if (!status) return jsonResponse(503, { message: '本机协作收件尚未就绪，请稍后刷新后重新生成绑定码。' })
+    return jsonResponse(200, status)
+  }
   let body = null
   if (request.method !== 'GET') {
     try {
@@ -400,7 +421,7 @@ async function fetchDelegationGroupSettings(request, ctx, credentials, settings,
       body = JSON.parse(raw)
     } catch { return jsonResponse(400, { message: '请求格式无效。' }) }
   }
-  if (kind === 'bots' && request.method === 'POST') {
+  if (['bots', 'challenge'].includes(kind) && request.method === 'POST') {
     const service = dshImService(ctx)
     if (!service?.describeBot) return jsonResponse(503, { message: '请先安装并启用 DSH-IM。' })
     try {
@@ -417,6 +438,7 @@ async function fetchDelegationGroupSettings(request, ctx, credentials, settings,
   }
   const path = kind === 'groups' ? '/api/me/im-delegations/groups'
     : kind === 'dm-chat' ? '/api/me/im-delegations/dm-chat'
+      : kind === 'challenge' ? '/api/me/im-delegations/owner-challenge'
       : request.method === 'DELETE'
         ? `/api/me/im-delegations/bots/${encodeURIComponent(body.bot_id)}`
         : '/api/me/im-delegations/bots'
@@ -430,6 +452,7 @@ async function fetchDelegationGroupSettings(request, ctx, credentials, settings,
       method: request.method,
       headers: { authorization: `Bearer ${connection.token}`, accept: 'application/json',
         ...(request.method !== 'GET' ? { origin: new URL(connection.serviceUrl).origin } : {}),
+        ...(kind === 'challenge' ? { 'x-ant-owner-approval-version': '1' } : {}),
         ...(['POST', 'PUT'].includes(request.method) ? { 'content-type': 'application/json' } : {}) },
       ...(['POST', 'PUT'].includes(request.method) ? { body: JSON.stringify(body) } : {}),
       redirect: 'manual', signal: AbortSignal.timeout(12_000),
@@ -448,6 +471,16 @@ async function fetchDelegationGroupSettings(request, ctx, credentials, settings,
     }
     const text = await readLimitedBody(response)
     if (text === null) return jsonResponse(502, { message: '团队服务响应过大。' })
+    if (kind === 'challenge' && request.method === 'POST' && response.ok) {
+      let challenge
+      try { challenge = JSON.parse(text) } catch {
+        return jsonResponse(502, { message: '团队服务返回的绑定码格式无效。' })
+      }
+      const host = getHost?.()
+      if (!host?.rememberOwnerChallenge?.(body.bot_fingerprint, challenge?.code)) {
+        return jsonResponse(503, { message: '本机协作收件尚未就绪，请稍后刷新后重新生成绑定码。' })
+      }
+    }
     if (kind === 'groups' && request.method === 'GET' && response.ok) {
       try {
         const groups = JSON.parse(text)
@@ -563,9 +596,10 @@ async function fetchDelegationCards(request, ctx, credentials, settings) {
 async function fetchDelegationRuleRecognition(request, credentials, settings, getHost) {
   if (request.method !== 'POST') return jsonResponse(405, { message: '只支持 POST 请求。' })
   try {
-    const connection = await readMemberConnection(credentials, settings)
+    request.signal.throwIfAborted()
+    const connection = await waitForSignal(readMemberConnection(credentials, settings), request.signal)
     if (!connection) return jsonResponse(401, { message: '请先连接 ANT 团队。' })
-    const raw = await request.text()
+    const raw = await waitForSignal(request.text(), request.signal)
     if (raw.length > 8_192) return jsonResponse(413, { message: '规则描述过长。' })
     let body
     try { body = JSON.parse(raw) } catch { return jsonResponse(400, { message: '规则识别请求格式无效。' }) }
@@ -574,7 +608,7 @@ async function fetchDelegationRuleRecognition(request, credentials, settings, ge
     }
     const host = getHost?.()
     if (!host?.recognizeRule) return jsonResponse(503, { message: '本机 DSH 协作会话尚未就绪，请稍后重试。' })
-    return jsonResponse(200, await host.recognizeRule(body.description))
+    return jsonResponse(200, await host.recognizeRule(body.description, request.signal))
   } catch (error) {
     return jsonResponse(502, { message: error?.message || '任务规则识别失败，请稍后重试。' })
   }
@@ -602,12 +636,14 @@ async function fetchDelegationExecutors(request, ctx) {
     if (Array.isArray(listed)) providers = listed
   } catch {}
   const available = new Set(providers)
-  const externalProviderReason = 'DSH 尚未提供可核验的逐任务文件、Git 和网络权限；ANT 暂不把外部子 Agent 用于协作任务。'
+  const providerReason = (name) => `DSH 尚未启用 ${name} 子 Agent 提供方。`
   return jsonResponse(200, [
     { id: 'dsh', title: 'DSH', available: Boolean(optionalHostService(ctx, 'sessionController')
       && optionalHostService(ctx, 'agents')) },
-    { id: 'codex', title: 'Codex', available: false, reason: externalProviderReason },
-    { id: 'claude-code', title: 'Claude Code', available: false, reason: externalProviderReason },
+    { id: 'codex', title: 'Codex', available: available.has('codex'),
+      ...(!available.has('codex') ? { reason: providerReason('Codex') } : {}) },
+    { id: 'claude-code', title: 'Claude Code', available: available.has('claude-code'),
+      ...(!available.has('claude-code') ? { reason: providerReason('Claude Code') } : {}) },
     { id: 'acp', title: 'DSH ACP', available: available.has('acp') },
     { id: 'dsh-sdk', title: 'DSH SDK 子代理', available: available.has('dsh-sdk') },
   ])
@@ -1161,6 +1197,7 @@ export function apply(ctx) {
       [DELEGATION_ENROLLED_BOTS_PATH, ['GET', 'POST', 'DELETE'], 'bots'],
       [DELEGATION_GROUPS_PATH, ['GET', 'PUT'], 'groups'],
       [DELEGATION_DM_CHAT_PATH, ['PUT'], 'dm-chat'],
+      [DELEGATION_OWNER_CHALLENGE_PATH, ['GET', 'POST', 'DELETE'], 'challenge'],
     ]) {
       connectionCtx.effect(() => connectionCtx.connection.fetch.register({
         path, methods, requestBody: 'buffered',