dsh-armory 1.9.3 → 1.10.0

package/lib/expert-market.js

@@ -27,9 +27,9 @@
 //   - 技能落盘目标与 SkillHub 技能同一发现范围 ~/.agents/skills/，目录名带 wbexpert__ 前缀
 //     防与其它来源撞名；本地缓存复制整树，CDN 兜底只写 SKILL.md 并如实标注。
 //   - patch 写入用 yaml 文档 API（与 mcp-config.js 同款 !!js 标量约定），保留其余条目与注释。
-import { cp, mkdir, readFile, readdir, rm, stat, writeFile } from "node:fs/promises";
+import { cp, mkdir, readFile, readdir, rename, rm, stat, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
-import { basename, join, resolve, sep } from "node:path";
+import { basename, join } from "node:path";
 import { parseDocument, Scalar, YAMLMap, YAMLSeq, isMap, isSeq } from "yaml";
 
 const EXPERT_ORIGIN = "https://acc-1258344699.cos.accelerate.myqcloud.com/workbuddy/expert-marketplace";
@@ -60,6 +60,14 @@ function skillsRoot() {
 function workbuddyExpertCache() {
   return join(homedir(), ".workbuddy", "plugins", "cache", "experts");
 }
+// 团队专家：主理人 + N 个成员，每人一份人设。成员人设不塞进 preset（会白白撑大每轮
+// 系统提示），而是落盘成独立 md，由主理人调度时按需 read 进 subagent 的 prompt。
+function teamMemberDir(plugin) {
+  return join(cacheDir(), "teams", safeSegment(plugin));
+}
+function teamMemberPersonaPath(plugin, memberId) {
+  return join(teamMemberDir(plugin), `${safeSegment(memberId)}.md`);
+}
 function safeSegment(value) {
   // 目录名防穿越：只留安全字符，与 wb-market.js 的 skillTargetName 同一纪律。
   const safe = String(value).toLowerCase().replace(/[^a-z0-9_-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 48);
@@ -143,15 +151,33 @@ async function loadManifest() {
 function bi(value) {
   return value && typeof value === "object" ? String(value.zh || value.en || "") : String(value || "");
 }
+function biMember(value) {
+  return value && typeof value === "object" ? String(value.zh || value.en || "") : String(value || "");
+}
+/** 团队编制里的一行：成员 ID / 花名 / 职业 / 角色 / 人设文件名。 */
+function projectMember(member) {
+  const id = String(member?.id || "").trim();
+  if (!id) return null;
+  return {
+    id,
+    name: biMember(member.displayName || member.name),
+    profession: biMember(member.profession),
+    role: String(member.role || "member"),
+    promptFile: String(member.promptFile || ""),
+    avatar: String(member.avatar || ""),
+  };
+}
 function projectExpert(entry, categoryById) {
   const plugin = String(entry.plugin || "").trim();
   if (!plugin) return null;
   const category = categoryById.get(entry.categoryId);
+  const members = Array.isArray(entry.members) ? entry.members.map(projectMember).filter(Boolean) : [];
   return {
     id: String(entry.id || plugin),
     plugin,
     agentName: String(entry.agentName || ""),
     expertType: entry.expertType === "team" ? "team" : "agent",
+    members,
     name: bi(entry.displayName) || plugin,
     profession: bi(entry.profession),
     description: bi(entry.description),
@@ -298,6 +324,120 @@ export async function installExpertSkills(plugin, skillNames, { onLog } = {}) {
   }
   return { installed, notes };
 }
+// ── 团队专家：成员人设落盘（召唤时执行，送还时整体清除）─────────────────
+async function localMemberPersona(plugin, memberId) {
+  for (const version of await localExpertVersions(plugin)) {
+    const candidate = join(version.dir, "agents", `${memberId}.md`);
+    try {
+      const text = await readFile(candidate, "utf8");
+      if (text.trim()) return text;
+    } catch { /* 该版本没有这个成员 */ }
+  }
+  return null;
+}
+async function readMemberPersona(plugin, member) {
+  const local = await localMemberPersona(plugin, member.id);
+  if (local) return { text: local, source: "workbuddy-cache" };
+  const promptFile = String(member.promptFile || `/plugins/${plugin}/agents/${member.id}.md`).trim();
+  const text = await fetchText(EXPERT_ORIGIN + promptFile);
+  if (!text.trim()) throw new Error("人设文件为空");
+  return { text, source: "cdn" };
+}
+/**
+ * 把团队成员的独立人设写成本机 md（不进 preset：5 份人设塞进系统提示会按轮计费）。
+ * 主理人调度时先 read 出来再拼进 subagent 的 prompt，语义等同 WorkBuddy 的独立协作方。
+ * @returns {Promise<{installed: Array, notes: string[], dir: string}>}
+ */
+export async function installTeamMemberPersonas(plugin, members, { onLog } = {}) {
+  const installed = [];
+  const notes = [];
+  const dir = teamMemberDir(plugin);
+  for (const member of Array.isArray(members) ? members : []) {
+    // 主理人人设本身就是召唤预设的 persona，不需要再落一份。
+    if (member.role === "lead") continue;
+    try {
+      const { text, source } = await readMemberPersona(plugin, member);
+      await mkdir(dir, { recursive: true });
+      const path = teamMemberPersonaPath(plugin, member.id);
+      await writeFile(path, text);
+      installed.push({ id: member.id, name: member.name, profession: member.profession, path, source });
+      onLog?.(`团队成员 ${member.name || member.id}：人设已落盘（${source}）`);
+    } catch (error) {
+      notes.push(`团队成员 ${member.name || member.id} 人设获取失败：${error.message}`);
+    }
+  }
+  return { installed, notes, dir };
+}
+export async function uninstallTeamMemberPersonas(plugin) {
+  const dir = teamMemberDir(plugin);
+  try {
+    await rm(dir, { recursive: true, force: true });
+    return dir;
+  } catch {
+    return null;
+  }
+}
+/**
+ * DSH 运行时桥接段：WorkBuddy 团队人设里的 TeamCreate / Agent(name, subagent_type)
+ * 在 DSH 里不存在，这里给出等价映射。追加在主理人人设末尾，只在召唤时拼一次。
+ * @param {object} detail wbExpertDetail 的返回值
+ * @param {Map<string,string>} personaFiles 成员 ID → 已落盘的人设路径（未落盘则不传）
+ */
+// 桥接段的唯一识别标记：readExpertPresets 靠它在召唤预设的人设正文里判断
+// 「这条团队预设带没带桥接段」。旧版本召唤写入的团队预设没有这段——那种预设下的
+// 会话主理人会去调不存在的 TeamCreate / Agent，成员永远开不出来（用户实测症状）。
+export const TEAM_BRIDGE_MARKER = "## DSH 运行时适配（团队协作桥接）";
+/** 团队人设正文是否已带桥接段（用于现存召唤预设行的 stale 体检）。 */
+export function hasTeamBridge(personaText) {
+  return typeof personaText === "string" && personaText.includes(TEAM_BRIDGE_MARKER);
+}
+export function buildTeamBridge(detail, personaFiles) {
+  const members = Array.isArray(detail?.members) ? detail.members : [];
+  const others = members.filter((member) => member.role !== "lead");
+  if (!others.length) return "";
+  const rows = others.map((member) => {
+    const file = personaFiles?.get(member.id);
+    return `| \`${member.id}\` | ${member.name || "-"} | ${member.profession || "-"} | ${file ? `\`${file}\`` : "（人设未落盘，按职责执行）"} |`;
+  });
+  return [
+    "",
+    "---",
+    "",
+    "## DSH 运行时适配（团队协作桥接）",
+    "",
+    "本会话运行在 DSH 上，**没有 WorkBuddy 的 `TeamCreate` 与 `Agent` 工具**。团队编制已在召唤时固定，因此上文里「建立团队」「Agent 工具 name/subagent_type」两类指令按下面的等价方式执行；其余铁律（不得代写成员产出、成员之间不直连、一切经你中转）保持不变。",
+    "",
+    "1. **建团队 → 无需调用**：本会话即本团队，成员固定如下表，不需要创建、也不需要命名。",
+    "2. **调度成员 → `subagent` 工具**：",
+    "   - `description`：`<成员ID>：<阶段产出名>`，例如 `software-architect：系统设计与任务分解`。",
+    "   - `prompt`：先用 `read` 读出该成员的人设文件（下表最后一列），把**人设正文原文**放在 prompt 最前面，接一行 `---`，再往下写本次任务、上游产出、期望交付物与验收标准。",
+    "   - 顺序 SOP（PRD → 架构 → 实现 → QA）**必须**传 `run_in_background: false`，当场等它返回再往下走；只有互不依赖的并行任务才留默认后台模式。",
+    "3. **成员产出**：子代理的最终回复就是该成员的专业产出，原文转交下一阶段，不要改写、不要替它编。",
+    "4. **续聊追问**：需要同一成员接着干活时，用 `send_message` 继续它的会话 id，不要重新 spawn 一个同名成员。",
+    "5. **上下文继承**：`subagent` 是干净上下文（更接近 WorkBuddy 的独立协作方）；只有确实需要它继承你当前会话上下文时才用 `subagent_fork`。",
+    "",
+    "### 团队编制",
+    "",
+    "| 成员 ID | 花名 | 职责 | 人设文件 |",
+    "| --- | --- | --- | --- |",
+    ...rows,
+    "",
+  ].join("\n");
+}
+/**
+ * 把「详情」变成真正可用的会话人设：单人专家原样返回，团队专家先落成员人设、
+ * 再在末尾追加 DSH 桥接段。召唤预设与会话级挂载走同一条路径，保证两个入口一致。
+ * @returns {Promise<{personaText: string, memberResult: object|null}>}
+ */
+export async function prepareExpertPersona(detail, { onLog, withMembers = true } = {}) {
+  if (detail?.expertType !== "team") return { personaText: detail?.persona || "", memberResult: null };
+  let memberResult = { installed: [], notes: [], dir: teamMemberDir(detail.plugin) };
+  if (withMembers) {
+    memberResult = await installTeamMemberPersonas(detail.plugin, detail.members, { onLog });
+  }
+  const files = new Map((memberResult.installed || []).map((row) => [row.id, row.path]));
+  return { personaText: `${detail.persona}${buildTeamBridge(detail, files)}`, memberResult };
+}
 export async function uninstallExpertSkills(plugin) {
   const root = skillsRoot();
   let names = [];
@@ -390,7 +530,20 @@ export function readExpertPresets(content) {
     const config = entry.get("config", true);
     const presetId = String(mapValue(config, "id") || "");
     if (!presetId.startsWith(EXPERT_PRESET_PREFIX)) continue;
-    rows.push({ presetId: String(mapValue(entry, "id")), plugin: presetId.slice(EXPERT_PRESET_PREFIX.length) });
+    // 带出人设正文（plugins[0] 的人设插件的 config.prefix），供 stale 体检：
+    // 旧版本召唤写入的团队预设没有桥接段，读出来后前端能标「需更新」。
+    let personaText = null;
+    const plugins = config.get("plugins", true);
+    if (isSeq(plugins) && plugins.items.length > 0 && isMap(plugins.items[0])) {
+      const personaConfig = plugins.items[0].get("config", true);
+      const prefix = personaConfig ? personaConfig.get("prefix", true) : null;
+      if (prefix && typeof prefix.value === "string") personaText = prefix.value;
+    }
+    rows.push({
+      presetId: String(mapValue(entry, "id")),
+      plugin: presetId.slice(EXPERT_PRESET_PREFIX.length),
+      personaText,
+    });
   }
   return rows;
 }
@@ -597,7 +750,22 @@ async function readRecentRaw() {
 }
 async function writeRecentRaw(data) {
   await mkdir(cacheDir(), { recursive: true });
-  await writeFile(recentPath(), JSON.stringify(data, null, 1));
+  // OPT-08：原子写。直接覆盖写若中途断电/被杀，会留下截断的 JSON——readRecentRaw
+  // 虽然会静默重置（只丢「最近使用」排序、不至于崩），但没必要留着这个窗口。
+  //
+  // 这里刻意用「临时文件 + rename」而不引 @deepseek-ai/dsh-atomic-write：那是宿主提供的
+  // peer 依赖，本包 node_modules 里没有它，而 expert-market.js 会被 test/expert-manual.mjs
+  // 直接 import —— 加静态导入会让本地测试当场 ERR_MODULE_NOT_FOUND。
+  // 同目录 rename 在同一文件系统内是原子操作，足够。
+  const target = recentPath();
+  const tmp = `${target}.${process.pid}.${Date.now().toString(36)}.tmp`;
+  try {
+    await writeFile(tmp, JSON.stringify(data, null, 1));
+    await rename(tmp, target);
+  } catch (e) {
+    await rm(tmp, { force: true }).catch(() => {});
+    throw e;
+  }
 }
 /** 记录一次使用。row 携带菜单展示所需的最小字段；kind ∈ skill|mcp|expert。 */
 export async function recordExpertRecent(kind, row) {

package/lib/index.js

@@ -13,10 +13,11 @@ import { collectImportLocations, missingEnvNames, resolveImportLocation } from "
 import { deriveMcpPhase, formatMcpLog, sanitizeMcpLog } from "./mcp-observability.js";
 import { allMcpEntries, entriesForName, projectToolSchema, revisionOf, toolInventory } from "./mcp-registry.js";
 import { WHATS_NEW } from "./whats-new.js";
-import { wbConnectorCatalog, wbConnectorPreview, wbSkillCatalog, wbSkillDetail, wbSkillFiles, wbSkillInstall, wbSkillInstalled, wbSkillUninstall } from "./wb-market.js";
-import { installExpertSkills, listExpertRecent, listExpertSkills, readExpertPresets, recordExpertRecent, removeExpertPreset, uninstallExpertSkills, wbExpertCatalog, wbExpertDetail, writeExpertPreset } from "./expert-market.js";
+import { wbConnectorCatalog, wbConnectorCachedCount, wbConnectorPreview, wbSkillCatalog, wbSkillDetail, wbSkillInstall, wbSkillInstalled, wbSkillUninstall } from "./wb-market.js";
+import { hasTeamBridge, installExpertSkills, listExpertRecent, listExpertSkills, prepareExpertPersona, readExpertPresets, recordExpertRecent, removeExpertPreset, uninstallExpertSkills, uninstallTeamMemberPersonas, wbExpertCatalog, wbExpertDetail, writeExpertPreset } from "./expert-market.js";
 import { attachPersona, detachPersona, listPersonas, reconcilePersonas } from "./session-persona.js";
-import { scanSessionLedger } from "./tool-ledger.js";
+// OPT-19：clearTextCache 一并引入——toolTailor 的可选动作要回收解压文本缓存。
+import { clearTextCache, scanSessionLedger } from "./tool-ledger.js";
 import { evaluateEnvExpression, jsExpressionToTemplate } from "./workspace-config.js";
 import { canonicalWorkspacePath, installAgentRuntime, listWorkspaceRecords, liveWorkspaceAgentCount, projectConnectionsView, readWorkspaceConfigCached, reconcileWorkspaceConnections, reconcileWorkspaceRestricts, reconnectWorkspaceServer, withWorkspaceWrite, workspaceConnectionStatus, workspaceMountErrorsView, workspaceRestrictErrorView, workspaceScopeErrorsView, workspaceToolSchemas, writeWorkspaceConfigFile } from "./workspace-runtime.js";
 
@@ -603,7 +604,19 @@ function selectSourceServers(row, names) {
 		if (!Array.isArray(names) || !names.every((name) => typeof name === "string")) throw new Error("导入条目名必须是字符串数组");
 		wanted = new Set(names);
 		const unknown = [...wanted].filter((name) => !row.entries.some((entry) => entry.name === name && !entry.error));
-		if (unknown.length) throw new Error(`来源中没有可导入的 MCP：${unknown.join(", ")}`);
+		if (unknown.length) {
+			// OPT-17：这个名字可能真在这份配置里，只是 `${input:}` 落在 url/command 上、
+			// 位置剔不掉而整条降级。此时再说「来源中没有」会把用户送去改一个没写错的地方，
+			// 所以按 `unsupportedEntries` 把两边分开报（两个集合互斥：一个条目只会进其中一边）。
+			const blocked = new Set((row.unsupportedEntries ?? []).map((entry) => entry.name));
+			const interactive = unknown.filter((name) => blocked.has(name));
+			if (interactive.length) {
+				const absent = unknown.filter((name) => !blocked.has(name));
+				throw new Error(`以下 MCP 需要交互取值，DSH 无法导入：${interactive.join(", ")}${
+					absent.length ? `；另有不存在的条目：${absent.join(", ")}` : ""}`);
+			}
+			throw new Error(`来源中没有可导入的 MCP：${unknown.join(", ")}`);
+		}
 	}
 	const served = row.entries.filter((entry) => !entry.error && (wanted === null || wanted.has(entry.name)));
 	if (!served.length) throw new Error("没有选中任何可导入的 MCP");
@@ -640,6 +653,18 @@ function projectSourceRow(row) {
 			maskedFields: entry.spec ? maskedSourceFields(entry.spec) : [],
 			missingEnv: entry.spec ? missingEnvNames(entry.spec, process.env) : [],
 		})),
+		// OPT-17：`${input:}` 的位置不可剔时，那条会整条降级、不进 `entries`，只在
+		// `unsupportedEntries` 里留一份可展示信息。不透出来的话，界面只能笼统说「这里
+		// 没有可导入的 MCP」，用户看不出是「有 N 条需要交互取值」。仍只发最小的四个键：
+		// name/transport 是标签，reason 是已经写好、可直接渲染的说明，names 是占位符名
+		// （名字不是密钥）；条目本体 `spec` 不出去，泄漏面不扩大。
+		// `?? []` 是给没挂这个字段的 row 兜底，避免投影本身抛错。
+		unsupportedEntries: (row.unsupportedEntries ?? []).map((entry) => ({
+			name: entry.name,
+			transport: entry.transport,
+			reason: entry.reason,
+			names: entry.names ?? [],
+		})),
 	};
 }
 // 来源层与导入目标必须同一层，否则报错。「看到的来源 == 会写进去的那一层」这条不变量
@@ -835,7 +860,7 @@ async function listMcpServers(ctx) {
 let McpManagerGateway = (() => {
 	let _classSuper = TypertRemoteService;
 	let _instanceExtraInitializers = [];
-	let _list_decorators, _status_decorators, _enable_decorators, _disable_decorators, _reconnect_decorators, _tools_decorators, _builtins_decorators, _installBuiltins_decorators, _add_decorators, _update_decorators, _remove_decorators, _reveal_decorators, _previewImport_decorators, _importJson_decorators, _listWorkspaces_decorators, _getWorkspaceView_decorators, _addWorkspaceServer_decorators, _updateWorkspaceServer_decorators, _removeWorkspaceServer_decorators, _setWorkspaceExclude_decorators, _installWorkspaceBuiltins_decorators, _previewWorkspaceImport_decorators, _importWorkspaceJson_decorators, _revealWorkspaceServer_decorators, _projectConnections_decorators, _reconnectWorkspaceServer_decorators, _updateHint_decorators, _whatsNew_decorators, _scanImportSources_decorators, _previewImportSource_decorators, _importSource_decorators, _toolTailor_decorators, _wbConnectorCatalog_decorators, _wbConnectorPreview_decorators, _wbConnectorInstall_decorators, _wbSkillCatalog_decorators, _wbSkillDetail_decorators, _wbSkillInstall_decorators, _wbSkillUninstall_decorators, _wbSkillInstalled_decorators;
+	let _list_decorators, _status_decorators, _enable_decorators, _disable_decorators, _reconnect_decorators, _tools_decorators, _builtins_decorators, _installBuiltins_decorators, _add_decorators, _update_decorators, _remove_decorators, _reveal_decorators, _previewImport_decorators, _importJson_decorators, _listWorkspaces_decorators, _getWorkspaceView_decorators, _addWorkspaceServer_decorators, _updateWorkspaceServer_decorators, _removeWorkspaceServer_decorators, _setWorkspaceExclude_decorators, _installWorkspaceBuiltins_decorators, _previewWorkspaceImport_decorators, _importWorkspaceJson_decorators, _revealWorkspaceServer_decorators, _projectConnections_decorators, _reconnectWorkspaceServer_decorators, _updateHint_decorators, _whatsNew_decorators, _scanImportSources_decorators, _previewImportSource_decorators, _importSource_decorators, _toolTailor_decorators, _wbConnectorCatalog_decorators, _wbConnectorCachedCount_decorators, _wbConnectorPreview_decorators, _wbConnectorInstall_decorators, _wbSkillCatalog_decorators, _wbSkillDetail_decorators, _wbSkillInstall_decorators, _wbSkillUninstall_decorators, _wbSkillInstalled_decorators;
 	return class McpManagerGateway extends _classSuper {
 		static {
 			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
@@ -905,6 +930,8 @@ let McpManagerGateway = (() => {
 			__esDecorate(this, null, _toolTailor_decorators, { kind: "method", name: "toolTailor", static: false, private: false, access: { has: (obj) => "toolTailor" in obj, get: (obj) => obj.toolTailor }, metadata: _metadata }, null, _instanceExtraInitializers);
 			_wbConnectorCatalog_decorators = [Remote("wbConnectorCatalog")];
 			__esDecorate(this, null, _wbConnectorCatalog_decorators, { kind: "method", name: "wbConnectorCatalog", static: false, private: false, access: { has: (obj) => "wbConnectorCatalog" in obj, get: (obj) => obj.wbConnectorCatalog }, metadata: _metadata }, null, _instanceExtraInitializers);
+			_wbConnectorCachedCount_decorators = [Remote("wbConnectorCachedCount")];
+			__esDecorate(this, null, _wbConnectorCachedCount_decorators, { kind: "method", name: "wbConnectorCachedCount", static: false, private: false, access: { has: (obj) => "wbConnectorCachedCount" in obj, get: (obj) => obj.wbConnectorCachedCount }, metadata: _metadata }, null, _instanceExtraInitializers);
 			_wbConnectorPreview_decorators = [Remote("wbConnectorPreview")];
 			__esDecorate(this, null, _wbConnectorPreview_decorators, { kind: "method", name: "wbConnectorPreview", static: false, private: false, access: { has: (obj) => "wbConnectorPreview" in obj, get: (obj) => obj.wbConnectorPreview }, metadata: _metadata }, null, _instanceExtraInitializers);
 			_wbConnectorInstall_decorators = [Remote("wbConnectorInstall")];
@@ -1114,6 +1141,12 @@ let McpManagerGateway = (() => {
 		async toolTailor(payload) {
 			// 只读账本：扫描本机会话日志 + 当前注册表 Schema，见 tool-ledger.js。
 			// days 由调用方传（7/30/90），缺省 30，服务端钳到 [1,365]。
+			// OPT-19：可选清空动作——payload.action === 'clearTextCache' 时先回收解压文本缓存
+			// 再出报告。透传性已核实（typert.js:35 payloadParam 的 schema 是 $any =
+			// z.unknown()，strict 只约束「必须有值」不做键剥离），额外键 action 能从客户端
+			// 原样到达这里，无需新增 RPC 契约。先清后扫：报告里的 textCache 快照直接呈现
+			// 清空后的状态，面板能立即看到「占用已归零」，不必再刷一次。
+			if (payload?.action === "clearTextCache") clearTextCache();
 			return buildToolTailorReport(this.ctx, payload || {});
 		}
 		async listWorkspaces() {
@@ -1423,6 +1456,10 @@ let McpManagerGateway = (() => {
 	async wbConnectorCatalog() {
 		return wbConnectorCatalog();
 	}
+	// 顶栏「市场」chip 的常驻计数：只读磁盘缓存，绝不联网（无缓存返回 null）。
+	async wbConnectorCachedCount() {
+		return wbConnectorCachedCount();
+	}
 	async wbConnectorPreview(payload) {
 		return wbConnectorPreview(payload?.connectorId);
 	}
@@ -1470,13 +1507,23 @@ let McpManagerGateway = (() => {
 		if (!sessionId) throw new Error("缺少 sessionId");
 		if (!plugin) throw new Error("缺少 plugin");
 		const detail = await wbExpertDetail({ plugin });
+		// 团队型：成员人设先落盘，主理人人设末尾追加 DSH 桥接段（与召唤预设同一套）。
+		const prepared = await prepareExpertPersona(detail, {
+			onLog: (message) => this.ctx.logger?.debug?.(`wb-expert: ${message}`),
+		});
 		const result = attachPersona(this.ctx, sessionId, {
 			plugin,
 			name: detail.name,
-			personaText: detail.persona,
+			personaText: prepared.personaText,
 		});
 		await recordExpertRecent("expert", { plugin, name: detail.name, profession: detail.profession, presetId: `session-${plugin}` }).catch(() => {});
-		return { ...result, profession: detail.profession };
+		return {
+			...result,
+			profession: detail.profession,
+			expertType: detail.expertType,
+			members: detail.members || [],
+			memberNotes: prepared.memberResult?.notes || [],
+		};
 	}
 	async expertDetach(payload) {
 		const sessionId = String(payload?.sessionId || "").trim();
@@ -1499,6 +1546,10 @@ let McpManagerGateway = (() => {
 		// 详情即预览：召唤写盘前拉一次真实人设与技能清单，失败则整体不动。
 		const detail = await wbExpertDetail({ plugin });
 		const withSkills = payload?.withSkills !== false && detail.skills.length > 0;
+		// 团队型：成员人设先落盘（人设不进 preset，避免每轮白付），主理人人设追加桥接段。
+		const prepared = await prepareExpertPersona(detail, {
+			onLog: (message) => this.ctx.logger?.debug?.(`wb-expert: ${message}`),
+		});
 		// 技能先落盘（失败只影响技能，不阻断召唤），预设行再走唯一写链（文件锁 + 版本校验 + 原子写）。
 		let skillResult = { installed: [], notes: [] };
 		if (withSkills) {
@@ -1513,7 +1564,7 @@ let McpManagerGateway = (() => {
 				displayName: detail.name,
 				profession: detail.profession,
 				description: detail.description,
-				personaText: detail.persona,
+				personaText: prepared.personaText,
 			});
 			if (written.content === state.content) return { mode: "unchanged", presetId: written.presetId };
 			await writePatch(state, written.content);
@@ -1521,14 +1572,26 @@ let McpManagerGateway = (() => {
 		});
 		// 召唤成功即记入最近使用（送还由 listExpertRecent 对账剔除）。记录失败不阻断召唤。
 		await recordExpertRecent("expert", { plugin, name: detail.name, profession: detail.profession, presetId: result.presetId }).catch(() => {});
+		const teamMembers = prepared.memberResult?.installed || [];
+		// upsert 后核对人设正文是否真带桥接段（团队型）；不带则提示更新结果不完整。
+		// 正常路径 prepared.personaText 已拼桥接段，这个分支只在异常数据时触发。
+		const staleBridge = detail.expertType === "team" && !hasTeamBridge(prepared.personaText);
 		return {
 			presetId: result.presetId,
 			presetMode: result.mode,
+			expertType: detail.expertType,
+			members: detail.members || [],
 			summonedSkills: skillResult.installed,
 			skillNotes: skillResult.notes,
+			summonedMembers: teamMembers,
+			memberNotes: prepared.memberResult?.notes || [],
+			staleBridge,
 			note: `已召唤「${detail.name}」：新会话选择预设「WorkBuddy 专家 · ${detail.name}」即专家人设接管`
+				+ (result.mode === "unchanged" ? "（预设已是最新，未改动）" : "")
+				+ (result.mode === "updated" ? "（旧预设行已刷新为人设最新版）" : "")
+				+ (teamMembers.length ? `；团队成员人设 ${teamMembers.length} 份已落盘，主理人按编制用 subagent 调度` : "")
 				+ (skillResult.installed.length ? `；捆绑技能 ${skillResult.installed.length} 个已装进 ~/.agents/skills/` : "")
-				+ (skillResult.notes.length ? `；注意：${skillResult.notes.join("；")}` : ""),
+				+ ([...(prepared.memberResult?.notes || []), ...skillResult.notes].length ? `；注意：${[...(prepared.memberResult?.notes || []), ...skillResult.notes].join("；")}` : ""),
 		};
 	}
 	async wbExpertDismiss(payload) {
@@ -1548,17 +1611,29 @@ let McpManagerGateway = (() => {
 		} catch (error) {
 			this.ctx.logger?.warn?.(`wb-expert: 预设已摘除，但技能清理失败：${error?.message ?? error}`);
 		}
-		if (result.mode === "absent" && !removedSkills.length) throw new Error("本机没有召唤过这个专家（profile patch 里没有对应预设行）");
+		// 团队型：成员人设目录同样按 plugin 隔离，一并清除。
+		let removedTeam = null;
+		try {
+			removedTeam = await uninstallTeamMemberPersonas(plugin);
+		} catch (error) {
+			this.ctx.logger?.warn?.(`wb-expert: 预设已摘除，但成员人设清理失败：${error?.message ?? error}`);
+		}
+		if (result.mode === "absent" && !removedSkills.length && !removedTeam) throw new Error("本机没有召唤过这个专家（profile patch 里没有对应预设行）");
 		return {
 			removedSkills,
+			removedTeam,
 			note: `已送还「${plugin}」`
 				+ (result.mode === "removed" ? "：召唤预设已从 profile patch 摘除（热加载，无需重启）" : "：本没有召唤预设")
-				+ (removedSkills.length ? `；捆绑技能已清理 ${removedSkills.length} 个目录` : ""),
+				+ (removedSkills.length ? `；捆绑技能已清理 ${removedSkills.length} 个目录` : "")
+				+ (removedTeam ? "；团队成员人设已清理" : ""),
 		};
 	}
 	async wbExpertInstalled() {
 		// 已召唤 = profile patch 里的召唤预设行；已装技能 = ~/.agents/skills 的 wbexpert__ 目录。
 		// patch 读走与 managedState 同一条解析（readPatch），但不持写锁——只读快照。
+		// 团队行做 stale 体检：人设正文缺桥接段 = 旧版本召唤写入的行，新会话选它会调
+		// 不存在的 TeamCreate/Agent（成员开不出来）。标记桥接判定放前端（需要市场目录的
+		// expertType），这里只把 personaText 原样带出去。
 		const patch = await readPatch(this.ctx);
 		return { presets: readExpertPresets(patch.content), skills: await listExpertSkills() };
 	}