@chenkai114/dsh-team-admin 0.2.1 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chenkai114/dsh-team-admin",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "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/api.mjs

@@ -80,7 +80,14 @@ export function createApi({ ctx, getStore, version, logSystem, services }) {
       if (path === '/api/team-admin/health') {
         if (method !== 'GET') { sendJson(res, 405, { error: '请求方法不支持' }); return }
         const budget = typeof services.readRosterBudget === 'function' ? services.readRosterBudget() : null
-        sendJson(res, 200, { ok: true, name: 'team-admin', version, maxMembers: budget === null ? null : budget.maxMembers })
+        sendJson(res, 200, {
+          ok: true,
+          name: 'team-admin',
+          version,
+          maxMembers: budget === null ? null : budget.maxMembers,
+          reclaimed: budget === null ? 0 : budget.reclaimed,
+          teams: budget === null ? {} : budget.teams,
+        })
         return
       }
 

package/src/filter.mjs

@@ -63,3 +63,20 @@ export function collectDismissedIds(state) {
   }
   return ids
 }
+/**
+ * 按 Lead 会话分组收集已删除成员 id。
+ * @param {object|null} state - store.readAll() 的返回值。
+ * @returns {Map<string, Set<string>>} lead 会话 id → 该团队已删除成员 id。
+ */
+export function collectDismissedByTeam(state) {
+  const teams = new Map()
+  const buckets = state !== null && typeof state === 'object' && state.dismissed !== null && typeof state.dismissed === 'object'
+    ? state.dismissed
+    : {}
+  for (const [leadId, bucket] of Object.entries(buckets)) {
+    if (bucket === null || typeof bucket !== 'object') continue
+    const ids = new Set(Object.keys(bucket))
+    if (ids.size > 0) teams.set(leadId, ids)
+  }
+  return teams
+}

package/src/index.js

@@ -6,7 +6,8 @@ import { join } from 'node:path'
 
 import { createApi } from './api.mjs'
 import { dismissMember } from './dismiss.mjs'
-import { collectDismissedIds, stripDismissedMembers } from './filter.mjs'
+import { collectDismissedByTeam, collectDismissedIds, stripDismissedMembers } from './filter.mjs'
+import { createLegacyDecorator } from './legacy.mjs'
 import { openStore } from './store.mjs'
 import { listTeamSessions, readTeam } from './team-read.mjs'
 
@@ -21,15 +22,16 @@ const ROUTE_PREFIX = '/api/team-admin'
 const DISMISSED_TTL_MS = 2000
 /** 包装标记：apply 与延迟注入可能都执行一次，避免重复包装。 */
 const FILTER_MARK = Symbol.for('dsh.team-admin.projection-filter')
-/** roster 预算标记与刷新句柄：名额 = 配置上限 + 已删除成员数。 */
+/** roster 预算标记、刷新句柄与统计读取。 */
 const ROSTER_MARK = Symbol.for('dsh.team-admin.roster-budget')
 const ROSTER_REFRESH = Symbol.for('dsh.team-admin.roster-refresh')
+const ROSTER_STATS = Symbol.for('dsh.team-admin.roster-stats')
 /** 单值出口：一次请求/一次流的快照。 */
 const UNARY_METHODS = ['list', 'projections']
 /** 流出口：control 基线携带全部投影，follow 携带单个会话的开场快照。 */
 const STREAM_METHODS = ['control', 'follow']
 /** 与 package.json 版本保持一致（发布前由测试校验）。 */
-const PLUGIN_VERSION = '0.2.1'
+const PLUGIN_VERSION = '0.2.2'
 
 /**
  * 解析插件数据目录。
@@ -62,12 +64,15 @@ export function apply(ctx) {
   const logSystem = (line) => {
     if (typeof ctx.logger?.warn === 'function') ctx.logger.warn(line)
   }
+  const decorateList = createLegacyDecorator()
   const ensureBudget = () => installRosterBudget(ctx, { getStore, logSystem, silent: true })
-  // 诊断用：读当前生效的成员上限（配置上限 + 已回收名额）。
+  // 诊断用：读当前生效的成员上限与回收结果（按团队）。
   const readRosterBudget = () => {
     const service = typeof ctx.get === 'function' ? ctx.get('agentTeams') : undefined
     const roster = service === null || service === undefined ? undefined : service.roster
-    return roster !== undefined && roster !== null && typeof roster.maxMembers === 'number' ? { maxMembers: roster.maxMembers } : null
+    if (roster === undefined || roster === null) return null
+    if (typeof roster[ROSTER_STATS] === 'function') return roster[ROSTER_STATS]()
+    return typeof roster.maxMembers === 'number' ? { maxMembers: roster.maxMembers, reclaimed: 0, teams: {} } : null
   }
   const handler = createApi({
     ctx,
@@ -78,7 +83,7 @@ export function apply(ctx) {
       listTeamSessions,
       readTeam,
       dismissMember,
-      // 删除成功后释放名额：名额外加数 = 墓碑数。
+      // 删除成功后按团队重算名额。
       onMemberDismissed: () => { void ensureBudget()?.() },
       readRosterBudget,
     },
@@ -91,11 +96,12 @@ export function apply(ctx) {
   if (typeof ctx.inject === 'function') {
     ctx.inject(['agentTeams'], (sub) => installRosterBudget(sub, { getStore, logSystem }))
   }
-  if (!installSessionListFilter(ctx, { getStore, logSystem, silent: true }) && typeof ctx.inject === 'function') {
+  if (!installSessionListFilter(ctx, { getStore, logSystem, decorateList, silent: true }) && typeof ctx.inject === 'function') {
     // 插件可能早于 sessionController 注册；等服务可用后再包一次。
-    ctx.inject(['sessionController'], (sub) => installSessionListFilter(sub, { getStore, logSystem }))
+    ctx.inject(['sessionController'], (sub) => installSessionListFilter(sub, { getStore, logSystem, decorateList }))
   }
 }
+
 /**
  * 建一个带短缓存的墓碑 id 读取器。
  * @param {() => Promise<object>} getStore - 惰性打开的状态存储。
@@ -119,14 +125,14 @@ function createDismissedIds(getStore, logSystem) {
 }
 
 /**
- * 给宿主的 sessionController 出口包一层：把已删除成员从 subagentCatalog / agentTeam.members 里摘掉。
- * 顶部「子智能体」选择器读 `list` 与 `control` 基线，内置「智能体团队」面板读同一批投影，
- * 因此在宿主出口过滤一次即可覆盖所有客户端，不需要改宿主源码，也不用重编译。
+ * 给宿主的 sessionController 出口包一层：把已删除成员从 subagentCatalog / agentTeam.members 里摘掉，
+ * 并给老格式会话补标题/空白标记。顶部选择器与团队面板读 `list` 与 `control` 基线，
+ * 在宿主出口处理一次即可覆盖所有客户端，不需要改宿主源码，也不用重新编译。
  * @param {object} ctx - Cordis 插件上下文。
- * @param {{ getStore: () => Promise<object>, logSystem: (line: string) => void, silent?: boolean }} deps - 存储与日志。
+ * @param {{ getStore: () => Promise<object>, logSystem: (line: string) => void, decorateList?: (value: object) => object, silent?: boolean }} deps - 存储、日志与列表补全器。
  * @returns {boolean} 至少包上一个方法时返回 true。
  */
-export function installSessionListFilter(ctx, { getStore, logSystem, silent = false }) {
+export function installSessionListFilter(ctx, { getStore, logSystem, decorateList, 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) {
@@ -149,7 +155,8 @@ export function installSessionListFilter(ctx, { getStore, logSystem, silent = fa
     const original = service[method]
     if (typeof original !== 'function') continue
     service[method] = async function teamAdminFilteredUnary(...args) {
-      return await strip(await original.apply(this, args))
+      const value = await strip(await original.apply(this, args))
+      return method === 'list' && typeof decorateList === 'function' ? decorateList(value) : value
     }
     wrapped += 1
   }
@@ -170,11 +177,12 @@ export function installSessionListFilter(ctx, { getStore, logSystem, silent = fa
 }
 
 /**
- * 把「已删除成员」占掉的名额还给 roster：宿主用 roster 的 append-only 成员数判断 maxMembers，
- * 删除只写墓碑不删记录，所以这里把上限动态抬到 `配置上限 + 墓碑数`。
+ * 把「已删除成员」占掉的名额还给**它所在的那个团队**：宿主的 `TeamRoster.spawnAdmitted`
+ * 用 `journal.state(root).members.length >= this.maxMembers` 判断，roster 只有一个上限字段。
+ * 这里在每次 spawn 前按 caller 的 Lead 设置本次生效的额外名额，spawn 结束清零。
  * @param {object} ctx - Cordis 插件上下文。
  * @param {{ getStore: () => Promise<object>, logSystem: (line: string) => void, silent?: boolean }} deps - 存储与日志。
- * @returns {null | (() => Promise<number>)} 刷新预算的函数；宿主没有 agentTeams 时返回 null。
+ * @returns {null | (() => Promise<number>)} 刷新名额的函数；宿主没有 agentTeams 时返回 null。
  */
 export function installRosterBudget(ctx, { getStore, logSystem, silent = false }) {
   const get = ctx !== null && typeof ctx?.get === 'function' ? ctx.get.bind(ctx) : null
@@ -186,22 +194,45 @@ export function installRosterBudget(ctx, { getStore, logSystem, silent = false }
   }
   if (roster[ROSTER_MARK] === true) return roster[ROSTER_REFRESH]
   const base = roster.maxMembers
-  const budget = { extra: 0 }
+  const extras = new Map()
+  const live = { current: 0, total: 0 }
   Object.defineProperty(roster, 'maxMembers', {
     configurable: true,
     enumerable: true,
-    get: () => base + budget.extra,
+    get: () => base + live.current,
   })
-  roster[ROSTER_MARK] = true
-  roster[ROSTER_REFRESH] = async () => {
+  const originalSpawn = roster.spawn
+  if (typeof originalSpawn === 'function') {
+    roster.spawn = async function teamAdminScopedSpawn(caller, request) {
+      let extra = 0
+      try { extra = extras.get(this.membership(caller).root.id) ?? 0 } catch (error) { void error }
+      live.current = extra
+      try {
+        return await originalSpawn.call(this, caller, request)
+      } finally {
+        live.current = 0
+      }
+    }
+  }
+  const refresh = async () => {
     try {
       const store = await getStore()
-      budget.extra = collectDismissedIds(await store.readAll()).size
+      const teams = collectDismissedByTeam(await store.readAll())
+      extras.clear()
+      live.total = 0
+      for (const [leadId, ids] of teams) {
+        extras.set(leadId, ids.size)
+        live.total += ids.size
+      }
+      return live.total
     } catch (error) {
       logSystem(`team-admin：读取墓碑失败，名额不回收（${error instanceof Error ? error.message : String(error)}）`)
+      return 0
     }
-    return budget.extra
   }
-  void roster[ROSTER_REFRESH]()
-  return roster[ROSTER_REFRESH]
-}
+  roster[ROSTER_MARK] = true
+  roster[ROSTER_REFRESH] = refresh
+  roster[ROSTER_STATS] = () => ({ maxMembers: base, reclaimed: live.total, teams: Object.fromEntries(extras) })
+  void refresh()
+  return refresh
+}

package/src/legacy.mjs

@@ -0,0 +1,88 @@
+/**
+ * 老格式会话（session.jsonl.zstd / v1）没有当前的 title、sessionListMetadata 投影，
+ * 宿主只能按「无标题」渲染成未命名，也认不出空白草稿。这里按需读日志补齐：
+ * 标题取最后一条 session/title，空草稿标记 blank，让侧栏表现和当前格式一致。
+ *
+ * @module legacy
+ */
+import { existsSync, readFileSync, readdirSync } from 'node:fs'
+import { homedir } from 'node:os'
+import { join } from 'node:path'
+import { zstdDecompressSync } from 'node:zlib'
+
+/** 已知的会话日志文件名，新到旧。 */
+const LOG_NAMES = ['session.v4.jsonl.zstd', 'session.v3.jsonl.zstd', 'session.jsonl.zstd']
+/** 默认缓存时长：日志很少变化，五分钟足够。 */
+const DEFAULT_TTL_MS = 300000
+
+/**
+ * 建一个惰性读老日志的补全器。
+ * @param {{ sessionsRoot?: string, ttlMs?: number }} [options] - 会话根目录与缓存时长。
+ * @returns {(value: object) => object} 就地补全 list 响应的函数。
+ */
+export function createLegacyDecorator(options = {}) {
+  const sessionsRoot = options.sessionsRoot ?? join(homedir(), '.dsh', 'sessions')
+  const ttlMs = options.ttlMs ?? DEFAULT_TTL_MS
+  let indexAt = 0
+  let index = new Map()
+  const cache = new Map()
+
+  const rebuild = () => {
+    index = new Map()
+    let workspaces = []
+    try { workspaces = readdirSync(sessionsRoot) } catch { return }
+    for (const workspace of workspaces) {
+      const dir = join(sessionsRoot, workspace)
+      let names = []
+      try { names = readdirSync(dir) } catch { continue }
+      for (const name of names) if (name.startsWith('session-')) index.set(name, join(dir, name))
+    }
+    indexAt = Date.now()
+  }
+
+  const readInfo = (sessionId) => {
+    if (cache.has(sessionId)) return cache.get(sessionId)
+    if (Date.now() - indexAt > ttlMs) rebuild()
+    const dir = index.get(sessionId)
+    if (dir === undefined) return null
+    const file = LOG_NAMES.map((name) => join(dir, name)).find((path) => existsSync(path))
+    if (file === undefined) return null
+    let text = ''
+    try { text = zstdDecompressSync(readFileSync(file)).toString('utf8') } catch { return null }
+    let title = null
+    let hasUserMessage = false
+    let hasTurn = false
+    for (const line of text.split('\n')) {
+      if (line === '') continue
+      if (line.includes('"session/title"')) {
+        try {
+          const event = JSON.parse(line)
+          const value = event?.data?.title
+          if (typeof value === 'string' && value.trim() !== '') title = value.trim()
+        } catch { /* 坏行忽略 */ }
+      }
+      if (line.includes('"turn/start"')) hasTurn = true
+      if (!hasUserMessage && line.includes('"role":"user"')) hasUserMessage = true
+    }
+    const info = { title, hasUserMessage, hasTurn }
+    cache.set(sessionId, info)
+    return info
+  }
+
+  return (value) => {
+    const items = Array.isArray(value?.items) ? value.items : []
+    for (const item of items) {
+      if (item === null || typeof item !== 'object') continue
+      const sessionId = item.sessionId
+      if (typeof sessionId !== 'string') continue
+      const titled = typeof item.title === 'string' && item.title.trim() !== ''
+      // 新格式会话（有标题且非空白）不需要补
+      if (titled && item.blank === false) continue
+      const info = readInfo(sessionId)
+      if (info === null) continue
+      if (!titled && info.title !== null) item.title = info.title
+      if (info.hasTurn === false && info.hasUserMessage === false) item.blank = true
+    }
+    return value
+  }
+}