@ch4acko3/dsh-turn-fold 0.5.2 → 0.6.1

package/README.md

@@ -35,15 +35,17 @@ short open/close transition that unmounts the activity after it closes.
 ## How it works
 
 Three shape-guarded Source Patches run in memory against the compiled browser
-bundle of `@deepseek-ai/dsh-client-ui-conversation` (`lib/client.js`) from
-`0.1.0-rc.8` through `0.1.1-rc.2`; installed DSH files are never modified.
-Every selector must still match exactly once, so an incompatible compiled shape
-fails closed instead of modifying an uncertain target.
+bundle. For DSH `0.1.0-rc.8` through `0.1.1-rc.2`, they target
+`@deepseek-ai/dsh-client-ui-conversation`; for DSH `0.1.2-alpha.5` through the
+`0.1.6` line (including prereleases), they follow the renderer into `@deepseek-ai/dsh-client-ui-chat`.
+Installed DSH files are never modified. Every selector must still match exactly
+once, so an incompatible compiled shape fails closed instead of modifying an
+uncertain target.
 
 | Patch | Selector (expect 1) | Effect |
 | --- | --- | --- |
 | `inject-turn-fold-runtime` | `FunctionDeclaration[name.name="ChatView"], VariableStatement:has(VariableDeclaration[name.name="ChatView"])` | Injects the fold renderer + disclosure UI into either native or decorated `ChatView` |
-| `rewrite-node-render-loop` | `CallExpression[expression.name.name="map"][expression.expression.name="order"]` | Replaces the `order.map(...)` node loop with the per-turn renderer |
+| `rewrite-node-render-loop` | legacy `order.map(...)` / 0.1.2 `ChatNodeList` call | Replaces the version-specific native node-list seam with the per-turn renderer |
 | `install-turn-fold-services` | `VariableStatement:has(VariableDeclaration[name.name="t"][initializer.expression.name.name="bind"])` | Registers the bundled English and Chinese dictionaries through DSH's native locale service and binds the native settings scope |
 
 ## Install
@@ -60,7 +62,7 @@ node test/run.cjs
 ```
 
 `npm install` installs the dependencies required by the test harness. The test
-suite applies all three patches in memory, parses the final browser bundle, and
+suite applies all three patches to both supported compiled shapes in memory, parses the final browser bundles, and
 covers completed, split-activity, post-closing, partial-history, failed,
 interrupted, open, accessibility, localization, settings, and state-retention
 behavior. A missing target or selector mismatch fails the test; it is never
@@ -87,3 +89,5 @@ Then create and push a version tag whose value matches `package.json`:
 npm version patch
 git push --follow-tags
 ```
+
+Compatibility checks cover the real `0.1.5-rc.2` and `0.1.6-alpha.2` bundles. Run `npm test` with `DSH_TURN_FOLD_UPSTREAM_ROOT` pointing to an isolated DSH installation to exercise that chat bundle. Exact selector counts remain required.

package/README.zh-CN.md

@@ -16,12 +16,12 @@ https://github.com/user-attachments/assets/3c9dfdcf-a454-4750-9edf-76771ed5a9a6
 
 ## 工作原理
 
-三个带形状校验的 Source Patch 会在内存中修改 `@deepseek-ai/dsh-client-ui-conversation` 从 DSH `0.1.0-rc.8` 至 `0.1.1-rc.2` 的编译后浏览器包（`lib/client.js`），不会修改已安装的 DSH 文件。每条选择器仍必须恰好命中一次，因此遇到不兼容的编译形状时会停止应用，而不会修改不确定的目标。
+三个带形状校验的 Source Patch 会在内存中修改编译后的浏览器包：DSH `0.1.0-rc.8` 至 `0.1.1-rc.2` 使用 `@deepseek-ai/dsh-client-ui-conversation`，DSH `0.1.2-alpha.5` 至 `0.1.6` 版本线（含预发布版）则跟随渲染器迁移到 `@deepseek-ai/dsh-client-ui-chat`。它们不会修改已安装的 DSH 文件。每条选择器仍必须恰好命中一次，因此遇到不兼容的编译形状时会停止应用，而不会修改不确定的目标。
 
 | Patch | 选择器（预期命中 1 次） | 作用 |
 | --- | --- | --- |
 | `inject-turn-fold-runtime` | `FunctionDeclaration[name.name="ChatView"], VariableStatement:has(VariableDeclaration[name.name="ChatView"])` | 向原生或已装饰的 `ChatView` 注入折叠渲染器和折叠 UI |
-| `rewrite-node-render-loop` | `CallExpression[expression.name.name="map"][expression.expression.name="order"]` | 将 `order.map(...)` 节点循环替换为按回合渲染器 |
+| `rewrite-node-render-loop` | 旧版 `order.map(...)` / 0.1.2 `ChatNodeList` 调用 | 将对应版本的原生节点列表接缝替换为按回合渲染器 |
 | `install-turn-fold-services` | `VariableStatement:has(VariableDeclaration[name.name="t"][initializer.expression.name.name="bind"])` | 通过 DSH 原生语言服务注册内置的中英文词典，并绑定原生设置作用域 |
 
 ## 安装
@@ -37,7 +37,7 @@ dsh harmony status --profile web   # 三个 Patch 都必须为 `bound`
 node test/run.cjs
 ```
 
-`npm install` 会安装测试工具所需的依赖。测试套件会在内存中应用三个 Patch、解析最终浏览器包，并覆盖已完成回合、分段活动、结束后活动、部分历史、失败、中断、进行中、无障碍、本地化、设置和状态保留等行为。目标缺失或选择器不匹配会使测试失败，不会被报告为跳过后通过。
+`npm install` 会安装测试工具所需的依赖。测试套件会对两种受支持的编译形状分别在内存中应用三个 Patch、解析最终浏览器包，并覆盖已完成回合、分段活动、结束后活动、部分历史、失败、中断、进行中、无障碍、本地化、设置和状态保留等行为。目标缺失或选择器不匹配会使测试失败，不会被报告为跳过后通过。
 
 ## CI 与发布
 
@@ -60,3 +60,5 @@ npx npm@^11.15.0 trust github @ch4acko3/dsh-turn-fold \
 npm version patch
 git push --follow-tags
 ```
+
+已使用真实 `0.1.5-rc.2` 和 `0.1.6-alpha.2` 包验证。设置 `DSH_TURN_FOLD_UPSTREAM_ROOT` 指向隔离的 DSH 安装后运行 `npm test`，可对该版本的聊天包执行测试。选择器仍要求精确命中。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ch4acko3/dsh-turn-fold",
-  "version": "0.5.2",
+  "version": "0.6.1",
   "description": "Codex-style turn folding for the DSH WebUI conversation, implemented as a dsh-harmony provider.",
   "main": "./index.cjs",
   "engines": {
@@ -55,11 +55,15 @@
     "@deepseek-ai/schemastery": "^3.18.1"
   },
   "peerDependencies": {
-    "@deepseek-ai/dsh-client-ui-conversation": ">=0.1.0-rc.8 <=0.1.1-rc.2",
-    "@deepseek-ai/dsh-settings": ">=0.1.0-rc.8 <=0.1.1-rc.2",
-    "dsh-harmony": "^0.8.10"
+    "@deepseek-ai/dsh-client-ui-chat": ">=0.1.2-alpha.5 <0.1.3-0 || >=0.1.3-0 <0.1.4-0 || >=0.1.4-0 <0.1.5-0 || >=0.1.5-0 <0.1.6-0 || >=0.1.6-0 <0.1.7-0",
+    "@deepseek-ai/dsh-client-ui-conversation": ">=0.1.0-rc.8 <=0.1.1-rc.2 || >=0.1.2-alpha.5 <0.1.3-0 || >=0.1.3-0 <0.1.4-0 || >=0.1.4-0 <0.1.5-0 || >=0.1.5-0 <0.1.6-0 || >=0.1.6-0 <0.1.7-0",
+    "@deepseek-ai/dsh-settings": ">=0.1.0-rc.8 <=0.1.1-rc.2 || >=0.1.2-alpha.5 <0.1.3-0 || >=0.1.3-0 <0.1.4-0 || >=0.1.4-0 <0.1.5-0 || >=0.1.5-0 <0.1.6-0 || >=0.1.6-0 <0.1.7-0",
+    "dsh-harmony": "^0.8.11"
   },
   "peerDependenciesMeta": {
+    "@deepseek-ai/dsh-client-ui-chat": {
+      "optional": true
+    },
     "@deepseek-ai/dsh-client-ui-conversation": {
       "optional": true
     },
@@ -71,10 +75,11 @@
     }
   },
   "devDependencies": {
+    "@deepseek-ai/dsh-client-ui-chat": "0.1.2-alpha.5",
     "@deepseek-ai/dsh-client-ui-conversation": "0.1.1-rc.2",
     "@deepseek-ai/dsh-settings": "0.1.1-rc.2",
     "@phenomnomnominal/tsquery": "^6.2.0",
-    "dsh-harmony": "^0.8.10",
+    "dsh-harmony": "^0.8.11",
     "react": "18.3.1",
     "react-test-renderer": "18.3.1",
     "semver": "^7.8.5",

package/patch.cjs

@@ -1,37 +1,87 @@
-// @ch4acko3/dsh-turn-fold — Harmony Source Patches for the DSH conversation chat flow.
+// @ch4acko3/dsh-turn-fold — Harmony Source Patches for the DSH chat flow.
 //
-// These three patches run in order, in memory only, against the compiled browser
-// bundle of @deepseek-ai/dsh-client-ui-conversation (lib/client.js). They never
-// modify the installed package.
-//
-// All three selectors use an exact `expect: 1` inside a bounded target-version
-// range, so a compiled-shape drift still fails loudly in `dsh harmony status`.
+// DSH 0.1.2 split the visual chat renderer out of ui-conversation and into
+// ui-chat. Keep the old compiled shape bounded through 0.1.1-rc.2, then select
+// the new target and render seam for the modern chat line.
 
+const fs = require('node:fs')
+const path = require('node:path')
+const { createRequire, findPackageJSON } = require('node:module')
+const { pathToFileURL } = require('node:url')
 const INLINE = require('./inline-source.cjs')
 
-const TARGET = {
-  package: '@deepseek-ai/dsh-client-ui-conversation',
-  version: '>=0.1.0-rc.8 <=0.1.1-rc.2',
-  file: 'lib/client.js',
+const LEGACY_RANGE = '>=0.1.0-rc.8 <=0.1.1-rc.2'
+const DSH_MODERN_RANGE = '>=0.1.2-alpha.5 <0.1.7-0'
+
+function manifestVersion(filename) {
+  return JSON.parse(fs.readFileSync(filename, 'utf8')).version
 }
 
-module.exports = [
-  {
-    id: 'inject-turn-fold-runtime',
-    description: 'Provides the Turn Fold rendering, disclosure, metrics, settings, and locale runtime used by ChatView.',
-    target: TARGET,
-    select: 'FunctionDeclaration[name.name="ChatView"], VariableStatement:has(VariableDeclaration[name.name="ChatView"])',
-    expect: 1,
-    apply({ node, sourceFile, edit }) {
-      edit.prependLeft(node.getStart(sourceFile), INLINE + '\n\n')
+function activeDshVersion() {
+  const entry = process.env.DSH_HARMONY_ACTIVE_DSH_ENTRY ?? process.env.DSH_HARMONY_DSH_ENTRY
+  if (entry !== undefined && typeof findPackageJSON === 'function') {
+    const manifest = findPackageJSON('@deepseek-ai/dsh', pathToFileURL(path.resolve(entry)))
+    if (manifest !== undefined) return manifestVersion(manifest)
+  }
+
+  const localRequire = createRequire(__filename)
+  try {
+    return manifestVersion(localRequire.resolve('@deepseek-ai/dsh/package.json'))
+  } catch {}
+  try {
+    return manifestVersion(localRequire.resolve('@deepseek-ai/dsh-client-ui-conversation/package.json'))
+  } catch {}
+  throw new Error('@ch4acko3/dsh-turn-fold: cannot determine the active DSH version')
+}
+
+function usesUiChat(version) {
+  const match = /^(\d+)\.(\d+)\.(\d+)/.exec(version)
+  if (match === null) throw new Error(`@ch4acko3/dsh-turn-fold: invalid DSH version ${JSON.stringify(version)}`)
+  const [major, minor, patch] = match.slice(1).map(Number)
+  return major > 0 || minor > 1 || (minor === 1 && patch >= 2)
+}
+
+function target(packageName, version) {
+  return { package: packageName, version, file: 'lib/client.js' }
+}
+
+function commonPatches(targetSpec, rewrite) {
+  return [
+    {
+      id: 'inject-turn-fold-runtime',
+      description: 'Provides the Turn Fold rendering, disclosure, metrics, settings, and locale runtime used by ChatView.',
+      target: targetSpec,
+      select: 'FunctionDeclaration[name.name="ChatView"], VariableStatement:has(VariableDeclaration[name.name="ChatView"])',
+      expect: 1,
+      apply({ node, sourceFile, edit }) {
+        edit.prependLeft(node.getStart(sourceFile), INLINE + '\n\n')
+      },
+    },
+    {
+      id: 'rewrite-node-render-loop',
+      description: 'Routes ChatView node rendering through Turn Fold while preserving the native node renderer.',
+      target: targetSpec,
+      select: rewrite.select,
+      expect: 1,
+      apply: rewrite.apply,
     },
-  },
-  {
-    id: 'rewrite-node-render-loop',
-    description: 'Routes ChatView node rendering through Turn Fold while preserving the native node renderer.',
-    target: TARGET,
+    {
+      id: 'install-turn-fold-services',
+      description: 'Registers Turn Fold locales and connects its settings when the chat UI starts.',
+      target: targetSpec,
+      select: 'VariableStatement:has(VariableDeclaration[name.name="t"][initializer.expression.name.name="bind"])',
+      expect: 1,
+      apply({ node, sourceFile, edit }) {
+        const statement = sourceFile.text.slice(node.getStart(sourceFile), node.getEnd())
+        edit.overwrite(node.getStart(sourceFile), node.getEnd(), `${statement}\n\t\t\t__ch4acko3DshTurnFoldInstall(ctx);`)
+      },
+    },
+  ]
+}
+
+function legacyPatches() {
+  return commonPatches(target('@deepseek-ai/dsh-client-ui-conversation', LEGACY_RANGE), {
     select: 'CallExpression[expression.name.name="map"][expression.expression.name="order"]',
-    expect: 1,
     apply({ node, sourceFile, edit }) {
       const callback = node.arguments[0]
       if (callback === undefined) throw new Error('@ch4acko3/dsh-turn-fold: order.map callback is missing')
@@ -42,20 +92,36 @@ module.exports = [
         `__ch4acko3DshTurnFoldRender({ order, nodeStore, timeline, sessionId, renderNode: ${renderNode}, t })`
       )
     },
-  },
-  {
-    id: 'install-turn-fold-services',
-    description: 'Registers Turn Fold locales and connects its settings when the conversation UI starts.',
-    target: TARGET,
-    select: 'VariableStatement:has(VariableDeclaration[name.name="t"][initializer.expression.name.name="bind"])',
-    expect: 1,
+  })
+}
+
+function dsh012Patches() {
+  return commonPatches(target('@deepseek-ai/dsh-client-ui-chat', DSH_MODERN_RANGE), {
+    select: 'CallExpression[arguments.0.name="ChatNodeList"]',
     apply({ node, sourceFile, edit }) {
-      const statement = sourceFile.text.slice(node.getStart(sourceFile), node.getEnd())
+      const props = node.arguments[1]
+      if (props === undefined) throw new Error('@ch4acko3/dsh-turn-fold: ChatNodeList props are missing')
+      const jsx = sourceFile.text.slice(node.expression.getStart(sourceFile), node.expression.getEnd())
+      const nativeProps = sourceFile.text.slice(props.getStart(sourceFile), props.getEnd())
       edit.overwrite(
         node.getStart(sourceFile),
         node.getEnd(),
-        `${statement}\n\t\t\t__ch4acko3DshTurnFoldInstall(ctx);`
+        `__ch4acko3DshTurnFoldRender({ order, nodeStore, timeline, sessionId, renderNode: (nodeKey) => ${jsx}(ChatNodeSeat, { ...(${nativeProps}), nodeKey }, nodeKey), t })`
       )
     },
-  },
-]
+  })
+}
+
+function createPatches(version) {
+  return usesUiChat(version) ? dsh012Patches() : legacyPatches()
+}
+
+const patches = createPatches(activeDshVersion())
+Object.defineProperties(patches, {
+  createPatches: { value: createPatches },
+  activeDshVersion: { value: activeDshVersion },
+  LEGACY_RANGE: { value: LEGACY_RANGE },
+  DSH_MODERN_RANGE: { value: DSH_MODERN_RANGE },
+})
+
+module.exports = patches