@waterplus-ai/waterbuddy 0.1.79 → 0.2.6

package/lib/host/expert-store.js

@@ -138,7 +138,7 @@ export function createExpertStore(options = {}) {
     } catch (error) {
       if (error.code !== 'ENOENT') {
         // 坏文件不能让设置页打不开：退回默认值并记一条 warning，下次写入会覆盖它。
-        console.warn('[WaterBuddy] expert config is unreadable:', error.message)
+        console.warn('[WaterPlusAI] expert config is unreadable:', error.message)
       }
       return normalizeExpertState(undefined)
     }

package/lib/host/expert-tools.js

@@ -9,7 +9,7 @@
  * 召唤走 `ctx.subagents`：把 persona 注入子代理（provider 的 `persona` 能力），
  * 并用 `toolFilter` 禁掉这三个工具本身——否则专家会继续召唤专家，无限套娃。
  */
-import { EXPERT_DIVISIONS, readExpertPersona } from './experts.js'
+import { EXPERT_DIVISIONS, readExpertMemberPersona, readExpertPersona } from './experts.js'
 
 /** 三个工具的名字。`summon*` 会互相禁用，列表见 {@link EXPERT_SUMMON_DENY}。 */
 export const EXPERT_TOOL_NAMES = ['list_experts', 'summon_expert', 'summon_experts']
@@ -152,6 +152,74 @@ function requireTask(task) {
   return text
 }
 
+function normalizeTeamMemberId(value) {
+  return String(value || '')
+    .replaceAll('\\', '/')
+    .replace(/^\.\//, '')
+    .replace(/^agents\//, '')
+    .replace(/\.md$/i, '')
+    .split('/')
+    .pop()
+    .trim()
+}
+
+function localizedTeamValue(value) {
+  if (value && typeof value === 'object') return String(value.zh || value.en || Object.values(value)[0] || '').trim()
+  return String(value || '').trim()
+}
+
+function teamMemberEntries(expert) {
+  const entries = []
+  const seen = new Set()
+  const leadId = normalizeTeamMemberId(expert.leadAgent || expert.agentName)
+  const add = (id, source = 'member') => {
+    const normalized = normalizeTeamMemberId(id)
+    if (!normalized || seen.has(normalized)) return
+    const metadata = (expert.members || []).find(member => normalizeTeamMemberId(member.slug) === normalized)
+    const pluginMetadata = (Array.isArray(expert.plugin?.members) ? expert.plugin.members : [])
+      .find(member => normalizeTeamMemberId(member?.id || member?.slug) === normalized)
+    const referenced = (expert.memberExperts || []).find(member => normalizeTeamMemberId(member.slug) === normalized)
+    const role = metadata?.role === 'lead' || pluginMetadata?.role === 'lead' || normalized === leadId
+      ? 'lead'
+      : source === 'lead' ? 'lead' : 'member'
+    seen.add(normalized)
+    entries.push({
+      id: normalized,
+      name: metadata?.name || referenced?.name || (role === 'lead' ? expert.name : normalized),
+      focus: metadata?.profession
+        || metadata?.roleName
+        || localizedTeamValue(pluginMetadata?.profession || pluginMetadata?.roleName)
+        || referenced?.description
+        || '',
+      role,
+    })
+  }
+  for (const file of Array.isArray(expert.plugin?.agents) ? expert.plugin.agents : []) {
+    add(file, normalizeTeamMemberId(file) === leadId ? 'lead' : 'member')
+  }
+  for (const member of expert.members || []) add(member.slug, member.role === 'lead' ? 'lead' : 'member')
+  for (const member of expert.memberExperts || []) add(member.slug)
+  if (leadId && !seen.has(leadId)) add(leadId, 'lead')
+  if (entries.length === 0) add(leadId || expert.slug, 'lead')
+  return entries
+}
+
+function teamMemberTask(expert, member, task) {
+  const role = member.role === 'lead' ? '负责人' : '成员'
+  const focus = member.focus ? `专业重点：${member.focus}。` : ''
+  const instruction = member.role === 'lead'
+    ? '请作为总负责人独立给出判断、优先级和可执行的汇总方案。'
+    : '请只从自己的专业视角评审，给出具体发现、风险和建议，不要重复完整实现，也不要假设其他成员已经完成工作。'
+  return [
+    `你是“${expert.name}”的${role}「${member.name}」。`,
+    focus,
+    instruction,
+    '',
+    '用户原始任务：',
+    task,
+  ].filter(Boolean).join('\n')
+}
+
 /**
  * 构造三个工具定义。
  *
@@ -175,9 +243,14 @@ export function createExpertToolDefinitions({ getCatalog, getEnabled, config, su
   }
 
   /** 只保留启用中的专家；一个分类被全部关掉时整条不显示，免得名册里冒出空分类。 */
-  const visibleDivisions = catalog => catalog.divisions
-    .map(division => ({ ...division, experts: division.experts.filter(expert => isEnabled(expert.slug)) }))
-    .filter(division => division.experts.length > 0)
+  const visibleDivisions = catalog => {
+    const groups = catalog.divisions
+      .map(division => ({ ...division, experts: division.experts.filter(expert => isEnabled(expert.slug)) }))
+      .filter(division => division.experts.length > 0)
+    const teams = (catalog.teams || []).filter(team => isEnabled(team.slug))
+    if (teams.length > 0) groups.push({ slug: 'teams', name: '专家团', experts: teams })
+    return groups
+  }
 
   /** 名册总览：分区永远给（便宜），指定分区时才附专家列表。 */
   const divisionOverview = catalog => visibleDivisions(catalog).map(division => ({
@@ -193,28 +266,16 @@ export function createExpertToolDefinitions({ getCatalog, getEnabled, config, su
     description: codePointLength(expert.description) > EXPERT_DESCRIPTION_MAX_CHARS
       ? `${Array.from(expert.description).slice(0, EXPERT_DESCRIPTION_MAX_CHARS).join('')}…`
       : expert.description,
+    kind: expert.kind || 'expert',
+    expertType: expert.expertType || 'expert',
+    members: expert.members || [],
   })
 
-  /** 召唤一个专家并等它跑完；失败按仓库口径抛出（注册表转成 isError）。 */
-  async function summonOnce(expert, task, exec) {
-    if (!exec?.agent) {
-      throw new Error('EXPERT_REQUIRES_AGENT: 专家召唤需要所属的 agent 会话')
-    }
-    // 停用的专家必须显式拒绝：静默"召唤成功"会让人以为开关没生效。
-    if (!isEnabled(expert.slug)) {
-      throw new Error(`EXPERT_DISABLED: 专家 ${expert.slug} 已在设置里停用`)
-    }
-    const { providerName, provider } = resolveExpertProvider(subagents, config)
-    const persona = await readExpertPersona(expert)
-    if (!persona) {
-      throw new Error(`EXPERT_PERSONA_EMPTY: ${expert.slug} 的正文为空`)
-    }
+  async function runSubagent(providerName, request, exec) {
     const maxDepth = Number(config?.expertMaxDepth)
     const run = await subagents.start(providerName, {
-      label: `expert:${expert.slug}`,
-      prompt: [{ type: 'text', text: task }],
+      ...request,
       parent: exec.agent,
-      persona,
       // 禁掉召唤工具：专家不该再召唤专家。
       toolFilter: { deny: EXPERT_SUMMON_DENY },
       ...(Number.isSafeInteger(maxDepth) && maxDepth >= 0 ? { maxDepth } : {}),
@@ -227,18 +288,88 @@ export function createExpertToolDefinitions({ getCatalog, getEnabled, config, su
       if (failure !== undefined) {
         throw new Error(`${failure}：${output || '（无输出）'}`)
       }
-      return { expert: expert.slug, name: expert.name, provider: providerName, output }
+      return output
     } finally {
       // 无论成功失败都要释放子代理资源。
       await run.dispose()
     }
   }
 
+  /** 召唤一个专家并等它跑完；失败按仓库口径抛出（注册表转成 isError）。 */
+  async function summonOnce(expert, task, exec) {
+    if (!exec?.agent) {
+      throw new Error('EXPERT_REQUIRES_AGENT: 专家召唤需要所属的 agent 会话')
+    }
+    // 停用的专家必须显式拒绝：静默"召唤成功"会让人以为开关没生效。
+    if (!isEnabled(expert.slug)) {
+      throw new Error(`EXPERT_DISABLED: 专家 ${expert.slug} 已在设置里停用`)
+    }
+    const { providerName } = resolveExpertProvider(subagents, config)
+    if (expert.kind !== 'team') {
+      const persona = await readExpertPersona(expert)
+      if (!persona) {
+        throw new Error(`EXPERT_PERSONA_EMPTY: ${expert.slug} 的正文为空`)
+      }
+      const output = await runSubagent(providerName, {
+        label: `expert:${expert.slug}`,
+        prompt: [{ type: 'text', text: task }],
+        persona,
+      }, exec)
+      return { expert: expert.slug, name: expert.name, provider: providerName, output }
+    }
+
+    const members = teamMemberEntries(expert)
+    const invokeMember = async (member, persona) => {
+      const label = `expert:${expert.slug}:${member.id}`
+      try {
+        const memberPersona = persona || await readExpertMemberPersona(expert, member.id)
+        if (!memberPersona) throw new Error(`EXPERT_MEMBER_PERSONA_EMPTY: ${expert.slug}/${member.id}`)
+        const output = await runSubagent(providerName, {
+          label,
+          prompt: [{ type: 'text', text: teamMemberTask(expert, member, task) }],
+          persona: memberPersona,
+        }, exec)
+        return { ok: true, member, output }
+      } catch (error) {
+        return { ok: false, member, error: error.message }
+      }
+    }
+    const lead = members.find(member => member.role === 'lead') || members[0]
+    let leadResult
+    if (lead) {
+      try {
+        leadResult = invokeMember(lead, await readExpertPersona(expert))
+      } catch (error) {
+        leadResult = Promise.resolve({ ok: false, member: lead, error: error.message })
+      }
+    }
+    const preparedMembers = await Promise.all(members
+      .filter(member => member !== lead)
+      .map(async member => {
+        try {
+          return { member, persona: await readExpertMemberPersona(expert, member.id) }
+        } catch (error) {
+          return { member, error: error.message }
+        }
+      }))
+    const memberResults = await Promise.all(preparedMembers.map(item => item.error
+      ? { ok: false, member: item.member, error: item.error }
+      : invokeMember(item.member, item.persona)))
+    const results = leadResult ? [await leadResult, ...memberResults] : memberResults
+    const output = [
+      `已召集“${expert.name}”${results.length}位成员并行评审：`,
+      ...results.map(result => result.ok
+        ? `【${result.member.name}】\n${result.output || '（无输出）'}`
+        : `【${result.member.name}】\n失败：${result.error}`),
+    ].join('\n\n')
+    return { expert: expert.slug, name: expert.name, provider: providerName, output }
+  }
+
   return [
     {
       name: 'list_experts',
       description:
-        '浏览专家名册。不传 division 时只返回分区与各分区专家数量；传了 division 才返回该分区的专家名单。',
+        '浏览专家名册。不传 division 时只返回分区与各分区专家数量；传了 division 才返回该分区的专家名单。专家团使用 division=teams。',
       // 注意：本插件是纯 JS、绕过了 `defineTool`，所以 parameters / output.schema 都必须写成
       // **原始 JSON Schema**（`required` 是对象级的字符串数组）。宿主里的内置工具用的是
       // 属性级 `required: true` 的「spec 方言」，那由 `defineTool` 转换——我们不经过它。
@@ -248,7 +379,7 @@ export function createExpertToolDefinitions({ getCatalog, getEnabled, config, su
         properties: {
           division: {
             type: 'string',
-            description: `分区 slug，可选值：${Object.keys(EXPERT_DIVISIONS).join('、')}`,
+            description: `分区 slug，可选值：${[...Object.keys(EXPERT_DIVISIONS), 'teams'].join('、')}`,
           },
         },
       },
@@ -296,7 +427,7 @@ export function createExpertToolDefinitions({ getCatalog, getEnabled, config, su
     {
       name: 'summon_expert',
       description:
-        '召唤一位专家分身执行任务，并等它返回结果。专家是独立的子代理，拥有该领域的系统提示词与完整的常备工具集。',
+        '召唤一位专家分身执行任务，并等它返回结果。专家团会自动并行召唤负责人和所有成员；普通专家只启动一个子代理。每个子代理拥有对应领域的系统提示词与完整的常备工具集。',
       parameters: {
         type: 'object',
         additionalProperties: false,