@aiwayds/dsh-dcp 0.11.0 → 0.12.0

package/README.en.md

@@ -3,7 +3,7 @@
 Deterministic context-compaction backend for dsh (DeepSeek Harness): **context
 compaction without an LLM call**, works out of the box.
 
-**Requires dsh >= 0.1.5-rc.2** — this plugin targets the dsh RC/stable line only (CI and releases resolve the newest of the `latest`/`next` dist-tags at runtime). **The alpha line is no longer supported.**
+**Requires dsh >= 0.1.7-rc.1** — this plugin targets the dsh RC/stable line only (CI and releases resolve the newest of the `latest`/`next` dist-tags at runtime). **The alpha line is no longer supported.**
 
 > [简体中文](README.md) · **English**
 
@@ -177,6 +177,7 @@ All optional, defaults work out of the box:
 | Key | Default | Meaning |
 |---|---|---|
 | `thresholdRatio` | 0.8 | pressure trigger (inherited upstream compaction-basic default 0.8; this plugin's bundle patch mounts 0.7, recommended for CJK-heavy sessions) |
+| `headroomTokens` | 65536 | inherited from upstream compaction-basic (new in 0.1.7): extra pressure-budget margin (non-negative integer). The pressure ceiling is context window − routed output reservation (`maxTokens`) − this margin; lower it for small-window models |
 | `roundInterval` | 50 | compact every N assistant messages (one LLM roundtrip) (0 disables). Default 50: 50, 100, 150… — the clock restarts after every compaction |
 | `onModelSwitch` | `notice` | after a model switch: `notice` suggests `/dcp compact` (default); `auto` compacts at the next idle boundary; `off` disables |
 | `modelSwitchMinTokens` | 32768 | minimum priced context size (measured by the host token meter) for a model switch to be announced; `0` disables this gate. 32k default ≈ the post-compaction baseline (~16% of the window) plus some real growth |
@@ -207,7 +208,7 @@ cordis.patch.yml mount block.
 ## Development
 
 ```bash
-npm install && npm test     # 65 tests: extractor/compaction/command/config/triggers/setup
+npm install && npm test     # 109 tests: extractor/compaction/command/config/triggers/recover-seam/setup
 ```
 
 ## License

package/README.md

@@ -2,7 +2,7 @@
 
 dsh（DeepSeek Harness）的确定性压缩后端：**上下文压缩不调 LLM**，开箱即用。
 
-**要求 dsh >= 0.1.5-rc.2** — 本插件只跟随 dsh RC/stable 线（CI 与发版在运行时解析 latest/next 中更新的 dist-tag）。**不再支持 alpha 线。**
+**要求 dsh >= 0.1.7-rc.1** — 本插件只跟随 dsh RC/stable 线（CI 与发版在运行时解析 latest/next 中更新的 dist-tag）。**不再支持 alpha 线。**
 
 > **简体中文** · [English](README.en.md)
 
@@ -144,6 +144,7 @@ npx dsh-dcp-setup --remove /path/to/cordis.patch.yml
 | 键 | 默认 | 说明 |
 |---|---|---|
 | `thresholdRatio` | 0.8 | 压力触发阈值（继承上游 compaction-basic 默认 0.8；本插件 bundle patch 挂载时默认 0.7，中文场景建议 0.7） |
+| `headroomTokens` | 65536 | 继承上游 compaction-basic（0.1.7 新增）：压力预算额外余量（非负整数）。压力上限 = 上下文窗口 − 路由请求预留输出（`maxTokens`）− 本余量；小窗口模型建议下调 |
 | `roundInterval` | 50 | 每 N 条 assistant message（一次 LLM 往返）触发一次压缩（0 关闭）。默认 50：50、100、150……每次压缩后重数 |
 | `onModelSwitch` | `notice` | 模型切换后：`notice` 提醒执行 `/dcp compact`（默认）；`auto` 下一个空闲点自动压缩；`off` 关闭 |
 | `modelSwitchMinTokens` | 32768 | 模型切换提醒/自动压缩的上下文下限（按宿主 tokenMeter 实测计价）：不足则忽略该次切换；`0` 关闭此门。默认 32k ≈ 压缩后基线（~16% 窗口）之上再涨一截才有得甩 |
@@ -169,7 +170,7 @@ npx dsh-dcp-setup --remove /path/to/cordis.patch.yml
 ## 开发
 
 ```bash
-npm install && npm test     # 65 个用例：抽取/压缩/命令/配置/触发/安装脚本
+npm install && npm test     # 109 个用例：抽取/压缩/命令/配置/触发/恢复缝/安装脚本
 ```
 
 ## License

package/icon.svg

@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg">
+  <path d="M5 5.5h14M8 12h8M5 18.5h14"/>
+  <path d="m10.4 1.8 1.6 1.6 1.6-1.6"/>
+  <path d="m10.4 22.2 1.6-1.6 1.6 1.6"/>
+</svg>

package/lib/config.js

@@ -25,6 +25,7 @@ export const DCP_CONFIG_KEYS = [
 /** compaction-basic policy keys forwarded to the parent engine verbatim. */
 export const BASIC_CONFIG_KEYS = [
   'thresholdRatio',
+  'headroomTokens',
   'retainRatio',
   'retainTokens',
   'summarizationProvider',

package/lib/index.js

@@ -96,6 +96,7 @@ const modelPolicy = z.object({
   provider: z.string().required(),
   model: z.string().required(),
   thresholdRatio: z.number(),
+  headroomTokens: z.number().step(1).min(0),
   retainRatio: z.number(),
   retainTokens: z.number().step(1).min(0),
   summarizationProvider: z.string(),
@@ -111,6 +112,7 @@ export class DcpEngine extends BasicCompactionEngine {
   static Config = z.object({
     // compaction-basic policy keys (forwarded verbatim)
     thresholdRatio: z.number(),
+    headroomTokens: z.number().step(1).min(0),
     retainRatio: z.number(),
     retainTokens: z.number().step(1).min(0),
     summarizationProvider: z.string(),
@@ -371,7 +373,9 @@ export class DcpEngine extends BasicCompactionEngine {
     try {
       session.append('user/message', createUserMessage({
         content: [{ type: 'text', text: summary }],
-        source: { kind: 'plugin', plugin: 'dsh-dcp', form: 'notice', summary },
+        // Producer-owned kind (dsh 0.1.7 removed the 'plugin' catch-all);
+        // declared for checkJs in lib/sources.d.ts.
+        source: { kind: 'dsh-dcp', form: 'notice', summary },
       }))
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error)
@@ -483,7 +487,9 @@ export class DcpEngine extends BasicCompactionEngine {
     try {
       session.append('user/message', createUserMessage({
         content: [{ type: 'text', text: summary }],
-        source: { kind: 'plugin', plugin: 'dsh-dcp', form: 'notice', summary },
+        // Producer-owned kind (dsh 0.1.7 removed the 'plugin' catch-all);
+        // declared for checkJs in lib/sources.d.ts.
+        source: { kind: 'dsh-dcp', form: 'notice', summary },
       }))
     } catch (error) {
       // The compaction already committed; a display-row failure must never

package/lib/sources.d.ts

@@ -0,0 +1,28 @@
+/**
+ * dsh-dcp's producer-owned message source kinds.
+ *
+ * dsh 0.1.7 removed the shared `kind: 'plugin'` catch-all: MessageSourceMap is
+ * now merge-extensible and every producer declares its own `kind` in its own
+ * module (see `MessageSourceMap` in @deepseek-ai/dsh-llm/message and the
+ * bundled `webhook` producer for the canonical shape). Session-log V4 admission
+ * refuses retired `'plugin'` wrappers, so the declarations below are what lets
+ * dsh-dcp's transcript rows persist.
+ *
+ * Legacy rows: session-format V3→V4 migrates unknown third-party plugin names
+ * to `plugin:<name>` kinds, so pre-migration dsh-dcp notice rows replay as
+ * `plugin:dsh-dcp` — lib/summarizer.js skips both spellings.
+ */
+declare module '@deepseek-ai/dsh-llm' {
+  interface MessageSourceMap {
+    /** dsh-dcp transcript row: a one-line compaction/model-switch account. */
+    'dsh-dcp': {
+      readonly kind: 'dsh-dcp'
+      readonly form: 'notice'
+      /** The bounded one-line account, via `boundContextSummary`. */
+      readonly summary: string
+    }
+  }
+}
+
+/** Module marker: keeps the block above an augmentation (merging), not an ambient module declaration (shadowing). */
+export {}

package/lib/summarizer.js

@@ -16,6 +16,8 @@
  * @module dsh-dcp/summarizer
  */
 
+import { isCompactCheckpointSource } from '@deepseek-ai/dsh-compaction'
+
 /** Section headers shared with compaction-basic's checkpoint instruction. */
 export const SECTIONS = Object.freeze({
   intent: 'Primary Request and Intent',
@@ -101,11 +103,13 @@ export function estimateTextTokens(text, mode = 'cjk') {
 }
 
 /**
- * Token estimate for one message: text blocks, tool-call arguments, and
- * tool-result payloads (the same content the host meter prices, minus its
- * per-block overhead).
+ * Token estimate for one message: text blocks and tool-call arguments. Tool
+ * results are first-class role-`'tool'` messages since dsh 0.1.7 (the old
+ * user-role `'tool-result'` block is gone), so their text blocks price through
+ * the same `'text'` branch — the same content the host meter prices, minus its
+ * per-block overhead.
  *
- * @param {{ content?: Array<Record<string, any>> }} message - any message-shaped object.
+ * @param {{ role?: string, content?: Array<Record<string, any>> }} message - any message-shaped object.
  * @param {'cjk'|'ascii'} [mode] - pricing mode, see {@link estimateTextTokens}.
  * @returns {number} estimated tokens.
  */
@@ -114,11 +118,6 @@ export function estimateMessageTokens(message, mode = 'cjk') {
   for (const block of message?.content ?? []) {
     if (block.type === 'text') parts.push(block.text)
     else if (block.type === 'tool-call') parts.push(block.arguments)
-    else if (block.type === 'tool-result') {
-      for (const inner of block.content ?? []) {
-        if (inner.type === 'text') parts.push(inner.text)
-      }
-    }
   }
   return estimateTextTokens(parts.join('\n'), mode)
 }
@@ -191,15 +190,19 @@ function textOf(message) {
 
 /**
  * Re-injected host context that appears as user-role messages every turn:
- * system-prompt snapshots, skill catalogs, and AGENTS.md-style instructions.
- * The host re-sends these on every request, so copying them into a checkpoint
- * is pure waste — the model never loses them. (A prior compaction checkpoint
- * is handled separately, and plugin notice/relay/recall forms stay.)
+ * skill catalogs, AGENTS.md-style instructions, and any producer's `snapshot`-
+ * form state (runtime context, time, tmux — dsh 0.1.7 has no shared `plugin`
+ * kind, so the snapshot form is matched generically). The host re-sends these
+ * on every request and a later snapshot supersedes an earlier one, so copying
+ * them into a checkpoint is pure waste — the model never loses them. (A prior
+ * compaction checkpoint is handled separately, and notice/relay/recall forms
+ * stay.)
  */
 function isInjectedContext(message) {
-  const kind = message.source?.kind
+  const source = message.source
+  const kind = source?.kind
   if (kind === 'skill-catalog' || kind === 'agent-instructions') return true
-  return kind === 'plugin' && message.source.form === 'snapshot'
+  return source?.form === 'snapshot'
 }
 
 /**
@@ -215,21 +218,17 @@ function noticeSummary(message) {
   return undefined
 }
 
-/** Tool-result blocks flattened as text, first non-empty line kept per block. */
-function resultFirstLines(blocks) {
-  const lines = []
-  for (const block of blocks) {
-    if (block.type !== 'tool-result') continue
-    const text = block.content
-      .filter((inner) => inner.type === 'text')
-      .map((inner) => inner.text)
-      .join('\n')
+/** First non-empty text line of one tool-result message, or undefined. */
+function resultFirstLine(message) {
+  for (const block of message.content) {
+    if (block.type !== 'text') continue
+    const line = block.text
       .split('\n')
-      .map((line) => line.trim())
-      .find((line) => line.length > 0)
-    if (text !== undefined) lines.push({ isError: block.isError === true, line: text })
+      .map((part) => part.trim())
+      .find((part) => part.length > 0)
+    if (line !== undefined) return { isError: message.isError === true, line }
   }
-  return lines
+  return undefined
 }
 
 /**
@@ -376,27 +375,33 @@ export function extractFacts(messages, language = 'en') {
       continue
     }
 
-    // user-role messages: tool results, prior checkpoints, real user text
-    const results = resultFirstLines(message.content)
-    if (results.length > 0) {
-      for (const result of results) {
-        const isError = result.isError || errorRegexes.some((pattern) => pattern.test(result.line))
-        if (!isError) continue
-        const call = message.source?.kind === 'tool' ? callsById.get(message.source.callId) : undefined
-        const who = call === undefined ? 'tool' : call.name
-        facts.errors.push(`${who}: ${result.line}`)
-      }
+    // Tool results are first-class role-'tool' messages since dsh 0.1.7
+    // (required toolCallId, message-level isError): only their error lines
+    // feed the checkpoint.
+    if (message.role === 'tool') {
+      const result = resultFirstLine(message)
+      if (result === undefined) continue
+      const isError = result.isError || errorRegexes.some((pattern) => pattern.test(result.line))
+      if (!isError) continue
+      const call = callsById.get(message.toolCallId ?? message.source?.callId)
+      const who = call === undefined ? 'tool' : call.name
+      facts.errors.push(`${who}: ${result.line}`)
       continue
     }
+
+    // user-role messages: prior checkpoints, real user text, display rows
     const text = textOf(message)
     if (text.trim().length === 0) continue
-    if (message.source?.kind === 'plugin' && message.source.plugin === 'compact') {
+    if (isCompactCheckpointSource(message.source)) {
       facts.carried = parseCheckpointSections(text)
       continue
     }
     // dsh-dcp's own compaction notices are transcript display rows: the model
     // learns nothing from them the checkpoint below does not already carry.
-    if (message.source?.kind === 'plugin' && message.source.plugin === 'dsh-dcp') continue
+    // `plugin:dsh-dcp` is the V3→V4 session-log migration's spelling for
+    // pre-migration rows (cast: no type declares the legacy namespace).
+    const noticeKind = /** @type {string} */ (message.source?.kind)
+    if (noticeKind === 'dsh-dcp' || noticeKind === 'plugin:dsh-dcp') continue
     if (isInjectedContext(message)) continue
     const intentText = noticeSummary(message) ?? text
     facts.lastUserText = intentText

package/locale/en.json

@@ -0,0 +1,6 @@
+{
+  "meta": {
+    "title": "dsh-dcp",
+    "description": "Deterministic zero-LLM context-pruning compaction backend with a /dcp command — works out of the box."
+  }
+}

package/locale/zh.json

@@ -0,0 +1,6 @@
+{
+  "meta": {
+    "title": "dsh-dcp",
+    "description": "确定性、零 LLM 摘要的上下文修剪压缩后端，附 /dcp 命令，开箱即用。"
+  }
+}

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@aiwayds/dsh-dcp",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Deterministic context-pruning compaction backend for dsh (DeepSeek Harness) — zero-LLM summaries, /dcp command, works out of the box. Design references Opencode-DCP/opencode-dynamic-context-pruning.",
   "type": "module",
   "main": "lib/index.js",
+  "icon": "./icon.svg",
   "bin": {
     "dsh-dcp-setup": "scripts/setup.mjs"
   },
@@ -12,7 +13,8 @@
     "./summarizer": "./lib/summarizer.js",
     "./config": "./lib/config.js",
     "./setup": "./lib/setup.js",
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./locale/*.json": "./locale/*.json"
   },
   "files": [
     "lib",
@@ -21,7 +23,9 @@
     "README.md",
     "README.en.md",
     "LICENSE",
-    "cordis.patch.yml"
+    "cordis.patch.yml",
+    "icon.svg",
+    "locale/*.json"
   ],
   "scripts": {
     "test": "node --test",
@@ -53,17 +57,17 @@
   "dependencies": {},
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-agent": ">=0.1.5-rc.2",
-    "@deepseek-ai/dsh-brand": ">=0.1.5-rc.2",
-    "@deepseek-ai/dsh-commands": ">=0.1.5-rc.2",
-    "@deepseek-ai/dsh-compaction": ">=0.1.5-rc.2",
-    "@deepseek-ai/dsh-compaction-basic": ">=0.1.5-rc.2",
-    "@deepseek-ai/dsh-compaction-tool-result-pruner": ">=0.1.5-rc.2",
-    "@deepseek-ai/dsh-invariants": ">=0.1.5-rc.2",
-    "@deepseek-ai/dsh-llm": ">=0.1.5-rc.2",
-    "@deepseek-ai/dsh-session": ">=0.1.5-rc.2",
-    "@deepseek-ai/dsh-skill": ">=0.1.5-rc.2",
-    "@deepseek-ai/dsh-token-meter": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-agent": ">=0.1.7-rc.1",
+    "@deepseek-ai/dsh-brand": ">=0.1.7-rc.1",
+    "@deepseek-ai/dsh-commands": ">=0.1.7-rc.1",
+    "@deepseek-ai/dsh-compaction": ">=0.1.7-rc.1",
+    "@deepseek-ai/dsh-compaction-basic": ">=0.1.7-rc.1",
+    "@deepseek-ai/dsh-compaction-tool-result-pruner": ">=0.1.7-rc.1",
+    "@deepseek-ai/dsh-invariants": ">=0.1.7-rc.1",
+    "@deepseek-ai/dsh-llm": ">=0.1.7-rc.1",
+    "@deepseek-ai/dsh-session": ">=0.1.7-rc.1",
+    "@deepseek-ai/dsh-skill": ">=0.1.7-rc.1",
+    "@deepseek-ai/dsh-token-meter": ">=0.1.7-rc.1",
     "@deepseek-ai/schemastery": "^3.18.2"
   },
   "peerDependenciesMeta": {
@@ -109,35 +113,35 @@
   },
   "devDependencies": {
     "@types/node": "^24.0.0",
-    "@deepseek-ai/cordis": "4.0.2",
-    "@deepseek-ai/dsh-agent": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-brand": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-commands": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-compaction": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-compaction-basic": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-compaction-tool-result-pruner": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-invariants": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-llm": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-session": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-token-meter": "0.1.5-rc.2",
+    "@deepseek-ai/cordis": "4.0.4",
+    "@deepseek-ai/dsh-agent": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-brand": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-commands": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-compaction": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-compaction-basic": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-compaction-tool-result-pruner": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-invariants": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-llm": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-session": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-token-meter": "0.1.7-rc.1",
     "@deepseek-ai/schemastery": "3.18.2",
     "typescript": "~5.9.0"
   },
   "overrides": {
-    "@deepseek-ai/dsh-agent": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-brand": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-commands": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-compaction": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-compaction-tool-result-pruner": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-invariants": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-llm": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-session": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-token-meter": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-scope": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-attachment": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-session-projection": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-system-prompt": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-llm-retry": "0.1.5-rc.2"
+    "@deepseek-ai/dsh-agent": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-brand": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-commands": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-compaction": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-compaction-tool-result-pruner": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-invariants": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-llm": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-session": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-token-meter": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-scope": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-attachment": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-session-projection": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-system-prompt": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-llm-retry": "0.1.7-rc.1"
   },
   "dsh": {
     "bundle": {
@@ -146,11 +150,11 @@
   },
   "pnpm": {
     "overrides": {
-      "@deepseek-ai/dsh-scope": "0.1.5-rc.2",
-      "@deepseek-ai/dsh-attachment": "0.1.5-rc.2",
-      "@deepseek-ai/dsh-session-projection": "0.1.5-rc.2",
-      "@deepseek-ai/dsh-system-prompt": "0.1.5-rc.2",
-      "@deepseek-ai/dsh-llm-retry": "0.1.5-rc.2"
+      "@deepseek-ai/dsh-scope": "0.1.7-rc.1",
+      "@deepseek-ai/dsh-attachment": "0.1.7-rc.1",
+      "@deepseek-ai/dsh-session-projection": "0.1.7-rc.1",
+      "@deepseek-ai/dsh-system-prompt": "0.1.7-rc.1",
+      "@deepseek-ai/dsh-llm-retry": "0.1.7-rc.1"
     }
   }
 }

package/scripts/compare.mjs

@@ -79,9 +79,6 @@ function hostTokens(content) {
   return content.reduce((total, block) => {
     if (block.type === 'text') return total + Math.ceil(block.text.length / 4)
     if (block.type === 'tool-call') return total + Math.ceil(block.arguments.length / 4)
-    if (block.type === 'tool-result') {
-      return total + block.content.reduce((sum, inner) => sum + (inner.type === 'text' ? Math.ceil(inner.text.length / 4) : 0), 0)
-    }
     return total
   }, 0)
 }
@@ -145,7 +142,7 @@ function checkpointMessage(summaryText, compactionId) {
       { type: 'text', text: summaryText },
       { type: 'text', text: '</compacted-summary>' },
     ],
-    source: { kind: 'plugin', plugin: 'compact', compactionId },
+    source: { kind: 'compact-checkpoint', compactionId },
   }
 }