@chenkai114/dsh-team-admin 0.1.7 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chenkai114/dsh-team-admin",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "DSH 插件：GUI 管理任意会话的智能体团队 —— 查看成员、删除角色并清理其持久会话（进回收站，可恢复）",
   "type": "module",
   "main": "src/index.js",
@@ -55,4 +55,4 @@
     "test:real": "node tests/e2e/real-data.mjs",
     "test:pack": "npm pack --dry-run"
   }
-}
+}

package/src/client.js

@@ -172,6 +172,7 @@
   const DISMISS_URL = API_BASE + '/dismiss'
   const DISMISSED_URL = API_BASE + '/dismissed'
   const LIST_FILTER_FLAG = '__dshTeamAdminSessionListFilter__'
+  const RESPONSE_FILTER_FLAG = '__dshTeamAdminResponseFilter__'
 
   function dismissPayload(sessionId, name) {
     return { sessionId: sessionId, name: name, deleteSession: true }
@@ -215,6 +216,36 @@
     return dismissedIds
   }
 
+  // 宿主可能在插件加载前就把全局 fetch 抓进闭包，包装 window.fetch 会被绕过；
+  // 再补一层 Response.prototype 过滤，任何解析 JSON 的消费方都会拿到过滤后的数据。
+  function installResponseFilter(scope) {
+    const ResponseCtor = scope === null || scope === undefined ? undefined : scope.Response
+    if (typeof ResponseCtor !== 'function') return false
+    const proto = ResponseCtor.prototype
+    if (proto === undefined || proto === null || proto[RESPONSE_FILTER_FLAG] === true) return false
+    proto[RESPONSE_FILTER_FLAG] = true
+    const originalJson = proto.json
+    const originalText = proto.text
+    if (typeof originalJson === 'function') {
+      proto.json = async function teamAdminAwareJson() {
+        const value = await originalJson.call(this)
+        try { return stripDismissedCatalogs(value, dismissedIds) } catch (error) { return value }
+      }
+    }
+    if (typeof originalText === 'function') {
+      proto.text = async function teamAdminAwareText() {
+        const text = await originalText.call(this)
+        if (typeof text !== 'string' || (text.indexOf('subagentCatalog') < 0 && text.indexOf('agentTeam') < 0)) return text
+        try {
+          const value = JSON.parse(text)
+          stripDismissedCatalogs(value, dismissedIds)
+          return JSON.stringify(value)
+        } catch (error) { return text }
+      }
+    }
+    return true
+  }
+
   function installSessionListFilter(win) {
     const scope = win !== undefined ? win : (typeof window === 'undefined' ? null : window)
     if (scope === null || scope === undefined) return false
@@ -225,10 +256,12 @@
     const original = scope.fetch
     if (typeof original !== 'function') return false
     scope[LIST_FILTER_FLAG] = true
+    installResponseFilter(scope)
     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)
+      // 宿主用相对路径（api/session/list，无前导 /），按子串匹配兼容两种形态。
+      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
@@ -1053,6 +1086,7 @@
         DISMISSED_URL: DISMISSED_URL,
         stripDismissedCatalogs: stripDismissedCatalogs,
         installSessionListFilter: installSessionListFilter,
+        installResponseFilter: installResponseFilter,
         refreshDismissedIds: refreshDismissedIds,
         DEBOUNCE_MS: DEBOUNCE_MS,
         CARD_TITLE: CARD_TITLE,

package/src/filter.mjs

@@ -0,0 +1,65 @@
+/**
+ * 从会话列表投影里摘掉已删除成员：顶部「子智能体」选择器读 `subagentCatalog`，
+ * 内置「智能体团队」面板读 `agentTeam.members`；两者都在 `/api/session/list` 的响应里。
+ * 宿主 catalog 与 roster 都是 append-only，删会话不会撤销事件，所以在服务端出口过滤一次。
+ *
+ * @module filter
+ */
+
+/**
+ * 判断条目是否属于已删除成员。
+ * @param {unknown} entry - 投影里的一个条目。
+ * @param {Set<string>} dismissed - 已删除的会话/成员 id 集合。
+ * @returns {boolean} 命中墓碑时返回 true（应被过滤）。
+ */
+function isDismissed(entry, dismissed) {
+  return entry !== null && typeof entry === 'object' && typeof entry.id === 'string' && dismissed.has(entry.id)
+}
+
+/**
+ * 递归过滤一份会话列表载荷（原地修改）。
+ * @param {unknown} payload - `/api/session/list` 的返回体（或其中的单个会话行）。
+ * @param {Set<string>} dismissed - 已删除的会话/成员 id 集合。
+ * @param {number} [maxDepth] - 递归深度上限，防御异常结构。
+ * @returns {unknown} 同一个 payload 引用。
+ */
+export function stripDismissedMembers(payload, dismissed, maxDepth = 6) {
+  if (payload === null || typeof payload !== 'object' || !(dismissed instanceof Set) || dismissed.size === 0) return payload
+  const visit = (node, depth) => {
+    if (node === null || typeof node !== 'object' || depth > maxDepth) return
+    if (Array.isArray(node.subagentCatalog)) node.subagentCatalog = node.subagentCatalog.filter((entry) => !isDismissed(entry, dismissed))
+    if (node.agentTeam !== null && typeof node.agentTeam === 'object' && Array.isArray(node.agentTeam.members)) {
+      node.agentTeam.members = node.agentTeam.members.filter((entry) => !isDismissed(entry, dismissed))
+    }
+    // 投影帧形如 { key: 'agentTeam', value: { members } } / { key: 'subagentCatalog', value: [...] }
+    if (node.key === 'agentTeam' && node.value !== null && typeof node.value === 'object' && Array.isArray(node.value.members)) {
+      node.value.members = node.value.members.filter((entry) => !isDismissed(entry, dismissed))
+    }
+    if (node.key === 'subagentCatalog' && Array.isArray(node.value)) {
+      node.value = node.value.filter((entry) => !isDismissed(entry, dismissed))
+    }
+    for (const key of Object.keys(node)) {
+      if (key === 'subagentCatalog' || key === 'agentTeam') continue
+      visit(node[key], depth + 1)
+    }
+  }
+  visit(payload, 0)
+  return payload
+}
+
+/**
+ * 从持久化状态里收集已删除成员 id。
+ * @param {object|null} state - store.readAll() 的返回值。
+ * @returns {Set<string>} 墓碑成员 id 集合。
+ */
+export function collectDismissedIds(state) {
+  const ids = new Set()
+  const buckets = state !== null && typeof state === 'object' && state.dismissed !== null && typeof state.dismissed === 'object'
+    ? state.dismissed
+    : {}
+  for (const bucket of Object.values(buckets)) {
+    if (bucket === null || typeof bucket !== 'object') continue
+    for (const memberId of Object.keys(bucket)) ids.add(memberId)
+  }
+  return ids
+}

package/src/index.js

@@ -6,6 +6,7 @@ import { join } from 'node:path'
 
 import { createApi } from './api.mjs'
 import { dismissMember } from './dismiss.mjs'
+import { collectDismissedIds, stripDismissedMembers } from './filter.mjs'
 import { openStore } from './store.mjs'
 import { listTeamSessions, readTeam } from './team-read.mjs'
 
@@ -16,8 +17,16 @@ export const inject = ['webServer']
 const DATA_DIR_ENV = 'DSH_TEAM_ADMIN_DATA_DIR'
 /** 路由前缀：webServer 只支持 exact/prefix 注册。 */
 const ROUTE_PREFIX = '/api/team-admin'
+/** 墓碑 id 缓存时长：过滤发生在每次投影响应/帧上，短缓存足够。 */
+const DISMISSED_TTL_MS = 2000
+/** 包装标记：apply 与延迟注入可能都执行一次，避免重复包装。 */
+const FILTER_MARK = Symbol.for('dsh.team-admin.projection-filter')
+/** 单值出口：一次请求/一次流的快照。 */
+const UNARY_METHODS = ['list', 'projections']
+/** 流出口：control 基线携带全部投影，follow 携带单个会话的开场快照。 */
+const STREAM_METHODS = ['control', 'follow']
 /** 与 package.json 版本保持一致（发布前由测试校验）。 */
-const PLUGIN_VERSION = '0.1.7'
+const PLUGIN_VERSION = '0.1.9'
 
 /**
  * 解析插件数据目录。
@@ -32,7 +41,7 @@ export function resolveDataDir(env = process.env, home = homedir()) {
 }
 
 /**
- * 装配插件：惰性建 store，注册一条 prefix 路由。
+ * 装配插件：惰性建 store，注册一条 prefix 路由，并给投影出口加过滤。
  * @param {object} ctx - Cordis 插件上下文。
  */
 export function apply(ctx) {
@@ -61,4 +70,81 @@ export function apply(ctx) {
     () => ctx.webServer.register({ kind: 'prefix', path: ROUTE_PREFIX, handler }),
     'team-admin routes',
   )
-}
+  if (!installSessionListFilter(ctx, { getStore, logSystem, silent: true }) && typeof ctx.inject === 'function') {
+    // 插件可能早于 sessionController 注册；等服务可用后再包一次。
+    ctx.inject(['sessionController'], (sub) => installSessionListFilter(sub, { getStore, logSystem }))
+  }
+}
+
+/**
+ * 建一个带短缓存的墓碑 id 读取器。
+ * @param {() => Promise<object>} getStore - 惰性打开的状态存储。
+ * @param {(line: string) => void} logSystem - 系统日志。
+ * @returns {() => Promise<Set<string>>} 读取已删除成员 id。
+ */
+function createDismissedIds(getStore, logSystem) {
+  let cached = { at: 0, ids: new Set() }
+  return async () => {
+    if (Date.now() - cached.at < DISMISSED_TTL_MS) return cached.ids
+    let ids = new Set()
+    try {
+      const store = await getStore()
+      ids = collectDismissedIds(await store.readAll())
+    } catch (error) {
+      logSystem(`team-admin：读取墓碑失败，本次不过滤投影（${error instanceof Error ? error.message : String(error)}）`)
+    }
+    cached = { at: Date.now(), ids }
+    return ids
+  }
+}
+
+/**
+ * 给宿主的 sessionController 出口包一层：把已删除成员从 subagentCatalog / agentTeam.members 里摘掉。
+ * 顶部「子智能体」选择器读 `list` 与 `control` 基线，内置「智能体团队」面板读同一批投影，
+ * 因此在宿主出口过滤一次即可覆盖所有客户端，不需要改宿主源码，也不用重编译。
+ * @param {object} ctx - Cordis 插件上下文。
+ * @param {{ getStore: () => Promise<object>, logSystem: (line: string) => void, silent?: boolean }} deps - 存储与日志。
+ * @returns {boolean} 至少包上一个方法时返回 true。
+ */
+export function installSessionListFilter(ctx, { getStore, logSystem, silent = false }) {
+  const get = ctx !== null && typeof ctx?.get === 'function' ? ctx.get.bind(ctx) : null
+  const service = get === null ? undefined : get('sessionController')
+  if (service === null || service === undefined) {
+    if (silent !== true) logSystem('team-admin：未找到 sessionController，跳过投影过滤')
+    return false
+  }
+  if (service[FILTER_MARK] === true) return false
+  const dismissedIds = createDismissedIds(getStore, logSystem)
+  const strip = async (value) => {
+    try {
+      const ids = await dismissedIds()
+      return ids.size === 0 ? value : stripDismissedMembers(value, ids, 10)
+    } catch (error) {
+      logSystem(`team-admin：过滤投影失败（${error instanceof Error ? error.message : String(error)}）`)
+      return value
+    }
+  }
+  let wrapped = 0
+  for (const method of UNARY_METHODS) {
+    const original = service[method]
+    if (typeof original !== 'function') continue
+    service[method] = async function teamAdminFilteredUnary(...args) {
+      return await strip(await original.apply(this, args))
+    }
+    wrapped += 1
+  }
+  for (const method of STREAM_METHODS) {
+    const original = service[method]
+    if (typeof original !== 'function') continue
+    service[method] = async function* teamAdminFilteredStream(...args) {
+      for await (const frame of original.apply(this, args)) yield await strip(frame)
+    }
+    wrapped += 1
+  }
+  if (wrapped === 0) {
+    if (silent !== true) logSystem('team-admin：sessionController 上没有可过滤的方法，跳过投影过滤')
+    return false
+  }
+  service[FILTER_MARK] = true
+  return true
+}