dsh-reasoning-distill 0.1.3 → 0.1.4

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 本插件的版本变更记录。
 
+## 0.1.4
+
+- **in-place 宿主补丁现在自动适配 `0.2.1-alpha.1` ～ `0.2.1-alpha.5`**：同一个编辑点可以带多组完整锚点，脚本按宿主实际形态挑**恰好匹配的一组**；一组都不匹配、或有多组命中，仍然整体拒绝、不做部分写入。
+- 第 10 处 `tracker-rewrite-sink` 增加「新形态」锚点：宿主自 `0.2.1-alpha.3` 起把该 hook 改成 generator effect + 解构闭包变量，替换文本因此改用闭包 `writers`（generator 内部 `this` 已不是那个实例）——只补缩进能编译，但第一个会话事件就会崩。
+- 逐版本实测（独立 clone）：`alpha.1`～`alpha.5` 全部 `--apply`/`--check`/`--revert` 通过，回退后工作树逐字节干净；`alpha.1`/`alpha.2`/`alpha.3`/`alpha.5` 打过补丁的树 `tsc -b` 通过（`alpha.4`/`alpha.5` 的补丁目标文件与 `alpha.3` 逐字节相同）。
+- README 增加「经过测试的 DSH 版本」：只有 `0.2.1-alpha.1` 是实机运行验证过的，其余为补丁覆盖。
+
 ## 0.1.3
 
 - **暗色模式可读性**：样式表原先引用的是宿主并不存在的 `--dsw-text-primary` / `--dsw-surface` 等变量，全部落到硬编码的浅色回退值，暗色下就成了深底深字、白底白字。现已改用宿主的真实主题 token（`--dsw-alias-label-*`、`--dsw-alias-bg-layer-*`、`--dsw-alias-border-l1`、`--dsw-alias-interactive-bg-hover`），颜色随应用主题自动切换；红/绿/橙保持原来的色调不变。

package/README.md

@@ -28,12 +28,20 @@
 ### 内置原位后端（in-place）与宿主补丁（首选）
 
 - 不需要安装任何包；它的前置条件是**给 DSH 本体打补丁**（`scripts/dsh-inplace-patch.mjs`）。快速安装里的 in-place 就是打这个补丁。
-- 补丁给会话加了两样能力：在不改变日志长度、seq、消息 id 的前提下，替换某条助手消息里的思考块；以及让持久化层能就地改写已存的记录。共 14 处字面编辑。
+- 补丁给会话加了两样能力：在不改变日志长度、seq、消息 id 的前提下，替换某条助手消息里的思考块；以及让持久化层能就地改写已存的记录。共 14 处编辑（其中 1 处带两份版本锚点，见下）。
 - 好处：不新建分支、不产生额外会话，对话列表和归档列表保持干净。
 - 风险：这是修改 DSH 本体源码的补丁。**DSH 跨版本升级很容易出问题**——补丁按字面锚点匹配，任何一处对不上就整体拒绝，不会写一半。升级 DSH 前建议先回退，升级后再用 `--check` 复查、必要时重打；打不上就用 `--checkout <DSH 源码目录>` 指路，不要手工改宿主源码。
 - 打完补丁需要重启 `dsh web` 才生效。回退：`node scripts/dsh-inplace-patch.mjs --revert --build`。
 - **打包版 DSH 用不了这个后端**：像 dsh-desktop 这类把 harness 装成只读、只有 `node_modules` 而没有源码的安装，没有可写的源码树可以打补丁；这类安装请用 message-edit。
 
+#### 经过测试的 DSH 版本
+
+- **实机运行验证过的只有 `0.2.1-alpha.1`**：就是本插件开发机正在运行的版本，in-place 补丁已在真实会话里长期使用。
+- **补丁本身经过验证的版本**：`0.2.1-alpha.1` ～ `0.2.1-alpha.5`。做法是把官方仓库单独 clone 出来，逐个 tag 跑 `--apply` → `--check` → `--revert` → `--check`（全部通过，回退后工作树逐字节干净），并让打过补丁的树跑 `tsc -b`（`alpha.3` 与 `alpha.5` 实测通过）。
+  - `alpha.4` / `alpha.5` 的 6 个补丁目标文件与 `alpha.3` 逐字节相同，所以这三个版本是同一组结论。
+- 上面的"覆盖"只证明：补丁能干净地打上、能逐字节回退、打过补丁的包能通过类型检查。**运行期行为只有 `alpha.1` 是实测的**；更"新"的宿主版本请先在一个可回退的环境里验证再长期使用。
+- 版本差异最大的一处：`packages/session/session-persistence-jsonl/src/storage.ts` 的 `install()` 从 `0.2.1-alpha.3` 起改成了 generator effect + 闭包变量（`writers` 取代 `this.writers`，在 generator 内部 `this` 已不是那个实例）。补丁脚本为此处带**两份锚点**，会按宿主实际形态自动选择匹配的那份，不会用"只改缩进"的方式硬套。
+
 ### 旧后端 `message-edit`（保留兼容，不推荐）
 
 - 这是**其他开发者发布的第三方插件**：<https://github.com/Moeblack/dsh-message-edit>。

package/lib/client/index.js

@@ -1335,48 +1335,48 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var Settings_module_css_default = {
-			"section": "jP3NOa_section",
-			"error": "jP3NOa_error",
-			"search": "jP3NOa_search",
-			"holidayBox": "jP3NOa_holidayBox",
-			"modeCards": "jP3NOa_modeCards",
+			"backendOptions": "jP3NOa_backendOptions",
+			"actions": "jP3NOa_actions",
+			"modalBackdrop": "jP3NOa_modalBackdrop",
+			"modal": "jP3NOa_modal",
+			"iconButton": "jP3NOa_iconButton",
 			"secondary": "jP3NOa_secondary",
-			"toggle": "jP3NOa_toggle",
 			"peakBox": "jP3NOa_peakBox",
-			"installProgress": "jP3NOa_installProgress",
-			"log": "jP3NOa_log",
-			"sectionHeading": "jP3NOa_sectionHeading",
-			"modalBody": "jP3NOa_modalBody",
 			"item": "jP3NOa_item",
-			"note": "jP3NOa_note",
-			"page": "jP3NOa_page",
-			"modal": "jP3NOa_modal",
-			"primary": "jP3NOa_primary",
-			"pickerItem": "jP3NOa_pickerItem",
-			"logBox": "jP3NOa_logBox",
-			"iconButton": "jP3NOa_iconButton",
-			"route": "jP3NOa_route",
+			"field": "jP3NOa_field",
 			"pickerPanel": "jP3NOa_pickerPanel",
-			"modalBackdrop": "jP3NOa_modalBackdrop",
-			"checks": "jP3NOa_checks",
+			"sectionHeading": "jP3NOa_sectionHeading",
 			"installBlock": "jP3NOa_installBlock",
-			"steps": "jP3NOa_steps",
-			"prompt": "jP3NOa_prompt",
-			"modeCard": "jP3NOa_modeCard",
-			"itemBody": "jP3NOa_itemBody",
-			"field": "jP3NOa_field",
-			"actions": "jP3NOa_actions",
 			"badge": "jP3NOa_badge",
-			"modalHead": "jP3NOa_modalHead",
-			"backendOptions": "jP3NOa_backendOptions",
-			"muted": "jP3NOa_muted",
-			"picker": "jP3NOa_picker",
-			"header": "jP3NOa_header",
+			"page": "jP3NOa_page",
+			"note": "jP3NOa_note",
 			"priceGrid": "jP3NOa_priceGrid",
+			"prompt": "jP3NOa_prompt",
+			"rule": "jP3NOa_rule",
+			"holidayBox": "jP3NOa_holidayBox",
+			"modeCards": "jP3NOa_modeCards",
+			"steps": "jP3NOa_steps",
+			"header": "jP3NOa_header",
+			"error": "jP3NOa_error",
+			"picker": "jP3NOa_picker",
+			"muted": "jP3NOa_muted",
+			"section": "jP3NOa_section",
+			"installEntry": "jP3NOa_installEntry",
+			"primary": "jP3NOa_primary",
+			"search": "jP3NOa_search",
+			"modalBody": "jP3NOa_modalBody",
+			"logBox": "jP3NOa_logBox",
+			"toggle": "jP3NOa_toggle",
+			"pickerItem": "jP3NOa_pickerItem",
+			"modeCard": "jP3NOa_modeCard",
 			"pickerList": "jP3NOa_pickerList",
+			"itemBody": "jP3NOa_itemBody",
+			"route": "jP3NOa_route",
+			"installProgress": "jP3NOa_installProgress",
+			"log": "jP3NOa_log",
+			"checks": "jP3NOa_checks",
 			"preview": "jP3NOa_preview",
-			"rule": "jP3NOa_rule",
-			"installEntry": "jP3NOa_installEntry"
+			"modalHead": "jP3NOa_modalHead"
 		};
 		//#endregion
 		//#region src/client/InstallBackend.tsx
@@ -2789,41 +2789,41 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var View_module_css_default = {
-			"sessionInfo": "_7CZWHG_sessionInfo",
-			"secondary": "_7CZWHG_secondary",
-			"metric": "_7CZWHG_metric",
+			"section": "_7CZWHG_section",
+			"sessionRow": "_7CZWHG_sessionRow",
+			"iconButton": "_7CZWHG_iconButton",
+			"popupFacts": "_7CZWHG_popupFacts",
+			"popupActions": "_7CZWHG_popupActions",
 			"textBlock": "_7CZWHG_textBlock",
-			"activeRow": "_7CZWHG_activeRow",
-			"actions": "_7CZWHG_actions",
+			"activityDotBlocked": "_7CZWHG_activityDotBlocked",
 			"activityWhy": "_7CZWHG_activityWhy",
-			"activityDot": "_7CZWHG_activityDot",
-			"entry": "_7CZWHG_entry",
-			"iconButton": "_7CZWHG_iconButton",
-			"popupRow": "_7CZWHG_popupRow",
-			"negative": "_7CZWHG_negative",
-			"page": "_7CZWHG_page",
-			"entryBody": "_7CZWHG_entryBody",
-			"section": "_7CZWHG_section",
-			"rdPulse": "_7CZWHG_rdPulse",
-			"entryTitle": "_7CZWHG_entryTitle",
 			"activity": "_7CZWHG_activity",
-			"blockedBanner": "_7CZWHG_blockedBanner",
-			"error": "_7CZWHG_error",
-			"activityDotBlocked": "_7CZWHG_activityDotBlocked",
 			"positive": "_7CZWHG_positive",
+			"metric": "_7CZWHG_metric",
+			"note": "_7CZWHG_note",
+			"activeRow": "_7CZWHG_activeRow",
 			"summary": "_7CZWHG_summary",
+			"muted": "_7CZWHG_muted",
+			"entryTitle": "_7CZWHG_entryTitle",
 			"popupList": "_7CZWHG_popupList",
-			"header": "_7CZWHG_header",
-			"note": "_7CZWHG_note",
+			"popup": "_7CZWHG_popup",
 			"headerTrigger": "_7CZWHG_headerTrigger",
-			"popupActions": "_7CZWHG_popupActions",
-			"muted": "_7CZWHG_muted",
-			"facts": "_7CZWHG_facts",
+			"page": "_7CZWHG_page",
+			"blockedBanner": "_7CZWHG_blockedBanner",
+			"error": "_7CZWHG_error",
+			"entry": "_7CZWHG_entry",
 			"popupHead": "_7CZWHG_popupHead",
 			"activityLabel": "_7CZWHG_activityLabel",
-			"sessionRow": "_7CZWHG_sessionRow",
-			"popup": "_7CZWHG_popup",
-			"popupFacts": "_7CZWHG_popupFacts"
+			"facts": "_7CZWHG_facts",
+			"actions": "_7CZWHG_actions",
+			"entryBody": "_7CZWHG_entryBody",
+			"activityDot": "_7CZWHG_activityDot",
+			"popupRow": "_7CZWHG_popupRow",
+			"sessionInfo": "_7CZWHG_sessionInfo",
+			"rdPulse": "_7CZWHG_rdPulse",
+			"secondary": "_7CZWHG_secondary",
+			"header": "_7CZWHG_header",
+			"negative": "_7CZWHG_negative"
 		};
 		//#endregion
 		//#region src/client/ActivityChip.tsx

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-reasoning-distill",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "type": "module",
   "description": "Distill over-long model reasoning into its useful core and replay the distilled version on every later request, with a per-session cost report.",
   "license": "MIT",

package/scripts/dsh-inplace-patch.mjs

@@ -27,6 +27,17 @@
  * Every edit is a literal (before, after) pair. An edit counts as applied when the file carries
  * its 'after' text; it is missing when it carries the 'before' text; anything else is an anchor
  * that no longer matches, and the whole patch refuses rather than writing a partial edit.
+ *
+ * An edit may carry alternates (`variants`) because the host rewrites its own functions: one patch
+ * point can exist in more than one literal shape across releases, and both have to be carried for
+ * one script to cover them. The tracker's live-routing hook is the example that forced this — the
+ * host turned it into a generator effect in 0.2.1-alpha.3, where the state it needs is a
+ * destructured closure variable instead of a field on `this`, so the replacement differs in more
+ * than whitespace. Exactly one variant may match a file; a checkout where none or several do is
+ * refused, never guessed at.
+ *
+ * Covered host versions (patch applied, checked, reverted, and type-checked on an isolated clone):
+ * 0.2.1-alpha.1 through 0.2.1-alpha.5. Only 0.2.1-alpha.1 has also been run against real sessions.
  * @module dsh-reasoning-distill/scripts/dsh-inplace-patch
  */
 
@@ -249,6 +260,39 @@ const TRACKER_INSTALL_AFTER = [
   '    })',
   '',
 ].join('\n')
+/**
+ * The same hook in the generator-effect form the host adopted on 2026-10-09
+ * (`fix(session): retain JSONL resources through provider-triggered teardown`, first released in
+ * `dsh-v0.2.1-alpha.3`), where `install` destructures its state and returns a disposer.
+ *
+ * Inside that generator body the `this` receiver is gone, so the sink has to read the
+ * destructured `writers` map. Matching this form with the legacy replacement would compile and
+ * then throw on the first session event, which is why the two forms are separate variants
+ * rather than one padded anchor.
+ */
+const TRACKER_INSTALL_BEFORE_EFFECT = [
+  "      yield ctx.on('session/event', (session: Session, event) => {",
+  '        writers.get(session.id)?.enqueueLive(event, (error) => {',
+  '          ctx.logger.warn(`session-persistence: background write for session "${session.id}" failed (buffered events retained): ${String(error)}`)',
+  '        })',
+  '      })',
+  '',
+].join('\n')
+const TRACKER_INSTALL_AFTER_EFFECT = [
+  "      yield ctx.on('session/event', (session: Session, event) => {",
+  '        const writer = writers.get(session.id)',
+  '        if (writer === undefined || writer === null) return',
+  '        // The write handle exists before the session publishes its first event, which is the',
+  '        // earliest point at which an in-place rewrite could be kept in step with the artifact.',
+  '        writer.watchRewrites(session, (error) => {',
+  '          ctx.logger.warn(`session-persistence: in-place rewrite for session "${session.id}" failed (artifact left unchanged): ${String(error)}`)',
+  '        })',
+  '        writer.enqueueLive(event, (error) => {',
+  '          ctx.logger.warn(`session-persistence: background write for session "${session.id}" failed (buffered events retained): ${String(error)}`)',
+  '        })',
+  '      })',
+  '',
+].join('\n')
 
 /** The whole-artifact rewrite published by the jsonl service. */
 const JSONL_REWRITE_BATCH = [
@@ -302,6 +346,8 @@ const JSONL_REWRITE_BATCH = [
  *
  * `before` and `after` are literal and must occur exactly once in the file's unpatched/patched
  * state; the same pair drives --apply and --revert, so a revert cannot drift from an apply.
+ * `variants` adds alternates for host releases that rewrote the surrounding function; each is a
+ * complete pair of its own, and exactly one of them may match a given file (see `match`).
  */
 const EDITS = [
   {
@@ -421,6 +467,10 @@ const EDITS = [
     file: 'packages/session/session-persistence-jsonl/src/storage.ts',
     before: TRACKER_INSTALL_BEFORE,
     after: TRACKER_INSTALL_AFTER,
+    // The host rewrote this hook on 2026-10-09 (first released in alpha.3): the same patch point
+    // exists in the generator-effect form with a destructured writers map. Both are carried so
+    // one script covers the releases on either side of that change.
+    variants: [{ before: TRACKER_INSTALL_BEFORE_EFFECT, after: TRACKER_INSTALL_AFTER_EFFECT }],
   },
   {
     id: 'session-handle-rewrite',
@@ -505,13 +555,39 @@ function count(haystack, needle) {
   return haystack.split(needle).length - 1
 }
 
+/** Every literal form one edit can take: the primary pair, then any version alternates. */
+function variantsOf(edit) {
+  return [{ before: edit.before, after: edit.after }, ...(edit.variants ?? [])]
+}
+
+/**
+ * Match one edit against one file.
+ *
+ * An edit may carry alternates because the host rewrites its own functions: the same patch point
+ * can exist in more than one literal shape across releases. Exactly one variant must match —
+ * its before text present once with its after text absent means the edit is still to be made,
+ * the other way round means it is already in place. Anything else is reported instead of guessed
+ * at, which is what keeps a partially matching checkout from being written to.
+ * @param text - the target file content.
+ * @param edit - one entry of EDITS.
+ * @returns the verdict and, when one variant matched, that variant.
+ */
+function match(text, edit) {
+  const variants = variantsOf(edit)
+  // An append-style edit keeps its anchor inside its replacement, so an applied variant may still
+  // carry its before text once; more than once means another copy of the anchor exists, which is
+  // not something this patch may treat as its own work.
+  const applied = variants.filter(variant => count(text, variant.after) === 1 && count(text, variant.before) <= 1)
+  if (applied.length === 1) return { state: 'applied', variant: applied[0] }
+  const absent = variants.filter(variant => count(text, variant.before) === 1 && count(text, variant.after) === 0)
+  if (absent.length === 1) return { state: 'absent', variant: absent[0] }
+  const seen = variants.some(variant => count(text, variant.before) > 0 || count(text, variant.after) > 0)
+  return { state: seen ? 'ambiguous' : 'anchor-missing', variant: undefined }
+}
+
 /** Classify one edit against one file. */
 function classify(text, edit) {
-  const after = count(text, edit.after)
-  const before = count(text, edit.before)
-  if (after === 1 && before <= 1) return 'applied'
-  if (after === 0 && before === 1) return 'absent'
-  return after === 0 && before === 0 ? 'anchor-missing' : 'ambiguous'
+  return match(text, edit).state
 }
 
 /**
@@ -545,7 +621,7 @@ function assertClean(root, states, force) {
 
 /** Classify every edit against the current files without writing anything. */
 function inspect(root) {
-  return EDITS.map(edit => ({ ...edit, state: classify(readTarget(root, edit.file), edit) }))
+  return EDITS.map(edit => ({ ...edit, ...match(readTarget(root, edit.file), edit) }))
 }
 
 /** Apply or revert the edit table, returning the per-edit verdicts. */
@@ -565,8 +641,8 @@ function run(root, mode) {
     for (const file of FILES) {
       let text = originals.get(file)
       for (const edit of todo.filter(item => item.file === file)) {
-        const from = mode === '--apply' ? edit.before : edit.after
-        const to = mode === '--apply' ? edit.after : edit.before
+        const from = mode === '--apply' ? edit.variant.before : edit.variant.after
+        const to = mode === '--apply' ? edit.variant.after : edit.variant.before
         const next = text.replace(from, () => to)
         if (next === text) throw new Error(edit.id + ': replacement found no anchor')
         text = next