@chenkai114/dsh-team-admin 0.1.3 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chenkai114/dsh-team-admin",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "DSH 插件：GUI 管理任意会话的智能体团队 —— 查看成员、删除角色并清理其持久会话（进回收站，可恢复）",
   "type": "module",
   "main": "src/index.js",

package/src/api.mjs

@@ -92,6 +92,22 @@ export function createApi({ ctx, getStore, version, logSystem, services }) {
         return
       }
 
+      if (path === '/api/team-admin/dismissed') {
+        if (method !== 'GET') { sendJson(res, 405, { error: '请求方法不支持' }); return }
+        const store = await getStore()
+        const state = await store.readAll()
+        const buckets = state !== null && typeof state === 'object' && typeof state.dismissed === 'object' && state.dismissed !== null
+          ? state.dismissed
+          : {}
+        const ids = []
+        for (const bucket of Object.values(buckets)) {
+          if (bucket === null || typeof bucket !== 'object') continue
+          for (const memberId of Object.keys(bucket)) ids.push(memberId)
+        }
+        sendJson(res, 200, { ids })
+        return
+      }
+
       if (path === '/api/team-admin/team') {
         if (method !== 'GET') { sendJson(res, 405, { error: '请求方法不支持' }); return }
         const sessionId = queryValue(url, 'sessionId')

package/src/client.js

@@ -170,11 +170,77 @@
   }
 
   const DISMISS_URL = API_BASE + '/dismiss'
+  const DISMISSED_URL = API_BASE + '/dismissed'
+  const LIST_FILTER_FLAG = '__dshTeamAdminSessionListFilter__'
 
   function dismissPayload(sessionId, name) {
     return { sessionId: sessionId, name: name, deleteSession: true }
   }
 
+  // —— 宿主会话列表过滤：把已删除成员从 subagentCatalog 投影里摘掉 ——
+  // 宿主 catalog 与 roster 都是 append-only，删会话不会撤销 catalog 事件；
+  // 这里在本插件内拦截 /api/session/list 的响应，按墓碑把失效条目过滤掉，
+  // 不修改宿主源码，也不需要重编译。
+  let dismissedIds = new Set()
+  let dismissedReady = null
+
+  function stripDismissedCatalogs(payload, dismissed) {
+    if (payload === null || typeof payload !== 'object' || dismissed === undefined || dismissed.size === 0) return payload
+    const visit = (node, depth) => {
+      if (node === null || typeof node !== 'object' || depth > 6) return
+      if (Array.isArray(node.subagentCatalog)) {
+        node.subagentCatalog = node.subagentCatalog.filter((entry) => !(entry !== null && typeof entry === 'object' && typeof entry.id === 'string' && dismissed.has(entry.id)))
+      }
+      for (const key of Object.keys(node)) {
+        if (key === 'subagentCatalog') continue
+        visit(node[key], depth + 1)
+      }
+    }
+    visit(payload, 0)
+    return payload
+  }
+
+  async function refreshDismissedIds() {
+    try {
+      const response = await fetch(DISMISSED_URL, { headers: { accept: 'application/json' } })
+      if (response.ok !== true) return dismissedIds
+      const payload = await response.json()
+      const ids = isRecord(payload) && Array.isArray(payload.ids) ? payload.ids : []
+      dismissedIds = new Set(ids.filter((id) => typeof id === 'string' && id !== ''))
+    } catch (error) {
+      // 墓碑拿不到就放行原始列表：过滤是增强，不是前置条件。
+    }
+    return dismissedIds
+  }
+
+  function installSessionListFilter(win) {
+    const scope = win !== undefined ? win : (typeof window === 'undefined' ? null : window)
+    if (scope === null || scope === undefined) return false
+    if (scope[LIST_FILTER_FLAG] === true) {
+      dismissedReady = refreshDismissedIds()
+      return false
+    }
+    const original = scope.fetch
+    if (typeof original !== 'function') return false
+    scope[LIST_FILTER_FLAG] = true
+    dismissedReady = refreshDismissedIds()
+    scope.fetch = async function teamAdminAwareFetch(input, init) {
+      const url = typeof input === 'string' ? input : (isRecord(input) && typeof input.url === 'string' ? input.url : '')
+      if (url.indexOf('/api/session/list') < 0) return await original(input, init)
+      if (dismissedReady !== null) await dismissedReady
+      const response = await original(input, init)
+      if (dismissedIds.size === 0 || response.ok !== true) return response
+      try {
+        const body = await response.clone().json()
+        stripDismissedCatalogs(body, dismissedIds)
+        return new Response(JSON.stringify(body), { status: response.status, statusText: response.statusText, headers: response.headers })
+      } catch (error) {
+        return response
+      }
+    }
+    return true
+  }
+
   // —— 响应校验：缺字段回退默认值，形态不对返回可展示的错误 ——
   function normalizeSessionRow(raw) {
     const row = isRecord(raw) ? raw : {}
@@ -788,6 +854,7 @@
         return
       }
       state.confirm = null
+      dismissedReady = refreshDismissedIds()
       state.notice = { text: dismissResultText(readDismissResult(outcome.data, target)) }
       render()
       await loadTeam(state.selectedId)
@@ -847,6 +914,7 @@
       throw new Error('mount(container) 需要一个可挂载的 DOM 元素')
     }
     ensureStyle(typeof document === 'undefined' ? null : document)
+    installSessionListFilter()
     const controller = createPanelController()
     container.appendChild(controller.root)
     controller.start()
@@ -922,6 +990,7 @@
     return {
       inject: ['slots'],
       apply(ctx) {
+        installSessionListFilter()
         const slots = ctx !== null && ctx !== undefined && ctx.slots !== undefined ? ctx.slots : null
         if (slots === null || typeof slots.inject !== 'function' || typeof slots.register !== 'function') {
           console.warn('[team-admin] 宿主未提供 slots 服务，配置卡片未注册')
@@ -979,6 +1048,10 @@
         PANEL_LABEL: PANEL_LABEL,
         PANEL_ORDER: PANEL_ORDER,
         API_BASE: API_BASE,
+        DISMISSED_URL: DISMISSED_URL,
+        stripDismissedCatalogs: stripDismissedCatalogs,
+        installSessionListFilter: installSessionListFilter,
+        refreshDismissedIds: refreshDismissedIds,
         DEBOUNCE_MS: DEBOUNCE_MS,
         CARD_TITLE: CARD_TITLE,
         CARD_SUMMARY: CARD_SUMMARY,
@@ -1011,4 +1084,4 @@
     && typeof window.__ModuleLoader__.load === 'function') {
     window.__ModuleLoader__.load({ id: PKG_ID, factory: factory })
   }
-})()
+})()

package/src/dismiss.mjs

@@ -148,7 +148,30 @@ async function stopMember(ctx, { leadSessionId, memberId, timeoutMs, logSystem }
 }
 
 /**
- * 删除一个团队成员：停会话 → 子会话目录进回收站 → 写墓碑。
+ * 释放一个子会话的 Activation 注册：宿主 GUI 的子智能体选择器按注册列表渲染，
+ * 只删会话文件不会摘掉该条目（点进去报 subagent/not-found）。
+ * 宿主没有该方法、Lead Agent 不在线或释放失败都只记日志——删除本身已经生效。
+ * @param {object} ctx - 宿主上下文。
+ * @param {{leadSessionId: string, memberId: string, logSystem: (line: string) => void}} request - 根会话、成员、日志函数。
+ * @returns {Promise<void>} 释放结束（失败已吞并记录）。
+ */
+async function releaseActivation(ctx, { leadSessionId, memberId, logSystem }) {
+  const subagents = service(ctx, 'subagents')
+  if (subagents === undefined || typeof subagents.drainChildren !== 'function') return
+  const leadAgent = liveAgent(ctx, leadSessionId)
+  if (leadAgent === undefined) {
+    logSystem('[team-admin] 无法释放 ' + memberId + ' 的子会话激活：Lead Agent 未加载')
+    return
+  }
+  try {
+    await subagents.drainChildren(leadAgent, [memberId])
+  } catch (error) {
+    logSystem('[team-admin] 释放子会话激活 ' + memberId + ' 失败：' + String(error?.message ?? error))
+  }
+}
+
+/**
+ * 删除一个团队成员：停会话 → 子会话目录进回收站 → 释放子会话激活 → 写墓碑。
  * @param {object} ctx - 宿主上下文（sessionPersistence / agents / subagents 均可选）。
  * @param {{sessionId: string, name: string, deleteSession?: boolean}} request - 根会话、成员名、是否清理子会话（默认 true）。
  * @param {{store?: object, now?: number|(() => number), logSystem?: (line: string) => void, interruptTimeoutMs?: number}} [options]
@@ -235,6 +258,9 @@ export async function dismissMember(ctx, request, options = {}) {
     }
   }
 
+  // 移动成功后释放该子会话的 Activation 注册；失败只记日志，删除与墓碑照常。
+  if (sessionDeleted) await releaseActivation(ctx, { leadSessionId: sessionId, memberId, logSystem })
+
   const record = await store.record(sessionId, memberId, {
     name: isRecord(member) && typeof member.name === 'string' ? member.name : name,
     dismissedAt: stamp,

package/src/index.js

@@ -17,7 +17,7 @@ const DATA_DIR_ENV = 'DSH_TEAM_ADMIN_DATA_DIR'
 /** 路由前缀：webServer 只支持 exact/prefix 注册。 */
 const ROUTE_PREFIX = '/api/team-admin'
 /** 与 package.json 版本保持一致（发布前由测试校验）。 */
-const PLUGIN_VERSION = '0.1.3'
+const PLUGIN_VERSION = '0.1.5'
 
 /**
  * 解析插件数据目录。