@nightpainters/dsh-ling 1.5.2 → 1.6.0

package/lib/index.js

@@ -2,20 +2,22 @@
 // Skeleton wiring: settings file, sqlite memory, freeze gate, system-prompt
 // injection, lifecycle listeners, loopback HTTP gateway.
 import { join } from 'node:path';
-import { readFileSync, existsSync } from 'node:fs';
-import { svc, pick, ensureDir, defaultDataDir, utcIso, dshHome } from './host/util.js';
+import { readFileSync } from 'node:fs';
+import { svc, pick, ensureDir, defaultDataDir, utcIso } from './host/util.js';
 import { SettingsFile } from './host/settings-file.js';
 import { MemoryStore } from './host/memory.js';
 import { FreezeGate } from './host/freeze.js';
 import { registerMemorySection } from './host/inject.js';
 import { wireSessionLine } from './host/session-line.js';
 import { wireLifecycle } from './host/lifecycle.js';
+import { registerModeService } from './host/mode-service.js';
 import { registerApi } from './host/api.js';
 import { summarizeDsh } from './host/summarizer.js';
-import { ingestFeedbackEntries, loadSeen, entriesFromFeedbackFile } from './host/feedback.js';
+import { registerFeedbackListener } from './host/feedback.js';
 import { probeLLM, runDeepPass, DEEP_CFG } from './host/deepsummary.js';
 import { registerLingTools } from './host/tools.js';
 import { registerClockSkill } from './host/clock-skill.js';
+import { registerIndexSkill } from './host/deep-index-skill.js'; // 1.6 步 6:深层库索引层(一簇一行,走 skill)
 import { installAccessLog } from './audit/index.js';
 
 export const name = 'dsh-ling';
@@ -36,7 +38,39 @@ export function apply(ctx, config = {}) {
   ensureDir(dataDir);
 
   const settings = new SettingsFile(dataDir);
-  const memory = new MemoryStore(join(dataDir, 'memory.db'));
+  // ⚠️ F4(蓝队 2026-10-04 实测 + 主人 2026-10-04 拍板「按错误码分流」):这里此前**没有 try** ⇒
+  //   只要构造抛(典型:另一个进程持写锁 —— 升级形态实测 16,445ms 后抛 `database is locked`),
+  //   异常就一路冒到 `apply()` ⇒ **8 个工具全不在、人格注入也没了**,而且**没有任何可指认面**。
+  //   那是 **fail-dead** 不是 fail-closed(本项目对 fail-closed 的定义 = 拒绝 + 给判据,见 B-05)。
+  //   分流规则:
+  //     · errcode **5 / 6**(BUSY / LOCKED)= "等一会儿就能开" ⇒ 同步有界重试 3 次 × 2 秒;
+  //     · **其余**(8 READONLY / 11 CORRUPT / 打不开文件…)= "真的打不开" ⇒ **不重试**,直接降级;
+  //   仍失败 ⇒ **降级加载**:本插件不注册任何东西(别的插件不受影响),并留一条**可执行**的 error。
+  const sleepSync = (ms) => {
+    try { Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms); } catch { /* 退化:不睡 */ }
+  };
+  const isLockErr = (e) => Number(e?.errcode ?? e?.code ?? -1) === 5 || Number(e?.errcode ?? -1) === 6
+    || /SQLITE_BUSY|SQLITE_LOCKED|database is locked/i.test(String(e?.message ?? e));
+  let memory = null;
+  let memoryErr = null;
+  for (let attempt = 0; attempt < 3 && !memory; attempt += 1) {
+    try {
+      memory = new MemoryStore(join(dataDir, 'memory.db'));
+    } catch (e) {
+      memoryErr = e;
+      if (!isLockErr(e)) break;          // 非锁类:立即放弃重试(照旧"真的打不开")
+      if (attempt < 2) sleepSync(2000);
+    }
+  }
+  if (!memory) {
+    const dbFile = join(dataDir, 'memory.db');
+    console.error('[dsh-ling] 记忆库打不开,**本次以降级形态加载**(记忆 / 人格注入 / 器灵工具面全部不可用;'
+      + '其余插件不受影响)。原因:' + String(memoryErr?.message ?? memoryErr).slice(0, 300)
+      + '\n  怎么排查:① 多半是别的进程正持写锁 —— 等几秒后重载宿主;'
+      + '② 确认 ' + dbFile + ' 没被只读挂载或被独占;'
+      + '③ 若文件损坏,先从 ' + dataDir + ' 下的备份恢复。');
+    return;
+  }
   // invalidate 延迟绑定(避免环):onFlush 在事件时点才调用,彼时必已就绪
   let invalidateNow = (sid) => {};
   import('./host/inject.js').then((m) => {
@@ -62,12 +96,21 @@ export function apply(ctx, config = {}) {
   // 也绝不调用带 surfaceOp 的 session.append。关掉开关:settings.memory.sessionProgressLine=false。
   disposers.push(wireSessionLine(ctx, memory, settings, cfg.sessionLine || {}));
   disposers.push(wireLifecycle(ctx, gate, memory, settings, cfg));
+  // P3-A(2026-09-29):把「给某个会话设模式」暴露成跨插件服务 `dsh-ling/mode` ——
+  // 飞书桥建线时用它把新会话钉到生活挡位。软能力:注册失败只记日志,不影响其余功能。
+  disposers.push(registerModeService(ctx, { gate, memory, settings }));
   disposers.push(registerApi(ctx, { gate, memory, settings }, cfg));
   // E4 可取证访问日志:只挂两个全局钩子,core 侧补丁留的调用点见 lib/audit/patch-spec.js。
   // 补丁未打时钩子收不到调用 —— 安装器会在启动日志里明确喊出来,不允许静默不记。
   disposers.push(installAccessLog(ctx, cfg.accessLog || {}));
-  // clock skill(精确时间按需查询,2026-09-23 用户定):取服务走与 tools 同款的三级兜底。
+  // clock skill(精确时间按需查询,2026-09-23 尝生定):取服务走与 tools 同款的三级兜底。
   disposers.push(...registerClockSkill(ctx));
+  // 深层库索引层 skill(1.6 步 6,2026-10-04):主人拍过「索引层 ≤400 字 · 一簇一行」,
+  //   承载形态选定为**整个索引层一个 skill** —— 目录只常驻 name + description(11 行簇目录),
+  //   正文按需展开;而 skill 目录按 sha256 比对、**内容不变就不重发** ⇒ 前缀稳定是白拿的。
+  //   ⚠️ 不要拆成"每簇一个 skill":实测边际成本 ≈205 字/条,11 簇会把常驻目录面撑爆,
+  //   而那个池子正是工具面压缩要抢的同一个。
+  disposers.push(...registerIndexSkill(ctx));
   // 会话内工具(规矩直达 / 习惯提议):拿不到 tools 服务就退化为"只能用面板",绝不抛错。
   // 取服务用三级兜底(与 webServer 同一套路):直取 → ctx.inject 子 ctx → 定时重试。
   // 2026-09-16 教训:本插件 apply 可能早于 tools 服务挂载,一次性直取会静默失败 —— 工具从未注册。
@@ -187,30 +230,19 @@ export function apply(ctx, config = {}) {
     }, 8000);
   }
 
-  // 反馈成长回路轮询(平台 messageFeedback.list 需会话身份参数 → 直接读 sidecar 文件)
-  let fbTimer = null;
-  const fbFile = join(dshHome(), 'storages', 'message_feedback.json');
-  const pollFeedback = async () => {
+  // 反馈成长回路:事件驱动(U7 正解,2026-10-01)。
+  // ⚠️ 旧实现是"每 60 秒读一次 `~/.dsh/storages/message_feedback.json`",两处都错:
+  //   ① 宿主**有推送** —— `dsh-message-feedback\lib\index.js:288` 在冷会话写入 flush 后
+  //      发 `feedback/committed`(活会话走 `session/event` 的 feedback 事件);
+  //   ② 那个 sidecar 在 Web 组合下自 2026/9/11 起**零写入**(该组合只挂 message-feedback,
+  //      反馈已改写在会话日志里)⇒ 轮询每 60 秒读同一个死文件,纯空转。
+  // 现在:事件到达即处理;`feedbackAuto:false` 可整体关掉。
+  if (cfg.feedbackAuto !== false) {
     try {
-      if (!existsSync(fbFile)) return;
-      const fileObj = JSON.parse(readFileSync(fbFile, 'utf8'));
-      const entries = entriesFromFeedbackFile(fileObj);
-      if (!entries.length) return;
-      const seen = loadSeen(memory);
-      const res = ingestFeedbackEntries(memory, entries, { seen });
-      if (res.queued + res.boosted + res.seenAdded > 0) {
-        memory.kvSet('feedback.last', JSON.stringify({ at: utcIso(), ...res }));
-      }
+      disposers.push(registerFeedbackListener(ctx, memory));
     } catch (e) {
-      console.debug('[dsh-ling] feedback poll failed', e);
+      console.debug('[dsh-ling] feedback listener wiring failed', e);
     }
-  };
-  if (cfg.feedbackAuto !== false) {
-    const pollSec = Math.max(20, Number(cfg.feedbackPollSec ?? 60));
-    fbTimer = setTimeout(() => {
-      pollFeedback();
-      fbTimer = setInterval(pollFeedback, pollSec * 1000);
-    }, 20000);
   }
 
   // LLM 深摘要:启动 12s 先自检探针;通过才挂自动调度(保守上限,可配)
@@ -237,11 +269,6 @@ export function apply(ctx, config = {}) {
       clearInterval(sumTimer);
       sumTimer = null;
     }
-    if (fbTimer) {
-      clearTimeout(fbTimer);
-      clearInterval(fbTimer);
-      fbTimer = null;
-    }
     if (deepTimer) {
       clearInterval(deepTimer);
       deepTimer = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nightpainters/dsh-ling",
-  "version": "1.5.2",
+  "version": "1.6.0",
   "description": "器灵 · 跑在你自己电脑上的记忆与人格助手插件:三层记忆、从历史里长出来的人格档案、定型锁与自由生长",
   "type": "module",
   "main": "./lib/index.js",
@@ -24,7 +24,7 @@
     "access": "public"
   },
   "scripts": {
-    "test": "node tests/unit.mjs && node tests/access-log.test.mjs && node tests/archive.test.mjs && node tests/autotree.test.mjs && node tests/backfill.test.mjs && node tests/branch.test.mjs && node tests/assistant.test.mjs && node tests/capture.test.mjs && node tests/clock.test.mjs && node tests/clock-skill.test.mjs && node tests/deep.test.mjs && node tests/dswebsum.test.mjs && node tests/duty.test.mjs && node tests/export.test.mjs && node tests/feedback.test.mjs && node tests/forget-backfill.test.mjs && node tests/genesis.test.mjs && node tests/guard.test.mjs && node tests/habitgen.test.mjs && node tests/idle.test.mjs && node tests/importfile.test.mjs && node tests/importlog.test.mjs && node tests/l1lines.test.mjs && node tests/memories.test.mjs && node tests/mode.test.mjs && node tests/mustache.test.mjs && node tests/retitle.test.mjs && node tests/rules.test.mjs && node tests/sessionline.test.mjs && node tests/suggest.test.mjs && node tests/summarize.test.mjs && node tests/times.test.mjs && node tests/tone.test.mjs && node tests/tools.test.mjs && node tests/tree.test.mjs && node tests/patch-spec.test.mjs",
+    "test": "node tests/unit.mjs && node tests/access-log.test.mjs && node tests/archive.test.mjs && node tests/autotree.test.mjs && node tests/backfill.test.mjs && node tests/branch.test.mjs && node tests/assistant.test.mjs && node tests/capture.test.mjs && node tests/clock.test.mjs && node tests/clock-skill.test.mjs && node tests/deep.test.mjs && node tests/deepitem.test.mjs && node tests/dswebsum.test.mjs && node tests/duty.test.mjs && node tests/export.test.mjs && node tests/feedback.test.mjs && node tests/forget-backfill.test.mjs && node tests/genesis.test.mjs && node tests/guard.test.mjs && node tests/habitgen.test.mjs && node tests/idle.test.mjs && node tests/importfile.test.mjs && node tests/importlog.test.mjs && node tests/injectlog.test.mjs && node tests/l1lines.test.mjs && node tests/memories.test.mjs && node tests/mode.test.mjs && node tests/mode-service.test.mjs && node tests/mustache.test.mjs && node tests/retitle.test.mjs && node tests/rules.test.mjs && node tests/sessionline.test.mjs && node tests/suggest.test.mjs && node tests/summarize.test.mjs && node tests/times.test.mjs && node tests/tone.test.mjs && node tests/tools.test.mjs && node tests/recall.test.mjs && node tests/recall-search.test.mjs && node tests/tree.test.mjs && node tests/patch-spec.test.mjs && node tests/bodylimit.test.mjs && node tests/client-batch.test.mjs",
     "check": "node tools/check-install.mjs",
     "check:publish": "node tools/check-publish.mjs"
   },
@@ -61,6 +61,7 @@
     "@deepseek-ai/dsh-client-ui-slots": ">=0.1.7-rc.2",
     "@deepseek-ai/dsh-host-webserver": ">=0.1.7-rc.2",
     "@deepseek-ai/dsh-llm": ">=0.1.7-rc.2",
+    "@deepseek-ai/dsh-session-query": ">=0.1.7-rc.2",
     "@deepseek-ai/dsh-skill": ">=0.1.7-rc.2",
     "@deepseek-ai/dsh-system-prompt": ">=0.1.7-rc.2",
     "@deepseek-ai/dsh-tools": ">=0.1.7-rc.2"
@@ -90,6 +91,9 @@
     "@deepseek-ai/dsh-llm": {
       "optional": true
     },
+    "@deepseek-ai/dsh-session-query": {
+      "optional": true
+    },
     "@deepseek-ai/dsh-skill": {
       "optional": true
     },

package/tools/apply-access-log-patch.mjs

@@ -2,7 +2,7 @@
 // E4 访问日志 · 核心补丁脚本（幂等 / 可回滚 / 可自检）
 //
 // 背景：`/api` 的 403/401 栅栏在 core 里（dsh-client-connection），插件层看不到 ——
-// 而"谁在什么时候被拦下"恰恰是悬案最缺的那条证据（任务书 §3.4 首选落点）。
+// 而"谁在什么时候被拦下"恰恰是悬案最缺的那条证据（E4 设计里定下的首选落点）。
 // 解决办法不是把逻辑搬进 core，而是让 core 多一行**可选调用**：
 //
 //     globalThis.__dshAccessLogObserve?.(req, res); // E4 access log (dsh-ling patch)