dsh-session-bridge 0.3.0 → 0.3.2-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-session-bridge",
-  "version": "0.3.0",
+  "version": "0.3.2-alpha.1",
   "description": "会话桥（dsh-session-bridge）：通过提示词创建新的主会话（顶层 UI 会话）、向任意会话发送消息、等待会话的下一条回复、读取会话消息，并按会话名或 id 跨工作区查找会话；此外支持监控/调度主任务与归档会话。",
   "private": false,
   "type": "module",
@@ -52,28 +52,28 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@deepseek-ai/dsh-agent": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-agent-presets": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-home-paths": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-session": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-session-persistence": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-workspace": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
+    "@deepseek-ai/dsh-agent": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0 || ^0.1.6-0",
+    "@deepseek-ai/dsh-agent-presets": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0 || ^0.1.6-0",
+    "@deepseek-ai/dsh-home-paths": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0 || ^0.1.6-0",
+    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0 || ^0.1.6-0",
+    "@deepseek-ai/dsh-session": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0 || ^0.1.6-0",
+    "@deepseek-ai/dsh-session-persistence": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0 || ^0.1.6-0",
+    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0 || ^0.1.6-0",
+    "@deepseek-ai/dsh-workspace": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0 || ^0.1.6-0",
     "cordis": "^4.0.0-rc.7"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-agent": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-agent-presets": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-brand": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-home-paths": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-scope": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-session": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-session-persistence": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-util-values": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
-    "@deepseek-ai/dsh-workspace": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0",
+    "@deepseek-ai/dsh-agent": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0 || ^0.1.6-0",
+    "@deepseek-ai/dsh-agent-presets": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0 || ^0.1.6-0",
+    "@deepseek-ai/dsh-brand": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0 || ^0.1.6-0",
+    "@deepseek-ai/dsh-home-paths": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0 || ^0.1.6-0",
+    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0 || ^0.1.6-0",
+    "@deepseek-ai/dsh-scope": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0 || ^0.1.6-0",
+    "@deepseek-ai/dsh-session": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0 || ^0.1.6-0",
+    "@deepseek-ai/dsh-session-persistence": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0 || ^0.1.6-0",
+    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0 || ^0.1.6-0",
+    "@deepseek-ai/dsh-util-values": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0 || ^0.1.6-0",
+    "@deepseek-ai/dsh-workspace": "^0.1.0-rc.6 || ^0.1.1-0 || ^0.1.2-0 || ^0.1.5-0 || ^0.1.6-0",
     "@types/node": "^24.0.0",
     "cordis": "^4.0.0-rc.7",
     "tsdown": "^0.22.14",
@@ -82,6 +82,7 @@
   "scripts": {
     "build": "bash scripts/build.sh",
     "build:client": "tsdown",
+    "check:compat": "node scripts/check-dsh-compat.mjs",
     "typecheck": "tsc -p tsconfig.json --noEmit"
   }
 }

package/scripts/build.sh

@@ -14,6 +14,24 @@ if [ -z "$CHECKOUT" ] || [ ! -d "$CHECKOUT/packages" ]; then
   exit 1
 fi
 
+# The type-check below runs against $DSH_CHECKOUT, which commonly lags the dsh
+# that actually loads this plugin — a stale checkout type-checks green while the
+# running harness has already moved on. Warn loudly rather than implying support.
+read_pkg_version() {
+  node -e "try{process.stdout.write(String(require(process.argv[1]).version))}catch(e){process.stdout.write('unknown')}" "$1" 2>/dev/null || echo unknown
+}
+CHECKOUT_VERSION="$(read_pkg_version "$CHECKOUT/package.json")"
+INSTALLED_VERSION="unknown"
+GLOBAL_ROOT="$(npm root -g 2>/dev/null | head -n1 || true)"
+if [ -n "$GLOBAL_ROOT" ] && [ -f "$GLOBAL_ROOT/@deepseek-ai/dsh/package.json" ]; then
+  INSTALLED_VERSION="$(read_pkg_version "$GLOBAL_ROOT/@deepseek-ai/dsh/package.json")"
+fi
+if [ "$INSTALLED_VERSION" != "unknown" ] && [ "$CHECKOUT_VERSION" != "$INSTALLED_VERSION" ]; then
+  echo "build: WARNING — checkout is $CHECKOUT_VERSION but the installed dsh is $INSTALLED_VERSION." >&2
+  echo "build: the type-check below therefore does NOT cover the running harness;" >&2
+  echo "build: run 'npm run check:compat' to type-check against the installed dsh." >&2
+fi
+
 TSC="$CHECKOUT/node_modules/.bin/tsc"
 if [ ! -x "$TSC" ]; then
   echo "build: tsc not found at $TSC" >&2

package/scripts/check-dsh-compat.mjs

@@ -0,0 +1,173 @@
+#!/usr/bin/env node
+/**
+ * Type-check src/ against the DSH packages that are ACTUALLY INSTALLED,
+ * rather than against $DSH_CHECKOUT.
+ *
+ * Why this exists: scripts/build.sh type-checks against a DSH *source* checkout.
+ * That checkout routinely lags the harness the plugin is loaded into (e.g. the
+ * checkout sat at 0.1.5-alpha.2 while the running harness was 0.1.6-alpha.1), so
+ * a green `build.sh` silently proves nothing about the running version. This
+ * script reads the `lib/types/*.d.ts` that ship inside the installed DSH npm
+ * package, i.e. the exact API surface the plugin loads against — so an upstream
+ * break shows up here even when the checkout is stale.
+ *
+ * Usage:
+ *   node scripts/check-dsh-compat.mjs [--dsh <path>]
+ *
+ * <path> may be either the DSH package directory or the `@deepseek-ai` scope
+ * directory that holds dsh-session, dsh-agent, ... . When omitted, the installed
+ * location is probed (DSH_INSTALLED_MODULES, then `npm root -g`).
+ *
+ * Exits 0 when the plugin's src/ type-checks against those types, 1 otherwise.
+ */
+import { execFileSync, execSync } from 'node:child_process'
+import { existsSync, readFileSync, realpathSync, rmSync, writeFileSync } from 'node:fs'
+import { dirname, join, resolve } from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const ROOT = resolve(dirname(fileURLToPath(import.meta.url)), '..')
+
+/** Read a JSON file, or return undefined when it is absent/unreadable. */
+function readJson(file) {
+  try { return JSON.parse(readFileSync(file, 'utf8')) } catch { return undefined }
+}
+
+/** True when `dir` looks like the `@deepseek-ai` scope directory. */
+function isScopeDir(dir) {
+  return dir !== undefined && existsSync(join(dir, 'dsh-session', 'package.json'))
+}
+
+/**
+ * Resolve the `@deepseek-ai` scope directory holding the installed DSH packages.
+ * Accepts an explicit path (package dir or scope dir) and otherwise probes.
+ */
+function resolveScopeDir(argv) {
+  const flagAt = argv.indexOf('--dsh')
+  const explicit = flagAt !== -1 ? argv[flagAt + 1] : (process.env.DSH_INSTALLED_MODULES ?? undefined)
+  const candidates = []
+  if (explicit !== undefined && explicit !== '') {
+    const base = resolve(explicit)
+    // Accept the scope dir itself, the dsh package dir, or a node_modules tree.
+    candidates.push(base, join(base, 'node_modules', '@deepseek-ai'), join(base, '@deepseek-ai'))
+  }
+
+  // Anchor 1: the global install root. execSync (string command) rather than
+  // execFileSync, because npm is a .cmd shim on Windows that cannot be spawned
+  // without a shell.
+  let globalRoot
+  try {
+    globalRoot = execSync('npm root -g', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim()
+  } catch { globalRoot = undefined }
+  if (globalRoot !== undefined && globalRoot !== '') {
+    // npm layout, then the common "dsh nests its own deps" layout.
+    candidates.push(join(globalRoot, '@deepseek-ai'), join(globalRoot, '@deepseek-ai', 'dsh', 'node_modules', '@deepseek-ai'))
+  }
+
+  // Anchor 2: walk up from the `dsh` executable itself. Its path is usually a
+  // symlink (scoop/volta), so resolve it first or the walk misses the real tree.
+  try {
+    const found = execSync(process.platform === 'win32' ? 'where dsh' : 'which dsh', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] })
+      .split(/\r?\n/).map((line) => line.trim()).filter((line) => line !== '')
+    for (const line of found) {
+      let dir
+      try { dir = dirname(realpathSync(line)) } catch { dir = dirname(line) }
+      for (let hop = 0; hop < 4 && dir !== dirname(dir); hop++) {
+        candidates.push(join(dir, 'node_modules', '@deepseek-ai', 'dsh', 'node_modules', '@deepseek-ai'))
+        candidates.push(join(dir, 'node_modules', '@deepseek-ai'))
+        dir = dirname(dir)
+      }
+    }
+  } catch { /* dsh not on PATH; the other anchors decide */ }
+
+  for (const candidate of candidates) if (isScopeDir(candidate)) return candidate
+  return undefined
+}
+
+/** Resolve a package's types entry point inside the scope directory. */
+function typesEntry(scope, pkg) {
+  const dir = join(scope, pkg)
+  const manifest = readJson(join(dir, 'package.json'))
+  if (manifest === undefined) return undefined
+  const declared = typeof manifest.types === 'string' ? manifest.types : undefined
+  const candidates = [
+    ...(declared !== undefined ? [join(dir, declared)] : []),
+    join(dir, 'lib', 'types', 'index.d.ts'),
+    join(dir, 'index.d.ts'),
+  ]
+  return candidates.find((c) => existsSync(c))
+}
+
+function fail(message) {
+  console.error('check-dsh-compat: ' + message)
+  process.exit(1)
+}
+
+const scope = resolveScopeDir(process.argv.slice(2))
+if (scope === undefined) {
+  fail('could not locate the installed DSH packages. Pass --dsh <path> (the DSH package dir or its @deepseek-ai scope dir) or set DSH_INSTALLED_MODULES.')
+}
+
+/** Read the version of the `dsh` package that owns this scope directory. */
+function dshVersionOf(scopeDir) {
+  // Nested layout puts dsh two levels above its own scope dir; a flat global
+  // install puts it beside the other packages.
+  for (const candidate of [join(scopeDir, 'dsh', 'package.json'), join(scopeDir, '..', '..', 'package.json')]) {
+    const manifest = readJson(candidate)
+    if (manifest?.name === '@deepseek-ai/dsh' && typeof manifest.version === 'string') return manifest.version
+  }
+  return undefined
+}
+
+const dshVersion = dshVersionOf(scope) ?? '(unknown)'
+
+// Every DSH package src/ imports, plus the plain `cordis` specifier that
+// package.json declares as a peer.
+const manifest = readJson(join(ROOT, 'package.json')) ?? {}
+const declared = [...Object.keys(manifest.peerDependencies ?? {}), ...Object.keys(manifest.devDependencies ?? {})]
+const wanted = new Set(declared.filter((name) => name.startsWith('@deepseek-ai/')))
+wanted.add('@deepseek-ai/cordis')
+wanted.add('@deepseek-ai/schemastery')
+
+const paths = {}
+const missing = []
+for (const name of [...wanted].sort()) {
+  const entry = typesEntry(scope, name.slice('@deepseek-ai/'.length))
+  if (entry === undefined) { missing.push(name); continue }
+  paths[name] = [entry]
+}
+// tsconfig.json maps the bare `cordis` specifier; keep that working under the
+// installed layout too, where cordis is published scoped.
+if (paths['@deepseek-ai/cordis'] !== undefined) paths['cordis'] = paths['@deepseek-ai/cordis']
+
+if (missing.length > 0) {
+  fail('installed DSH is missing the packages this plugin imports: ' + missing.join(', ') + '\n  (looked in ' + scope + ')')
+}
+
+// The generated config must live in the repo root: tsconfig.json's `include`
+// is relative to the config that declares it, so a config placed elsewhere
+// would look for src/ in the wrong directory. Every mapped path is absolute,
+// so only `include`/`extends` depend on the location. Removed again below.
+const configPath = join(ROOT, '.dsh-compat.tsconfig.json')
+writeFileSync(configPath, JSON.stringify({ extends: './tsconfig.json', compilerOptions: { paths } }, null, 2))
+
+// Run tsc's JS entry through the current node binary. Spawning the .bin shell
+// shim instead would need a shell on Windows (npm .cmd/.bat shims cannot be
+// spawned directly), and this way the exit code and output stay unambiguous.
+const tsc = join(ROOT, 'node_modules', 'typescript', 'bin', 'tsc')
+if (!existsSync(tsc)) { rmSync(configPath, { force: true }); fail('local typescript not found at ' + tsc + ' (run the package manager install first)') }
+
+console.log('check-dsh-compat: type-checking src/ against installed dsh ' + dshVersion)
+console.log('check-dsh-compat: scope ' + scope)
+let failure
+try {
+  execFileSync(process.execPath, [tsc, '-p', configPath, '--noEmit'], { cwd: ROOT, stdio: 'inherit' })
+} catch (error) {
+  failure = error
+} finally {
+  rmSync(configPath, { force: true })
+}
+if (failure !== undefined) {
+  const status = typeof failure.status === 'number' ? ' (tsc exit ' + failure.status + ')' : ''
+  fail('src/ does NOT type-check against installed dsh ' + dshVersion + status + ' — this is a real incompatibility with the running harness.')
+}
+console.log('check-dsh-compat: OK — src/ type-checks against installed dsh ' + dshVersion)

package/src/core.ts

@@ -21,7 +21,9 @@ export interface LiveAgentLike {
   whenIdle?(): Promise<void>
   readonly ctx: Context
   readonly inbox?: {
-    hasPending: boolean
+    // dsh 0.1.2 及之前：`hasPending` getter；dsh 0.1.5 起已删除，仅有
+    // nextTurn / nextStep 只读数组（Inbox 成为 driver 持有的接口）。
+    hasPending?: boolean
     nextTurn?: readonly unknown[]
     nextStep?: readonly unknown[]
   }
@@ -86,6 +88,34 @@ export function asEventList(events: unknown): readonly SessionEvent[] {
   return Array.isArray(events) ? events : []
 }
 
+/**
+ * 读取一个持久化（离线）会话的事件日志与头部元数据。兼容两代 persistence API：
+ * - 旧版：`sessionPersistence.inspect(id)` 直接返回 { events, meta }；
+ * - dsh 0.1.5 之后：`inspect` 已删除，改用 `open(id, 'read')` → `handle.read()`
+ *   （+ `handle.header`），读句柄不抢写所有权，读后必须 close()。
+ * 会话不存在时两个 API 都抛错，调用方按原语义处理。
+ */
+export async function inspectPersistedSession(ctx: Context, id: string): Promise<{ events: readonly SessionEvent[]; meta: { cwd?: string } }> {
+  const persistence = ctx.sessionPersistence as unknown as {
+    inspect?: (sid: string) => Promise<{ events: readonly SessionEvent[]; meta: { cwd?: string } }>
+    open?: (sid: string, access: 'read') => Promise<{
+      header: { cwd?: string }
+      read(): Promise<{ events: readonly SessionEvent[] }>
+      close(): Promise<void>
+    }>
+  }
+  if (typeof persistence.inspect === 'function') {
+    return await persistence.inspect(id)
+  }
+  const handle = await persistence.open!(id, 'read')
+  try {
+    const { events } = await handle.read()
+    return { events, meta: handle.header }
+  } finally {
+    await handle.close()
+  }
+}
+
 /** agent.followup / steer 接受的用户消息值。 */
 export function userMessage(text: string): unknown {
   return {
@@ -237,18 +267,20 @@ export interface CoTLiveSlice {
 }
 
 /**
- * 对一个 live 会话的事件日志折叠出其"实时思维链"：
- * - 优先聚合流式 assistant/chunk 事件里的 reasoning-delta（turn 中途即可见、增量，
- *   这正是监控思维链并按规则提前终止所需的粒度）；
- * - 同时聚合同窗口的 text-delta 增量；
- * - 若没有进行中的 chunk（会话空闲、或该 provider 不流式推理/无推理），返回 null，
- *   调用方应回落为 foldMessages 里的已定型 message.reasoning。
+ * 对一个 live 会话的事件日志折叠出其"最近推理/文本增量流"。兼容两代日志形状：
+ * - dsh 0.1.5 之后：turn 内不再发布独立 chunk 事件，流式增量内嵌在已定型
+ *   assistant/message（或未定型 assistant/attempt）事件的 `stream` 记录里
+ *   （reasoning-chunks / text-chunks 批量段 + 原始 chunk：reasoning-delta / text-delta）；
+ * - 0.1.2-rc 之前：独立的 assistant/chunk 事件（turn 中途即可见、增量，
+ *   这正是旧版监控思维链并按规则提前终止所需的粒度）。
+ * 两者兼读、取最新一份；无任何增量（会话空闲、或该 provider 不流式推理/无推理）
+ * 返回 null，调用方应回落为 foldMessages 里已定型的 message.reasoning。
  * 纯读、无副作用；事件形状不做任何假设，缺失/异常一律安全处理。
  */
 export function liveReasoningSnapshot(events: readonly SessionEvent[]): CoTLiveSlice | null {
   const list = asEventList(events)
-  // 只累积"最近一条已定型 assistant/message 之后"的流式增量（当前 in-flight 窗口），
-  // 避免把历史每一轮的思维链都拼接进来。turn/step 记录窗口内最近的 chunk 归属。
+  // 旧格式只累积"最近一条已定型 assistant/message 之后"的流式增量（in-flight 窗口）；
+  // 新格式的 stream 随定型事件落地，直接以最新携带 stream 的事件为准。
   let lastFinalizedSeq = -1
   let reasoning = ''
   let text = ''
@@ -258,11 +290,42 @@ export function liveReasoningSnapshot(events: readonly SessionEvent[]): CoTLiveS
   let step = 0
   let foundDelta = false
   for (const event of list) {
-    if (event.type === 'assistant/message') {
-      lastFinalizedSeq = event.seq
+    const type = event.type as string
+    if (type === 'assistant/message' || type === 'assistant/attempt') {
+      const data = event.data as { turn?: unknown; step?: unknown; stream?: unknown } | null | undefined
+      if (data !== null && data !== undefined && typeof data === 'object' && Array.isArray(data.stream)) {
+        let r = ''
+        let t = ''
+        for (const raw of data.stream as unknown[]) {
+          const record = raw as { type?: unknown; texts?: unknown; text?: unknown; chunk?: unknown } | null
+          if (record === null || typeof record !== 'object') continue
+          if (record.type === 'reasoning-chunks' && Array.isArray(record.texts)) {
+            for (const s of record.texts as unknown[]) if (typeof s === 'string') r += s
+          } else if (record.type === 'text-chunks' && Array.isArray(record.texts)) {
+            for (const s of record.texts as unknown[]) if (typeof s === 'string') t += s
+          } else if (record.type === 'chunk') {
+            const c = record.chunk as { type?: unknown; text?: unknown } | null
+            if (c !== null && typeof c === 'object' && typeof c.type === 'string' && typeof c.text === 'string') {
+              if (c.type === 'reasoning-delta') r += c.text
+              else if (c.type === 'text-delta') t += c.text
+            }
+          }
+        }
+        if (r !== '' || t !== '') {
+          if (typeof data.turn === 'number') turn = data.turn
+          if (typeof data.step === 'number') step = data.step
+          reasoning = r
+          text = t
+          seq = event.seq
+          time = event.time
+          foundDelta = true
+        }
+      }
+      if (type === 'assistant/message') lastFinalizedSeq = event.seq
       continue
     }
-    if (event.type !== 'assistant/chunk') continue
+    // 旧格式：独立 assistant/chunk 事件。
+    if (type !== 'assistant/chunk') continue
     if (event.seq <= lastFinalizedSeq) continue
     const data = event.data as { turn?: unknown; step?: unknown; chunk?: unknown } | null | undefined
     if (data === null || data === undefined || typeof data !== 'object') continue
@@ -559,7 +622,8 @@ export function statusSnapshot(ctx: Context, agent: LiveAgentLike): BridgeStatus
     lastTurn,
     lastActivityAt,
     stalledMs: lastActivityAt === null ? null : Date.now() - lastActivityAt,
-    pendingWork: inbox?.hasPending ?? false,
+    // 双兼容：0.1.2 用 hasPending getter；0.1.5 起只有 nextTurn/nextStep 数组。
+    pendingWork: inbox?.hasPending === true || (inbox?.nextTurn?.length ?? 0) + (inbox?.nextStep?.length ?? 0) > 0,
     nextTurnCount: inbox?.nextTurn?.length ?? 0,
     nextStepCount: inbox?.nextStep?.length ?? 0,
     ...(lastAssistantText === undefined ? {} : { lastAssistantText }),

package/src/tools.ts

@@ -7,7 +7,7 @@ import type { Context } from '@deepseek-ai/cordis'
 import { defineTool } from '@deepseek-ai/dsh-tools'
 import type { JsonValue } from '@deepseek-ai/dsh-util-values'
 import type {} from '@deepseek-ai/dsh-agent-presets'
-import type { SessionEvent, SessionId } from '@deepseek-ai/dsh-session'
+import type { Session, SessionEvent, SessionId } from '@deepseek-ai/dsh-session'
 import * as agentApi from '@deepseek-ai/dsh-agent'
 import type {
   BridgeFindItem,
@@ -15,11 +15,11 @@ import type {
   BridgeStatusSnapshot,
   BridgeWaitResult,
   LiveAgentLike,
-  WaitForReplyOptions,
 } from './core.ts'
 import {
   attachSessionToWorkspace,
   foldMessages,
+  inspectPersistedSession,
   maxSeq,
   resolveTargetCwd,
   segmentsSince,
@@ -102,10 +102,10 @@ interface WaitArgs {
   timeoutMs?: number
 }
 
-async function maybeWait(env: BridgeEnv, session: { events: readonly SessionEvent[] }, baselineSeq: number, args: WaitArgs, signal: AbortSignal): Promise<ReturnType<typeof renderWait> | undefined> {
+async function maybeWait(env: BridgeEnv, session: Session, baselineSeq: number, args: WaitArgs, signal: AbortSignal): Promise<ReturnType<typeof renderWait> | undefined> {
   if (args.waitForReply !== true) return undefined
   const result = await waitForReply({
-    session: session as WaitForReplyOptions['session'],
+    session,
     baselineSeq,
     timeoutMs: clampTimeout(args.timeoutMs),
     signal,
@@ -194,8 +194,16 @@ function registerCreate(env: BridgeEnv): void {
           ...(model !== '' ? { model } : {}),
           ...(reasoningEffort === undefined ? {} : { reasoningEffort }),
         },
-        setup: (agentCtx: Context) => {
-          if (caller !== undefined) {
+        setup: async (agentCtx: Context) => {
+          const requestedPreset = typeof args.agentPreset === 'string' && args.agentPreset.trim() !== '' ? args.agentPreset.trim() : undefined
+          if (requestedPreset !== undefined) {
+            // An explicit agentPreset composes THAT preset. Falling through to the
+            // caller-join below would silently ignore the request: the id would
+            // still reach the session header, while the agent kept running on the
+            // caller's standing composition and its tools.
+            const presets = env.ctx.agentPresets as unknown as { mount(agentCtx: Context, id: string): Promise<unknown> }
+            await presets.mount(agentCtx, requestedPreset)
+          } else if (caller !== undefined) {
             const presets = env.ctx.agentPresets as unknown as { composeFrom(agentCtx: Context, parentCtx: Context): string | undefined }
             presets.composeFrom(agentCtx, caller.ctx)
           }
@@ -354,8 +362,13 @@ function registerResume(env: BridgeEnv): void {
       }
       let headers: readonly { id: string; cwd?: string; createdAt: number }[] = []
       try {
-        const persistence = env.ctx.sessionPersistence as unknown as { list(): Promise<readonly { id: string; cwd?: string; createdAt: number }[]> }
-        headers = await persistence.list()
+        // dsh >= 0.1.5-alpha.1：list() 返回 { header, ... } 快照；映射回平铺字段。
+        const persistence = env.ctx.sessionPersistence as unknown as { list(): Promise<readonly { header: { id: string; cwd?: string; createdAt: number } }[]> }
+        headers = (await persistence.list()).map((rec) => ({
+          id: rec.header.id,
+          ...(rec.header.cwd === undefined ? {} : { cwd: rec.header.cwd }),
+          createdAt: rec.header.createdAt,
+        }))
       } catch (error) {
         throw new Error('session persistence unavailable: ' + (error instanceof Error ? error.message : String(error)))
       }
@@ -502,8 +515,7 @@ function registerSegments(env: BridgeEnv): void {
         live = true
       } else {
         try {
-          const persistence = env.ctx.sessionPersistence as unknown as { inspect(id: string): Promise<{ events: readonly SessionEvent[] }> }
-          const inspection = await persistence.inspect(args.sessionId)
+          const inspection = await inspectPersistedSession(env.ctx, args.sessionId)
           events = inspection.events
           live = false
         } catch (error) {
@@ -580,8 +592,7 @@ function registerRead(env: BridgeEnv): void {
       } else {
         let inspection: { events: readonly SessionEvent[]; meta: { cwd?: string } }
         try {
-          const persistence = env.ctx.sessionPersistence as unknown as { inspect(id: string): Promise<{ events: readonly SessionEvent[]; meta: { cwd?: string } }> }
-          inspection = await persistence.inspect(args.sessionId)
+          inspection = await inspectPersistedSession(env.ctx, args.sessionId)
         } catch (error) {
           throw new Error('cannot read session ' + JSON.stringify(args.sessionId) + ': ' + (error instanceof Error ? error.message : String(error)))
         }
@@ -685,8 +696,11 @@ function registerFind(env: BridgeEnv): void {
       }
       if (args.liveOnly !== true) {
         try {
-          const persistence = env.ctx.sessionPersistence as unknown as { list(): Promise<readonly { id: string; cwd?: string; parentSession?: string; origin?: 'subagent'; createdAt: number; agentPreset?: string }[]> }
-          for (const header of await persistence.list()) {
+          // dsh >= 0.1.5-alpha.1：list() 返回 { header: SessionHeader, revision, ... } 快照，
+          // 不再平铺 id/cwd；旧版直接返回 header 平铺字段。两者都按新形状读，向下兼容。
+          const persistence = env.ctx.sessionPersistence as unknown as { list(): Promise<readonly { header: { id: string; cwd?: string; parentSession?: string; origin?: 'subagent'; createdAt: number; agentPreset?: string } }[]> }
+          for (const rec of await persistence.list()) {
+            const header = rec.header
             if (items.some((item) => item.sessionId === header.id)) continue
             items.push({
               sessionId: header.id,
@@ -720,13 +734,12 @@ function registerFind(env: BridgeEnv): void {
       const cwdFilter = typeof args.cwd === 'string' ? args.cwd.trim().toLowerCase() : ''
       const needsOfflineTitle = titleFilter !== '' || (query !== '' && items.some((item) => !item.live))
       if (needsOfflineTitle) {
-        const persistence = env.ctx.sessionPersistence as unknown as { inspect(id: string): Promise<{ events: readonly SessionEvent[] }> }
         let inspected = 0
         for (const item of items) {
           if (inspected >= 30) break
           if (item.live || item.title !== undefined) continue
           try {
-            const inspection = await persistence.inspect(item.sessionId)
+            const inspection = await inspectPersistedSession(env.ctx, item.sessionId)
             item.title = titleOf(inspection.events)
             inspected += 1
           } catch {
@@ -1118,7 +1131,6 @@ function registerArchive(env: BridgeEnv): void {
       const archived = env.ctx.workspaceRegistry.archivedSessionIds.map(String)
       const items: Array<{ sessionId: string; title?: string }> = archived.map((id) => ({ sessionId: id }))
       if (args.resolveTitles === true && items.length > 0) {
-        const persistence = env.ctx.sessionPersistence as unknown as { inspect(id: string): Promise<{ events: readonly SessionEvent[] }> }
         const registryTitles = new Map<string, string>()
         try {
           const records = await env.registry.all()
@@ -1130,7 +1142,7 @@ function registerArchive(env: BridgeEnv): void {
             continue
           }
           try {
-            const inspection = await persistence.inspect(item.sessionId)
+            const inspection = await inspectPersistedSession(env.ctx, item.sessionId)
             item.title = titleOf(inspection.events)
           } catch { /* offline title unavailable */ }
         }