@aiwayds/dsh-dcp 0.6.0 → 0.8.0

package/README.en.md

@@ -3,6 +3,8 @@
 Deterministic context-compaction backend for dsh (DeepSeek Harness): **context
 compaction without an LLM call**, works out of the box.
 
+**Requires dsh >= 0.1.2-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**
 
 ## Why
@@ -103,6 +105,28 @@ npx dsh-dcp-setup                   # safe: date-stamped backup → append-only
 > mount it. The web profile does not bundle the TUI, so it keeps the official
 > backend and is unaffected.
 
+## Uninstall
+
+**Bundle path** (`dsh plugin add`, or listed under `bundles`):
+
+```sh
+dsh plugin --profile <name> remove @aiwayds/dsh-dcp
+```
+
+The host reconciles automatically: the bundles entry is spliced, the patch layer drops with the package, and the stock LLM summarizer (`compaction-basic`) re-enables.
+
+**Setup-script path** (the patch block `npx dsh-dcp-setup` wrote):
+
+```bash
+npx dsh-dcp-setup --remove                        # default home patch
+npx dsh-dcp-setup --remove --profile tui          # a named profile
+npx dsh-dcp-setup --remove /path/to/cordis.patch.yml
+```
+
+`--remove` strips only the setup-written mount block (including any config you tuned), with the same date-stamped backup before modifying; hand-written mounts are left alone; the file is deleted when nothing else remains. Two WARN lines matter: a leftover `compaction-basic` disable entry keeps the stock summarizer off (remove it by hand if it was only for dsh-dcp), and another dsh-dcp mount in the same file is untouched.
+
+Removing the package without the reverse step leaves the mount pointing at the vanished absolute entry path, and the profile boot fails with module-not-found.
+
 ## /dcp command
 
 | Command | Effect |

package/README.md

@@ -2,6 +2,8 @@
 
 dsh（DeepSeek Harness）的确定性压缩后端：**上下文压缩不调 LLM**，开箱即用。
 
+**要求 dsh >= 0.1.2-rc.1** — 本插件只跟随 dsh RC/stable 线（CI 与发版在运行时解析 latest/next 中更新的 dist-tag）。**不再支持 alpha 线。**
+
 > **简体中文** · [English](README.en.md)
 
 ## 为什么做
@@ -82,6 +84,28 @@ npx dsh-dcp-setup                   # 安全脚本：带日期备份 → 只追
 
 > dsh-dcp 挂在 dsh 的压缩接口上，只对挂载了它的 profile 生效。web profile 没挂 tui，继续用官方压缩，不受影响。
 
+## 卸载
+
+**Bundle 方式**（`dsh plugin add` 或列在 `bundles`）：
+
+```sh
+dsh plugin --profile <name> remove @aiwayds/dsh-dcp
+```
+
+宿主自动收敛：bundles 条目移除、patch 层随包消失，官方 LLM 压缩后端 `compaction-basic` 自动恢复。
+
+**setup 脚本方式**（`npx dsh-dcp-setup` 写入的 patch 块）：
+
+```bash
+npx dsh-dcp-setup --remove                        # 默认 home patch
+npx dsh-dcp-setup --remove --profile tui          # 指定 profile
+npx dsh-dcp-setup --remove /path/to/cordis.patch.yml
+```
+
+`--remove` 只删除 setup 写入的挂载块（含你调过的 config），修改前同样带日期备份；手工写的挂载块不受影响；删完文件为空时自动删除文件。两条 WARN 要留意：文件里若还留有 `compaction-basic` 的 disable 条目，官方压缩后端会保持关闭 —— 不是给 dsh-dcp 用的就手动删掉；同一文件里另一处 dsh-dcp 挂载不会被碰。
+
+不执行反向步骤直接卸包，patch 里的绝对路径会指向已消失的安装目录，profile 启动将以 module-not-found 失败。
+
 ## /dcp 命令
 
 | 命令 | 作用 |

package/cordis.patch.yml

@@ -7,6 +7,7 @@
 # cordis.patch.yml editing.
 
 - id: compaction-basic
+  name: '@deepseek-ai/dsh-compaction-basic'
   disabled: true
 - insert:
     - id: dsh-dcp

package/lib/setup.js

@@ -11,8 +11,12 @@
  */
 import { readdirSync, readFileSync } from 'node:fs'
 
-/** The patch entry that disables the default LLM summarizer. */
+/** The patch entry that disables the default LLM summarizer. The `name` is
+ *  a guard, not an override: if a future host renames or drops the row, the
+ *  entry is skipped with a loader warning instead of silently disabling an
+ *  unrelated component (the same pattern dsh-tui-pi's patch uses). */
 const DISABLE_ENTRY = `- id: compaction-basic
+  name: '@deepseek-ai/dsh-compaction-basic'
   disabled: true`
 
 /** The dsh-dcp mount block, one YAML list item, appended to the file. */
@@ -93,3 +97,65 @@ export function backupStamp(date = new Date()) {
   const p = (n) => String(n).padStart(2, '0')
   return `${date.getFullYear()}${p(date.getMonth() + 1)}${p(date.getDate())}-${p(date.getHours())}${p(date.getMinutes())}`
 }
+
+/** The marker comment every setup-written mount block starts with. */
+const MOUNT_MARKER = 'added by @aiwayds/dsh-dcp setup'
+
+/**
+ * Reverse of planPatch/mountBlock: remove the setup-appended dsh-dcp mount
+ * block — the marker comment, the disable entry it added, and the insert
+ * item including any config the user tuned inside it — from one patch
+ * file's text. Hand-written mounts without the marker are NOT touched (the
+ * human wrote it; the human removes it); user entries after the block are
+ * preserved byte-for-byte.
+ *
+ * Uninstalling the package without this reverse step leaves the mount
+ * pointing at the vanished absolute entry path, which fails the profile's
+ * whole boot with a module-not-found error.
+ *
+ * @param {string|undefined} text - the patch file content.
+ * @returns {{ removed: boolean, text: string, note?: string }} `text` with
+ *   the block gone ('' when nothing else remains — the caller may delete the
+ *   file); `removed: false` leaves `text` untouched and sets `note`.
+ */
+export function planRemoval(text) {
+  if (!text) return { removed: false, text: text ?? '' }
+  const lines = text.split('\n')
+  const marker = lines.findIndex((line) => line.includes(MOUNT_MARKER))
+  if (marker === -1) {
+    return { removed: false, text, note: 'no setup-written dsh-dcp mount block found (hand-written mounts are left alone)' }
+  }
+  let i = marker + 1
+  let end = lines.length
+  let sawInsert = false
+  while (i < lines.length) {
+    const line = lines[i]
+    if (line === '') { i++; continue }
+    if (line.startsWith('- ')) {
+      // One top-level list item: the entry line plus its indented body (and
+      // any blank lines inside it the user added while tuning config). The
+      // split artifact after a final newline is EOF, not a blank to consume.
+      let j = i + 1
+      while (j < lines.length && (lines[j] === '' ? j < lines.length - 1 : lines[j].startsWith(' ') || lines[j].startsWith('\t'))) j++
+      if (line.startsWith('- insert')) {
+        sawInsert = true
+        end = j
+        break
+      }
+      i = j
+      continue
+    }
+    // Anything else at column 0 (a user comment or entry) ends our block.
+    end = i
+    break
+  }
+  if (!sawInsert) {
+    return { removed: false, text, note: 'the setup marker was found but the dsh-dcp insert item is missing — leaving the file untouched' }
+  }
+  let start = marker
+  // The block was appended with one leading blank line; take it so repeated
+  // mount/unmount cycles do not accumulate blank runs.
+  if (start > 0 && lines[start - 1].trim() === '') start -= 1
+  const remaining = [...lines.slice(0, start), ...lines.slice(end)].join('\n')
+  return { removed: true, text: remaining.trim() === '' ? '' : remaining }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiwayds/dsh-dcp",
-  "version": "0.6.0",
+  "version": "0.8.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",
@@ -52,16 +52,16 @@
   "dependencies": {},
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-agent": ">=0.1.2-alpha.3",
-    "@deepseek-ai/dsh-brand": ">=0.1.2-alpha.3",
-    "@deepseek-ai/dsh-commands": ">=0.1.2-alpha.3",
-    "@deepseek-ai/dsh-compaction": ">=0.1.2-alpha.3",
-    "@deepseek-ai/dsh-compaction-basic": ">=0.1.2-alpha.3",
-    "@deepseek-ai/dsh-compaction-tool-result-pruner": ">=0.1.2-alpha.3",
-    "@deepseek-ai/dsh-invariants": ">=0.1.2-alpha.3",
-    "@deepseek-ai/dsh-llm": ">=0.1.2-alpha.3",
-    "@deepseek-ai/dsh-session": ">=0.1.2-alpha.3",
-    "@deepseek-ai/dsh-token-meter": ">=0.1.2-alpha.3",
+    "@deepseek-ai/dsh-agent": ">=0.1.2-rc.1",
+    "@deepseek-ai/dsh-brand": ">=0.1.2-rc.1",
+    "@deepseek-ai/dsh-commands": ">=0.1.2-rc.1",
+    "@deepseek-ai/dsh-compaction": ">=0.1.2-rc.1",
+    "@deepseek-ai/dsh-compaction-basic": ">=0.1.2-rc.1",
+    "@deepseek-ai/dsh-compaction-tool-result-pruner": ">=0.1.2-rc.1",
+    "@deepseek-ai/dsh-invariants": ">=0.1.2-rc.1",
+    "@deepseek-ai/dsh-llm": ">=0.1.2-rc.1",
+    "@deepseek-ai/dsh-session": ">=0.1.2-rc.1",
+    "@deepseek-ai/dsh-token-meter": ">=0.1.2-rc.1",
     "@deepseek-ai/schemastery": "^3.18.2"
   },
   "peerDependenciesMeta": {
@@ -105,33 +105,47 @@
   "devDependencies": {
     "@types/node": "^24.0.0",
     "@deepseek-ai/cordis": "4.0.2",
-    "@deepseek-ai/dsh-agent": "0.1.2-alpha.3",
-    "@deepseek-ai/dsh-brand": "0.1.2-alpha.3",
-    "@deepseek-ai/dsh-commands": "0.1.2-alpha.3",
-    "@deepseek-ai/dsh-compaction": "0.1.2-alpha.3",
-    "@deepseek-ai/dsh-compaction-basic": "0.1.2-alpha.3",
-    "@deepseek-ai/dsh-compaction-tool-result-pruner": "0.1.2-alpha.3",
-    "@deepseek-ai/dsh-invariants": "0.1.2-alpha.3",
-    "@deepseek-ai/dsh-llm": "0.1.2-alpha.3",
-    "@deepseek-ai/dsh-session": "0.1.2-alpha.3",
-    "@deepseek-ai/dsh-token-meter": "0.1.2-alpha.3",
+    "@deepseek-ai/dsh-agent": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-brand": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-commands": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-compaction": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-compaction-basic": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-compaction-tool-result-pruner": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-invariants": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-llm": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-session": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-token-meter": "0.1.2-rc.1",
     "@deepseek-ai/schemastery": "3.18.2",
     "typescript": "~5.9.0"
   },
   "overrides": {
-    "@deepseek-ai/dsh-agent": "0.1.2-alpha.3",
-    "@deepseek-ai/dsh-brand": "0.1.2-alpha.3",
-    "@deepseek-ai/dsh-commands": "0.1.2-alpha.3",
-    "@deepseek-ai/dsh-compaction": "0.1.2-alpha.3",
-    "@deepseek-ai/dsh-compaction-tool-result-pruner": "0.1.2-alpha.3",
-    "@deepseek-ai/dsh-invariants": "0.1.2-alpha.3",
-    "@deepseek-ai/dsh-llm": "0.1.2-alpha.3",
-    "@deepseek-ai/dsh-session": "0.1.2-alpha.3",
-    "@deepseek-ai/dsh-token-meter": "0.1.2-alpha.3"
+    "@deepseek-ai/dsh-agent": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-brand": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-commands": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-compaction": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-compaction-tool-result-pruner": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-invariants": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-llm": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-session": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-token-meter": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-scope": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-attachment": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-session-projection": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-system-prompt": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-llm-retry": "0.1.2-rc.1"
   },
   "dsh": {
     "bundle": {
       "patch": "./cordis.patch.yml"
     }
+  },
+  "pnpm": {
+    "overrides": {
+      "@deepseek-ai/dsh-scope": "0.1.2-rc.1",
+      "@deepseek-ai/dsh-attachment": "0.1.2-rc.1",
+      "@deepseek-ai/dsh-session-projection": "0.1.2-rc.1",
+      "@deepseek-ai/dsh-system-prompt": "0.1.2-rc.1",
+      "@deepseek-ai/dsh-llm-retry": "0.1.2-rc.1"
+    }
   }
 }

package/scripts/setup.mjs

@@ -20,11 +20,13 @@
  *   node scripts/setup.mjs                 # home patch
  *   node scripts/setup.mjs --profile tui   # tui profile's patch
  *   node scripts/setup.mjs /path/to/cordis.patch.yml
+ *   node scripts/setup.mjs --remove [...]  # reverse: remove the setup-written
+ *                                          # mount block (same target forms)
  */
 import fs from 'node:fs'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
-import { planPatch, backupStamp, findBundledProfiles } from '../lib/setup.js'
+import { planPatch, planRemoval, hasEntry, isMounted, backupStamp, findBundledProfiles } from '../lib/setup.js'
 
 const PKG = '@aiwayds/dsh-dcp'
 const pkgRoot = path.dirname(path.dirname(fileURLToPath(import.meta.url)))
@@ -36,18 +38,53 @@ function home() {
 
 function parseArgs(argv) {
   const force = argv.includes('--force')
+  const remove = argv.includes('--remove')
   if (argv.includes('--profile')) {
     const index = argv.indexOf('--profile')
     const name = argv[index + 1]
     if (!name) throw new Error('setup: --profile requires a profile name')
-    return { target: path.join(home(), 'profiles', name, 'cordis.patch.yml'), kind: 'profile', profileName: name, force }
+    return { target: path.join(home(), 'profiles', name, 'cordis.patch.yml'), kind: 'profile', profileName: name, force, remove }
   }
   const explicit = argv.find((a) => !a.startsWith('-'))
-  if (explicit) return { target: path.resolve(explicit), kind: 'explicit', force }
-  return { target: path.join(home(), 'cordis.patch.yml'), kind: 'home', force }
+  if (explicit) return { target: path.resolve(explicit), kind: 'explicit', force, remove }
+  return { target: path.join(home(), 'cordis.patch.yml'), kind: 'home', force, remove }
+}
+
+const { target, kind, profileName, force, remove } = parseArgs(process.argv.slice(2))
+
+if (remove) {
+  const existed = fs.existsSync(target)
+  const text = existed ? fs.readFileSync(target, 'utf8') : undefined
+  if (!existed) {
+    console.log(`no ${target} — nothing to remove.`)
+    process.exit(0)
+  }
+  const plan = planRemoval(text)
+  if (!plan.removed) {
+    console.log(`dsh-dcp mount not removed from ${target}.`)
+    if (plan.note) console.log(`note: ${plan.note}`)
+    process.exit(0)
+  }
+  const backup = `${target}.bak.${backupStamp()}`
+  fs.copyFileSync(target, backup)
+  console.log(`backup: ${backup}`)
+  if (plan.text === '') {
+    fs.rmSync(target)
+    console.log(`removed ${target} (the file held nothing else)`)
+  } else {
+    fs.writeFileSync(target, plan.text)
+    console.log(`removed the dsh-dcp mount block from ${target}`)
+  }
+  if (plan.text !== '' && hasEntry(plan.text, 'compaction-basic')) {
+    console.warn('WARN: a compaction-basic entry remains in this patch file — the stock LLM summarizer stays disabled; remove that entry by hand if it was only for dsh-dcp.')
+  }
+  if (plan.text !== '' && isMounted(plan.text)) {
+    console.warn('WARN: another dsh-dcp mount remains in this patch file — leaving it alone.')
+  }
+  console.log('restart dsh to apply.')
+  process.exit(0)
 }
 
-const { target, kind, profileName, force } = parseArgs(process.argv.slice(2))
 const existed = fs.existsSync(target)
 const text = existed ? fs.readFileSync(target, 'utf8') : undefined
 if (!existed) console.log(`no ${target} — will generate a fresh patch file`)

package/scripts/smoke-boot.mjs

@@ -12,11 +12,16 @@
 //      as a file: dependency, and a cordis.patch.yml carrying the
 //      disable-compaction-basic + insert-dsh-dcp mount block
 //   3. pnpm install in the profile
-//   4. `dsh --profile smoke --dump-config` must compose dsh-dcp into the tree
-//      (mount/patch-layer proof)
-//   5. a real boot under a timeout must load the plugin tree without a loader
-//      error (a healthy boot is silent and survives to the kill signal; a
-//      broken plugin dies within ~1s with the loader error)
+//   4. Phase A: setup.mjs mounts the profile patch (marker block), the
+//      composed tree carries dsh-dcp with compaction-basic disabled, then
+//      `setup.mjs --remove` strips it and the recomposed tree is back to
+//      stock (this is what breaks a profile when the package is removed
+//      without the reverse step)
+//   5. Phase B: a hand-written mount pointing into the installed tarball —
+//      the true user shape — composes, and a real boot under a timeout must
+//      load the plugin tree without a loader error (a healthy boot is silent
+//      and survives to the kill signal; a broken plugin dies within ~1s with
+//      the loader error)
 //
 // The dsh CLI comes from $DSH_BIN if set (e.g. a scratch alpha closure:
 // DSH_BIN=~/tmp/dsh-alpha-closure/node_modules/@deepseek-ai/dsh/lib/bin.js),
@@ -57,18 +62,9 @@ if (pack.status !== 0 || pack.error) fail('npm pack failed', `${pack.stdout}\n${
 const tarball = path.join(work, pack.stdout.trim().split('\n').at(-1) ?? '')
 
 writeFileSync(path.join(profile, 'cordis.yml'), '# dsh profile root — empty; the tree is composed from the bundle patches\n[]\n')
-// The mount layer under test — isomorphic with scripts/setup.mjs's output:
-// compaction-basic disabled, dsh-dcp inserted by absolute entry path.
-writeFileSync(path.join(profile, 'cordis.patch.yml'), `# scratch smoke profile: dsh-dcp mounted the setup.mjs way
-- id: compaction-basic
-  disabled: true
-- insert:
-    - id: ${entryId}
-      name: ${path.join(profile, 'node_modules', '@aiwayds', 'dsh-dcp', 'lib', 'index.js')}
-      config:
-        thresholdRatio: 0.7
-        language: zh
-`)
+// The patch file starts EMPTY: Phase A below drives the full setup.mjs
+// mount → remove lifecycle against it, then Phase B hand-writes the mount
+// (isomorphic with setup.mjs's output) for the real-boot proof.
 writeFileSync(path.join(profile, 'pnpm-workspace.yaml'), 'packages:\n  - .\n\nnodeLinker: hoisted\nautoInstallPeers: false\n')
 writeFileSync(path.join(profile, 'package.json'), JSON.stringify({
   name: 'dsh-profile-smoke',
@@ -90,8 +86,47 @@ writeFileSync(path.join(profile, 'package.json'), JSON.stringify({
 const install = spawnSync('pnpm', ['install'], { cwd: profile, encoding: 'utf8' })
 if (install.status !== 0 || install.error) fail('pnpm install in the scratch profile failed', `${install.stdout}\n${install.stderr}`)
 
-// Phase 1 — mount proof: the composed tree must carry the dsh-dcp entry, with
-// compaction-basic disabled rather than removed-by-default.
+// Phase A — the setup.mjs lifecycle: mount → compose → remove → stock tree.
+// This is the exact pair of commands a standalone user runs (`npx dsh-dcp-setup`
+// and its `--remove`), against the profile patch file they target.
+const patchFile = path.join(profile, 'cordis.patch.yml')
+const setup = spawnSync(process.execPath, [path.join(repoRoot, 'scripts', 'setup.mjs'), patchFile], { encoding: 'utf8' })
+if (setup.status !== 0 || setup.error) fail('setup.mjs mount failed', `${setup.stdout}\n${setup.stderr}`)
+const dumpMounted = dsh(['--profile', 'smoke', '--dump-config'])
+if (dumpMounted.status !== 0 || dumpMounted.error) fail('dsh --dump-config failed on the setup-mounted profile', `${dumpMounted.stdout}\n${dumpMounted.stderr}`)
+if (!dumpMounted.stdout.includes(entryId) || !/compaction-basic\n(  name: .*\n)?  disabled: true/.test(dumpMounted.stdout)) {
+  fail('the setup-mounted tree does not carry dsh-dcp with compaction-basic disabled', dumpMounted.stdout)
+}
+const remove = spawnSync(process.execPath, [path.join(repoRoot, 'scripts', 'setup.mjs'), '--remove', patchFile], { encoding: 'utf8' })
+if (remove.status !== 0 || remove.error) fail('setup.mjs --remove failed', `${remove.stdout}\n${remove.stderr}`)
+const dumpAfter = dsh(['--profile', 'smoke', '--dump-config'])
+if (dumpAfter.status !== 0 || dumpAfter.error) fail('dsh --dump-config failed after removal', `${dumpAfter.stdout}\n${dumpAfter.stderr}`)
+if (dumpAfter.stdout.includes(entryId)) {
+  fail(`the composed tree still contains the "${entryId}" entry after removal`, dumpAfter.stdout)
+}
+if (/compaction-basic\n(  name: .*\n)?  disabled: true/.test(dumpAfter.stdout)) {
+  fail('compaction-basic is still disabled after removal — the stock backend did not come back', dumpAfter.stdout)
+}
+if (!dumpAfter.stdout.includes('compaction-basic')) {
+  fail('compaction-basic vanished from the composed tree after removal', dumpAfter.stdout)
+}
+console.log('smoke-boot: setup.mjs mount → remove lifecycle restored the stock tree')
+
+// Phase B — mount proof: the composed tree must carry the dsh-dcp entry, with
+// compaction-basic disabled rather than removed-by-default. The hand-written
+// mount points INTO the installed tarball (the true user shape), so the boot
+// below exercises the packed artifact.
+writeFileSync(path.join(profile, 'cordis.patch.yml'), `# scratch smoke profile: dsh-dcp mounted the setup.mjs way
+- id: compaction-basic
+  name: '@deepseek-ai/dsh-compaction-basic'
+  disabled: true
+- insert:
+    - id: ${entryId}
+      name: ${path.join(profile, 'node_modules', '@aiwayds', 'dsh-dcp', 'lib', 'index.js')}
+      config:
+        thresholdRatio: 0.7
+        language: zh
+`)
 const dump = dsh(['--profile', 'smoke', '--dump-config'])
 if (dump.status !== 0 || dump.error) fail('dsh --dump-config failed on the scratch profile', `${dump.stdout}\n${dump.stderr}`)
 if (!dump.stdout.includes(entryId)) {
@@ -118,5 +153,5 @@ if (boot.signal !== 'SIGKILL' && boot.status !== 0) {
   fail(`dsh exited early with code ${boot.status} and no loader error — unexpected`, output)
 }
 
-console.log(`smoke-boot: PASS — ${ownName} mounted via cordis.patch.yml (compaction-basic disabled), composed into the scratch profile tree, and booted clean in real dsh (${boot.signal === 'SIGKILL' ? `survived ${bootSeconds}s boot window` : `exited ${boot.status}`})`)
+console.log(`smoke-boot: PASS — ${ownName} mounted via cordis.patch.yml (compaction-basic disabled), composed into the scratch profile tree, booted clean in real dsh (${boot.signal === 'SIGKILL' ? `survived ${bootSeconds}s boot window` : `exited ${boot.status}`}); setup mount → remove lifecycle restored the stock tree`)
 rmSync(work, { recursive: true, force: true })