@ai-wendao/ant 0.4.9 → 0.4.11

package/conversation.js

@@ -114,9 +114,9 @@ async function restrictedSession(ctx, model, root, sessionIds, configure = null,
       ? undefined : 'ANT 协作对话不能调用本机工具。')
     disposeTools = configure ? configure(agent, sessionId) : []
     await ctx.sessionController.selectModel({ sessionId,
-      provider: model.protocol === 'anthropic' ? 'ant-team-anthropic' : 'ant-team-openai', model: model.model_id })
+      provider: teamModelProvider(model), model: model.model_id })
     return { sessionId, cwd, disposeTools,
-      modelKey: `${model.protocol}\0${model.model_id}` }
+      modelKey: `${teamModelProvider(model)}\0${model.model_id}` }
   } catch (error) {
     for (const dispose of disposeTools) dispose?.()
     sessionIds.delete(sessionId)
@@ -166,19 +166,49 @@ async function prompt(ctx, sessionId, content, signal) {
   throw new Error('DSH 对话等待超时。')
 }
 
-async function modelFor(memberJson, connection) {
+export function teamModelProvider(model) {
+  if (model.protocol === 'anthropic') return 'ant-team-anthropic'
+  return model.openai_api_mode === 'responses' ? 'ant-team-openai-responses' : 'ant-team-openai-chat-completions'
+}
+
+function dshDefaultSelection(ctx) {
+  try { return (ctx.agentDefaultModel || ctx.get?.('agentDefaultModel'))?.currentSelection?.() || null }
+  catch { return null }
+}
+
+export async function modelFor(ctx, memberJson, connection) {
   const catalog = await memberJson(connection, '/api/me/models')
-  const model = catalog.models?.find((item) => ['openai', 'anthropic'].includes(item.protocol))
+  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
+    && teamModelProvider(item) === selection.provider)
+  const serverDefault = catalog.default_model && models.find((item) => item.protocol === catalog.default_model.protocol
+    && item.model_id === catalog.default_model.model_id)
+  const model = localDefault || serverDefault || (!Object.hasOwn(catalog, 'default_model') ? models[0] : null)
+  if (!model && models.length) throw new Error('当前没有可用的 ANT 默认模型；请在插件“团队模型”中选择本机默认，或联系管理员检查授权。')
   if (!model) throw new Error('当前没有可用的团队模型。')
   return model
 }
 
+export function cardReviewers(card) {
+  const selected = Array.isArray(card?.reviewers)
+    ? [...new Set(card.reviewers.filter((runner) => ['dsh', 'codex', 'claude-code'].includes(runner)))] : []
+  return selected.length ? selected : card?.runner ? [card.runner] : []
+}
+
+export function isCrossReviewRequest(text) {
+  const value = (typeof text === 'string' ? text : '').normalize('NFKC').toLowerCase()
+  if (/(?:不要|别|不用|不需要|不做|取消)\s*(?:进行|做)?\s*(?:交叉\s*(?:review|审查|评审)|cross[\s-]*review)/iu.test(value)
+    || /\b(?:do\s+not|don't|without|no\s+need\s+to)\s+cross[\s-]*review\b/iu.test(value)) return false
+  return /(?:交叉\s*(?:review|审查|评审)|cross[\s-]*review)/iu.test(value)
+}
+
 export function hasRequiredCodexReviewPr(card, parameters) {
-  return card?.runner === 'codex' && hasRequiredNativeReviewPr(card, parameters)
+  return cardReviewers(card).includes('codex') && hasRequiredNativeReviewPr(card, parameters)
 }
 
 export function hasRequiredNativeReviewPr(card, parameters) {
-  if (!['codex', 'claude-code'].includes(card?.runner)
+  if (!cardReviewers(card).some((runner) => ['codex', 'claude-code'].includes(runner))
     || !Array.isArray(card.parameters) || card.parameters.length !== 1) return false
   const [rule] = card.parameters
   const value = parameters?.[rule.name]
@@ -328,7 +358,7 @@ function chatGate(maxActive = 4) {
 }
 
 export function createConversationEngine({ ctx, ledger, readConnection, memberJson, fetchPr,
-  preparePrWorkspace, runNativeReview,
+  preparePrWorkspace, runCodexReview = runCodexReadOnly, runNativeReview, runDshReview,
   logger, sessionIds, signal, workspaceRoot, gate }) {
   let settings = { context_messages: 10, history_max_records: 100, max_concurrency: 3 }
   let cardsByFingerprint = new Map()
@@ -430,11 +460,11 @@ export function createConversationEngine({ ctx, ledger, readConnection, memberJs
   async function scopeSession(scope, model) {
     const live = scopeSessions.get(scope)
     if (live) {
-      const modelKey = `${model.protocol}\0${model.model_id}`
+      const modelKey = `${teamModelProvider(model)}\0${model.model_id}`
       if (live.modelKey !== modelKey) {
         try {
           await ctx.sessionController.selectModel({ sessionId: live.sessionId,
-            provider: model.protocol === 'anthropic' ? 'ant-team-anthropic' : 'ant-team-openai',
+            provider: teamModelProvider(model),
             model: model.model_id })
           live.modelKey = modelKey
         } catch (error) {
@@ -457,9 +487,10 @@ export function createConversationEngine({ ctx, ledger, readConnection, memberJs
       }
       try {
         register('ant_capabilities',
-          '查看当前请求人在这段对话里可申请的任务能力。普通聊天无需调用。', {},
+          '查看当前请求人在这段对话里可申请的任务能力。普通聊天无需调用。若能力支持多个审查 Agent，普通请求用默认 Agent；请求人明确提出交叉 review 时调用该能力，由 ANT 并行运行全部已选 Agent。', {},
           withTurn(async (current) => current.cards.map((card) => ({ id: card.id,
             title: card.title, intent: card.intent, examples: card.examples,
+            reviewers: cardReviewers(card), cross_review_enabled: cardReviewers(card).length > 1,
             parameters: card.parameters.map((rule) => ({ name: rule.name, description: rule.description,
               kind: rule.kind, required: rule.required, choices: rule.choices,
               min: rule.min, max: rule.max, repository: rule.repository })) }))));
@@ -757,7 +788,7 @@ export function createConversationEngine({ ctx, ledger, readConnection, memberJs
     let answer = '我暂时没法继续这段对话，请稍后再试。'
     let session = null
     try {
-      const model = await modelFor(memberJson, connection)
+      const model = await modelFor(ctx, memberJson, connection)
       let history
       try { history = await firstHistory(ctx, event, settings, signal) }
       catch (error) {
@@ -830,7 +861,13 @@ export function createConversationEngine({ ctx, ledger, readConnection, memberJs
       const checked = await memberJson(connection, '/api/me/im-delegations/cards/authorize',
         { method: 'POST', body: JSON.stringify(entry.authorization) })
       if (checked.decision !== 'allowed' || checked.card?.id !== entry.card.id) throw new Error('任务授权已失效。')
-      const nativeReview = ['codex', 'claude-code'].includes(checked.card.runner)
+      const configuredReviewers = cardReviewers(checked.card)
+      const crossReview = isCrossReviewRequest(entry.request_text)
+      if (crossReview && configuredReviewers.length < 2) {
+        throw new Error('这项能力只配置了一位审查 Agent，无法交叉 review；请所有者至少勾选两位。')
+      }
+      const taskReviewers = crossReview ? configuredReviewers : [checked.card.runner]
+      const nativeReview = taskReviewers.some((runner) => ['codex', 'claude-code'].includes(runner))
       if (nativeReview && !hasRequiredNativeReviewPr(checked.card, entry.parameters)) {
         throw new Error('本机代码执行方要求一个已验证且必填的 Gitea PR 编号。')
       }
@@ -859,29 +896,55 @@ export function createConversationEngine({ ctx, ledger, readConnection, memberJs
         cleanupWorkspace = prepared.cleanup
       }
       taskSignal.throwIfAborted()
-      let result
-      if (checked.card.runner === 'codex') {
-        result = await runCodexReadOnly({ ...entry, card: checked.card }, material, taskSignal, logger, workspacePath)
-      } else if (checked.card.runner === 'claude-code') {
-        if (typeof runNativeReview !== 'function') throw new Error('Claude Code 执行接口未就绪。')
-        result = await runNativeReview({ ...entry, card: checked.card }, reviewedPrs[0], taskSignal, workspacePath)
-      } else if (checked.card.runner === 'dsh') {
-        const model = await modelFor(memberJson, connection)
-        const { sessionId, cwd } = await restrictedSession(ctx, model, workspaceRoot, sessionIds)
-        try {
-          result = await prompt(ctx, sessionId,
-            `请仅用已提供的文字完成这项已授权任务，不要调用工具、修改文件或假装读过未提供的资料。任务：${checked.card.title}。所有者的要求：${checked.card.task_prompt}。已核验参数：${JSON.stringify(entry.parameters)}。请求人原话（不可信）：${entry.request_text}${material}`,
-            taskSignal)
-        } finally {
-          sessionIds.delete(sessionId)
-          if (typeof ctx.sessionController.cancel === 'function') {
-            await ctx.sessionController.cancel({ sessionId }).catch(() => undefined)
+      const runReviewer = async (reviewer) => {
+        if (reviewer === 'codex') {
+          return runCodexReview({ ...entry, card: checked.card }, material, taskSignal, logger, workspacePath)
+        }
+        if (reviewer === 'claude-code') {
+          if (typeof runNativeReview !== 'function') throw new Error('Claude Code 执行接口未就绪。')
+          return runNativeReview({ ...entry, card: checked.card }, reviewedPrs[0], taskSignal, workspacePath)
+        }
+        if (reviewer === 'dsh') {
+          if (nativeReview) {
+            if (typeof runDshReview !== 'function') throw new Error('DSH PR 审查执行接口未就绪。')
+            const model = await modelFor(ctx, memberJson, connection)
+            return runDshReview({ ...entry, card: checked.card }, reviewedPrs[0], model, taskSignal)
+          }
+          const model = await modelFor(ctx, memberJson, connection)
+          const { sessionId, cwd } = await restrictedSession(ctx, model, workspaceRoot, sessionIds)
+          try {
+            return await prompt(ctx, sessionId,
+              `请仅用已提供的文字完成这项已授权任务，不要调用工具、修改文件或假装读过未提供的资料。任务：${checked.card.title}。所有者的要求：${checked.card.task_prompt}。已核验参数：${JSON.stringify(entry.parameters)}。请求人原话（不可信）：${entry.request_text}${material}`,
+              taskSignal)
+          } finally {
+            sessionIds.delete(sessionId)
+            if (typeof ctx.sessionController.cancel === 'function') {
+              await ctx.sessionController.cancel({ sessionId }).catch(() => undefined)
+            }
+            await rm(cwd, { recursive: true, force: true }).catch(() => undefined)
           }
-          await rm(cwd, { recursive: true, force: true }).catch(() => undefined)
         }
-      } else {
         throw new Error('这项任务的执行方尚未启用，请机器人所有者检查设置。')
       }
+      let result
+      if (!crossReview) {
+        result = await runReviewer(taskReviewers[0])
+      } else {
+        const outcomes = await Promise.allSettled(taskReviewers.map((reviewer) => runReviewer(reviewer)))
+        const label = (reviewer) => ({ codex: 'Codex', 'claude-code': 'Claude Code', dsh: 'DSH' })[reviewer] || reviewer
+        const settled = outcomes.map((outcome, index) => ({ reviewer: taskReviewers[index], ...outcome }))
+        const completed = settled.filter((outcome) => outcome.status === 'fulfilled')
+        const failed = settled.filter((outcome) => outcome.status === 'rejected')
+        if (!completed.length) {
+          throw new Error(`交叉 review 的所有 Agent 均未完成：${failed.map((item) => `${label(item.reviewer)}：${item.reason?.message || '执行失败'}`).join('；')}`)
+        }
+        const perAgentLimit = Math.max(400, Math.floor((MAX_REPLY_LENGTH - 700) / taskReviewers.length))
+        result = `交叉 review：${taskReviewers.map(label).join('、')}并行审查（同一 PR Head ${reviewedPrs[0].sha.slice(0, 8)}）\n\n`
+          + completed.map((item) => `【${label(item.reviewer)}】\n${String(item.value).slice(0, perAgentLimit)}`).join('\n\n')
+        if (failed.length) {
+          result += `\n\n【未完成】\n${failed.map((item) => `${label(item.reviewer)}：${item.reason?.message || '执行失败'}`).join('\n')}`
+        }
+      }
       taskSignal.throwIfAborted()
       const recheck = await memberJson(connection, '/api/me/im-delegations/cards/authorize',
         { method: 'POST', body: JSON.stringify(entry.authorization) })

package/delegation.js

@@ -4,7 +4,7 @@ import { homedir } from 'node:os'
 import { dirname, join, resolve } from 'node:path'
 import { spawn } from 'node:child_process'
 import { CONVERSATION_TOOL_NAMES, conversationKey, createConversationEngine,
-  isHelpRequest, requestsPrivateReply } from './conversation.js'
+  isHelpRequest, modelFor, requestsPrivateReply, teamModelProvider } from './conversation.js'
 
 const MAX_DIFF_BYTES = 240_000
 const MAX_GITEA_JSON_BYTES = 64_000
@@ -815,8 +815,8 @@ export async function cleanupPrWorkspaceCaches(workspaceRoot, cards, entries, ge
   })
 }
 
-function reviewPrompt(grant, material, task = null) {
-  const snapshot = task?.card
+function reviewPrompt(grant, material, task = null, snapshotAvailable = Boolean(task?.card)) {
+  const snapshot = snapshotAvailable
     ? '本次 PR 的完整代码快照位于当前任务工作目录；可以只读查看目录内相关源码、测试和配置。'
     : '当前工作目录不包含完整仓库；只能根据下列已提供的 PR 差异审查，并说明上下文局限。'
   const ownerInstructions = task?.card?.task_prompt
@@ -899,7 +899,8 @@ export async function runNativePrReview(ctx, executor, grant, material, sessionI
   }
 }
 
-export async function runDshPrReview(ctx, grant, material, model, sessionIds, signal, workspaceRoot = dshRoot()) {
+export async function runDshPrReview(ctx, grant, material, model, sessionIds, signal,
+  workspaceRoot = dshRoot(), task = null) {
   signal.throwIfAborted()
   const workspace = join(workspaceRoot, 'ant-delegation', 'workspaces', randomUUID())
   await mkdir(workspace, { recursive: true, mode: 0o700 })
@@ -919,8 +920,9 @@ export async function runDshPrReview(ctx, grant, material, model, sessionIds, si
     }
     agent.ctx.tools.restrict({ allow: [] })
     agent.ctx.tools.guard(() => 'ANT 委托审查不能调用 DSH 工具。')
-    await ctx.sessionController.selectModel({ sessionId, provider: model.protocol === 'anthropic' ? 'ant-team-anthropic' : 'ant-team-openai', model: model.model_id })
-    await ctx.sessionController.prompt({ sessionId, requestId: randomUUID(), mode: 'queue', content: [{ type: 'text', text: reviewPrompt(grant, material) }] }, signal)
+    await ctx.sessionController.selectModel({ sessionId, provider: teamModelProvider(model), model: model.model_id })
+    await ctx.sessionController.prompt({ sessionId, requestId: randomUUID(), mode: 'queue',
+      content: [{ type: 'text', text: reviewPrompt(grant, material, task, false) }] }, signal)
     const deadline = Date.now() + MODEL_TIMEOUT_MS
     while (Date.now() < deadline) {
       if (signal.aborted) throw new Error('任务已取消。')
@@ -1075,6 +1077,8 @@ export function startDelegationHost(ctx, readConnection, { ledger = new Delegati
     fetchPr: fetchGiteaPr,
     preparePrWorkspace: (card, taskId, pr, taskSignal) =>
       preparePrWorkspace(ctx, card, taskId, pr, taskSignal, workspaceRoot, readSettings),
+    runDshReview: (entry, pr, model, taskSignal) => runDshPrReview(ctx, pr.target,
+      { title: pr.title, sha: pr.sha, diff: pr.diff }, model, sessionIds, taskSignal, workspaceRoot, entry),
     runNativeReview: (entry, pr, taskSignal, workspacePath) => runNativePrReview(ctx, 'claude-code', {
       ...pr.target,
     }, { title: pr.title, sha: pr.sha, diff: pr.diff }, sessionIds, taskSignal, workspaceRoot,
@@ -1113,9 +1117,7 @@ export function startDelegationHost(ctx, readConnection, { ledger = new Delegati
           const credential = await ctx.credentials.resolve('ANT_GITEA_API_TOKEN')
           const material = await fetchGiteaPr(auth.grant, credential?.value)
           if (executor === 'dsh') {
-            const models = await memberJson(connection, '/api/me/models')
-            const model = models.models?.find((item) => item.protocol === 'openai' || item.protocol === 'anthropic')
-            if (!model) throw new Error('当前没有可用的团队模型。')
+            const model = await modelFor(ctx, memberJson, connection)
             reply = await runDshPrReview(ctx, auth.grant, material, model, sessionIds, taskSignal, workspaceRoot)
           } else {
             reply = await runNativePrReview(ctx, executor, auth.grant, material, sessionIds, taskSignal, workspaceRoot, logger)
@@ -1396,7 +1398,12 @@ export function startDelegationHost(ctx, readConnection, { ledger = new Delegati
           approval = { code, owner_id: event.actor.id, group_id: groupId, card_id: matches[0].id,
             expires_at: Date.now() + 300_000 }
           kind = 'group_card_approval_offer'
-          const runnerDescription = matches[0].runner === 'codex' ? '这台电脑的 Codex 专用只读差异审查'
+          const reviewers = Array.isArray(matches[0].reviewers) && matches[0].reviewers.length
+            ? matches[0].reviewers : [matches[0].runner]
+          const reviewerLabel = (id) => ({ dsh: 'DSH', codex: 'Codex', 'claude-code': 'Claude Code' })[id] || id
+          const runnerDescription = reviewers.length > 1
+            ? `普通请求默认由${reviewerLabel(matches[0].runner)}执行；明确说“交叉 review”时并行启动${reviewers.map(reviewerLabel).join('、')}`
+            : matches[0].runner === 'codex' ? '这台电脑的 Codex 专用只读差异审查'
             : matches[0].runner === 'claude-code' ? '这台 DSH 已注册的 Claude Code 子代理试用'
               : '受限 DSH'
           reply = `确认后，本群任何成员可请求“${matches[0].title}”；执行方为${runnerDescription}，参数规则沿用私聊任务，结果公开回复原群／原话题，授权最长 7 天。请在 5 分钟内 @我回复“确认启用 ${code}”。`
@@ -1425,7 +1432,7 @@ export function startDelegationHost(ctx, readConnection, { ledger = new Delegati
                 method: 'POST', body: JSON.stringify({ bot_id: event.botId, bot_fingerprint: event.fingerprint,
                   title: source.title, intent: source.intent, examples: source.examples,
                   parameters: source.parameters, task_prompt: source.task_prompt,
-                  runner: source.runner, workspace: null, sender_scope: 'any', sender_ids: [],
+                  runner: source.runner, reviewers: source.reviewers, workspace: null, sender_scope: 'any', sender_ids: [],
                   conversation_kind: 'group', conversation_id: groupId,
                   expires_at: Math.min(source.expires_at, Math.floor(Date.now() / 1000) + 7 * 86400) }),
               })

package/index.js

@@ -193,7 +193,7 @@ async function fetchMemberModels(request, credentials, settings) {
     if (!Array.isArray(result?.models) || normalizeServiceUrl(result.service_url) !== serviceUrl) {
       return jsonResponse(502, { message: 'ANT 团队模型目录与已连接服务不匹配。' })
     }
-    return jsonResponse(200, { service_url: serviceUrl, models: result.models })
+    return jsonResponse(200, { service_url: serviceUrl, models: result.models, default_model: result.default_model ?? null })
   } catch {
     return jsonResponse(502, { message: '无法连接 ANT 团队服务' })
   }
@@ -362,7 +362,7 @@ async function fetchDelegationStatus(request, credentials, settings) {
 }
 
 async function fetchDelegationCards(request, ctx, credentials, settings) {
-  if (!['GET', 'POST', 'DELETE'].includes(request.method)) return jsonResponse(405, { message: '请求方式不支持。' })
+  if (!['GET', 'POST', 'PUT', 'DELETE'].includes(request.method)) return jsonResponse(405, { message: '请求方式不支持。' })
   let connection
   try { connection = await readMemberConnection(credentials, settings) } catch {
     return jsonResponse(500, { message: '无法读取 ANT 连接。' })
@@ -376,7 +376,7 @@ async function fetchDelegationCards(request, ctx, credentials, settings) {
       body = JSON.parse(raw)
     } catch { return jsonResponse(400, { message: '任务设置格式无效。' }) }
   }
-  if (request.method === 'POST') {
+  if (['POST', 'PUT'].includes(request.method)) {
     const service = dshImService(ctx)
     if (!service?.describeBot) return jsonResponse(503, { message: '请先安装并启用 DSH-IM。' })
     try {
@@ -390,18 +390,28 @@ async function fetchDelegationCards(request, ctx, credentials, settings) {
   if (request.method === 'DELETE' && (typeof body?.id !== 'string' || !/^[0-9a-f-]{36}$/iu.test(body.id))) {
     return jsonResponse(400, { message: '任务编号无效。' })
   }
+  if ((request.method === 'POST' && body?.id !== undefined)
+    || (request.method === 'PUT' && (typeof body?.id !== 'string' || !/^[0-9a-f-]{36}$/iu.test(body.id)))) {
+    return jsonResponse(400, { message: '任务编号无效。' })
+  }
   const path = request.method === 'DELETE'
     ? `/api/me/im-delegations/cards/${encodeURIComponent(body.id)}` : '/api/me/im-delegations/cards'
+  const payload = body
   try {
     const response = await fetch(new URL(path, connection.serviceUrl), {
       method: request.method,
       headers: { authorization: `Bearer ${connection.token}`, accept: 'application/json',
         ...(request.method !== 'GET' ? { origin: new URL(connection.serviceUrl).origin } : {}),
-        ...(request.method === 'POST' ? { 'content-type': 'application/json' } : {}) },
-      ...(request.method === 'POST' ? { body: JSON.stringify(body) } : {}),
+        ...(['POST', 'PUT'].includes(request.method) ? { 'content-type': 'application/json' } : {}) },
+      ...(['POST', 'PUT'].includes(request.method) ? { body: JSON.stringify(payload) } : {}),
       redirect: 'manual', signal: AbortSignal.timeout(12_000),
     })
-    if (response.status === 404 && request.method !== 'DELETE') return jsonResponse(426, { message: '团队服务端尚未支持自定义任务，请联系管理员升级。' })
+    if (response.status === 404 && ['GET', 'POST'].includes(request.method)) {
+      return jsonResponse(426, { message: '团队服务端尚未支持自定义任务，请联系管理员升级。' })
+    }
+    if (response.status === 405 && request.method === 'PUT') {
+      return jsonResponse(426, { message: '团队服务端尚未支持能力编辑，请联系管理员升级 ANT 服务端。' })
+    }
     if (response.status === 204) return new Response(null, { status: 204 })
     const text = await readLimitedBody(response, request.method === 'GET' ? 8 * 1024 * 1024 : MAX_MODEL_RESPONSE_BYTES)
     if (text === null) return jsonResponse(502, { message: '团队服务响应过大。' })
@@ -962,7 +972,7 @@ export function apply(ctx) {
       fetch: (request) => fetchDelegationStatus(request, connectionCtx.credentials, connectionCtx.settings),
     }), 'ant-teams: local delegated task status')
     connectionCtx.effect(() => connectionCtx.connection.fetch.register({
-      path: DELEGATION_CARDS_PATH, methods: ['GET', 'POST', 'DELETE'], requestBody: 'buffered',
+      path: DELEGATION_CARDS_PATH, methods: ['GET', 'POST', 'PUT', 'DELETE'], requestBody: 'buffered',
       fetch: (request) => fetchDelegationCards(request, connectionCtx, connectionCtx.credentials, connectionCtx.settings),
     }), 'ant-teams: member task cards')
     connectionCtx.effect(() => connectionCtx.connection.fetch.register({

package/package.json

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