dsh-compact-relay 0.5.0 → 0.5.2

package/lib/dsh/session-view.js

@@ -6,7 +6,7 @@
  */
 import { latestCompressHint } from '../core/compress-hint.js';
 import { latestPinnedSeqs } from '../core/pins.js';
-import { scanCompactionLog } from './compaction-pair.js';
+import { isCommittedCompaction, scanCompactionLog } from './compaction-pair.js';
 
 /**
  * 0.4 BUG-013：checkpoint 判定的默认实现（漏传第二个参数时也不再静默失效）。
@@ -68,23 +68,29 @@ export function firstCompactableIdx(session) {
  *
  * 以前数所有 compaction/summary，事务在 summary 之后失败会留下「幽灵摘要」，
  * 把 advice 提前推到交接、6 次后提前打开合并旧摘要模式。
- * 现在按 compactionId 配对：summary + 无 error 的 end + 覆盖该 summary 的 replace 才算一次；
- * 没有 compactionId 的旧日志（或外部夹具）按旧口径计数，保证兼容。
+ * 现在按 compactionId 配对：summary + 无 error 的 end + 覆盖该 summary 的 replace 才算一次。
+ *
+ * 0.5.1 D01：**口径与 `dsh/compaction-log.collectCompactions` 合并**（唯一实现
+ * `compaction-pair.isCommittedCompaction`）。以前的宽松分支（没有 compactionId 的
+ * 旧日志直接 +1、不看 replace）会与面板的 committed 打架 —— 同一份日志
+ * countSummaries=1 / committed=false。现在旧日志同样要求 replace。
  */
 export function countSummaries(session) {
-  // 配对扫描（summary/end/replace）与 dsh/compaction-log 共用，口径见 compaction-pair.js。
+  // 配对扫描 + 「已提交」判定都与 dsh/compaction-log 共用（见 compaction-pair.js）。
   const { summaries, ends, replaceByCoveredSeq } = scanCompactionLog(sessionLog(session));
   let count = 0;
   for (const summary of summaries) {
     const id = summary.data?.compactionId;
-    if (typeof id !== 'string') {
+    const hasId = typeof id === 'string';
+    if (
+      isCommittedCompaction({
+        compactionId: hasId ? id : null,
+        end: hasId ? ends.get(id) : undefined,
+        replace: replaceByCoveredSeq.get(summary.seq),
+      })
+    ) {
       count += 1;
-      continue;
     }
-    const end = ends.get(id);
-    if (end === undefined || end.error !== undefined) continue;
-    if (!replaceByCoveredSeq.has(summary.seq)) continue;
-    count += 1;
   }
   return count;
 }

package/lib/dsh/sessions.js

@@ -28,6 +28,7 @@ import {
   truncateTitleUtf8,
 } from '../core/relay.js';
 import { HANDOFF_PREAMBLE } from '../core/prompts.js';
+import { childRelayRecordOf } from '../core/relay-record.js';
 import { localIso } from './diag-counters.js';
 import { cacheControls, routeOf } from './route.js';
 import { relayRecordOf, writeRelayRecord } from './relay.js';
@@ -444,20 +445,26 @@ export async function createHandoffSession({ ctx, engine, session, agent, doc, t
   //    0.5.0 补：交接单已由调用方落盘，path 一并写进子记录 —— 接力条在子会话里直接
   //    拿到「查看交接单」的路径，父会话未加载/已归档时不再退化为「暂无交接单」。
   //    path 拿不到（旧调用方/失败）就不写这个键，不猜、不写空串。
+  //    0.5.2 S2：record 形状（含键顺序、不写父会话侧字段、条件 path）由
+  //    core/relay-record 的唯一构造器负责，这里只传语义参数。
   const titlePlan = plan ?? handoffTitlePlanOf(ctx, session);
   const relayAt = Date.now();
-  const relayWrote = writeRelayRecord(engine, childSession, {
-    parentId: session.id,
-    childId,
-    ordinal: titlePlan.index,
-    baseTitle: titlePlan.baseTitle,
-    title,
-    scheme: titlePlan.scheme,
-    titleSeq,
-    ...(typeof path === 'string' && path.length > 0 ? { path } : {}),
-    at: relayAt,
-    atIso: localIso(new Date(relayAt)),
-  });
+  const relayWrote = writeRelayRecord(
+    engine,
+    childSession,
+    childRelayRecordOf({
+      parentId: session.id,
+      childId,
+      ordinal: titlePlan.index,
+      baseTitle: titlePlan.baseTitle,
+      title,
+      scheme: titlePlan.scheme,
+      titleSeq,
+      path,
+      at: relayAt,
+      atIso: localIso(new Date(relayAt)),
+    }),
+  );
   if (!relayWrote) {
     log?.warn?.(`compact-relay: 新会话 ${childId} 接力链记录写入失败（下次从该会话交接将回退到标题解析）`);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-compact-relay",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "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 && node test/diagnostics.mjs && node test/pin-contract.mjs && node test/ledger.mjs && node test/handoff-p2.mjs && node test/relay-title-scheme.mjs && node test/relay-chain.mjs && node test/handoff-naming.mjs && node test/native-line.mjs && node test/handoff-guard.mjs && node test/settings-ux.mjs && node test/archive.mjs && node test/relay-bar.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/clip.mjs && node test/diagnostics.mjs && node test/pin-contract.mjs && node test/ledger.mjs && node test/handoff-p2.mjs && node test/relay-title-scheme.mjs && node test/relay-chain.mjs && node test/relay-chain-endpoint.mjs && node test/handoff-naming.mjs && node test/native-line.mjs && node test/handoff-guard.mjs && node test/settings-ux.mjs && node test/pin-health.mjs && node test/archive.mjs && node test/force-archive.mjs && node test/relay-bar.mjs && node test/relay-record.mjs && node test/contract-golden.mjs",
     "test:e2e": "node test/e2e/smoke.mjs",
     "test:e2e:settings": "node test/e2e/settings-ui.mjs",
     "test:e2e:settings-ux": "node test/e2e/settings-ux.mjs",