dsh-compact-relay 0.3.6 → 0.4.0

package/lib/dsh/native-compaction.js

@@ -6,6 +6,9 @@
  *   thresholdRatio: 0.8（80% 触发）
  * 用户可以在 profile 的 `cordis.patch.yml` 里按 `- id: compaction-basic` 覆盖。
  *
+ * 0.4 P2-3：解析 `headroomTokens` 与 `modelPolicies`，供「真实触发线」计算
+ * （thresholdTokens = floor(min(W × ratio, W − 输出预留 − headroom))，见 core/native-line.js）。
+ *
  * 本模块只做两件事：
  * 1. 读当前��效值（用户覆盖 + 默认值），供指示灯/设置页显示；
  * 2. 写开关（关闭/恢复自动压缩）——追加或修改那一条，**写前备份**、原子替换。
@@ -17,6 +20,8 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 
+import { NATIVE_HEADROOM_DEFAULT } from '../core/native-line.js';
+
 export const NATIVE_PLUGIN_ID = 'compaction-basic';
 export const NATIVE_PLUGIN_NAME = '@deepseek-ai/dsh-compaction-basic';
 /** DSH 默认值（compaction-basic 源码：auto ?? true、thresholdRatio ?? 0.8）。 */
@@ -65,6 +70,11 @@ const ENTRY_ID_RE = /^(\s*)-\s+id:\s*['"]?compaction-basic['"]?\s*(?:#.*)?$/;
 const CONFIG_RE = /^(\s*)config\s*:\s*(?:#.*)?$/;
 const AUTO_RE = /^auto\s*:\s*(true|false)\s*(?:#.*)?$/;
 const RATIO_RE = /^thresholdRatio\s*:\s*['"]?([0-9.]+)['"]?\s*(?:#.*)?$/;
+const HEADROOM_RE = /^headroomTokens\s*:\s*['"]?(\d+)['"]?\s*(?:#.*)?$/;
+/** modelPolicies 列表项里的键（- provider: x / model: y / thresholdRatio: 0.5 / headroomTokens: 4096）。 */
+const POLICY_PROVIDER_RE = /^provider\s*:\s*['"]?([^'"#\s]+)['"]?\s*(?:#.*)?$/;
+const POLICY_MODEL_RE = /^model\s*:\s*['"]?([^'"#\s]+)['"]?\s*(?:#.*)?$/;
+const POLICY_ITEM_RE = /^(\s*)-\s+(.*)$/;
 
 /** 按行拆文本，保留原换行风格（CRLF 文件 apply 后仍是 CRLF）。 */
 function splitText(text) {
@@ -177,9 +187,124 @@ export function parseCompactionOverride(text) {
       if (Number.isFinite(value) && value > 0 && value <= 1) override.thresholdRatio = value;
     }
   }
+  // 0.4 P2-3：headroomTokens 也是 config 直属子键（全局余量，默认 65536）。
+  const headroomIndex = findDirectChild(lines, entry, config, HEADROOM_RE);
+  if (headroomIndex >= 0) {
+    const match = HEADROOM_RE.exec(lines[headroomIndex].trim());
+    if (match !== null) {
+      const value = Number(match[1]);
+      if (Number.isInteger(value) && value >= 0) override.headroomTokens = value;
+    }
+  }
   return override;
 }
 
+/**
+ * 0.4 P2-3：解析 `config.modelPolicies`（嵌套层，按 provider+model 精确匹配的路由级覆盖）。
+ *
+ * 支持 DSH Loader 的两种 YAML 写法（Win 真实配置用的是列表写法）：
+ *   modelPolicies:
+ *     - provider: mac-unc
+ *       model: qwen35-unc-64k
+ *       headroomTokens: 4096
+ *   或映射写法（key 当 model）：
+ *   modelPolicies:
+ *     mac-unc:
+ *       thresholdRatio: 0.5
+ *
+ * 只收 `thresholdRatio`（0–1）与 `headroomTokens`（≥0）；其它键忽略。
+ * @param {string} text
+ * @returns {Array<{provider:string|null, model:string|null, thresholdRatio?:number, headroomTokens?:number}>}
+ */
+export function parseModelPolicies(text) {
+  if (typeof text !== 'string' || text.length === 0) return [];
+  const { lines } = splitText(text);
+  const entry = locateEntry(lines);
+  if (entry === null) return [];
+  const config = locateConfig(lines, entry);
+  if (config === null || config.childIndent === null) return [];
+  const start = findDirectChild(lines, entry, config, /^modelPolicies\s*:\s*(?:#.*)?$/);
+  if (start < 0) return [];
+  const blockIndent = indentOf(lines[start]);
+  const policies = [];
+  let current = null;
+  const flush = () => {
+    if (current === null) return;
+    if (current.thresholdRatio !== undefined || current.headroomTokens !== undefined) policies.push(current);
+    current = null;
+  };
+  for (let index = start + 1; index < entry.end; index += 1) {
+    const line = lines[index];
+    if (line.trim().length === 0 || /^\s*#/.test(line)) continue;
+    const indent = indentOf(line);
+    if (indent <= blockIndent) break;
+    const item = POLICY_ITEM_RE.exec(line);
+    if (item !== null && indent > blockIndent) {
+      // 列表项：- provider: x 或 - model: y（同缩进的新项）
+      if (item[1].length <= blockIndent + 2) { flush(); current = { provider: null, model: null }; }
+      const rest = item[2].trim();
+      const pm = POLICY_PROVIDER_RE.exec(rest);
+      const mm = POLICY_MODEL_RE.exec(rest);
+      if (current === null) current = { provider: null, model: null };
+      if (pm !== null) current.provider = pm[1];
+      else if (mm !== null) current.model = mm[1];
+      continue;
+    }
+    const trimmed = line.trim();
+    const ratioMatch = RATIO_RE.exec(trimmed);
+    const headMatch = HEADROOM_RE.exec(trimmed);
+    const providerMatch = POLICY_PROVIDER_RE.exec(trimmed);
+    const modelMatch = POLICY_MODEL_RE.exec(trimmed);
+    if (ratioMatch !== null || headMatch !== null || providerMatch !== null || modelMatch !== null) {
+      if (current === null) current = { provider: null, model: null };
+      if (ratioMatch !== null) {
+        const value = Number(ratioMatch[1]);
+        if (Number.isFinite(value) && value > 0 && value <= 1) current.thresholdRatio = value;
+      } else if (headMatch !== null) {
+        const value = Number(headMatch[1]);
+        if (Number.isInteger(value) && value >= 0) current.headroomTokens = value;
+      } else if (providerMatch !== null) current.provider = providerMatch[1];
+      else current.model = modelMatch[1];
+      continue;
+    }
+    // 映射写法：更深一层的 key 行当 model，其下缩进再深的键值由后续循环计入（current 不变）。
+    const keyMatch = /^([A-Za-z0-9._@/-]+)\s*:\s*(?:#.*)?$/.exec(trimmed);
+    if (keyMatch !== null && indent === blockIndent + 2 && current === null) {
+      current = { provider: null, model: keyMatch[1] };
+    }
+  }
+  flush();
+  return policies;
+}
+
+/**
+ * 0.4 P2-3：按路由取生效的 compaction-basic 策略（全局值 + 精确 provider/model 覆盖）。
+ * @param {{thresholdRatio:number, headroomTokens:number, modelPolicies?:Array}} nativeCfg readNativeCompaction() 结果
+ * @param {{provider:string, model:string}|null} route
+ * @returns {{thresholdRatio:number, headroomTokens:number, overridden:boolean}}
+ */
+export function resolveNativePolicy(nativeCfg, route) {
+  const globalRatio = Number.isFinite(nativeCfg?.thresholdRatio) ? nativeCfg.thresholdRatio : NATIVE_DEFAULTS.thresholdRatio;
+  const globalHeadroom = Number.isFinite(nativeCfg?.headroomTokens) ? nativeCfg.headroomTokens : NATIVE_HEADROOM_DEFAULT;
+  if (route === null || route === undefined || typeof route.provider !== 'string' || typeof route.model !== 'string') {
+    return { thresholdRatio: globalRatio, headroomTokens: globalHeadroom, overridden: false };
+  }
+  const list = Array.isArray(nativeCfg?.modelPolicies) ? nativeCfg.modelPolicies : [];
+  const hit = list.find(
+    (policy) =>
+      policy !== null &&
+      typeof policy === 'object' &&
+      (policy.model === route.model || policy.model === `${route.provider}/${route.model}` || policy.model === null || policy.model === undefined) &&
+      (policy.provider === undefined || policy.provider === null || policy.provider === route.provider),
+  );
+  if (hit === undefined) return { thresholdRatio: globalRatio, headroomTokens: globalHeadroom, overridden: false };
+  return {
+    thresholdRatio: Number.isFinite(hit.thresholdRatio) ? hit.thresholdRatio : globalRatio,
+    headroomTokens: Number.isFinite(hit.headroomTokens) ? hit.headroomTokens : globalHeadroom,
+    overridden: true,
+  };
+}
+
 /**
  * 读当前生效的原生压缩配置（用户覆盖 + 默认值）。带 mtime 缓存，避免每帧 stat 读文件。
  *
@@ -204,6 +329,9 @@ export function readNativeCompaction(profileDir = resolveProfileDir()) {
   const value = {
     autoEnabled: override.autoEnabled ?? NATIVE_DEFAULTS.autoEnabled,
     thresholdRatio: override.thresholdRatio ?? NATIVE_DEFAULTS.thresholdRatio,
+    // 0.4 P2-3：真实触发线要用的余量与路由级覆盖（additive 字段，老调用方不受影响）。
+    headroomTokens: override.headroomTokens ?? NATIVE_HEADROOM_DEFAULT,
+    modelPolicies: parseModelPolicies(text),
     override,
     file,
   };

package/lib/dsh/pressure.js

@@ -7,12 +7,14 @@
 import { ratioOf } from '../core/policy.js';
 import { routeOf } from './route.js';
 
-/** provider/model → contextWindow 的进程内缓存（Promise，避免并发重复解析）。 */
+/** provider/model → {window, defaultMaxTokens} 的进程内缓存（Promise，避免并发重复解析）。 */
 const windowCache = new Map();
 
-async function resolveWindow(ctx, session, agent, fallback) {
-  const route = routeOf(ctx, session, agent);
-  if (route === null) return fallback;
+/**
+ * 解析路由模型的容量信息（contextWindow + 适配器默认输出上限）。
+ * 0.4 P2-3：输出预留要先看 requestHeader 的 maxTokens，其次才是这里的 defaultMaxTokens。
+ */
+async function resolveModelMeta(ctx, route) {
   const key = `${route.provider}/${route.model}`;
   let pending = windowCache.get(key);
   if (pending === undefined) {
@@ -20,18 +22,68 @@ async function resolveWindow(ctx, session, agent, fallback) {
       try {
         const info = await ctx.llm.resolveModelInfo(route.provider, route.model);
         const window = info?.context?.contextWindow;
-        return Number.isInteger(window) && window > 0 ? window : null;
+        const def = info?.defaultMaxTokens;
+        return {
+          window: Number.isInteger(window) && window > 0 ? window : null,
+          defaultMaxTokens: Number.isInteger(def) && def >= 0 ? def : null,
+        };
       } catch {
-        return null;
+        return { window: null, defaultMaxTokens: null };
       }
     })();
     windowCache.set(key, pending);
   }
-  const window = await pending;
-  // 失败（null）不留在缓存里：适配器还没就绪时第一次解析失败，不能永久用 fallback
+  const meta = await pending;
+  // 失败不留在缓存里：适配器还没就绪时第一次解析失败，不能永久用 fallback
   // 窗口算比例（2026-10-19 debug：指示灯百分比长期低估）。
-  if (!(Number.isInteger(window) && window > 0)) windowCache.delete(key);
-  return window ?? fallback;
+  if (meta.window === null) windowCache.delete(key);
+  return meta;
+}
+
+async function resolveWindow(ctx, session, agent, fallback) {
+  const route = routeOf(ctx, session, agent);
+  if (route === null) return fallback;
+  const meta = await resolveModelMeta(ctx, route);
+  return meta.window ?? fallback;
+}
+
+/**
+ * 0.4 P2-3：解析「真实触发线」需要的路由预算。
+ *   - contextWindow：路由模型窗口（失败回落测量窗口）；
+ *   - reservedCompletionTokens = session.requestHeader().config.maxTokens ?? 适配器 defaultMaxTokens ?? 0
+ *     （与 dsh-compaction-basic 的 reservedCompletionTokens 同一口径）。
+ * @param {object} ctx
+ * @param {object} session
+ * @param {object} [agent]
+ * @param {number} [fallbackWindow]
+ * @returns {Promise<{route:object|null, contextWindow:number|null, reservedCompletionTokens:number, defaultMaxTokens:number|null, requestMaxTokens:number|null}>}
+ */
+export async function routeBudgetOf(ctx, session, agent, fallbackWindow) {
+  const route = routeOf(ctx, session, agent);
+  let meta = { window: null, defaultMaxTokens: null };
+  if (route !== null) {
+    try {
+      meta = await resolveModelMeta(ctx, route);
+    } catch {
+      /* ignore */
+    }
+  }
+  let headerMax = null;
+  try {
+    const value = session?.requestHeader?.()?.config?.maxTokens;
+    if (Number.isInteger(value) && value >= 0) headerMax = value;
+  } catch {
+    /* 老宿主没有 requestHeader 就按未知处理 */
+  }
+  const reserved = headerMax ?? meta.defaultMaxTokens ?? 0;
+  const window = meta.window ?? (Number.isFinite(fallbackWindow) && fallbackWindow > 0 ? fallbackWindow : null);
+  return {
+    route,
+    contextWindow: window,
+    reservedCompletionTokens: reserved,
+    defaultMaxTokens: meta.defaultMaxTokens,
+    requestMaxTokens: headerMax,
+  };
 }
 
 /**

package/lib/dsh/relay.js

@@ -9,21 +9,38 @@ import { RELAY_RECORD_TYPE } from '../core/relay.js';
 
 /**
  * 合法化一条 relay 记录；不合法返回 null。
+ *
+ * 0.4 P2-2（接力链元数据补全）：canonical 字段为 `parentId` / `childId` / `ordinal` / `at` / `atIso`；
+ * 同时保留 0.3 的旧字段 `parentSessionId` / `index`（旧记录只读兼容，新写入两者都带）。
+ *
  * @param {unknown} data
- * @returns {{parentSessionId:string, childId:string, index:number, path?:string, planId?:string|null, at:number, title?:string, baseTitle?:string}|null}
+ * @returns {{parentId:string, childId:string, ordinal:number, at:number, atIso:string|null, parentSessionId:string, index:number, path?:string, planId?:string|null, title?:string, baseTitle?:string}|null}
  */
 export function normalizeRelayRecord(data) {
   if (data === null || typeof data !== 'object') return null;
   if (typeof data.childId !== 'string' || data.childId.length === 0) return null;
-  const index = Number.isInteger(data.index) && data.index > 0 ? data.index : null;
-  if (index === null) return null;
+  const ordinal = Number.isInteger(data.ordinal) && data.ordinal > 0
+    ? data.ordinal
+    : Number.isInteger(data.index) && data.index > 0
+      ? data.index
+      : null;
+  if (ordinal === null) return null;
+  const parentId = typeof data.parentId === 'string'
+    ? data.parentId
+    : typeof data.parentSessionId === 'string'
+      ? data.parentSessionId
+      : '';
   return {
-    parentSessionId: typeof data.parentSessionId === 'string' ? data.parentSessionId : '',
+    parentId,
     childId: data.childId,
-    index,
+    ordinal,
+    at: Number.isFinite(data.at) ? data.at : 0,
+    atIso: typeof data.atIso === 'string' ? data.atIso : null,
+    // 0.3 旧字段兼容（测试/旧读法仍按这些名字取）。
+    parentSessionId: parentId,
+    index: ordinal,
     ...(typeof data.path === 'string' ? { path: data.path } : {}),
     planId: typeof data.planId === 'string' ? data.planId : null,
-    at: Number.isFinite(data.at) ? data.at : 0,
     ...(typeof data.title === 'string' ? { title: data.title } : {}),
     ...(typeof data.baseTitle === 'string' ? { baseTitle: data.baseTitle } : {}),
   };

package/lib/dsh/session-view.js

@@ -8,6 +8,30 @@ import { latestCompressHint } from '../core/compress-hint.js';
 import { latestPinnedSeqs } from '../core/pins.js';
 import { scanCompactionLog } from './compaction-pair.js';
 
+/**
+ * 0.4 BUG-013：checkpoint 判定的默认实现（漏传第二个参数时也不再静默失效）。
+ *
+ * 背景：0.3.1 起 `lastCheckpointSurfaceIdx/Seq` 的第二个参数 `isCheckpointSource`
+ * 在部分调用点（如 actions/state.js）被漏传。`isCheckpointSource(source)` 对
+ * undefined 会抛 TypeError，而函数内 try/catch 把它吞成「不是 checkpoint」→ 永远
+ * 返回 -1 → `compressHint` 永远算「有效」（压缩/交接后旧断点不消失、还会抑制 cue）。
+ *
+ * 这里给默认值补上 engine 的实现（dsh→dsh 同层，不产生环；engine 不 import 本文件）。
+ * 但 engine 是全插件唯一 import `@deepseek-ai/*` 的模块：纯 node 单测
+ * （test/smoke.mjs / state-passive.mjs / handoff.mjs）不注册包解析钩子、加载不了
+ * 这些包。所以用受保护的动态 import 取默认实现：
+ *   - 宿主环境：正常拿到 engine.isCompactCheckpointSource；
+ *   - 纯 node 单测：加载失败则保持 null（函数里显式传入的 fake engine 照常优先）。
+ */
+let defaultIsCheckpointSource = null;
+try {
+  const loaded = await import('./engine.js');
+  const candidate = loaded?.default?.isCompactCheckpointSource;
+  if (typeof candidate === 'function') defaultIsCheckpointSource = candidate;
+} catch {
+  defaultIsCheckpointSource = null;
+}
+
 /** @returns {number[]} 当前 surface 的 event seq（升序） */
 export function surfaceSeqs(session) {
   const nodes = session?.surface?.nodes;
@@ -68,9 +92,13 @@ export function countSummaries(session) {
 /**
  * 最后一次 checkpoint 消息在 surface 中的下标；没有返回 -1。
  * @param {object} session
- * @param {(source: unknown) => boolean} isCheckpointSource 通常传 engine.isCompactCheckpointSource
+ * @param {(source: unknown) => boolean} [isCheckpointSource] 省略时用 engine.isCompactCheckpointSource
+ * @returns {number}
  */
-export function lastCheckpointSurfaceIdx(session, isCheckpointSource) {
+export function lastCheckpointSurfaceIdx(session, isCheckpointSource = defaultIsCheckpointSource) {
+  // 既没显式传、默认实现也没加载到（纯 node 单测）：按「没有 checkpoint」处理，
+  // 不再让 TypeError 在循环里被静默吞掉。
+  if (typeof isCheckpointSource !== 'function') return -1;
   const seqs = surfaceSeqs(session);
   for (let index = seqs.length - 1; index >= 0; index -= 1) {
     const event = typeof session.eventAt === 'function' ? session.eventAt(seqs[index]) : undefined;
@@ -119,10 +147,10 @@ export function livePinnedSeqs(session) {
  * 按下标切会把这段旧尾部又压一遍（2026-10-19 真机踩过：33 条旧消息被误压）。
  *
  * @param {object} session
- * @param {(source: unknown) => boolean} isCheckpointSource
+ * @param {(source: unknown) => boolean} [isCheckpointSource] 省略时用 engine.isCompactCheckpointSource
  * @returns {number|undefined}
  */
-export function lastCheckpointSurfaceSeq(session, isCheckpointSource) {
+export function lastCheckpointSurfaceSeq(session, isCheckpointSource = defaultIsCheckpointSource) {
   const index = lastCheckpointSurfaceIdx(session, isCheckpointSource);
   if (index < 0) return undefined;
   return surfaceSeqs(session)[index];

package/lib/dsh/sessions.js

@@ -81,7 +81,7 @@ export function handoffTitlePlanOf(ctx, session) {
   if (record !== null) {
     const fallback = splitHandoffTitle(sourceTitleOf(ctx, session));
     const baseTitle = typeof record.baseTitle === 'string' && record.baseTitle.length > 0 ? record.baseTitle : fallback.baseTitle;
-    const index = record.index + 1;
+    const index = (Number.isInteger(record.ordinal) ? record.ordinal : record.index) + 1;
     return { index, baseTitle, title: relayTitleOf(index, baseTitle), viaRecord: true };
   }
   const split = splitHandoffTitle(sourceTitleOf(ctx, session));

package/lib/index.js

@@ -12,7 +12,9 @@ import { registerHttp } from './adapters/http.js';
 import { registerCompressCue } from './adapters/prompt.js';
 import { registerTool } from './adapters/tool.js';
 import { createSettingsStore } from './actions/settings.js';
+import { createDiagCounters } from './dsh/diag-counters.js';
 import engine from './dsh/engine.js';
+import { createLedgerStore } from './dsh/ledger.js';
 import { createStateHub } from './dsh/state-hub.js';
 
 export const name = 'compact-relay';
@@ -53,6 +55,10 @@ export function apply(ctx, config) {
     lock: createLock(),
     // M6：进行中动作登记表（HTTP cancel 用），与 lock 的分工见 actions/inflight.js。
     inflight: createInflight(),
+    // 0.4 P0-2：诊断计数/耗时/错误码（纯内存，重启清零；见 dsh/diag-counters.js）。
+    diag: createDiagCounters(),
+    // 0.4 P1-3：轻账本（~/.dsh/compact-relay-ledger.jsonl；写失败静默降级，不影响动作）。
+    ledger: createLedgerStore(),
     engine,
     ...(log === undefined ? {} : { log }),
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-compact-relay",
-  "version": "0.3.6",
+  "version": "0.4.0",
   "description": "DeepSeek Harness 上下文指示器插件：提供容量监控、压缩预览与确认、九段式交接单生成及消息锁定功能。 · Context indicator for DSH: preview-then-confirm compaction, 9-section session handoff, and pinned messages.",
   "type": "module",
   "main": "lib/index.js",
@@ -53,7 +53,7 @@
     "node": ">=22"
   },
   "scripts": {
-    "test": "node scripts/build-client.mjs --check && node --check lib/client.js && node test/smoke.mjs && node test/handoff.mjs && node test/plugin-load.mjs && node test/contract.mjs && node test/compact-log.mjs && node test/compress-cue.mjs && node test/state-passive.mjs && node test/native-compaction.mjs && node test/markdown-lite.mjs",
+    "test": "node scripts/build-client.mjs --check && node --check lib/client.js && node test/smoke.mjs && node test/handoff.mjs && node test/plugin-load.mjs && node test/contract.mjs && node test/compact-log.mjs && node test/compress-cue.mjs && node test/state-passive.mjs && node test/native-compaction.mjs && node test/markdown-lite.mjs && node test/diagnostics.mjs && node test/pin-contract.mjs && node test/ledger.mjs && node test/handoff-p2.mjs && node test/native-line.mjs",
     "test:e2e": "node test/e2e/smoke.mjs",
     "test:e2e:settings": "node test/e2e/settings-ui.mjs",
     "test:e2e:compact": "node test/e2e/real-compact.mjs"