@ch4acko3/dsh-turn-fold 0.6.2 → 0.6.4

package/README.md

@@ -34,10 +34,17 @@ short open/close transition that unmounts the activity after it closes.
 
 ## How it works
 
+On DSH versions with native message folding, Turn Fold takes over: it removes
+the native process disclosure and disables native node folding, leaving the
+plugin's turn summary and activity groups in control. Support is detected from
+the chat renderer's `compactTranscript` or `usePresentation` prop rather than the CLI version.
+DSH still renders reasoning, tools, and context. Saved native display preferences
+are unchanged, so disabling the plugin restores native folding.
+
 Three shape-guarded Source Patches run in memory against the compiled browser
 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`.
+`0.1.7` 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.
@@ -90,4 +97,6 @@ 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.
+Compatibility checks cover the real `0.1.5-rc.2`, `0.1.6-alpha.2`, and `0.1.7-rc.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.
+
+DSH `0.2.0-rc.2` is also supported explicitly. Its runtime uses `configForms`, a Plugins settings tab, live configuration fields, and the renamed native icons. Turn Fold reads the timeline through the native chat hook when the renderer has no local timeline binding, and accepts the native duration formatter's numeric/unit segments. Windows browser checks cover combined startup with Bites, editing metrics, persistence across a Host restart, and replaying a synthetic two-turn session written through native session persistence. Seeking back hides later turns, playback disables input, and exiting restores input. This does not cover real model calls or browser interactions on macOS/Linux. The `0.2` range is limited to this tested release.

package/README.zh-CN.md

@@ -16,7 +16,9 @@ https://github.com/user-attachments/assets/3c9dfdcf-a454-4750-9edf-76771ed5a9a6
 
 ## 工作原理
 
-三个带形状校验的 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 文件。每条选择器仍必须恰好命中一次，因此遇到不兼容的编译形状时会停止应用，而不会修改不确定的目标。
+在带原生消息折叠的新版 DSH 中，Turn Fold 会接管折叠：移除原生执行过程折叠栏，关闭节点内部的原生折叠，只保留插件的回合摘要和活动分组。按聊天渲染器是否提供 `compactTranscript` 或 `usePresentation` 判断能力，不依赖 CLI 版本号。原生思考、工具和上下文内容仍由 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.7` 版本线（含预发布版）则跟随渲染器迁移到 `@deepseek-ai/dsh-client-ui-chat`。它们不会修改已安装的 DSH 文件。每条选择器仍必须恰好命中一次，因此遇到不兼容的编译形状时会停止应用，而不会修改不确定的目标。
 
 | Patch | 选择器（预期命中 1 次） | 作用 |
 | --- | --- | --- |
@@ -61,4 +63,6 @@ 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`，可对该版本的聊天包执行测试。选择器仍要求精确命中。
+已使用真实 `0.1.5-rc.2`、`0.1.6-alpha.2` 和 `0.1.7-rc.2` 包验证。设置 `DSH_TURN_FOLD_UPSTREAM_ROOT` 指向隔离的 DSH 安装后运行 `npm test`，可对该版本的聊天包执行测试。选择器仍要求精确命中。
+
+另明确支持 DSH `0.2.0-rc.2`：该版本使用 `configForms`、插件设置标签页、可实时修改的配置字段及新版原生图标。渲染器没有局部时间线变量时，Turn Fold 通过原生聊天 hook 读取时间线，并适配原生时长格式化函数返回的数字与单位分段。Windows 浏览器检查覆盖与 Bites 组合启动、编辑摘要指标、Host 重启后设置持久化，以及通过原生会话持久化写入的两轮合成历史回放：回退时隐藏后续轮次，回放期间禁用输入，退出后恢复输入。尚未覆盖真实模型调用或 macOS/Linux 浏览器交互。`0.2` 的兼容范围仅包含这个已验证版本。

package/index.cjs

@@ -1,12 +1,18 @@
 'use strict'
 
 // Host entry for the @ch4acko3/dsh-turn-fold Harmony provider.
-const { Config, SETTINGS_NAMESPACE, createSettingsSchema } = require('./settings.cjs')
+const { SETTINGS_NAMESPACE, createConfigSchema, createSettingsSchema } = require('./settings.cjs')
 
-exports.Config = Config
+// Resolve the schema after the Host has finished importing its ESM graph.
+Object.defineProperty(exports, 'Config', { enumerable: true, get: createConfigSchema })
 exports.inject = ['harmony']
 exports.apply = (ctx, config) => {
   ctx.inject(['settings'], (settingsCtx) => {
-    settingsCtx.settings.register(SETTINGS_NAMESPACE, createSettingsSchema(), { base: config })
+    if (typeof settingsCtx.settings.configure === 'function') {
+      settingsCtx.effect(() => settingsCtx.settings.configure({ auto: false }, ctx.fiber))
+    } else {
+      const summaryFields = typeof config.summaryFields.get === 'function' ? config.summaryFields.get() : config.summaryFields
+      settingsCtx.settings.register(SETTINGS_NAMESPACE, createSettingsSchema(), { base: { ...config, summaryFields } })
+    }
   })
 }

package/index.mjs

@@ -0,0 +1,8 @@
+// Let Node settle the schema's ESM dependencies before the CommonJS helper
+// constructs the live Config schema.
+import '@deepseek-ai/schemastery'
+import provider from './index.cjs'
+
+export const Config = provider.Config
+export const inject = provider.inject
+export const apply = provider.apply

package/inline-source.cjs

@@ -138,7 +138,10 @@ function __ch4acko3DshTurnFoldPublishSettings(fields) {
 function __ch4acko3DshTurnFoldInstall(ctx) {
   ctx.effect(function () { return ctx.locale.register(__ch4acko3DshTurnFoldLocaleNamespace, __ch4acko3DshTurnFoldDictionaries); }, "@ch4acko3/dsh-turn-fold: dictionaries");
   __ch4acko3DshTurnFoldTranslate = ctx.locale.bind(__ch4acko3DshTurnFoldLocaleNamespace);
-  var scope = ctx.settingsScope.bind({ namespace: __ch4acko3DshTurnFoldSettingsNamespace, decode: __ch4acko3DshTurnFoldDecodeSettings });
+  var modern = typeof ctx.configForms !== "undefined";
+  var scope = modern
+    ? ctx.configForms.get("ch4acko3-dsh-turn-fold")
+    : ctx.settingsScope.bind({ namespace: __ch4acko3DshTurnFoldSettingsNamespace, decode: __ch4acko3DshTurnFoldDecodeSettings });
   __ch4acko3DshTurnFoldSettingsScope = scope;
   function publish() {
     var snapshot = scope.getSnapshot();
@@ -146,10 +149,11 @@ function __ch4acko3DshTurnFoldInstall(ctx) {
   }
   ctx.effect(function () { return scope.subscribe(publish); }, "@ch4acko3/dsh-turn-fold: settings");
   publish();
-  ctx.slots.inject("settings.plugin.item", function () {
+  var slot = modern ? "settings.plugins.tab" : "settings.plugin.item";
+  ctx.slots.inject(slot, function () {
     return ctx.slots.register({
-      name: "settings.plugin.item",
-      key: __ch4acko3DshTurnFoldSettingsNamespace
+      name: slot,
+      ...(modern ? { id: __ch4acko3DshTurnFoldSettingsNamespace, label: function () { return __ch4acko3DshTurnFoldText("settings.title"); } } : { key: __ch4acko3DshTurnFoldSettingsNamespace })
     }, __ch4acko3DshTurnFoldSettingsCard);
   });
 }
@@ -468,8 +472,9 @@ function __ch4acko3DshTurnFoldSettingsCard() {
     if (next.length === fields.length && next.every(function (field, index) { return field === fields[index]; })) return;
     setPending(true);
     setFailed(false);
-    scope.set("summaryFields", next).then(function () {
+    scope.set("summaryFields", next).then(function (accepted) {
       setPending(false);
+      if (accepted === false) setFailed(true);
     }, function () {
       setPending(false);
       setFailed(true);
@@ -714,6 +719,12 @@ function __ch4acko3DshTurnFoldLiveDuration(metrics, running) {
   return metrics.durationMs;
 }
 function __ch4acko3DshTurnFoldSpacedDuration(value) {
+  // rc.2 exposes numeric/unit segments; earlier hosts return one string.
+  if (Array.isArray(value)) value = value.map(function (part) {
+    if (part === null || typeof part !== "object" || typeof part.text !== "string") throw new Error("@ch4acko3/dsh-turn-fold: unsupported native duration segment");
+    return part.text;
+  }).join("");
+  if (typeof value !== "string") throw new Error("@ch4acko3/dsh-turn-fold: unsupported native duration format");
   return value.replace(/(\d)(?=(?:小时|分钟|秒|分|时))/g, "$1 ").replace(/(小时|分钟|秒|分|时)(?=\d)/g, "$1 ");
 }
 function __ch4acko3DshTurnFoldAnimatedPart(field, key, parameter, display, animationKey, qualifier) {
@@ -761,7 +772,7 @@ function __ch4acko3DshTurnFoldSummaryParts(metrics, running, settled, completed,
     } else if (field === "tokensPerSecond") {
       if (typeof value === "number") parts.push({ field: field, text: __ch4acko3DshTurnFoldText("summary.tokensPerSecond", { count: value >= 10 ? Math.round(value) : Math.round(value * 10) / 10 }) });
     } else if (typeof value === "number") {
-      parts.push(__ch4acko3DshTurnFoldCountPart(field, "summary." + field, value, formatTokens(value), metrics.tokenUsagePartial && settled ? "≥ " : ""));
+      parts.push(__ch4acko3DshTurnFoldCountPart(field, "summary." + field, value, formatTokens(value, durationT), metrics.tokenUsagePartial && settled ? "≥ " : ""));
     }
   }
   return parts.length === 0 ? [{ field: "activity", text: __ch4acko3DshTurnFoldText("summary.activity") }] : parts;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@ch4acko3/dsh-turn-fold",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "Codex-style turn folding for the DSH WebUI conversation, implemented as a dsh-harmony provider.",
-  "main": "./index.cjs",
+  "main": "./index.mjs",
   "engines": {
     "node": "^22.22.3 || >=24.11.1"
   },
@@ -11,6 +11,7 @@
     "README.zh-CN.md",
     "harmony.patch.yml",
     "index.cjs",
+    "index.mjs",
     "inline-source.cjs",
     "locales.cjs",
     "locales/*.json",
@@ -52,12 +53,12 @@
     "check": "node test/run.cjs"
   },
   "dependencies": {
-    "@deepseek-ai/schemastery": "^3.18.1"
+    "@deepseek-ai/schemastery": "^3.18.4"
   },
   "peerDependencies": {
-    "@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",
+    "@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 || >=0.1.7-0 <0.1.8-0 || 0.2.0-rc.2 || 0.2.1-alpha.2",
+    "@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 || >=0.1.7-0 <0.1.8-0 || 0.2.0-rc.2 || 0.2.1-alpha.2",
+    "@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 || >=0.1.7-0 <0.1.8-0 || 0.2.0-rc.2 || 0.2.1-alpha.2",
     "dsh-harmony": "^0.8.11"
   },
   "peerDependenciesMeta": {

package/patch.cjs

@@ -11,7 +11,7 @@ const { pathToFileURL } = require('node:url')
 const INLINE = require('./inline-source.cjs')
 
 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'
+const DSH_MODERN_RANGE = '>=0.1.2-alpha.5 <0.1.8-0 || 0.2.0-rc.2'
 
 function manifestVersion(filename) {
   return JSON.parse(fs.readFileSync(filename, 'utf8')).version
@@ -45,7 +45,27 @@ function target(packageName, version) {
   return { package: packageName, version, file: 'lib/client.js' }
 }
 
-function commonPatches(targetSpec, rewrite) {
+function runtimeSource(version) {
+  const [major, minor, patch] = version.split('.').map(part => Number.parseInt(part, 10))
+  const modern = major > 0 || minor > 1 || (minor === 1 && patch >= 7)
+  let source = INLINE.replace('var modern = typeof ctx.configForms !== "undefined";', `var modern = ${modern};`)
+  if (modern) source = source
+    .replaceAll('IconApiOutline14', 'IconApiOutlineRegular')
+    .replaceAll('IconChevronDownOutline14', 'IconChevronDownOutlineRegular')
+  if (minor >= 2 || major > 0) source = `function __ch4acko3DshTurnFoldReasoningRow(props) {
+  return react_jsx_runtime.jsx(ReasoningRow, {
+    ...props,
+    useDisclosure,
+    usePresentation: (select) => select({ settledReasoningPreview: false }),
+    renderSlot: (_name, content) => react_jsx_runtime.jsx(_deepseek_ai_dsh_client_ui_primitives.MarkdownText, {
+      text: content.text, streaming: content.running, labels: markdownLabels(props.t), variant: "compact"
+    })
+  });
+}\n` + source.replaceAll('react_jsx_runtime.jsx(ReasoningRow,', 'react_jsx_runtime.jsx(__ch4acko3DshTurnFoldReasoningRow,')
+  return source
+}
+
+function commonPatches(targetSpec, rewrite, inline = INLINE) {
   return [
     {
       id: 'inject-turn-fold-runtime',
@@ -54,7 +74,7 @@ function commonPatches(targetSpec, rewrite) {
       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')
+        edit.prependLeft(node.getStart(sourceFile), inline + '\n\n')
       },
     },
     {
@@ -95,7 +115,7 @@ function legacyPatches() {
   })
 }
 
-function dsh012Patches() {
+function dsh012Patches(version) {
   return commonPatches(target('@deepseek-ai/dsh-client-ui-chat', DSH_MODERN_RANGE), {
     select: 'CallExpression[arguments.0.name="ChatNodeList"]',
     apply({ node, sourceFile, edit }) {
@@ -103,17 +123,51 @@ function dsh012Patches() {
       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())
+      let chatView = node.parent
+      while (chatView && !(chatView.name?.getText(sourceFile) === 'ChatView' && chatView.body)) chatView = chatView.parent
+      if (!chatView) throw new Error('@ch4acko3/dsh-turn-fold: ChatNodeList is outside ChatView')
+      const hasTimeline = chatView.body.statements.some(statement => statement.declarationList?.declarations.some(declaration => declaration.name.getText(sourceFile) === 'timeline'))
+      const timeline = hasTimeline ? 'timeline' : '__ch4acko3DshTurnFoldTimeline'
+      if (!hasTimeline) edit.prependLeft(chatView.body.getStart(sourceFile) + 1, '\nconst __ch4acko3DshTurnFoldTimeline = useChat((snapshot) => snapshot.timeline);\n')
+      // Newer ChatNodeSeat hides process nodes independently of Turn Fold.
+      // Take over both its visibility flag and its synthetic disclosure row.
+      const hasPresentation = props.properties.some((property) => property.name?.getText(sourceFile) === 'usePresentation')
+      const hasNativeFolding = hasPresentation || props.properties.some((property) => property.name?.getText(sourceFile) === 'compactTranscript')
+      const order = hasNativeFolding ? 'order: order.filter((key) => nodeStore.get(key)?.kind !== "turn-process")' : 'order'
+      const foldingProps = hasPresentation
+        ? 'usePresentation: (select) => usePresentation((policy) => select({ ...policy, foldCompletedTurns: false })), '
+        : hasNativeFolding ? 'compactTranscript: false, ' : ''
       edit.overwrite(
         node.getStart(sourceFile),
         node.getEnd(),
-        `__ch4acko3DshTurnFoldRender({ order, nodeStore, timeline, sessionId, renderNode: (nodeKey) => ${jsx}(ChatNodeSeat, { ...(${nativeProps}), nodeKey }, nodeKey), t })`
+        `__ch4acko3DshTurnFoldRender({ ${order}, nodeStore, timeline: ${timeline}, sessionId, renderNode: (nodeKey) => ${jsx}(ChatNodeSeat, { ...(${nativeProps}), ${foldingProps}nodeKey }, nodeKey), t })`
       )
     },
-  })
+  }, runtimeSource(version))
 }
 
 function createPatches(version) {
-  return usesUiChat(version) ? dsh012Patches() : legacyPatches()
+  if (/^0\.2\.1-/.test(version)) return dsh021Patches(version)
+  return usesUiChat(version) ? dsh012Patches(version) : legacyPatches()
+}
+
+function dsh021Patches(version) {
+  return commonPatches(target('@deepseek-ai/dsh-client-ui-chat', '0.2.1-alpha.2'), {
+    select: 'FunctionExpression[name.name="ChatFlow"]',
+    apply({ node, sourceFile, edit, query }) {
+      const rows = query('CallExpression[expression.name.name="map"][expression.expression.name="entries"]', node)
+      const flow = query('CallExpression').filter(call => call.expression.getText(sourceFile) === 'renderSlot' && call.arguments[0]?.getText(sourceFile) === '"conversation.chat.flow"')
+      if (rows.length !== 1 || flow.length !== 1) throw new Error('@ch4acko3/dsh-turn-fold: expected one ChatFlow render loop and slot')
+      const parameters = node.parameters[0].name
+      edit.prependLeft(parameters.getStart(sourceFile) + 1, 'sessionId, ')
+      edit.prependLeft(flow[0].arguments[1].getStart(sourceFile) + 1, 'sessionId, ')
+      edit.prependLeft(node.body.getStart(sourceFile) + 1, '\nconst order = useChat((snapshot) => snapshot.order);\nconst timeline = useChat((snapshot) => snapshot.timeline);\n')
+      const pending = query('CallExpression', node).find(call => call.expression.getText(sourceFile) === 'rows.splice')
+      if (!pending) throw new Error('@ch4acko3/dsh-turn-fold: pending input insertion is missing')
+      edit.overwrite(pending.arguments[0].getStart(sourceFile), pending.arguments[0].getEnd(), 'rows.length')
+      edit.overwrite(rows[0].getStart(sourceFile), rows[0].getEnd(), `__ch4acko3DshTurnFoldRender({ order: order.filter((key) => nodeStore.get(key)?.kind !== "turn-process"), nodeStore, timeline, sessionId, renderNode: (nodeKey) => (0, react.createElement)(ChatNodeSeat, { ...seatProps, usePresentation: (select) => usePresentation((policy) => select({ ...policy, foldCompletedTurns: false })), nodeKey, key: nodeKey }), t })`)
+    },
+  }, runtimeSource(version))
 }
 
 const patches = createPatches(activeDshVersion())
@@ -122,6 +176,7 @@ Object.defineProperties(patches, {
   activeDshVersion: { value: activeDshVersion },
   LEGACY_RANGE: { value: LEGACY_RANGE },
   DSH_MODERN_RANGE: { value: DSH_MODERN_RANGE },
+  runtimeSource: { value: runtimeSource },
 })
 
 module.exports = patches

package/settings.cjs

@@ -52,6 +52,15 @@ Object.defineProperty(Config, '~standard', {
 })
 
 let settingsSchema
+let configSchema
+function createConfigSchema() {
+  if (configSchema !== undefined) return configSchema
+  const z = require('@deepseek-ai/schemastery')
+  configSchema = z.object({
+    summaryFields: z.array(z.union(SUMMARY_FIELDS)).default(DEFAULT_SUMMARY_FIELDS).volatile(),
+  })
+  return configSchema
+}
 function createSettingsSchema() {
   if (settingsSchema !== undefined) return settingsSchema
   // The Host loads CommonJS providers alongside the ESM settings graph. Defer
@@ -66,6 +75,7 @@ function createSettingsSchema() {
 module.exports = {
   Config,
   createSettingsSchema,
+  createConfigSchema,
   DEFAULT_SUMMARY_FIELDS,
   SETTINGS_NAMESPACE,
   SUMMARY_FIELDS,