@dsh-fly/dsh-plugin-fly-engagement 0.1.4 → 0.2.0

package/README.md

@@ -4,13 +4,22 @@ DSH Fly 的 **engagement 记录面**（Security / CTF 作战室的"把发现沉
 
 - **agent 平面**（`tools/index.js`，由 Fly preset 按会话挂载）：`eng_record`（goal/facts/findings/assets/edges，
   漏洞**必须带复现步骤**）、`eng_state`（投影 + `counts`/`dropped`/`refused`/`truncated`）、
-  `eng_report`（全量 Markdown 报告）。
-- **宿主平面**（根 `index.js`，`inject: ['webServer','shell']`）：`GET /fly/engagement/state|report`，
-  给抽屉面板取数；两半共用 `lib/fold.mjs` 的投影口径 ⇒ 面板读数与 `eng_state` 永远同口径。
+  `eng_report`（Markdown 报告）、`eng_adopt`（认领 v1 未归属记录）。
+- **宿主平面**（根 `index.js`，`inject: ['webServer','shell']`）：`GET /fly/engagement/state|report`、
+  `POST /fly/engagement/adopt`，给抽屉面板取数与认领；两半共用 `lib/fold.mjs` 的投影口径
+  ⇒ 面板读数与 `eng_state` 永远同口径。
 
 存储：`<workspace>/.fly-engagement/events.jsonl`（append-only，投影 = fold）。
 **不写任何自定义会话事件**（DSH 毒药条）；文件读写全走 `ctx.shell` 接缝。
 
+## v2：会话维度
+
+一个工作区一条账本，**每行带 `session` 归属**——同一工作区开多个会话各自一条证据链
+（同 workspace 分析不同程序、同 repo 分析不同模块都不会混）。默认只看本会话，
+`scope=workspace` 看全部（`workspaceCounts` 始终给全量计数）；goal 按会话独立。
+边（edges）**跟随端点**：两端在作用域内即可见。v1 遗留记录（无 session）计入 `legacy`，
+经 `eng_adopt` 认领进当前会话（已归属他人的一律跳过，`skipped` 计数）。
+
 借鉴 `@howmp/dsh-pentest`（MIT）的数据形状（六表 + 带词汇的边 + 必填步骤 + 双计数 + 确定性 id），
 承载面用 DSH Fly 自己的抽屉面板。设计与验收见 dsh-fly 仓 `docs/security-mode-review-and-plan.md` §11。
 
@@ -19,7 +28,7 @@ DSH Fly 的 **engagement 记录面**（Security / CTF 作战室的"把发现沉
 | 挂载点 | 文件 | 干什么 |
 | --- | --- | --- |
 | 宿主行（bundle patch，**裸包名**） | `index.js` | 端点 + 客户端半边（客户端半边要求行名是裸包名，带 `/` 不会被登记） |
-| agent 行（preset 指向子路径） | `tools/index.js` | 三个 `eng_*` 工具 |
+| agent 行（preset 指向子路径） | `tools/index.js` | 四个 `eng_*` 工具 |
 
 ## 门禁
 

package/index.js

@@ -1,15 +1,16 @@
-import { foldEvents, ledgerPath, renderReport, windowView } from './lib/fold.mjs'
+import { foldEvents, ledgerPath, renderReport, scopeView } from './lib/fold.mjs'
 
 /**
  * fly-engagement —— **宿主平面的面板行**（根文件 = 裸包名，客户端半边才登记得上）。
  *
  * 形状照 `dsh-plugin-fly-smart`（一个包、两种挂载）：
- *   · 根 `index.js`（本文件）= 宿主行：`inject: ['webServer', 'shell']`，只做
- *     `GET /fly/engagement/state|report`；**不注册工具**（bundle patch 里没有 `inject:['tools']` 的行）；
- *   · `tools/index.js` = agent 平面的三个 `eng_*`，由 preset 按会话挂；
+ *   · 根 `index.js`（本文件）= 宿主行：`inject: ['webServer', 'shell']`，做
+ *     `GET /fly/engagement/state|report` 与 `POST /fly/engagement/adopt`；
+ *   · `tools/index.js` = agent 平面的 `eng_*`，由 preset 按会话挂；
  *   · 两半共用 `lib/fold.mjs` 的投影口径 ⇒ 面板读数与 `eng_state` 永远同口径。
  *
- * 数据来源：`<workspace>/.fly-engagement/events.jsonl`（append-only，投影=fold），
+ * 数据来源：`<workspace>/.fly-engagement/events.jsonl`（append-only，投影=fold）。
+ * 一个工作区一条账本，**每行带 session 归属**；默认只看本会话，`scope=workspace` 看全部。
  * 读文件走沙箱化的 `ctx.shell` 接缝（本包不 import `node:fs`）。
  */
 
@@ -33,6 +34,18 @@ async function readText(shell, file) {
   return result.stdout.text
 }
 
+async function appendText(shell, file, text) {
+  const encoded = Buffer.from(text, 'utf8').toString('base64')
+  const handle = await shell.execute(shell.resolve({ command: 'printf %s ' + shq(encoded) + ' | base64 -d >> ' + shq(file) }))
+  const result = await handle.result()
+  if (result.sandbox?.denied) {
+    const error = new Error(`[sandbox: file access denied under ${result.sandbox.mode} mode]`)
+    error.name = 'SandboxError'
+    throw error
+  }
+  return result
+}
+
 function json(res, status, payload) {
   const body = JSON.stringify(payload, null, 2)
   res.writeHead(status, { 'content-type': 'application/json; charset=utf-8', 'content-length': Buffer.byteLength(body) })
@@ -41,12 +54,19 @@ function json(res, status, payload) {
 
 /** 每条路由都自述（面板的"这个面板能问什么"表，与 netops 同一条纪律）。 */
 export const endpoints = [
-  { path: `${BASE}/state`, summary: 'engagement 投影（与 eng_state 同口径）：goal/节点/边/counts/dropped/refused/truncated' },
-  { path: `${BASE}/report`, summary: '全量 Markdown 报告（与 eng_report 同一份渲染）' },
+  { path: `${BASE}/state`, summary: 'engagement 投影（与 eng_state 同口径）：?workspace=&session=&scope=session|workspace&window=' },
+  { path: `${BASE}/report`, summary: 'Markdown 报告（与 eng_report 同一份渲染）：?workspace=&session=&scope=' },
+  { path: `${BASE}/adopt`, method: 'POST', summary: '认领未归属（v1）记录到当前会话：{ workspace, session, all? , ids?, goal? }' },
 ]
 
+function badWorkspace(workspace) {
+  if (typeof workspace !== 'string' || workspace.trim() === '') return 'missing ?workspace=<absolute path>'
+  if (!workspace.startsWith('/')) return 'workspace 必须是绝对路径（收到 ' + workspace + '）'
+  return null
+}
+
 /**
- * 处理一条请求。`?workspace=<绝对路径>` 必填（取不到会话 cwd 时由面板填 + 记忆）。
+ * 处理一条 GET。`?workspace=<绝对路径>` 必填；`session` 缺省 = 未归属（v1 遗留）。
  * 返回 `{ status, payload }`，由 transport 层写回 —— 纯函数，好测。
  */
 export async function answer(shell, url) {
@@ -54,48 +74,109 @@ export async function answer(shell, url) {
   if (!path.startsWith(BASE)) return { status: 404, payload: { error: 'not found', endpoints } }
   const query = new URLSearchParams(path.slice(path.indexOf('?') + 1))
   const workspace = query.get('workspace')
-  if (workspace === null || workspace.trim() === '') {
-    return { status: 400, payload: { error: 'missing ?workspace=<absolute path>', endpoints } }
-  }
-  if (!workspace.startsWith('/')) {
-    return { status: 400, payload: { error: 'workspace 必须是绝对路径（收到 ' + workspace + '）', endpoints } }
-  }
+  const invalid = badWorkspace(workspace)
+  if (invalid !== null) return { status: 400, payload: { error: invalid, endpoints } }
+  const session = (query.get('session') ?? '').trim() === '' ? null : query.get('session')
+  const scope = query.get('scope') === 'workspace' ? 'workspace' : 'session'
   const windowSize = Math.min(2000, Math.max(1, Math.round(Number(query.get('window') ?? 200) || 200)))
   const file = ledgerPath(workspace)
   const state = foldEvents((await readText(shell, file)).split('\n'))
+  const view = scopeView(state, { session, scope }, windowSize)
   if (path.startsWith(BASE + '/report')) {
-    return { status: 200, payload: { workspace, ledger: file, markdown: renderReport(workspace, state) } }
+    return { status: 200, payload: { workspace, ledger: file, session, scope, markdown: renderReport(workspace, view) } }
   }
   if (path.startsWith(BASE + '/state')) {
     return {
       status: 200,
-      payload: {
-        workspace,
-        ledger: file,
-        window: windowSize,
-        projection: windowView(state, windowSize),
-        endpoints,
-      },
+      payload: { workspace, ledger: file, window: windowSize, session, scope, projection: view, endpoints },
     }
   }
   return { status: 404, payload: { error: 'not found', endpoints } }
 }
 
+/**
+ * `POST /fly/engagement/adopt` —— 面板上的「认领未归属记录」按钮走这里。
+ * 只改未归属（session=null）的行；已归属其他会话的一律跳过。
+ */
+export async function adopt(shell, body) {
+  const workspace = body?.workspace
+  const invalid = badWorkspace(workspace)
+  if (invalid !== null) return { status: 400, payload: { error: invalid, endpoints } }
+  const session = typeof body?.session === 'string' ? body.session.trim() : ''
+  if (session === '') return { status: 400, payload: { error: 'adopt 需要 session（当前会话身份）', endpoints } }
+  const file = ledgerPath(workspace)
+  const state = foldEvents((await readText(shell, file)).split('\n'))
+  const unowned = [...state.facts, ...state.findings, ...state.assets].filter(row => (row.session ?? null) === null)
+  const ids = body?.all === true ? unowned.map(row => row.id) : (Array.isArray(body?.ids) ? body.ids : [])
+  const goal = body?.goal === true || body?.all === true
+  if (ids.length === 0 && goal === false) {
+    return { status: 400, payload: { error: '没有可认领的记录（未归属为空，且未请求 goal）', endpoints } }
+  }
+  const event = { op: 'adopt', at: new Date().toISOString(), session, ids, goal }
+  await appendText(shell, file, JSON.stringify(event) + '\n')
+  const after = foldEvents((await readText(shell, file)).split('\n'))
+  const view = scopeView(after, { session, scope: 'session' }, 2000)
+  const count = rows => rows.filter(row => (row.session ?? null) === null).length
+  return {
+    status: 200,
+    payload: {
+      workspace,
+      session,
+      adopted: {
+        facts: count(state.facts) - count(after.facts),
+        findings: count(state.findings) - count(after.findings),
+        assets: count(state.assets) - count(after.assets),
+        edges: count(state.edges) - count(after.edges),
+        goal: state.goals.filter(row => row.session === null).length - after.goals.filter(row => row.session === null).length,
+      },
+      legacy: view.legacy,
+      skipped: after.skipped,
+    },
+  }
+}
+
+async function readBody(req) {
+  const chunks = []
+  for await (const chunk of req) chunks.push(chunk)
+  const text = Buffer.concat(chunks).toString('utf8')
+  return text === '' ? {} : JSON.parse(text)
+}
+
 export function apply(ctx) {
   const shell = ctx.shell
   ctx.effect(
-    () => ctx.webServer.register({
-      kind: 'prefix',
-      path: BASE,
-      handler: async (req, res) => {
-        try {
-          const { status, payload } = await answer(shell, req.url ?? '/')
-          json(res, status, payload)
-        } catch (error) {
-          json(res, 500, { error: String(error?.message ?? error), endpoints })
-        }
-      },
-    }),
+    () => {
+      // `webServer.register` 对重复的 (kind, path) 是**抛错**语义（组合层契约）。
+      // profile 热重载时若上一代路由还没被 dispose，新实例会撞上它 —— 这里把失败
+      // 写进宿主日志再抛，否则症状只是"面板一直 404"而没有任何线索。
+      try {
+        return ctx.webServer.register({
+          kind: 'prefix',
+          path: BASE,
+          handler: async (req, res) => {
+            try {
+              const url = req.url ?? '/'
+              if (req.method === 'POST' && String(url).startsWith(BASE + '/adopt')) {
+                const { status, payload } = await adopt(shell, await readBody(req))
+                json(res, status, payload)
+                return
+              }
+              if (req.method !== 'GET') {
+                json(res, 405, { error: 'method not allowed', endpoints })
+                return
+              }
+              const { status, payload } = await answer(shell, url)
+              json(res, status, payload)
+            } catch (error) {
+              json(res, 500, { error: String(error?.message ?? error), endpoints })
+            }
+          },
+        })
+      } catch (error) {
+        ctx.logger?.error?.('fly-engagement: 注册 ' + BASE + '/* 失败（面板将 404）', error)
+        throw error
+      }
+    },
     'fly-engagement: ' + BASE + '/*',
   )
 }

package/lib/client.js

@@ -1,5 +1,5 @@
 /* @dsh-fly/dsh-plugin-fly-engagement — browser half, built by scripts/build-plugin-client.mjs.
- * src-hash: dfc489bb58d29d86b67f417b96d83c86f598b665a6426ab841f69745bd106120
+ * src-hash: 8df6cd805bb668cf7c43bc05afeae736d5f7f1e8e672ac1f4d084ca644afea08
  * Factory-form CJS: the loader calls the factory with its platform `require`
  * and memoizes the returned exports. Keep the banner so the loader id and the
  * package that produced the bundle stay greppable in a live page. */
@@ -31,36 +31,25 @@ const PANEL_CSS = `/*
  * 实现时一律 'var(--dsw-alias-*, 兜底)' —— 真宿主会给出 token，兜底只在 mock/降级时生效。
  * 面板框（rail 8px / desk 12px / 3px 亮缘）照 '.fly-panel' 的结构，不再发明第二套。
  */
-:root {
-  --dsw-alias-bg-base: #070b12;
-  --dsw-alias-bg-layer-1: rgba(255, 255, 255, 0.045);
-  --dsw-alias-bg-layer-2: rgba(255, 255, 255, 0.07);
-  --dsw-alias-fg-primary: #e8eef8;
-  --dsw-alias-fg-secondary: #9fb0c6;
-  --dsw-alias-fg-muted: #6b7d95;
-  --dsw-alias-border-l1: rgba(255, 255, 255, 0.10);
-  --fly-accent: #f0a55a;
-  --fly-accent-dim: rgba(240, 165, 90, 0.16);
-  --fly-critical: #ff5f6d;
-  --fly-high: #ff9b52;
-  --fly-medium: #e8c54a;
-  --fly-low: #6fc2ff;
-  --fly-info: #8fa3bd;
-}
-
-* { box-sizing: border-box; }
-body {
-  margin: 0;
-  padding: var(--fly-desk, 12px);
-  background: #05080d;
-  font: 13px/1.5 -apple-system, "SF Pro Text", "PingFang SC", system-ui, sans-serif;
-  color: var(--dsw-alias-fg-primary);
-}
-
+/* 2026-10-19：这三条**只属于独立效果图页**（body padding / 全页重置 / token 兜底），
+   不能注入宿主 —— 它们把宿主页面挤了 12px 并刷成不透明底，症状是"侧栏卡片与 App 边缘
+   之间多出一条黑边、发光顶不到边"（用户判词）。宿主里每一条声明都自带 var() 兜底，
+   不需要这里的 :root。留注释备查，mock 页仍按原样式表渲染。 */
 /* ── 面板框：照 .fly-panel 的结构（rail 8px / 3px 亮缘 / 底部关系型亮缘） ── */
+/* 滚动可达性：宿主页签容器（P3OORG_tabBody）是 flex column + height:100% +
+   overflow:hidden，而本面板只声明了宽度与内边距 —— 高度由内容撑开、溢出被父层裁掉，
+   整条祖先链上没有滚动容器，所以是"根本不能滚"。
+   修法：让面板自己成为滚动容器（可收缩的 flex 子项 + min-height:0；不 grow，短内容不拉伸），
+   与 fly-smart 的 .fly-panel 同一处方。max-width 兜住窄抽屉下的横向溢出。 */
 .fly-eg-panel {
   --fly-rail: 8px;
+  box-sizing: border-box;
+  flex: 0 1 auto;
+  min-height: 0;
   width: 760px;
+  max-width: 100%;
+  overflow-y: auto;
+  overscroll-behavior: contain;
   border-radius: 12px;
   border: 1px solid var(--dsw-alias-border-l1);
   background:
@@ -101,8 +90,12 @@ body {
 /* ── 表 ── */
 .fly-eg-table { width: 100%; border-collapse: collapse; font-size: 12px; }
 .fly-eg-table th { text-align: left; font-weight: 500; color: var(--dsw-alias-fg-muted); font-size: 11px; padding: 4px 6px; border-bottom: 1px solid var(--dsw-alias-border-l1); }
-.fly-eg-table td { padding: 5px 6px; border-bottom: 1px solid rgba(255, 255, 255, 0.05); vertical-align: top; }
-.fly-eg-id { font-family: ui-monospace, Menlo, monospace; font-size: 11px; color: var(--dsw-alias-fg-muted); }
+/* overflow-wrap:anywhere 让单元格的**最小内容宽**变小 —— sha256、长路径这类
+   不可断长串不再把表格撑出卡片（word-break 只在排版时折行，不影响最小宽）。 */
+.fly-eg-table td { padding: 5px 6px; border-bottom: 1px solid rgba(255, 255, 255, 0.05); vertical-align: top; overflow-wrap: anywhere; word-break: break-word; }
+/* id 列整行不折（fact-1 不该断成 fact-
+1），宽让给正文列。 */
+.fly-eg-id { font-family: ui-monospace, Menlo, monospace; font-size: 11px; color: var(--dsw-alias-fg-muted); white-space: nowrap; }
 .fly-eg-src { font-size: 11px; color: var(--dsw-alias-fg-muted); }
 .fly-eg-src b { color: var(--dsw-alias-fg-secondary); font-weight: 500; }
 .fly-eg-sev { font-size: 11px; font-weight: 600; padding: 1px 7px; border-radius: 999px; display: inline-block; }
@@ -111,21 +104,54 @@ body {
 .fly-eg-sev.medium { color: #1a1506; background: var(--fly-medium); }
 .fly-eg-sev.low { color: #061019; background: var(--fly-low); }
 .fly-eg-sev.info { color: #0b1017; background: var(--fly-info); }
-.fly-eg-steps { margin: 4px 0 0 0; padding-left: 18px; color: var(--dsw-alias-fg-secondary); font-size: 11.5px; }
-.fly-eg-steps code, .fly-eg-cmd { font-family: ui-monospace, Menlo, monospace; font-size: 11px; background: rgba(255, 255, 255, 0.06); padding: 0 4px; border-radius: 4px; }
+/* 复现步骤 = 编号清单 + 行尾 ⧉ 单条复制（勾选功能已撤：li 保持 list-item，编号才有）。 */
+.fly-eg-steps { margin: 4px 0 0 0; padding-left: 20px; color: var(--dsw-alias-fg-secondary); font-size: 11.5px; }
+.fly-eg-step { position: relative; margin: 2px 0; padding-right: 20px; }
+.fly-eg-step-text { font-family: ui-monospace, Menlo, monospace; font-size: 11px; background: rgba(255, 255, 255, 0.06); padding: 0 4px; border-radius: 4px; overflow-wrap: anywhere; }
+.fly-eg-step-copy { position: absolute; right: 0; top: 0; border: none; background: none; padding: 0; cursor: pointer; color: var(--dsw-alias-fg-muted); font-size: 11.5px; line-height: 1.5; opacity: 0.55; }
+.fly-eg-step-copy:hover { opacity: 1; color: var(--fly-accent); }
+/* Report 标题行：标题左、动作右。 */
+.fly-eg-section-head { display: flex; align-items: center; justify-content: space-between; gap: 8px; }
+.fly-eg-copy { font-size: 11px; padding: 2px 9px; border-radius: 7px; border: 1px solid var(--dsw-alias-border-l1); background: var(--dsw-alias-bg-layer-2); color: var(--dsw-alias-fg-secondary); cursor: default; }
+.fly-eg-copy:hover { color: var(--dsw-alias-fg-primary); border-color: rgba(240, 165, 90, 0.45); }
+.fly-eg-copy.is-done { color: var(--fly-accent); border-color: rgba(240, 165, 90, 0.55); }
+.fly-eg-steps code, .fly-eg-cmd { font-family: ui-monospace, Menlo, monospace; font-size: 11px; background: rgba(255, 255, 255, 0.06); padding: 0 4px; border-radius: 4px; overflow-wrap: anywhere; white-space: pre-wrap; }
 
 /* ── 图区：静态分层 + 边胶囊 + 只读（借 xyflow 的形状，不引入拖拽） ── */
-.fly-eg-graph { position: relative; height: 300px; border: 1px solid var(--dsw-alias-border-l1); border-radius: 10px; background: radial-gradient(600px 240px at 50% 0%, rgba(255,255,255,0.035), transparent 70%), var(--dsw-alias-bg-layer-1); overflow: hidden; }
+/* 图框：内层 .fly-eg-canvas 是按布局算出来的固定宽度，放不下时横向滚动（不裁剪）。 */
+.fly-eg-graph { position: relative; height: 300px; border: 1px solid var(--dsw-alias-border-l1); border-radius: 10px; background: radial-gradient(600px 240px at 50% 0%, rgba(255,255,255,0.035), transparent 70%), var(--dsw-alias-bg-layer-1); overflow-x: auto; overflow-y: hidden; }
+.fly-eg-canvas { position: relative; }
 .fly-eg-graph-hint { position: absolute; left: 8px; bottom: 6px; font-size: 10.5px; color: var(--dsw-alias-fg-muted); }
 .fly-eg-graph-badge { position: absolute; right: 8px; top: 8px; font-size: 10.5px; padding: 2px 7px; border-radius: 999px; border: 1px solid rgba(255, 95, 109, 0.45); background: rgba(255, 95, 109, 0.12); color: #ffb8be; }
-.fly-eg-node { position: absolute; transform: translate(-50%, -50%); border-radius: 8px; border: 1px solid var(--dsw-alias-border-l1); background: var(--dsw-alias-bg-layer-2); padding: 5px 9px; font-size: 11.5px; white-space: nowrap; }
+/* 节点宽 = 内容宽（max-content）：短文本的框刚好包住文字；超过 240px 才省略号。
+   真宽由 Graph 用 useLayoutEffect 量 offsetWidth 回填给布局（列宽、线头都用它）。 */
+.fly-eg-node { position: absolute; transform: translate(-50%, -50%); box-sizing: border-box; width: max-content; max-width: 240px; border-radius: 8px; border: 1px solid var(--dsw-alias-border-l1); background: var(--dsw-alias-bg-layer-2); padding: 5px 9px; font-size: 11.5px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+/* 色调规则在 hover 块**之前**：hover 靠同等特异性 + 源顺序压过它们，色调 hover 又以更高特异性收尾。 */
 .fly-eg-node.is-finding { border-color: rgba(255, 155, 82, 0.55); background: rgba(255, 155, 82, 0.14); color: #ffd7b0; }
 .fly-eg-node.is-asset { border-color: rgba(111, 194, 255, 0.45); background: rgba(111, 194, 255, 0.12); color: #cbe8ff; }
+/* hover 展开全文：宽回到内容宽（封顶 420px 仍换行），抬高 z-index 压住邻居；
+   被截断的内容从此 hover 就能读全 —— 不依赖原生 title（迟 1 秒、样式也不可控）。
+   底色在 hover 时转**不透明**：半透明底一旦压到连线或邻近节点上，下层文字会透上来
+   与展开的全文混在一起看不清（用户判词）。三档不透明底与各自的色调边框/字色配套。 */
+.fly-eg-node:hover { width: max-content; max-width: 420px; white-space: normal; overflow-wrap: anywhere; overflow: visible; text-overflow: clip; z-index: 5; background: #20272f; border-color: rgba(240, 165, 90, 0.55); box-shadow: 0 10px 28px rgba(0, 0, 0, 0.5); cursor: default; }
+.fly-eg-node.is-finding:hover { background: #3a2810; }
+.fly-eg-node.is-asset:hover { background: #11293e; }
 .fly-eg-edge { position: absolute; height: 1.5px; background: rgba(240, 165, 90, 0.55); transform-origin: 0 50%; }
 .fly-eg-edge-cap { position: absolute; font-size: 10px; color: var(--fly-accent); background: rgba(7, 11, 18, 0.85); padding: 0 4px; border-radius: 4px; border: 1px solid rgba(240, 165, 90, 0.3); }
 
 /* ── 报告区 ── */
-.fly-eg-report { border: 1px solid var(--dsw-alias-border-l1); border-radius: 10px; background: var(--dsw-alias-bg-layer-1); padding: 8px 10px; font-size: 11.5px; color: var(--dsw-alias-fg-secondary); }
+.fly-eg-report { border: 1px solid var(--dsw-alias-border-l1); border-radius: 10px; background: var(--dsw-alias-bg-layer-1); padding: 8px 10px; font-size: 11.5px; color: var(--dsw-alias-fg-secondary); overflow-wrap: anywhere; }
+/* 报告 Markdown 的排版（受控子集）：三级标题 + 段落 + 列表 + 行内 code/bold。 */
+.fly-eg-md-h1 { margin: 2px 0 6px; font-size: 13.5px; font-weight: 650; color: var(--dsw-alias-fg-primary); }
+.fly-eg-md-h2 { margin: 10px 0 4px; font-size: 12.5px; font-weight: 650; color: var(--dsw-alias-fg-primary); }
+.fly-eg-md-h3 { margin: 8px 0 3px; font-size: 11.5px; font-weight: 650; color: var(--dsw-alias-fg-primary); }
+.fly-eg-md-p { margin: 4px 0; line-height: 1.65; }
+.fly-eg-md-list { margin: 4px 0; padding-left: 18px; line-height: 1.65; }
+/* 报告里 "reproducible steps" 之后的有序列表带单条复制（renderMarkdown 认出该行后打标）。 */
+.fly-eg-md-steps { padding-left: 20px; }
+.fly-eg-md-list li { margin: 1px 0; }
+.fly-eg-md-code { font-family: ui-monospace, Menlo, monospace; font-size: 10.5px; background: rgba(255, 255, 255, 0.06); padding: 0 4px; border-radius: 4px; overflow-wrap: anywhere; }
+.fly-eg-report b { color: var(--dsw-alias-fg-primary); font-weight: 650; }
 .fly-eg-report-actions { display: flex; gap: 6px; margin-top: 8px; }
 .fly-eg-btn { font-size: 11.5px; padding: 3px 10px; border-radius: 7px; border: 1px solid var(--dsw-alias-border-l1); background: var(--dsw-alias-bg-layer-2); color: var(--dsw-alias-fg-primary); }
 
@@ -146,6 +172,16 @@ body {
 .fly-eg-group > summary .fly-eg-count { margin-left: auto; font-size: 10.5px; color: var(--dsw-alias-fg-muted); }
 .fly-eg-group table { margin: 0 0 2px; }
 
+/* ── 会话作用域条：本会话 / 工作区 + 未归属认领 ── */
+.fly-eg-scope { display: flex; align-items: center; gap: 8px; margin: 8px 0 2px; font-size: 11.5px; }
+.fly-eg-scope-tab { padding: 2px 9px; border-radius: 999px; border: 1px solid var(--dsw-alias-border-l1); color: var(--dsw-alias-fg-secondary); cursor: default; }
+.fly-eg-scope-tab.is-active { border-color: rgba(240, 165, 90, 0.55); background: rgba(240, 165, 90, 0.14); color: #ffd7b0; }
+.fly-eg-scope-count { color: var(--dsw-alias-fg-muted); font-size: 10.5px; }
+.fly-eg-adopt { margin-left: auto; border-color: rgba(240, 165, 90, 0.45); }
+.fly-eg-scope-badge { font-size: 10.5px; padding: 1px 7px; border-radius: 999px; border: 1px solid var(--dsw-alias-border-l1); color: var(--dsw-alias-fg-muted); }
+.fly-eg-hint { display: block; margin-top: 3px; font-size: 10.5px; color: var(--dsw-alias-fg-muted); }
+.fly-eg-link { color: var(--fly-accent); cursor: default; }
+
 .fly-eg-input { width: 100%; font: inherit; font-size: 11.5px; padding: 3px 8px; border-radius: 7px; border: 1px solid var(--dsw-alias-border-l1); background: var(--dsw-alias-bg-layer-1); color: var(--dsw-alias-fg-primary); }
 .fly-eg-error { margin: 8px 0; padding: 6px 9px; border-radius: 8px; border: 1px solid rgba(255,95,109,0.45); background: rgba(255,95,109,0.10); color: #ffb8be; font-size: 11.5px; }
 .fly-eg-empty { margin: 14px 0; color: var(--dsw-alias-fg-muted); font-size: 11.5px; }
@@ -155,7 +191,145 @@ async function getJson(path) {
   if (!response.ok) throw new Error(path + " → HTTP " + response.status);
   return await response.json();
 }
+const REPORT_PREVIEW_CAP = 2e4;
+async function copyText(text) {
+  try {
+    await navigator.clipboard.writeText(text);
+    return true;
+  } catch {
+    const area = document.createElement("textarea");
+    area.value = text;
+    area.style.position = "fixed";
+    area.style.opacity = "0";
+    document.body.appendChild(area);
+    area.select();
+    let ok = true;
+    try {
+      document.execCommand("copy");
+    } catch {
+      ok = false;
+    }
+    area.remove();
+    return ok;
+  }
+}
+function StepItem({ step }) {
+  const [copied, setCopied] = react.useState(false);
+  return /* @__PURE__ */ jsxRuntime.jsxs("li", { className: "fly-eg-step", children: [
+    /* @__PURE__ */ jsxRuntime.jsx("code", { className: "fly-eg-step-text", children: step }),
+    /* @__PURE__ */ jsxRuntime.jsx("button", { className: "fly-eg-step-copy", title: "复制此步", onClick: () => void (async () => {
+      if (await copyText(step)) {
+        setCopied(true);
+        window.setTimeout(() => setCopied(false), 1200);
+      }
+    })(), children: copied ? "✓" : "⧉" })
+  ] });
+}
+function renderInline(text, keyPrefix) {
+  const out = [];
+  const pattern = /(`[^`]+`)|(\*\*[^*]+\*\*)|(?:(?<=^|[^\w])_([^_]+)_(?![\w]))/g;
+  let cursor = 0;
+  let index = 0;
+  for (const match of text.matchAll(pattern)) {
+    if (match.index > cursor) out.push(text.slice(cursor, match.index));
+    const token = match[0];
+    const key = keyPrefix + "-i" + index++;
+    if (token.startsWith("`")) out.push(/* @__PURE__ */ jsxRuntime.jsx("code", { className: "fly-eg-md-code", children: token.slice(1, -1) }, key));
+    else if (token.startsWith("**")) out.push(/* @__PURE__ */ jsxRuntime.jsx("b", { children: token.slice(2, -2) }, key));
+    else out.push(/* @__PURE__ */ jsxRuntime.jsx("i", { children: token.slice(1, -1) }, key));
+    cursor = match.index + token.length;
+  }
+  if (cursor < text.length) out.push(text.slice(cursor));
+  return out;
+}
+function renderMarkdown(text) {
+  const blocks = [];
+  const paragraph = [];
+  let list = null;
+  let stepsNext = false;
+  const flushParagraph = () => {
+    if (paragraph.length === 0) return;
+    const key = "p" + blocks.length;
+    const text2 = paragraph.join(" ");
+    if (/^reproducible steps/i.test(text2)) stepsNext = true;
+    blocks.push(/* @__PURE__ */ jsxRuntime.jsx("p", { className: "fly-eg-md-p", children: renderInline(text2, key) }, key));
+    paragraph.length = 0;
+  };
+  const flushList = () => {
+    if (list === null) return;
+    const key = "l" + blocks.length;
+    const asSteps = stepsNext && list.ordered;
+    const items = list.items.map((item, i) => asSteps ? /* @__PURE__ */ jsxRuntime.jsx(StepItem, { step: item.raw }, key + "-" + i) : /* @__PURE__ */ jsxRuntime.jsx("li", { children: item.content }, key + "-" + i));
+    const className = asSteps ? "fly-eg-md-list fly-eg-md-steps" : "fly-eg-md-list";
+    stepsNext = false;
+    blocks.push(list.ordered ? /* @__PURE__ */ jsxRuntime.jsx("ol", { className, children: items }, key) : /* @__PURE__ */ jsxRuntime.jsx("ul", { className, children: items }, key));
+    list = null;
+  };
+  for (const line of text.split("\n")) {
+    const heading = /^(#{1,3})\s+(.*)$/.exec(line);
+    const bullet = /^[-*]\s+(.*)$/.exec(line);
+    const ordered = /^\d+\.\s+(.*)$/.exec(line);
+    if (heading !== null) {
+      flushParagraph();
+      flushList();
+      stepsNext = false;
+      const key = "h" + blocks.length;
+      const content = renderInline(heading[2], key);
+      const level = heading[1].length;
+      blocks.push(level === 1 ? /* @__PURE__ */ jsxRuntime.jsx("h1", { className: "fly-eg-md-h1", children: content }, key) : level === 2 ? /* @__PURE__ */ jsxRuntime.jsx("h2", { className: "fly-eg-md-h2", children: content }, key) : /* @__PURE__ */ jsxRuntime.jsx("h3", { className: "fly-eg-md-h3", children: content }, key));
+      continue;
+    }
+    if (bullet !== null || ordered !== null) {
+      flushParagraph();
+      const isOrdered = ordered !== null;
+      const raw = (bullet ?? ordered)[1];
+      const content = renderInline(raw, "i" + blocks.length + "-" + (list?.items.length ?? 0));
+      if (list === null || list.ordered !== isOrdered) {
+        flushList();
+        list = { ordered: isOrdered, items: [] };
+      }
+      list.items.push({ raw, content });
+      continue;
+    }
+    if (line.trim() === "") {
+      flushParagraph();
+      flushList();
+      continue;
+    }
+    paragraph.push(line.trim());
+  }
+  flushParagraph();
+  flushList();
+  return blocks;
+}
+function assetDepth(assets, parentEdges, id) {
+  const parentOf = /* @__PURE__ */ new Map();
+  for (const edge of parentEdges) parentOf.set(edge.to, edge.from);
+  for (const asset of assets) if (asset.parentId !== void 0 && asset.parentId !== "") parentOf.set(asset.id, asset.parentId);
+  const seen = /* @__PURE__ */ new Set([id]);
+  let depth = 0;
+  let cursor = parentOf.get(id);
+  while (cursor !== void 0 && !seen.has(cursor)) {
+    seen.add(cursor);
+    depth += 1;
+    cursor = parentOf.get(cursor);
+  }
+  return depth;
+}
 function Graph({ nodes, edges, kind }) {
+  const nodeRefs = react.useRef(/* @__PURE__ */ new Map());
+  const [widths, setWidths] = react.useState(/* @__PURE__ */ new Map());
+  react.useLayoutEffect(() => {
+    const next = /* @__PURE__ */ new Map();
+    let changed = widths.size !== nodes.length;
+    for (const node of nodes) {
+      const width = nodeRefs.current.get(node.id)?.offsetWidth ?? 0;
+      if (width <= 0) continue;
+      next.set(node.id, width);
+      if (widths.get(node.id) !== width) changed = true;
+    }
+    if (changed) setWidths(next);
+  });
   const byLayer = /* @__PURE__ */ new Map();
   for (const node of nodes) {
     const list = byLayer.get(node.layer) ?? [];
@@ -163,65 +337,152 @@ function Graph({ nodes, edges, kind }) {
     byLayer.set(node.layer, list);
   }
   const layers = [...byLayer.keys()].sort((a, b) => a - b);
-  const widest = Math.max(120, ...nodes.map((node) => node.label.length * 6.6 + 20));
-  const gap = 78;
+  const NODE_MAX = 240;
+  const NODE_MIN = 88;
+  const textW = (label) => {
+    let width = 22;
+    for (const ch of label) width += /[\u3000-\u9fff\uff01-\uff60]/.test(ch) ? 11.5 : 6.4;
+    return Math.min(NODE_MAX, Math.max(NODE_MIN, Math.round(width)));
+  };
+  const nodeW = /* @__PURE__ */ new Map();
+  for (const node of nodes) nodeW.set(node.id, widths.get(node.id) ?? textW(node.label));
+  const colW = /* @__PURE__ */ new Map();
+  for (const node of nodes) colW.set(node.layer, Math.max(colW.get(node.layer) ?? 0, nodeW.get(node.id) ?? 0));
+  const colGap = 56;
   const xOf = /* @__PURE__ */ new Map();
-  let cursor = 60;
+  let cursor = 16;
   for (const layer of layers) {
-    for (const node of byLayer.get(layer) ?? []) xOf.set(node.id, cursor + widest / 2);
-    cursor += widest + gap;
+    const w = colW.get(layer) ?? NODE_MIN;
+    for (const node of byLayer.get(layer) ?? []) xOf.set(node.id, cursor + w / 2);
+    cursor += w + colGap;
   }
-  const height = Math.max(180, ...layers.map((layer) => (byLayer.get(layer) ?? []).length * 54));
+  const totalWidth = Math.round(cursor - colGap + 16);
+  const rowPitch = 40;
+  const height = Math.max(96, ...layers.map((layer) => (byLayer.get(layer) ?? []).length * rowPitch));
   const yOf = /* @__PURE__ */ new Map();
   for (const layer of layers) {
     const list = byLayer.get(layer) ?? [];
     list.forEach((node, index) => yOf.set(node.id, height / (list.length + 1) * (index + 1)));
   }
-  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "fly-eg-graph", style: { height: height + 60 }, children: [
-    /* @__PURE__ */ jsxRuntime.jsx("svg", { className: "fly-eg-wires", width: "100%", height: "100%", children: edges.filter((edge) => xOf.has(edge.from) && xOf.has(edge.to)).map((edge) => {
-      const x1 = (xOf.get(edge.from) ?? 0) + widest / 2;
-      const x2 = (xOf.get(edge.to) ?? 0) - widest / 2;
-      const midX = (x1 + x2) / 2;
-      return /* @__PURE__ */ jsxRuntime.jsx("path", { className: "fly-eg-wire", d: "M " + x1 + " " + yOf.get(edge.from) + " H " + midX + " V " + yOf.get(edge.to) + " H " + x2 }, kind + edge.from + edge.to);
-    }) }),
-    nodes.map((node) => /* @__PURE__ */ jsxRuntime.jsx(
-      "div",
-      {
-        className: "fly-eg-node" + (node.tone === "finding" ? " is-finding" : node.tone === "asset" ? " is-asset" : ""),
-        style: { left: xOf.get(node.id), top: yOf.get(node.id) },
-        children: node.label
-      },
-      node.id
-    )),
+  const markerId = "fly-eg-arrow-" + kind;
+  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "fly-eg-graph", style: { height: height + 34 }, children: [
+    /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "fly-eg-canvas", style: { width: totalWidth, height: height + 34 }, children: [
+      /* @__PURE__ */ jsxRuntime.jsxs("svg", { className: "fly-eg-wires", width: totalWidth, height: height + 34, viewBox: `0 0 ${totalWidth} ${height + 34}`, children: [
+        /* @__PURE__ */ jsxRuntime.jsx("defs", { children: /* @__PURE__ */ jsxRuntime.jsx("marker", { id: markerId, markerWidth: "7", markerHeight: "7", refX: "6", refY: "3.5", orient: "auto", markerUnits: "userSpaceOnUse", children: /* @__PURE__ */ jsxRuntime.jsx("path", { d: "M0,0.6 L6,3.5 L0,6.4 z", fill: "rgba(240, 165, 90, 0.85)" }) }) }),
+        edges.filter((edge) => xOf.has(edge.from) && xOf.has(edge.to)).map((edge) => {
+          const w1 = nodeW.get(edge.from) ?? NODE_MIN;
+          const w2 = nodeW.get(edge.to) ?? NODE_MIN;
+          const cx1 = xOf.get(edge.from) ?? 0;
+          const cx2 = xOf.get(edge.to) ?? 0;
+          const y1 = yOf.get(edge.from) ?? 0;
+          const y2 = yOf.get(edge.to) ?? 0;
+          let d;
+          if (cx2 > cx1) {
+            const x1 = cx1 + w1 / 2 + 3;
+            const x2 = cx2 - w2 / 2 - 3;
+            const midX = (x1 + x2) / 2;
+            d = "M " + x1 + " " + y1 + " H " + midX + " V " + y2 + " H " + x2;
+          } else {
+            const x1 = cx1 + w1 / 2 + 3;
+            const x2 = cx2 - w2 / 2 - 3;
+            const floor = height + 16;
+            d = "M " + x1 + " " + y1 + " H " + (x1 + 14) + " V " + floor + " H " + (x2 - 14) + " V " + y2 + " H " + x2;
+          }
+          return /* @__PURE__ */ jsxRuntime.jsx("path", { className: "fly-eg-wire", markerEnd: `url(#${markerId})`, d }, kind + edge.from + edge.to);
+        })
+      ] }),
+      nodes.map((node) => /* @__PURE__ */ jsxRuntime.jsx(
+        "div",
+        {
+          ref: (element) => {
+            if (element !== null) nodeRefs.current.set(node.id, element);
+            else nodeRefs.current.delete(node.id);
+          },
+          className: "fly-eg-node" + (node.tone === "finding" ? " is-finding" : node.tone === "asset" ? " is-asset" : ""),
+          style: { left: xOf.get(node.id), top: yOf.get(node.id) },
+          children: node.label
+        },
+        node.id
+      ))
+    ] }),
     /* @__PURE__ */ jsxRuntime.jsx("div", { className: "fly-eg-graph-hint", children: "折线走层间间隙 · 静态分层 · 只读" })
   ] });
 }
-function Panel() {
-  const [workspace, setWorkspace] = react.useState(() => localStorage.getItem(STORE_KEY) ?? "");
+function Panel({ sessionId, useSessions }) {
+  const [override, setOverride] = react.useState(() => localStorage.getItem(STORE_KEY) ?? "");
+  const liveCwd = useSessions === void 0 || sessionId === void 0 ? void 0 : useSessions((state2) => state2.byId[sessionId]?.cwd);
+  const workspace = override.trim() !== "" ? override : liveCwd ?? "";
+  const session = sessionId ?? "";
+  const [scope, setScope] = react.useState("session");
   const [state, setState] = react.useState(null);
   const [error, setError] = react.useState("");
   const [view, setView] = react.useState("table");
   const [report, setReport] = react.useState("");
-  const load = react.useCallback(async (target) => {
+  const [busy, setBusy] = react.useState(false);
+  const [copied, setCopied] = react.useState(false);
+  const copyReport = async () => {
+    if (report === "") return;
+    if (await copyText(report)) {
+      setCopied(true);
+      window.setTimeout(() => setCopied(false), 1600);
+    } else {
+      setError("复制失败：浏览器拒绝了剪贴板写入");
+    }
+  };
+  const load = react.useCallback(async (target, mode) => {
     if (target.trim() === "") return;
     setError("");
+    const query = "workspace=" + encodeURIComponent(target) + "&session=" + encodeURIComponent(session) + "&scope=" + mode;
     try {
       const [next, rendered] = await Promise.all([
-        getJson(BASE + "/state?workspace=" + encodeURIComponent(target)),
-        getJson(BASE + "/report?workspace=" + encodeURIComponent(target)).catch(() => ({ markdown: "" }))
+        getJson(BASE + "/state?" + query),
+        getJson(BASE + "/report?" + query).catch(() => ({ markdown: "" }))
       ]);
       setState(next);
       setReport(rendered.markdown);
-      localStorage.setItem(STORE_KEY, target);
     } catch (failure) {
-      setError(String(failure.message ?? failure));
+      const message = String(failure.message ?? failure);
+      setError(message.includes("HTTP 404") ? "宿主没有注册 " + BASE + " 路由（面板行未激活）· 重启 DSH 或重载 profile 后再试 · " + message : message);
       setState(null);
     }
-  }, []);
+  }, [session]);
+  react.useEffect(() => {
+    void load(workspace, scope);
+  }, [load, workspace, scope]);
   react.useEffect(() => {
-    void load(workspace);
-  }, [load, workspace]);
+    const refresh = () => {
+      if (document.visibilityState === "visible") void load(workspace, scope);
+    };
+    document.addEventListener("visibilitychange", refresh);
+    window.addEventListener("focus", refresh);
+    return () => {
+      document.removeEventListener("visibilitychange", refresh);
+      window.removeEventListener("focus", refresh);
+    };
+  }, [load, workspace, scope]);
+  const adopt = async () => {
+    if (busy || workspace.trim() === "" || session === "") return;
+    setBusy(true);
+    try {
+      const response = await fetch(BASE + "/adopt", {
+        method: "POST",
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify({ workspace, session, all: true })
+      });
+      if (!response.ok) throw new Error("adopt → HTTP " + response.status);
+      await load(workspace, scope);
+    } catch (failure) {
+      setError(String(failure.message ?? failure));
+    } finally {
+      setBusy(false);
+    }
+  };
   const projection = state?.projection;
+  const legacy = projection?.legacy ?? { facts: 0, findings: 0, assets: 0, goal: 0 };
+  const totals = projection?.workspaceCounts ?? projection?.counts;
+  const legacyTotal = legacy.facts + legacy.findings + legacy.assets + legacy.goal;
+  const scopedTotal = projection === void 0 ? 0 : projection.counts.facts + projection.counts.findings + projection.counts.assets;
+  const workspaceTotal = totals === void 0 ? 0 : totals.facts + totals.findings + totals.assets;
   const groups = react.useMemo(() => {
     const map = /* @__PURE__ */ new Map();
     for (const fact of projection?.facts ?? []) {
@@ -234,20 +495,26 @@ function Panel() {
     /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "fly-eg-head", children: [
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "fly-eg-title", children: [
         /* @__PURE__ */ jsxRuntime.jsx("h1", { children: "Engagement" }),
+        /* @__PURE__ */ jsxRuntime.jsx("span", { className: "fly-eg-scope-badge", children: session === "" ? "未绑定会话" : "会话 " + session.slice(0, 8) }),
         projection?.goal === null || projection === void 0 ? null : /* @__PURE__ */ jsxRuntime.jsx("span", { className: "fly-eg-badge", children: projection.goal.target })
       ] }),
-      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "fly-eg-meta", children: /* @__PURE__ */ jsxRuntime.jsx(
-        "input",
-        {
-          className: "fly-eg-input",
-          value: workspace,
-          placeholder: "工作区绝对路径（记录在 <workspace>/.fly-engagement/events.jsonl）",
-          onChange: (event) => setWorkspace(event.target.value),
-          onKeyDown: (event) => {
-            if (event.key === "Enter") void load(workspace);
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "fly-eg-meta", children: [
+        /* @__PURE__ */ jsxRuntime.jsx(
+          "input",
+          {
+            className: "fly-eg-input",
+            value: workspace,
+            placeholder: "工作区绝对路径（默认跟随当前会话 cwd）",
+            onChange: (event) => setOverride(event.target.value),
+            onKeyDown: (event) => {
+              if (event.key !== "Enter") return;
+              localStorage.setItem(STORE_KEY, override);
+              void load(workspace, scope);
+            }
           }
-        }
-      ) }),
+        ),
+        override.trim() === "" && liveCwd !== void 0 && liveCwd !== "" ? /* @__PURE__ */ jsxRuntime.jsx("span", { className: "fly-eg-hint", children: "跟随会话 cwd · 输入可覆盖" }) : null
+      ] }),
       projection?.goal === null || projection === void 0 ? null : /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
         /* @__PURE__ */ jsxRuntime.jsx("div", { className: "fly-eg-meta", children: /* @__PURE__ */ jsxRuntime.jsxs("span", { children: [
           "objective: ",
@@ -262,6 +529,20 @@ function Panel() {
     ] }),
     error !== "" ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "fly-eg-error", children: error }) : null,
     projection === void 0 ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "fly-eg-empty", children: "还没读取记录（填工作区后回车）" }) : /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "fly-eg-scope", children: [
+        /* @__PURE__ */ jsxRuntime.jsx("span", { className: "fly-eg-scope-tab" + (scope === "session" ? " is-active" : ""), onClick: () => setScope("session"), children: "本会话" }),
+        /* @__PURE__ */ jsxRuntime.jsx("span", { className: "fly-eg-scope-tab" + (scope === "workspace" ? " is-active" : ""), onClick: () => setScope("workspace"), children: "工作区" }),
+        /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "fly-eg-scope-count", children: [
+          "工作区合计 ",
+          workspaceTotal,
+          " 条"
+        ] }),
+        legacyTotal > 0 && session !== "" ? /* @__PURE__ */ jsxRuntime.jsx("button", { className: "fly-eg-btn fly-eg-adopt", disabled: busy, onClick: () => void adopt(), children: busy ? "认领中…" : "认领 " + legacyTotal + " 条未归属记录" }) : null
+      ] }),
+      scopedTotal === 0 ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "fly-eg-empty", children: [
+        scope === "session" ? workspaceTotal > 0 ? "本会话还没有记录；工作区共 " + workspaceTotal + " 条" : "本会话还没有记录" : "这个工作区还没有记录",
+        scope === "session" && workspaceTotal > 0 ? /* @__PURE__ */ jsxRuntime.jsx("span", { className: "fly-eg-link", onClick: () => setScope("workspace"), children: " 看工作区 →" }) : null
+      ] }) : null,
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "fly-eg-counters", children: [
         /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "fly-eg-counter", children: [
           "facts",
@@ -308,7 +589,7 @@ function Panel() {
             /* @__PURE__ */ jsxRuntime.jsx("td", { className: "fly-eg-id", children: finding.id }),
             /* @__PURE__ */ jsxRuntime.jsx("td", { children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "fly-eg-sev " + (finding.severity ?? "info"), children: finding.severity ?? "info" }) }),
             /* @__PURE__ */ jsxRuntime.jsx("td", { children: finding.title }),
-            /* @__PURE__ */ jsxRuntime.jsx("td", { children: /* @__PURE__ */ jsxRuntime.jsx("ol", { className: "fly-eg-steps", children: finding.reproducibleSteps.map((step, index) => /* @__PURE__ */ jsxRuntime.jsx("li", { children: /* @__PURE__ */ jsxRuntime.jsx("code", { children: step }) }, index)) }) })
+            /* @__PURE__ */ jsxRuntime.jsx("td", { children: /* @__PURE__ */ jsxRuntime.jsx("ol", { className: "fly-eg-steps", children: finding.reproducibleSteps.map((step, index) => /* @__PURE__ */ jsxRuntime.jsx(StepItem, { step }, index)) }) })
           ] }, finding.id)) }) })
         ] }),
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "fly-eg-section", children: [
@@ -328,8 +609,11 @@ function Panel() {
           ] }, tool))
         ] }),
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "fly-eg-section", children: [
-          /* @__PURE__ */ jsxRuntime.jsx("h2", { children: "Report" }),
-          /* @__PURE__ */ jsxRuntime.jsx("div", { className: "fly-eg-report", children: report === "" ? "（还没有可渲染的报告）" : report.slice(0, 2e3) })
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "fly-eg-section-head", children: [
+            /* @__PURE__ */ jsxRuntime.jsx("h2", { children: "Report" }),
+            /* @__PURE__ */ jsxRuntime.jsx("button", { className: "fly-eg-copy" + (copied ? " is-done" : ""), disabled: report === "", onClick: () => void copyReport(), children: copied ? "已复制 ✓" : "复制 Markdown" })
+          ] }),
+          /* @__PURE__ */ jsxRuntime.jsx("div", { className: "fly-eg-report", children: report === "" ? "（还没有可渲染的报告）" : renderMarkdown(report.length > REPORT_PREVIEW_CAP ? report.slice(0, REPORT_PREVIEW_CAP) + "\n\n**…（报告超过 " + REPORT_PREVIEW_CAP + " 字符，已截断预览）**" : report) })
         ] })
       ] }) : /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "fly-eg-section", children: [
@@ -352,7 +636,7 @@ function Panel() {
             Graph,
             {
               kind: "parent",
-              nodes: projection.assets.map((asset) => ({ id: asset.id, label: asset.value + " (" + asset.type + ")", layer: asset.parentId === void 0 ? 0 : 1, tone: "asset" })),
+              nodes: projection.assets.map((asset) => ({ id: asset.id, label: asset.value + " (" + asset.type + ")", layer: assetDepth(projection.assets, projection.edges.filter((edge) => edge.kind === "parent"), asset.id), tone: "asset" })),
               edges: projection.edges.filter((edge) => edge.kind === "parent")
             }
           )

package/lib/fold.mjs

@@ -4,6 +4,9 @@
  * 为什么单独成文件：这两半是两个挂载点（`tools/index.js` 由 preset 按会话挂；根 `index.js`
  * 是宿主平面的面板行），**投影口径必须逐字一致**，否则面板上的计数和 `eng_state` 会讲两个故事。
  * 同包内 import ⇒ 不需要"两份逐字节相同"的钉子（那是跨包才付的代价）。
+ *
+ * v2 起事件带 `session`：一个工作区一条账本，但**每个会话各自一条证据链**。
+ * 没有 session 的旧事件归入「未归属」（v1 遗留），可以经 `eng_adopt` 认领。
  */
 
 export const FACT_KINDS = ['net', 'service', 'http', 'binary', 'code', 'vuln', 'info']
@@ -19,13 +22,18 @@ export function ledgerPath(workspace) {
   return String(workspace).replace(/\/+$/u, '') + '/' + LEDGER_DIR + '/' + LEDGER_FILE
 }
 
+/** 事件信封上的会话身份：缺省 / 空串都折成 null（= v1 遗留的未归属）。 */
+export function sessionOf(event) {
+  return typeof event?.session === 'string' && event.session !== '' ? event.session : null
+}
+
 /**
  * 折叠事件流 ⇒ 完整状态（**确定性**：同一个文件永远折出同一张图）。
- * 坏引用计入 `refused`（不是静默丢弃）。
+ * 坏引用计入 `refused`（不是静默丢弃）；认领别人的记录计入 `skipped`。
  */
 export function foldEvents(lines) {
-  const state = { goal: null, facts: [], findings: [], assets: [], edges: [], refused: 0 }
-  const known = () => new Set([...state.facts.map(row => row.id), ...state.findings.map(row => row.id), ...state.assets.map(row => row.id)])
+  const state = { goals: [], facts: [], findings: [], assets: [], edges: [], refused: 0, skipped: 0 }
+  const allRows = () => new Map([...state.facts, ...state.findings, ...state.assets].map(row => [row.id, row]))
   for (const line of lines) {
     if (line.trim() === '') continue
     let event
@@ -36,60 +44,131 @@ export function foldEvents(lines) {
       continue
     }
     if (event.op === 'goal') {
-      if (state.goal !== null) { state.refused += 1; continue }
-      state.goal = event.goal
+      const session = sessionOf(event)
+      if (state.goals.some(row => row.session === session)) { state.refused += 1; continue }
+      state.goals.push({ session, goal: event.goal, at: event.at ?? null })
+      continue
+    }
+    if (event.op === 'adopt') {
+      const session = sessionOf(event)
+      if (session === null) { state.refused += 1; continue }
+      const rows = allRows()
+      for (const id of event.ids ?? []) {
+        const row = rows.get(id)
+        if (row === undefined) { state.refused += 1; continue }
+        if ((row.session ?? null) !== null) { state.skipped += 1; continue }
+        row.session = session
+      }
+      if (event.goal === true) {
+        const legacy = state.goals.find(row => row.session === null)
+        if (legacy === undefined || state.goals.some(row => row.session === session)) state.skipped += 1
+        else legacy.session = session
+      }
+      // 边跟着端点走：两端都归本会话的未归属边一起认领（保持账本内部一致；渲染不依赖这一步）。
+      for (const edge of state.edges) {
+        if ((edge.session ?? null) !== null) continue
+        const from = rows.get(edge.from)
+        const to = rows.get(edge.to)
+        if (from !== undefined && to !== undefined && from.session === session && to.session === session) edge.session = session
+      }
       continue
     }
     if (event.op !== 'record') continue
-    const ids = known()
+    const session = sessionOf(event)
+    const ids = new Set(allRows().keys())
     for (const asset of event.assets ?? []) {
       if (asset.parentId !== undefined && asset.parentId !== '' && !ids.has(asset.parentId)) { state.refused += 1; continue }
-      state.assets.push(asset)
+      state.assets.push({ ...asset, session })
       ids.add(asset.id)
     }
     for (const fact of event.facts ?? []) {
-      state.facts.push(fact)
+      state.facts.push({ ...fact, session })
       ids.add(fact.id)
     }
     for (const finding of event.findings ?? []) {
       if (finding.affectedAssetId !== undefined && finding.affectedAssetId !== '' && !ids.has(finding.affectedAssetId)) { state.refused += 1; continue }
-      state.findings.push(finding)
+      state.findings.push({ ...finding, session })
       ids.add(finding.id)
     }
     for (const edge of event.edges ?? []) {
       if (!ids.has(edge.from) || !ids.has(edge.to)) { state.refused += 1; continue }
-      state.edges.push(edge)
+      state.edges.push({ ...edge, session })
     }
   }
   return state
 }
 
+/** 某个会话的 goal（`session` 为 null 即 v1 遗留）。 */
+export function goalFor(state, session) {
+  return state.goals.find(row => row.session === (session ?? null))?.goal ?? null
+}
+
+const countsOf = rows => ({
+  facts: rows.facts.length,
+  findings: rows.findings.length,
+  assets: rows.assets.length,
+  edges: rows.edges.length,
+})
+
 /**
- * 窗口视图：每张表留最新 `windowSize` 条；`dropped` 是被逐出的条数。
- * `counts` 报**全量**、窗口只影响 rows —— 两个读数都要在（面板与 `eng_state` 同口径）。
+ * 作用域视图：`scope='session'` 只留该会话的行，`scope='workspace'` 合并全部。
+ *
+ * 两个读数永远都给：`counts` 是**当前作用域**的计数，`workspaceCounts` 是全工作区的。
+ * `legacy` 单独报未归属条数（v1 遗留），面板据此决定要不要给「认领」按钮。
  */
-export function windowView(state, windowSize) {
+export function scopeView(state, options = {}, windowSize = 200) {
+  const scope = options.scope === 'workspace' ? 'workspace' : 'session'
+  const session = scope === 'session' ? (options.session ?? null) : null
+  const inScope = row => scope === 'workspace' || (row.session ?? null) === session
   const cut = rows => rows.length <= windowSize
     ? { rows, dropped: 0 }
     : { rows: rows.slice(rows.length - windowSize), dropped: rows.length - windowSize }
-  const facts = cut(state.facts)
-  const findings = cut(state.findings)
-  const assets = cut(state.assets)
+
+  const factsAll = state.facts.filter(inScope)
+  const findingsAll = state.findings.filter(inScope)
+  const assetsAll = state.assets.filter(inScope)
+  // 边**跟随端点**：两端都在作用域内才算这条作用域的边（边自己的 session 只是出处，
+  // 不参与过滤 —— 否则 adopt 只认领节点后，边会以未归属身份残留、图上看不到连线）。
+  const scopedIds = new Set([...factsAll, ...findingsAll, ...assetsAll].map(row => row.id))
+  const edgesAll = state.edges.filter(edge => scopedIds.has(edge.from) && scopedIds.has(edge.to))
+  const facts = cut(factsAll)
+  const findings = cut(findingsAll)
+  const assets = cut(assetsAll)
   const kept = new Set([...facts.rows, ...findings.rows, ...assets.rows].map(row => row.id))
   const dropped = facts.dropped + findings.dropped + assets.dropped
-  return {
-    goal: state.goal,
+  const scoped = {
     facts: facts.rows,
     findings: findings.rows,
     assets: assets.rows,
-    edges: state.edges.filter(edge => kept.has(edge.from) && kept.has(edge.to)),
-    counts: { facts: state.facts.length, findings: state.findings.length, assets: state.assets.length, edges: state.edges.length },
+    edges: edgesAll.filter(edge => kept.has(edge.from) && kept.has(edge.to)),
+  }
+  const goals = scope === 'workspace' ? state.goals : state.goals.filter(row => row.session === session)
+  return {
+    ...scoped,
+    scope,
+    session,
+    goal: goals.length === 1 ? goals[0].goal : null,
+    goals: goals.map(row => ({ session: row.session, goal: row.goal })),
+    counts: countsOf({ facts: factsAll, findings: findingsAll, assets: assetsAll, edges: edgesAll }),
+    workspaceCounts: countsOf(state),
+    legacy: {
+      facts: state.facts.filter(row => (row.session ?? null) === null).length,
+      findings: state.findings.filter(row => (row.session ?? null) === null).length,
+      assets: state.assets.filter(row => (row.session ?? null) === null).length,
+      goal: state.goals.filter(row => row.session === null).length,
+    },
     dropped,
     refused: state.refused,
+    skipped: state.skipped,
     truncated: dropped > 0,
   }
 }
 
+/** 兼容旧调用：整份账本的窗口视图。 */
+export function windowView(state, windowSize) {
+  return scopeView(state, { scope: 'workspace' }, windowSize)
+}
+
 /** 下一个确定性 id `<kind>-<n>`。 */
 export function nextId(prefix, rows) {
   let max = 0
@@ -100,32 +179,35 @@ export function nextId(prefix, rows) {
   return prefix + '-' + (max + 1)
 }
 
-/** 从全量状态渲染 Markdown 报告（`eng_report` 与 `/fly/engagement/report` 同一份）。 */
-export function renderReport(workspace, state) {
+/** 从视图渲染 Markdown 报告（`eng_report` 与 `/fly/engagement/report` 同一份）。 */
+export function renderReport(workspace, view) {
   const lines = []
+  const scopeLabel = view.scope === 'workspace' ? '整个工作区' : '会话 ' + (view.session ?? '（未归属）')
   lines.push('# Engagement report')
   lines.push('')
   lines.push('- workspace: `' + workspace + '`')
   lines.push('- ledger: `' + ledgerPath(workspace) + '`')
-  lines.push('- counts: facts=' + state.facts.length + ' findings=' + state.findings.length + ' assets=' + state.assets.length + ' edges=' + state.edges.length)
-  if (state.refused > 0) lines.push('- refused writes: ' + state.refused + '（引用不存在的 id，已拒绝）')
+  lines.push('- scope: ' + scopeLabel)
+  lines.push('- counts: facts=' + view.counts.facts + ' findings=' + view.counts.findings + ' assets=' + view.counts.assets + ' edges=' + view.counts.edges)
+  if (view.scope === 'session') lines.push('- workspace totals: facts=' + view.workspaceCounts.facts + ' findings=' + view.workspaceCounts.findings + ' assets=' + view.workspaceCounts.assets + ' edges=' + view.workspaceCounts.edges)
+  if (view.refused > 0) lines.push('- refused writes: ' + view.refused + '（引用不存在的 id，已拒绝）')
   lines.push('', '## Goal', '')
-  if (state.goal === null) {
-    lines.push('_未设置（还没有 eng_record 带 goal）_')
+  if (view.goal === null) {
+    lines.push('**未设置（还没有 eng_record 带 goal）**')
   } else {
-    lines.push('- target: ' + state.goal.target)
-    lines.push('- objective: ' + state.goal.objective)
-    lines.push('- authorization: ' + (state.goal.authorization === undefined || state.goal.authorization === '' ? '_未记录_（这是审计事实，不是门禁）' : state.goal.authorization))
+    lines.push('- target: ' + view.goal.target)
+    lines.push('- objective: ' + view.goal.objective)
+    lines.push('- authorization: ' + (view.goal.authorization === undefined || view.goal.authorization === '' ? '**未记录**（这是审计事实，不是门禁）' : view.goal.authorization))
   }
   lines.push('', '## Assets')
-  if (state.assets.length === 0) lines.push('', '_none_')
-  for (const asset of state.assets) {
+  if (view.assets.length === 0) lines.push('', 'none')
+  for (const asset of view.assets) {
     const parent = asset.parentId === undefined || asset.parentId === '' ? '' : '  ← parent `' + asset.parentId + '`'
     lines.push('- `' + asset.id + '` [' + asset.type + '] ' + asset.value + parent)
   }
   lines.push('', '## Findings')
-  if (state.findings.length === 0) lines.push('', '_none_')
-  for (const finding of state.findings) {
+  if (view.findings.length === 0) lines.push('', 'none')
+  for (const finding of view.findings) {
     lines.push('', '### `' + finding.id + '` ' + finding.title + ' — **' + (finding.severity ?? 'info') + '**')
     if (finding.description !== undefined && finding.description !== '') lines.push('', finding.description)
     if (finding.affectedAssetId !== undefined && finding.affectedAssetId !== '') lines.push('', 'affected asset: `' + finding.affectedAssetId + '`')
@@ -133,14 +215,14 @@ export function renderReport(workspace, state) {
     for (const [index, step] of finding.reproducibleSteps.entries()) lines.push((index + 1) + '. ' + step)
   }
   lines.push('', '## Facts')
-  if (state.facts.length === 0) lines.push('', '_none_')
-  for (const fact of state.facts) {
+  if (view.facts.length === 0) lines.push('', 'none')
+  for (const fact of view.facts) {
     const source = fact.source === undefined ? '' : '  _(source: ' + [fact.source.tool, fact.source.operation].filter(Boolean).join(' · ') + ')_'
     lines.push('- `' + fact.id + '` [' + (fact.kind ?? 'info') + ']' + (fact.target === undefined ? '' : ' ' + fact.target) + ' — ' + fact.detail + source)
   }
   lines.push('', '## Edges')
-  if (state.edges.length === 0) lines.push('', '_none_')
-  for (const edge of state.edges) lines.push('- `' + edge.from + '` -[' + edge.kind + ']→ `' + edge.to + '`')
+  if (view.edges.length === 0) lines.push('', 'none')
+  for (const edge of view.edges) lines.push('- `' + edge.from + '` -[' + edge.kind + ']→ `' + edge.to + '`')
   lines.push('')
   return lines.join('\n')
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-fly/dsh-plugin-fly-engagement",
-  "version": "0.1.4",
+  "version": "0.2.0",
   "type": "module",
   "main": "index.js",
   "files": [

package/tools/index.js

@@ -1,7 +1,7 @@
 import { defineTool } from '@deepseek-ai/dsh-tools'
 import {
   ASSET_TYPES, EDGE_KINDS, FACT_KINDS, SEVERITIES,
-  foldEvents, ledgerPath, nextId, renderReport, windowView,
+  foldEvents, ledgerPath, nextId, renderReport, scopeView, sessionOf,
 } from '../lib/fold.mjs'
 
 /**
@@ -95,6 +95,16 @@ function normalizeRecord(args) {
 }
 
 const workspaceParam = { type: 'string', required: true, description: 'Absolute workspace path; the ledger lives in <workspace>/.fly-engagement/events.jsonl' }
+const sessionParam = { type: 'string', description: 'Session identity; defaults to the calling agent (exec.agent.id). Explicit value wins — used for backfill/migration.' }
+const scopeParam = { type: 'string', enum: ['session', 'workspace'], description: 'session (default): only this session\'s chain; workspace: every session in this workspace.' }
+
+/** 记录归属：显式 `session` 优先，否则取调用它的 agent（`ToolExecutionInput.agent.id` 就是会话身份）。 */
+function resolveSession(args, exec) {
+  const explicit = typeof args.session === 'string' ? args.session.trim() : ''
+  if (explicit !== '') return explicit
+  const agentId = exec?.agent?.id
+  return typeof agentId === 'string' && agentId !== '' ? agentId : null
+}
 
 export function apply(ctx) {
   const shell = ctx.shell
@@ -104,7 +114,8 @@ export function apply(ctx) {
     description: 'Record engagement evidence into the workspace ledger: goal (once), facts, findings (reproducible steps required), assets and edges. Returns deterministic ids for later reference.',
     parameters: {
       workspace: workspaceParam,
-      goal: { type: 'object', additionalProperties: true, description: 'Once per engagement: { target, objective, authorization? }' },
+      session: sessionParam,
+      goal: { type: 'object', additionalProperties: true, description: 'Once per session: { target, objective, authorization? }' },
       facts: { type: 'array', items: { type: 'object', additionalProperties: true }, description: 'Facts: { kind?, target?, detail (required), confidence?, source? }' },
       findings: { type: 'array', items: { type: 'object', additionalProperties: true }, description: 'Findings: { title, severity?, description?, reproducibleSteps (required), affectedAssetId? }' },
       assets: { type: 'array', items: { type: 'object', additionalProperties: true }, description: 'Assets: { type, value, parentId?, meta? }' },
@@ -117,12 +128,14 @@ export function apply(ctx) {
       if (normalized.goal === null && normalized.facts.length === 0 && normalized.findings.length === 0 && normalized.assets.length === 0 && normalized.edges.length === 0) {
         throw argumentError('eng_record 一次要写至少一样东西（goal / facts / findings / assets / edges 全空）')
       }
+      const session = resolveSession(args, exec)
       const file = ledgerPath(args.workspace)
       const dir = file.slice(0, file.lastIndexOf('/'))
       await runCmd(shell, ['sh', '-c', 'mkdir -p ' + shq(dir)], exec)
       const existing = foldEvents((await readText(shell, file, exec)).split('\n'))
-      if (normalized.goal !== null && existing.goal !== null) {
-        throw argumentError('这个 engagement 已经有 goal 了（target=' + existing.goal.target + '）—— 一个 engagement 只有一个 goal；要重新开始请换一个工作区')
+      const existingGoal = existing.goals.find(row => row.session === session)?.goal ?? null
+      if (normalized.goal !== null && existingGoal !== null) {
+        throw argumentError('这个会话已经有 goal 了（target=' + existingGoal.target + '）—— 一个会话只有一个 goal；要重新开始请换一个会话')
       }
       const ids = new Set([...existing.facts.map(row => row.id), ...existing.findings.map(row => row.id), ...existing.assets.map(row => row.id)])
       const created = { facts: [], findings: [], assets: [], edges: [] }
@@ -154,8 +167,8 @@ export function apply(ctx) {
         created.edges.push({ ...edge })
       }
       const events = []
-      if (normalized.goal !== null) events.push({ op: 'goal', at: new Date().toISOString(), goal: normalized.goal })
-      events.push({ op: 'record', at: new Date().toISOString(), facts: created.facts, findings: created.findings, assets: created.assets, edges: created.edges })
+      if (normalized.goal !== null) events.push({ op: 'goal', at: new Date().toISOString(), session, goal: normalized.goal })
+      events.push({ op: 'record', at: new Date().toISOString(), session, facts: created.facts, findings: created.findings, assets: created.assets, edges: created.edges })
       await appendText(shell, file, events.map(event => JSON.stringify(event)).join('\n') + '\n', exec)
       return JSON.stringify({
         tool: 'eng_record',
@@ -165,12 +178,13 @@ export function apply(ctx) {
           created: { facts: created.facts.length, findings: created.findings.length, assets: created.assets.length, edges: created.edges.length },
           ids: { facts: created.facts.map(row => row.id), findings: created.findings.map(row => row.id), assets: created.assets.map(row => row.id) },
           goal: normalized.goal === null ? null : normalized.goal.target,
+          session,
         },
         confidence: 'observed',
         limitations: [
-          '记录是 append-only 的：写错要改请换工作区重来（v1 不做改写/删除）',
-          'id 是确定性 <kind>-<n>（按会话内的记录次序），跨调用可引用；同一次调用内不能互相引用（先父后子）',
-          'ledger 在 <workspace>/.fly-engagement/events.jsonl —— 工作区换一个就是另一个 engagement',
+          '记录是 append-only 的：写错要改请换会话/工作区重来（v1 不做改写/删除）',
+          'id 是确定性 <kind>-<n>（按账本的记录次序），跨调用可引用；同一次调用内不能互相引用（先父后子）',
+          'ledger 在 <workspace>/.fly-engagement/events.jsonl —— 一个工作区一条账本，每行带 session 归属',
         ],
       }, null, 2)
     },
@@ -181,6 +195,8 @@ export function apply(ctx) {
     description: 'Read the engagement projection: goal, nodes, edges, counts, and the window bookkeeping (dropped/refused/truncated).',
     parameters: {
       workspace: workspaceParam,
+      session: sessionParam,
+      scope: scopeParam,
       window: { type: 'number', description: 'Node window per table (default 200)' },
     },
     output: { schema: { type: 'string' }, render: (_args, value) => [{ type: 'text', text: value }] },
@@ -188,16 +204,17 @@ export function apply(ctx) {
       if (typeof args.workspace !== 'string' || args.workspace.trim() === '') throw argumentError('eng_state 需要 workspace（绝对路径）')
       const windowSize = Math.min(2000, Math.max(1, Math.round(Number(args.window ?? 200) || 200)))
       const file = ledgerPath(args.workspace)
-      const view = windowView(foldEvents((await readText(shell, file, exec)).split('\n')), windowSize)
+      const view = scopeView(foldEvents((await readText(shell, file, exec)).split('\n')), { session: resolveSession(args, exec), scope: args.scope }, windowSize)
       return JSON.stringify({
         tool: 'eng_state',
         target: file,
-        operation: 'fold the workspace ledger into the engagement projection (window=' + windowSize + ')',
+        operation: 'fold the workspace ledger into the ' + view.scope + ' projection (window=' + windowSize + ')',
         observed: view,
         confidence: 'observed',
         limitations: [
           '投影是**窗口视图**：每张表只留最新 ' + windowSize + ' 条；dropped=' + view.dropped + '（被逐出）refused=' + view.refused + '（引用不存在的 id 被拒，累计）',
           view.truncated ? '⚠️ truncated=true：被逐出的记录不在这个视图里 —— 完整记录以 eng_report（读全量）为准' : '这次没有截断（每张表都在窗口内）',
+          view.scope === 'session' ? '当前是会话视图；scope=workspace 可看整个工作区（workspaceCounts 已给出全量计数）' : '当前是整个工作区视图：多会话的记录合并在这一份里',
           'ledger 不存在 ⇒ 空 projection（还没开始记录，不是错误）',
         ],
       }, null, 2)
@@ -207,24 +224,81 @@ export function apply(ctx) {
   ctx.tools.register(defineTool({
     name: 'eng_report',
     description: 'Render the engagement report as Markdown (goal + authorization, assets, facts with source tools, findings with reproducible steps, counts).',
-    parameters: { workspace: workspaceParam },
+    parameters: { workspace: workspaceParam, session: sessionParam, scope: scopeParam },
     output: { schema: { type: 'string' }, render: (_args, value) => [{ type: 'text', text: value }] },
     async execute(args, exec) {
       if (typeof args.workspace !== 'string' || args.workspace.trim() === '') throw argumentError('eng_report 需要 workspace（绝对路径）')
       const file = ledgerPath(args.workspace)
       const state = foldEvents((await readText(shell, file, exec)).split('\n'))
+      const view = scopeView(state, { session: resolveSession(args, exec), scope: args.scope }, 2000)
       return JSON.stringify({
         tool: 'eng_report',
         target: file,
-        operation: 'render the full engagement ledger as Markdown (no window)',
-        observed: { markdown: renderReport(args.workspace, state), counts: { facts: state.facts.length, findings: state.findings.length, assets: state.assets.length, edges: state.edges.length }, refused: state.refused },
+        operation: 'render the ' + view.scope + ' engagement report as Markdown (no window)',
+        observed: { markdown: renderReport(args.workspace, view), counts: view.counts, workspaceCounts: view.workspaceCounts, refused: view.refused, scope: view.scope, session: view.session },
         confidence: 'observed',
         limitations: [
-          '这份报告读的是**全量** ledger（不经窗口）—— 面板上的图是窗口视图，两者条数可能不同',
+          '这份报告读的是**当前作用域**的全量 ledger（不经窗口）—— 面板上的图是窗口视图，两者条数可能不同',
           'findings 的复现步骤原样列出（不重新编号内容、不排序）',
           'ledger 写在 <workspace>/.fly-engagement/events.jsonl；报告可以复制走，记录仍在工作区里',
         ],
       }, null, 2)
     },
   }))
+
+  ctx.tools.register(defineTool({
+    name: 'eng_adopt',
+    description: 'Claim v1 records that have no session (legacy, session=null) into the calling session. Records already owned by another session are skipped, never stolen.',
+    parameters: {
+      workspace: workspaceParam,
+      session: sessionParam,
+      all: { type: 'boolean', description: 'Adopt every unowned node (and the unowned goal). Default false.' },
+      ids: { type: 'array', items: { type: 'string' }, description: 'Explicit node ids to adopt (facts/findings/assets). Ignored when all=true.' },
+      goal: { type: 'boolean', description: 'Also adopt the unowned goal when this session has none.' },
+    },
+    output: { schema: { type: 'string' }, render: (_args, value) => [{ type: 'text', text: value }] },
+    async execute(args, exec) {
+      if (typeof args.workspace !== 'string' || args.workspace.trim() === '') throw argumentError('eng_adopt 需要 workspace（绝对路径）')
+      const session = resolveSession(args, exec)
+      if (session === null) throw argumentError('eng_adopt 需要会话身份：显式传 session，或由 agent 调用（exec.agent.id）')
+      const file = ledgerPath(args.workspace)
+      const state = foldEvents((await readText(shell, file, exec)).split('\n'))
+      const unowned = [...state.facts, ...state.findings, ...state.assets].filter(row => (row.session ?? null) === null)
+      const ids = args.all === true ? unowned.map(row => row.id) : (Array.isArray(args.ids) ? args.ids : [])
+      const wantGoal = args.goal === true || args.all === true
+      if (ids.length === 0 && !wantGoal) throw argumentError('eng_adopt 没有可认领的东西（ids 为空且 goal 未请求）')
+      if (args.all !== true && unowned.length > 0 && ids.every(id => !unowned.some(row => row.id === id)) && !wantGoal) {
+        throw argumentError('给出的 ids 里没有未归属记录（已归属其他会话的不能认领）')
+      }
+      const event = { op: 'adopt', at: new Date().toISOString(), session, ids, goal: wantGoal }
+      await appendText(shell, file, JSON.stringify(event) + '\n', exec)
+      const after = foldEvents((await readText(shell, file, exec)).split('\n'))
+      const view = scopeView(after, { session, scope: 'session' }, 2000)
+      const delta = (before, afterRows) => before - afterRows
+      return JSON.stringify({
+        tool: 'eng_adopt',
+        target: file,
+        operation: 'append an adopt event (reassign unowned v1 records to this session)',
+        observed: {
+          session,
+          adopted: {
+            facts: delta(state.facts.filter(row => (row.session ?? null) === null).length, after.facts.filter(row => (row.session ?? null) === null).length),
+            findings: delta(state.findings.filter(row => (row.session ?? null) === null).length, after.findings.filter(row => (row.session ?? null) === null).length),
+            assets: delta(state.assets.filter(row => (row.session ?? null) === null).length, after.assets.filter(row => (row.session ?? null) === null).length),
+            edges: delta(state.edges.filter(row => (row.session ?? null) === null).length, after.edges.filter(row => (row.session ?? null) === null).length),
+            goal: delta(state.goals.filter(row => row.session === null).length, after.goals.filter(row => row.session === null).length),
+          },
+          counts: view.counts,
+          legacy: view.legacy,
+          skipped: after.skipped,
+        },
+        confidence: 'observed',
+        limitations: [
+          '认领是 append-only 的：写一条 adopt 事件，不改历史行',
+          '已归属其他会话的记录一律跳过（计入 skipped），不会被抢',
+          '未归属 goal 只会在本会话还没有 goal 时被认领',
+        ],
+      }, null, 2)
+    },
+  }))
 }