@nightpainters/dsh-ling 1.5.1 → 1.5.3

package/lib/index.js

@@ -2,16 +2,18 @@
 // 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';
@@ -56,7 +58,14 @@ export function apply(ctx, config = {}) {
 
   const disposers = [];
   disposers.push(registerMemorySection(ctx, gate, memory, settings));
+  // E0「那一行跟着会话走」:只加一个 agent/pre-step 监听(全库目前没有别处用它)。
+  // 形态 A —— 只往 `decision.messages` 追加,**不碰** systemPrompt 的 section()/context(),
+  // 也绝不调用带 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。
   // 补丁未打时钩子收不到调用 —— 安装器会在启动日志里明确喊出来,不允许静默不记。
@@ -182,30 +191,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 先自检探针;通过才挂自动调度(保守上限,可配)
@@ -232,11 +230,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.1",
+  "version": "1.5.3",
   "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/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/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/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/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/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"
   },
@@ -51,16 +51,63 @@
   "engines": {
     "node": ">=22.5.0"
   },
+  "peerDependencies": {
+    "@deepseek-ai/cordis": ">=4.0.4",
+    "@deepseek-ai/dsh-agent-default-model": ">=0.1.7-rc.2",
+    "@deepseek-ai/dsh-api-session-controller": ">=0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-connection": ">=0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-locale": ">=0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-store": ">=0.1.7-rc.2",
+    "@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-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"
+  },
+  "peerDependenciesMeta": {
+    "@deepseek-ai/dsh-agent-default-model": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-api-session-controller": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-connection": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-locale": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-store": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-ui-slots": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-host-webserver": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-llm": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-skill": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-system-prompt": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-tools": {
+      "optional": true
+    }
+  },
   "dsh": {
     "bundle": {
       "patch": "./cordis.patch.yml"
     },
     "client": {
       "inject": [
-        "@deepseek-ai/dsh-client-store",
         "@deepseek-ai/dsh-client-connection",
         "@deepseek-ai/dsh-client-locale",
-        "@deepseek-ai/dsh-client-ui-slots",
         "@deepseek-ai/dsh-api-session-controller"
       ],
       "platform": "web"

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)