@waterplus-ai/waterbuddy 0.1.78 → 0.2.5

package/lib/host/index.js

@@ -5,7 +5,7 @@ import path from 'node:path'
 import { WATERPLUS_PERSONA } from '../shared/persona.js'
 import { createExpertStore, isExpertEnabled } from './expert-store.js'
 import { createExpertToolDefinitions } from './expert-tools.js'
-import { EXPERT_DIVISIONS, loadExpertCatalog, mergeCustomExperts, readExpertBody, resolveExpertAvatar } from './experts.js'
+import { EXPERT_DIVISIONS, loadExpertCatalog, mergeCustomExperts, readExpertBody, readExpertDetails, resolveExpertAvatar, resolveExpertMemberAvatar } from './experts.js'
 import { bindLlmCredential, describeLlmCredential, ensureLlmCredential, formatBalanceText, isGatewayActive, readActiveProvider, refreshLlmQuota, restoreDeviceLlmCredential, switchDefaultProviderWithRetry } from './llm-gateway.js'
 
 const WATERPLUS_ICON = Buffer.from('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=', 'base64')
@@ -73,7 +73,7 @@ function savePersistedAuth(auth) {
     fs.writeFileSync(file, JSON.stringify(auth), { mode: 0o600 })
     try { fs.chmodSync(file, 0o600) } catch {}
   } catch (error) {
-    console.warn('[WaterBuddy] failed to persist login:', error.message)
+    console.warn('[WaterPlusAI] failed to persist login:', error.message)
   }
 }
 
@@ -110,7 +110,7 @@ function normalizeUser(profile) {
   return user
 }
 
-const MANIFEST = JSON.stringify({ id: '/', name: 'WaterBuddy', short_name: 'WaterBuddy', start_url: '/', scope: '/', display: 'fullscreen', icons: [{ src: '/waterplus-mark.png', sizes: '84x84', type: 'image/png', purpose: 'any' }] })
+const MANIFEST = JSON.stringify({ id: '/', name: 'WaterPlusAI', short_name: 'WaterPlusAI', start_url: '/', scope: '/', display: 'fullscreen', icons: [{ src: '/waterplus-mark.png', sizes: '84x84', type: 'image/png', purpose: 'any' }] })
 
 function json(res, status, body) {
   res.writeHead(status, { 'content-type': 'application/json; charset=utf-8', 'cache-control': 'no-store' })
@@ -191,7 +191,7 @@ async function finalizeLogin(token) {
     try {
       await withTimeout(Promise.resolve().then(() => llmLoginHook(token)), LLM_SWAP_TIMEOUT_MS, 'llm-bind')
     } catch (error) {
-      console.warn('[WaterBuddy] llm bind after login failed:', error.message)
+      console.warn('[WaterPlusAI] llm bind after login failed:', error.message)
     }
   }
   return { token, user }
@@ -362,7 +362,7 @@ export async function bootstrapLlmCredential(ctx, config) {
       } catch (error) {
         // 会话过期或网关不可用时回落设备档，保证仍能对话。
         console.warn(
-          '[WaterBuddy] startup bind failed; falling back to the device credential:',
+          '[WaterPlusAI] startup bind failed; falling back to the device credential:',
           error.message,
         )
       }
@@ -374,10 +374,10 @@ export async function bootstrapLlmCredential(ctx, config) {
     try {
       await switchDefaultProviderWithRetry(ctx)
     } catch (error) {
-      console.warn('[WaterBuddy] default provider not switched:', error.message)
+      console.warn('[WaterPlusAI] default provider not switched:', error.message)
     }
   } catch (error) {
-    console.warn('[WaterBuddy] LLM credential bootstrap failed:', error.message)
+    console.warn('[WaterPlusAI] LLM credential bootstrap failed:', error.message)
     llmStatus = { ...(llmStatus || {}), error: error.message }
   }
   return llmStatus || null
@@ -429,6 +429,9 @@ function expertPromptSection(catalog) {
     '',
     `名册共 ${catalog.bySlug.size} 位专家，分 ${catalog.divisions.length} 个方向：`,
     divisions,
+    catalog.teams?.length > 0
+      ? `专家团：${catalog.teams.map(team => `${team.slug}（${team.name}，成员：${(team.members || []).map(member => member.name || member.slug).join('、')}）`).join('、')}`
+      : '',
     '',
     '专家返回的是独立分析，仍需你结合上下文判断后再交付给用户。',
   ].join('\n')
@@ -463,8 +466,12 @@ function expertRoutes(snapshot, store) {
     name: expert.name,
     emoji: expert.emoji,
     description: expert.description,
-    division: expert.division,
-    divisionName: EXPERT_DIVISIONS[expert.division] || expert.division,
+    division: expert.kind === 'team' ? 'teams' : expert.division,
+    divisionName: expert.kind === 'team' ? '专家团' : EXPERT_DIVISIONS[expert.division] || expert.division,
+    kind: expert.kind || 'expert',
+    expertType: expert.expertType || 'expert',
+    members: expert.members || [],
+    skills: expert.skills || [],
     custom: expert.custom === true,
     enabled: isExpertEnabled(state, expert.slug),
     // 外链直接用；本地图片走我们的取图路由（按需读、带缓存，不塞进快照）。
@@ -475,6 +482,16 @@ function expertRoutes(snapshot, store) {
       : '',
   })
 
+  const divisionBriefs = catalog => {
+    const divisions = catalog.divisions.map(division => ({
+      slug: division.slug,
+      name: division.name,
+      count: division.experts.length,
+    }))
+    if (catalog.teams?.length > 0) divisions.push({ slug: 'teams', name: '专家团', count: catalog.teams.length })
+    return divisions
+  }
+
   /** 统一把异常收敛成 JSON：带错误码的校验失败返回 400，其余 502。 */
   const guard = handler => async (req, res) => {
     try {
@@ -505,16 +522,17 @@ function expertRoutes(snapshot, store) {
           const expert = catalog.bySlug.get(slug)
           if (!expert) return json(res, 404, { error: 'expert-not-found' })
           // 展示返回未消毒的原文：零宽空格不该出现在用户能复制走的文本里。
-          return json(res, 200, { expert: brief(expert, state), body: await readExpertBody(expert) })
+          const details = await readExpertDetails(expert)
+          return json(res, 200, {
+            expert: { ...brief(expert, state), ...details },
+            body: await readExpertBody(expert),
+          })
         }
         const experts = [...catalog.bySlug.values()].map(expert => brief(expert, state))
         json(res, 200, {
           experts,
-          divisions: catalog.divisions.map(division => ({
-            slug: division.slug,
-            name: division.name,
-            count: division.experts.length,
-          })),
+          teams: (catalog.teams || []).map(team => brief(team, state)),
+          divisions: divisionBriefs(catalog),
           enabledCount: experts.filter(expert => expert.enabled).length,
           revision: state.revision,
           // 版本号由宿主下发：客户端不该自己硬编码一份会漂移的副本。
@@ -527,10 +545,15 @@ function expertRoutes(snapshot, store) {
       path: '/api/waterbuddy/experts/avatar',
       handler: guard(async (req, res) => {
         if (req.method !== 'GET') return json(res, 405, { error: 'method-not-allowed' })
-        const slug = new URL(req.url, 'http://127.0.0.1').searchParams.get('slug') || ''
+        const query = new URL(req.url, 'http://127.0.0.1').searchParams
+        const slug = query.get('slug') || ''
+        const memberSlug = query.get('member') || ''
         const { catalog } = await snapshot()
         const expert = catalog.bySlug.get(slug)
-        const avatar = expert ? resolveExpertAvatar(expert) : undefined
+        const member = memberSlug && expert?.members?.find(item => item.slug === memberSlug)
+        const avatar = expert
+          ? (member ? resolveExpertMemberAvatar(expert, member) : resolveExpertAvatar(expert))
+          : undefined
         if (!avatar) return json(res, 404, { error: 'avatar-not-found' })
         if (avatar.kind === 'remote') return json(res, 400, { error: 'avatar-is-remote' })
         const extension = (avatar.path.match(/\.[a-z0-9]+$/i) || [''])[0].toLowerCase()
@@ -554,6 +577,8 @@ function expertRoutes(snapshot, store) {
         const experts = [...catalog.bySlug.values()].map(expert => brief(expert, state))
         json(res, 200, {
           experts,
+          teams: (catalog.teams || []).map(team => brief(team, state)),
+          divisions: divisionBriefs(catalog),
           enabledCount: experts.filter(expert => expert.enabled).length,
           revision: state.revision,
         })
@@ -570,6 +595,8 @@ function expertRoutes(snapshot, store) {
         const experts = [...catalog.bySlug.values()].map(expert => brief(expert, state))
         json(res, 200, {
           experts,
+          teams: (catalog.teams || []).map(team => brief(team, state)),
+          divisions: divisionBriefs(catalog),
           enabledCount: experts.filter(expert => expert.enabled).length,
           revision: state.revision,
         })
@@ -586,6 +613,8 @@ function expertRoutes(snapshot, store) {
         const experts = [...catalog.bySlug.values()].map(expert => brief(expert, state))
         json(res, 200, {
           experts,
+          teams: (catalog.teams || []).map(team => brief(team, state)),
+          divisions: divisionBriefs(catalog),
           enabledCount: experts.filter(expert => expert.enabled).length,
           revision: state.revision,
         })
@@ -598,7 +627,7 @@ function setupExpertTools(ctx, config, { getCatalog, getEnabled }) {
   const tools = readService(ctx, 'tools')
   const subagents = readService(ctx, 'subagents')
   if (!tools?.register || !subagents) {
-    console.warn('[WaterBuddy] experts disabled: host exposes no tools/subagents service')
+    console.warn('[WaterPlusAI] experts disabled: host exposes no tools/subagents service')
     return []
   }
 
@@ -626,7 +655,7 @@ function setupExpertTools(ctx, config, { getCatalog, getEnabled }) {
       },
     }))
   } catch (error) {
-    console.warn('[WaterBuddy] expert tools registration failed:', error.message)
+    console.warn('[WaterPlusAI] expert tools registration failed:', error.message)
     for (const dispose of disposers) {
       try { dispose() } catch { /* 已失败，回滚本身不再抛 */ }
     }
@@ -644,7 +673,7 @@ export function apply(ctx, config) {
     // 内置名册读一次（异步、失败只记日志）；自定义专家与启用状态存在 settings 里，
     // 每次快照时合并，所以用户在设置页改完立刻生效，不需要重启。
     const builtinCatalog = loadExpertCatalog(config?.expertsDir || undefined)
-    builtinCatalog.catch(error => console.warn('[WaterBuddy] expert catalog failed to load:', error.message))
+    builtinCatalog.catch(error => console.warn('[WaterPlusAI] expert catalog failed to load:', error.message))
     // 状态存在 $DSH_HOME/waterbuddy-experts.json（`expertsStateFile` 可覆盖，测试用临时文件）。
     // 名册加载完成后记下全部 slug，供 store 判断白名单是否来自上一代名册。
     let knownExpertSlugs
@@ -689,12 +718,12 @@ export function apply(ctx, config) {
         })
       } },
       { kind: 'exact', path: '/api/waterbuddy/llm/refresh', handler: async (req, res) => { if (req.method !== 'POST') return json(res, 405, { error: 'method-not-allowed' }); try { json(res, 200, { llm: await bootstrapLlmCredential(ctx, config) }) } catch (error) { json(res, 502, { error: error.message }) } } },
-      { kind: 'exact', path: '/api/waterbuddy/logout', handler: async (_req, res) => { currentUser = undefined; for (const session of sessions.values()) delete session.token; clearPersistedAuth(); if (llmLogoutHook) { try { await withTimeout(Promise.resolve().then(() => llmLogoutHook()), LLM_SWAP_TIMEOUT_MS, 'llm-unbind') } catch (error) { console.warn('[WaterBuddy] llm restore after logout failed:', error.message) } } json(res, 200, { ok: true }) } },
+      { kind: 'exact', path: '/api/waterbuddy/logout', handler: async (_req, res) => { currentUser = undefined; for (const session of sessions.values()) delete session.token; clearPersistedAuth(); if (llmLogoutHook) { try { await withTimeout(Promise.resolve().then(() => llmLogoutHook()), LLM_SWAP_TIMEOUT_MS, 'llm-unbind') } catch (error) { console.warn('[WaterPlusAI] llm restore after logout failed:', error.message) } } json(res, 200, { ok: true }) } },
       { kind: 'prefix', path: '/api/waterbuddy/mcp', handler: async (req, res) => { try { await proxyMcp(req, res) } catch (error) { json(res, 502, { error: error.message }) } } },
       ...expertRoutes(expertSnapshot, expertStore),
     ]
     const disposers = routes.map(route => ctx.webServer.register(route))
-    const disposeTitle = ctx.webServer.tapIndex(html => html.replace(/<title>[^<]*<\/title>/i, '<title>WaterBuddy</title>').replace(/<link[^>]+rel=["']icon["'][^>]*>/i, '<link rel="icon" type="image/png" href="/waterplus-mark.png" />'))
+    const disposeTitle = ctx.webServer.tapIndex(html => html.replace(/<title>[^<]*<\/title>/i, '<title>WaterPlusAI</title>').replace(/<link[^>]+rel=["']icon["'][^>]*>/i, '<link rel="icon" type="image/png" href="/waterplus-mark.png" />'))
     const disposePersona = ctx.systemPrompt.section({ name: 'waterplus:persona', order: 100, text: WATERPLUS_PERSONA })
     const expertDisposers = setupExpertTools(ctx, config, {
       getCatalog: async () => (await expertSnapshot()).catalog,

package/lib/host/llm-gateway.js

@@ -98,7 +98,7 @@ function writeDeviceState(state) {
     fs.writeFileSync(file, JSON.stringify(state), { mode: 0o600 })
     try { fs.chmodSync(file, 0o600) } catch {}
   } catch (error) {
-    console.warn('[WaterBuddy] failed to persist device state:', error.message)
+    console.warn('[WaterPlusAI] failed to persist device state:', error.message)
   }
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@waterplus-ai/waterbuddy",
-  "version": "0.1.78",
-  "description": "WaterBuddy branding and Web profile bundle for DeepSeek Harness",
+  "version": "0.2.5",
+  "description": "WaterPlusAI branding and Web profile bundle for DeepSeek Harness",
   "license": "UNLICENSED",
   "type": "module",
   "packageManager": "pnpm@11.7.0",
@@ -37,7 +37,7 @@
     }
   },
   "scripts": {
-    "test": "node --test tests/*.test.mjs",
+    "test": "node --test \"tests/**/*.test.mjs\"",
     "pack:check": "pnpm run build:client && pnpm pack --dry-run",
     "pack:release": "pnpm run build:client && pnpm pack --pack-destination releases",
     "release:cdn": "pnpm run build:client && node scripts/build-cdn-release.mjs",