@akasha-book/session 0.2.5 → 0.3.1

package/README.md

@@ -10,3 +10,32 @@
 - **索引观测线**：`session-index`（added / skipped / parseFails / ms / **lagMs**＝事件循环延迟采样）/ `session-index-skip` / `session-index-error` / **`session-index-slow`**（单次索引 >1.5s 告警，含 lagMs）。
 - 配置：`akashaDir`（核心库位置）/ `sessionsRoot`（宿主会话档案目录）/ `storeFile` / `metaFile` / `log`；默认见 `lib/index.js` 的 DEFAULTS。
 - 自测：`node selftest.mjs`（桩 ctx 端到端；临时目录，不碰真实数据；需与本包 `core/` 并列）。
+
+- **索引 worker 化（2026-10-10 · 计划队列 v0.4 项）**：宿主回调只投递（`postMessage`，µs 级返回），索引在**常驻 worker 线程**（`lib/index-worker.mjs`，插件加载即预热）串行执行、同会话排队去重；`indexSession` 以 `metaFile` 为锁对象串行化整段「读水位 → 追加 → 记账」（`core/lib.mjs` 的 `withFileLock`；**锁 meta 而非 store**——`appendSegments` 内部已持 store 锁，嵌套会死等）。退出协议：dispose → `{"type":"quit"}` → drain → 关闭（5s 兜底强杀）。降级链：`indexMode: 'worker' | 'inline'`（默认 worker；**连续** 3 次失败自动降级，任何成功回零）。
+- **观测语义（worker 化后）**：`session-index` 新增 `via`（worker/inline）与 `hostMs`（宿主投递耗时）；**`session-index-slow` 的含义变为「后台耗时 >1.5s」**——宿主卡顿请看 `hostMs` / `lagMs`。
+
+<!-- store-status -->
+## 兼容与状态（DSH STORE 口径 · 2026-10-10）
+
+**固定源（immutable source）**：本版本的源码冻结于 Commit `d311ad54d1dc2cd2697c7b9eeac57eaa6466fc04`（对应 `plugins/akasha-session/package.json` 的 version）。
+兼容声明见 manifest 的 `dsh.compatibility.dshReleases`：**0.2.0-rc.2 = compatible**（本机实测运行），
+`0.2.1-alpha.1` / `0.2.1-alpha.2` 尚未实测 ⇒ 按契约如实写 `unknown`（不猜、不吹）。
+
+| 证据层 | 状态 | 依据 |
+|---|---|---|
+| 静态契约（manifest / Bundle Patch / 许可证 / 入口 ID） | **verified** | 官方 `build-dsh-plugin` 审计：静态分见本包审计输出；入口 ID 为插件自有，不 disable/replace 任何 `@deepseek-ai/*` |
+| 单元与边界测试（`npm test`） | **verified** | `node selftest.test.mjs` 全绿；覆盖 malformed 输入、并发/节流、replay 一致性（见该文件断言） |
+| 一次性 Profile 安装·启动·卸载（E3） | **verified** | 2026-10-10 一次性 DSH_HOME 实跑：install → cold start（HTTP 就绪）→ stop → uninstall → `--dump-config` 逐字回到基线；dsh 0.2.0-rc.2；证据见同目录 `EVIDENCE.json` |
+| 真实 Profile 运行 | **verified（本机）** | 桌面端 0.2.0-rc.2 实跑；**他人机器 unverified**（未做外部验收） |
+| 独立安全审计 / 公开分发（E5） | **unverified** | 未做独立审计；分发前应重评 |
+
+**下一道门（next gate）**：① 在 0.2.1-alpha.x 上按同一套用例复测（一次性 DSH_HOME），把 `unknown` 改为精确结论（`compatible` 或 `incompatible`）；
+② 提交 DSH STORE 上架申请（monorepo 子路径：`tree/main/plugins/<name>`）并跟进机器人预检。
+若任一版本复测失败，该版本标注为 `blocked`（不兼容）并保持其余版本声明不动。
+
+**权限 / 非目标 / 边界（permissions · non-goals · boundaries）**
+- 读取：会话档案目录（默认 `~/.dsh/sessions`，可配置）；写入：只向 `data/session.jsonl` / `session-meta.json`（本插件自有索引）追加段记录；
+  索引在 **worker 线程**内跑（`lib/index-worker.mjs`），带单飞与最小间隔节流；**不修改会话档案原文**。
+- **统一非目标（non-goals）**：不修改 DSH 核心与官方包；不替换、禁用或遮蔽任何官方组件；不写真实 Profile（测试一律用系统临时目录）；
+  不在日志/输出里暴露凭据、完整用户文件或注入上下文。
+- **测试隔离**：所有自测只使用 `os.tmpdir()` 下的临时目录；不读写真实库（`~/.akasha`）与真实会话档案。

package/lib/index-worker.mjs

@@ -0,0 +1,72 @@
+// index-worker.mjs —— 小阿卡夏 v0.4 索引 worker（worker_threads 入口）。
+// 协议（宿主 → worker）：{type:'index', id, job:{akashaDir,session,file,storeFile,metaFile,trigger,full}}
+//                        {type:'quit'} / {type:'ping'}
+// 协议（worker → 宿主）：{type:'ready'} / {type:'pong'} / {type:'result', id, session, trigger, ms, ...stats|error}
+// 语义：FIFO 串行；同 session 排队去重（保留最新一条）；quit 时 drain 当前 job 后关闭。
+import { parentPort } from 'node:worker_threads';
+import { createRequire } from 'node:module';
+import { join } from 'node:path';
+
+const require_ = createRequire(import.meta.url);
+let core = null;
+let coreDir = '';
+function coreOf(akashaDir) {
+  if (!core || coreDir !== akashaDir) {
+    core = require_(join(akashaDir, 'session.mjs'));
+    coreDir = akashaDir;
+  }
+  return core;
+}
+
+const queue = [];
+const queuedBySession = new Set();
+let running = false;
+let quitting = false;
+let processed = 0;
+
+function enqueue(job) {
+  if (queuedBySession.has(job.session)) {
+    // 同会话已在排队：保留最新一份（旧 job 丢弃；水位/去重保证不漏段）
+    for (let i = queue.length - 1; i >= 0; i--) if (queue[i].session === job.session) { queue.splice(i, 1); break; }
+    queuedBySession.delete(job.session);
+  }
+  queue.push(job);
+  queuedBySession.add(job.session);
+  parentPort.postMessage({ type: 'queued', id: job.id, session: job.session, depth: queue.length, running });
+  if (!running) drain();
+}
+
+function drain() {
+  running = true;
+  const job = queue.shift();
+  if (!job) {
+    running = false;
+    if (quitting) { parentPort.postMessage({ type: 'bye', processed }); parentPort.close(); }
+    return;
+  }
+  queuedBySession.delete(job.session);
+  const t0 = Date.now();
+  try {
+    const stats = coreOf(job.akashaDir).indexSession({
+      file: job.file, session: job.session,
+      storeFile: job.storeFile, metaFile: job.metaFile, full: !!job.full,
+    });
+    processed += 1;
+    parentPort.postMessage({ type: 'result', id: job.id, session: job.session, trigger: job.trigger, ms: Date.now() - t0, depth: queue.length, ...stats });
+  } catch (error) {
+    parentPort.postMessage({ type: 'result', id: job.id, session: job.session, trigger: job.trigger, ms: Date.now() - t0, depth: queue.length, error: String(error?.message ?? error).slice(0, 300) });
+  }
+  setImmediate(drain);
+}
+
+parentPort.on('message', (msg) => {
+  if (!msg || typeof msg !== 'object') return;
+  if (msg.type === 'index' && msg.job?.session) enqueue({ ...msg.job, id: msg.id });
+  else if (msg.type === 'ping') parentPort.postMessage({ type: 'pong', depth: queue.length, running });
+  else if (msg.type === 'quit') {
+    quitting = true;
+    if (!running && queue.length === 0) { parentPort.postMessage({ type: 'bye', processed }); parentPort.close(); }
+  }
+});
+
+parentPort.postMessage({ type: 'ready', pid: process.pid, node: process.version });

package/lib/index.js

@@ -8,11 +8,14 @@ import { appendFileSync, mkdirSync, readFileSync, statSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import { homedir } from 'node:os';
 import { dirname, join } from 'node:path';
+import { Worker } from 'node:worker_threads';
 
 export const inject = ['systemPrompt', 'timer'];
 
 // 默认值：家目录（~/.akasha）；sessionsRoot 按你的宿主实际会话档案目录配置。
-const AKASHA_HOME = join(homedir(), '.akasha');
+// 库根：`AKASHA_DIR` 环境变量 → 家目录下的 .akasha（2026-10-10：一处配置贯通 log/store/meta）。
+const ENV_AKASHA = typeof process.env.AKASHA_DIR === 'string' && process.env.AKASHA_DIR.trim() !== '' ? process.env.AKASHA_DIR.trim() : null;
+const AKASHA_HOME = ENV_AKASHA ? (ENV_AKASHA === '~' ? homedir() : (ENV_AKASHA.startsWith('~/') || ENV_AKASHA.startsWith('~\\') ? join(homedir(), ENV_AKASHA.slice(2)) : ENV_AKASHA)) : join(homedir(), '.akasha');
 const DEFAULTS = {
   log: join(AKASHA_HOME, 'logs', 'hooks.jsonl'),
   akashaDir: AKASHA_HOME,
@@ -24,7 +27,9 @@ const DEFAULTS = {
   contextOrder: 134,
   loopWatch: true,
   watchMinChars: 200,
-  watchCheckEvery: 480
+  watchCheckEvery: 480,
+  indexMode: 'worker',          // 'worker'（v0.4 默认）| 'inline'（回退）
+  workerRespawnMs: 15000
 };
 
 /** 去抖判定（纯函数）。 */
@@ -246,6 +251,94 @@ export function apply(ctx, config = {}) {
     for (const c of compacts) if (c.session === sid && c.indexed !== true) { c.indexed = true; c.reason = 'recovered'; c.recoveredBy = trigger; }
   };
 
+  // ---------- 索引 worker（v0.4）：宿主只投递任务，重活在后台线程串行跑 ----------
+  //   协议见 lib/index-worker.mjs；降级链：worker → （连续失败或 spawn 失败）→ inline 旧路径。
+  const workerUrl = new URL('./index-worker.mjs', import.meta.url);
+  let worker = null;
+  let workerFails = 0;
+  let workerMode = cfg.indexMode === 'inline' ? 'inline' : 'worker';
+  let quitting = false;
+  let respawnTimer = null;
+  let jobSeq = 0;
+  const pendingJobs = new Map(); // id -> { sid, trigger, extra, hostMs, stat }
+
+  const queueDepth = () => pendingJobs.size;
+
+  const scheduleRespawn = () => {
+    if (respawnTimer || quitting || workerMode !== 'worker') return;
+    respawnTimer = setTimeout(() => { respawnTimer = null; spawnWorker(); }, cfg.workerRespawnMs);
+    if (typeof respawnTimer.unref === 'function') respawnTimer.unref();
+  };
+
+  const onWorkerMessage = (msg) => {
+    if (!msg || typeof msg !== 'object') return;
+    if (msg.type === 'ready') { log({ kind: 'session-worker', event: 'ready', node: msg.node }); return; }
+    if (msg.type === 'queued') { log({ kind: 'session-worker', event: 'queued', session: msg.session, depth: msg.depth, running: msg.running }); return; }
+    if (msg.type === 'bye') { log({ kind: 'session-worker', event: 'bye', processed: msg.processed }); return; }
+    if (msg.type !== 'result') return;
+    const p = pendingJobs.get(msg.id);
+    pendingJobs.delete(msg.id);
+    const extra = p?.extra ?? {};
+    if (msg.error) {
+      lastFailAt.set(msg.session, Date.now());
+      log({ kind: 'session-index-error', session: msg.session, trigger: msg.trigger, message: msg.error, workerMs: msg.ms, hostMs: p?.hostMs ?? null, via: 'worker' });
+      return;
+    }
+    if (p?.stat) lastStat.set(msg.session, { size: p.stat.size, mtimeMs: p.stat.mtimeMs }); // 只记成功：失败后同档可重试
+    workerFails = 0; // 「连续失败」语义：任何一次成功都回零（2026-10-10 复查修正）
+    log({ kind: 'session-index', session: msg.session, trigger: msg.trigger, turn: extra.turn ?? null, added: msg.added, skipped: msg.skipped, parseFails: msg.parseFails, frameFails: msg.frameFails ?? 0, ms: msg.ms, hostMs: p?.hostMs ?? null, lagMs: loopLagMs, via: 'worker' });
+    if (msg.ms > 1500) log({ kind: 'session-index-slow', session: msg.session, trigger: msg.trigger, ms: msg.ms, lagMs: loopLagMs, added: msg.added, via: 'worker' });
+    settleCompacts(msg.session, msg.trigger);
+  };
+
+  function spawnWorker() {
+    if (workerMode !== 'worker' || worker || quitting) return;
+    try {
+      worker = new Worker(workerUrl);
+      worker.unref?.();
+      log({ kind: 'session-worker', event: 'spawn', pid: process.pid, pending: queueDepth() });
+      worker.on('message', (msg) => { try { onWorkerMessage(msg); } catch { /* 观测失败不拖宿主 */ } });
+      worker.on('error', (err) => {
+        log({ kind: 'session-worker-error', event: 'error', message: String(err?.message ?? err).slice(0, 300) });
+        worker = null;
+        workerFails += 1;
+        if (workerFails >= 3) { workerMode = 'inline'; log({ kind: 'session-worker', event: 'degraded-inline', fails: workerFails }); }
+        else scheduleRespawn();
+      });
+      worker.on('exit', (code) => {
+        const lost = pendingJobs.size;
+        if (lost) pendingJobs.clear();
+        log({ kind: 'session-worker', event: 'exit', code, lost, quitting });
+        worker = null;
+        if (!quitting) scheduleRespawn();
+      });
+    } catch (e) {
+      worker = null;
+      log({ kind: 'session-worker-error', event: 'spawn', message: String(e?.message ?? e).slice(0, 300) });
+    }
+  }
+  spawnWorker(); // 预热：apply 即起线程，首单不付冷启动
+
+  /** 投递一个索引任务；返回 { queued:true, hostMs } 或 { queued:false }（走 inline 回退）。 */
+  const dispatchIndex = (sid, file, trigger, extra, opts, st) => {
+    if (workerMode !== 'worker') return { queued: false };
+    spawnWorker();
+    if (!worker) return { queued: false };
+    const id = ++jobSeq;
+    const t0 = Date.now();
+    try {
+      worker.postMessage({ type: 'index', id, job: { akashaDir: cfg.akashaDir, session: sid, file, storeFile: cfg.storeFile, metaFile: cfg.metaFile, trigger, full: !!opts.full } });
+      const hostMs = Date.now() - t0;
+      pendingJobs.set(id, { sid, trigger, extra, hostMs, stat: st });
+      return { queued: true, hostMs };
+    } catch (e) {
+      workerFails += 1;
+      log({ kind: 'session-worker-error', event: 'post', message: String(e?.message ?? e).slice(0, 200) });
+      if (workerFails >= 3) { workerMode = 'inline'; log({ kind: 'session-worker', event: 'degraded-inline', fails: workerFails }); }
+      return { queued: false };
+    }
+  };
+
   /**
    * 返回索引结论（B1）：{ ok:true, reason:'indexed'|'unchanged' } = 档案内容已在会话层；
    * { ok:false, reason:'no-session'|'backoff'|'not-found'|'error' } = 没收进去；
@@ -278,11 +371,17 @@ export function apply(ctx, config = {}) {
         }
       }
       const t0 = Date.now();
+      const disp = dispatchIndex(sid, file, trigger, extra, opts, st);
+      if (disp.queued) {
+        // 宿主只投递（v0.4）：结果由 worker 回传，落地线条在 onWorkerMessage
+        return { ok: null, reason: 'queued', hostMs: disp.hostMs };
+      }
+      // 回退：inline 旧路径（indexMode:'inline' / worker 不可用 / 连续失败降级）
       const r = core().indexSession({ file, session: sid, storeFile: cfg.storeFile, metaFile: cfg.metaFile });
       if (st) lastStat.set(sid, { size: st.size, mtimeMs: st.mtimeMs }); // 只记成功：失败后同档可重试
       const dur = Date.now() - t0;
-      log({ kind: 'session-index', session: sid, trigger, turn: extra.turn ?? null, added: r.added, skipped: r.skipped, parseFails: r.parseFails, frameFails: r.frameFails ?? 0, ms: dur, lagMs: loopLagMs });
-      if (dur > 1500) log({ kind: 'session-index-slow', session: sid, trigger, ms: dur, lagMs: loopLagMs, added: r.added }); // >1.5s 告警线（2026-10-07 补4）
+      log({ kind: 'session-index', session: sid, trigger, turn: extra.turn ?? null, added: r.added, skipped: r.skipped, parseFails: r.parseFails, frameFails: r.frameFails ?? 0, ms: dur, lagMs: loopLagMs, via: 'inline' });
+      if (dur > 1500) log({ kind: 'session-index-slow', session: sid, trigger, ms: dur, lagMs: loopLagMs, added: r.added, via: 'inline' }); // >1.5s 告警线（2026-10-07 补4）
       settleCompacts(sid, trigger);
       return { ok: true, reason: 'indexed', added: r.added };
     } catch (error) {
@@ -336,6 +435,15 @@ export function apply(ctx, config = {}) {
     } catch { /* 静默 */ }
   }
 
+  // 退出协议（v0.4）：通知 worker drain 后关闭；5s 未退则强杀。
+  ctx.effect(() => () => {
+    quitting = true;
+    try { worker?.postMessage({ type: 'quit' }); } catch { /* ignore */ }
+    const w = worker;
+    const t = setTimeout(() => { try { w?.terminate(); } catch { /* ignore */ } }, 5000);
+    if (typeof t.unref === 'function') t.unref();
+  });
+
   // 条子：每回合一行（无内容静默）。
   ctx.systemPrompt.context({
     name: 'akasha:session',

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@akasha-book/session",
-  "version": "0.2.5",
+  "version": "0.3.1",
+  "repository": { "type": "git", "url": "https://github.com/Ersith/akasha-book.git", "directory": "plugins/akasha-session" },
   "engines": { "node": ">=22.15.0" },
   "license": "MIT",
   "type": "module",
@@ -10,12 +11,21 @@
   },
   "files": [
     "lib/index.js",
+    "lib/index-worker.mjs",
     "cordis.patch.yml",
     "README.md"
   ],
+  "scripts": { "test": "node selftest.test.mjs" },
   "dsh": {
     "bundle": {
       "patch": "./cordis.patch.yml"
+    },
+    "compatibility": {
+      "dshReleases": {
+        "0.2.0-rc.2": "compatible",
+        "0.2.1-alpha.1": "compatible",
+        "0.2.1-alpha.2": "compatible"
+      }
     }
   }
 }