@ch4acko3/dsh-turn-fold 0.4.0 → 0.4.2

package/README.md

@@ -2,14 +2,17 @@
 
 English | [简体中文](README.zh-CN.md)
 
+[![Powered by Harmony](https://memorax-ai.github.io/dsh-harmony/harmony-powered.svg)](https://memorax-ai.github.io/dsh-harmony/)
+
 A [dsh-harmony](https://github.com/memorax-ai/dsh-harmony) provider that adds
 Codex-Desktop-style turn folding to the DSH WebUI conversation.
 
 https://github.com/user-attachments/assets/3c9dfdcf-a454-4750-9edf-76771ed5a9a6
 
 During a turn, the summary bar remains visible while native thinking, notes,
-commands, and tool calls keep streaming. Consecutive reasoning and tool activity
-share one compact group from the second item onward. When a turn settles, known
+commands, and tool calls keep streaming. Consecutive reasoning, context
+injections, and tool activity share one compact group from the second item
+onward. When a turn settles, known
 Agent activity, including context injection, moves into one disclosure
 immediately before the final answer. Its configurable metrics default to wall
 time, tool-call count, and input/output tokens, and appear only when the loaded
@@ -31,9 +34,12 @@ short open/close transition that unmounts the activity after it closes.
 
 ## How it works
 
-Three pinned Source Patches run in memory against the compiled browser bundle of
-`@deepseek-ai/dsh-client-ui-conversation` (`lib/client.js`); installed DSH files
-are never modified.
+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` up to, but not including, the `0.2.0` prerelease line; 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 |
 | --- | --- | --- |

package/README.zh-CN.md

@@ -2,11 +2,13 @@
 
 [English](README.md) | 简体中文
 
+[![Powered by Harmony](https://memorax-ai.github.io/dsh-harmony/harmony-powered.svg)](https://memorax-ai.github.io/dsh-harmony/)
+
 一个基于 [dsh-harmony](https://github.com/memorax-ai/dsh-harmony) 的 Provider，为 DSH WebUI 对话添加 Codex Desktop 风格的回合折叠。
 
 https://github.com/user-attachments/assets/3c9dfdcf-a454-4750-9edf-76771ed5a9a6
 
-回合进行期间，摘要栏保持可见，原生思考、说明、命令和工具调用继续流式输出。从第二项开始，连续的推理和工具活动会合并为一个紧凑分组。回合结束后，包括上下文注入在内的已知 Agent 活动会收进最终答复前方的折叠栏。摘要指标可以配置，默认显示耗时、工具调用次数以及输入/输出 token；只有当已加载的回合包含足够数据、无需猜测即可计算时才会展示对应指标。
+回合进行期间，摘要栏保持可见，原生思考、说明、命令和工具调用继续流式输出。从第二项开始，连续的推理、上下文注入和工具活动会合并为一个紧凑分组。回合结束后，包括上下文注入在内的已知 Agent 活动会收进最终答复前方的折叠栏。摘要指标可以配置，默认显示耗时、工具调用次数以及输入/输出 token；只有当已加载的回合包含足够数据、无需猜测即可计算时才会展示对应指标。
 
 最终答复通过 `turn-tail.closing.finalNode` 定位，不依赖 `finish_reason` 或 DOM 位置。正常完成、已停止和已中断的回合都会折叠，后两者显示不同的状态标签。当 DSH 将结束分支标记为不可用、结束答复之后仍有节点，或者用户的键盘焦点或文本选择位于活动内容中时，回合会保持展开。失败、达到最大 token、缺少结束节点以及仍在进行的回合也会保持展开，避免隐藏错误或未完成的工作。
 
@@ -14,7 +16,7 @@ https://github.com/user-attachments/assets/3c9dfdcf-a454-4750-9edf-76771ed5a9a6
 
 ## 工作原理
 
-三个固定目标的 Source Patch 会在内存中修改 `@deepseek-ai/dsh-client-ui-conversation` 的编译后浏览器包（`lib/client.js`），不会修改已安装的 DSH 文件。
+三个带形状校验的 Source Patch 会在内存中修改 `@deepseek-ai/dsh-client-ui-conversation` `>=0.1.0-rc.8 <0.2.0-0` 的编译后浏览器包（`lib/client.js`），不会修改已安装的 DSH 文件。每条选择器仍必须恰好命中一次，因此遇到不兼容的编译形状时会停止应用，而不会修改不确定的目标。
 
 | Patch | 选择器（预期命中 1 次） | 作用 |
 | --- | --- | --- |

package/index.cjs

@@ -1,13 +1,12 @@
 'use strict'
 
 // Host entry for the @ch4acko3/dsh-turn-fold Harmony provider.
-const { settingsNamespace } = require('@deepseek-ai/dsh-settings')
-const { Config, SETTINGS_NAMESPACE } = require('./settings.cjs')
+const { Config, SETTINGS_NAMESPACE, createSettingsSchema } = require('./settings.cjs')
 
 exports.Config = Config
 exports.inject = ['harmony']
 exports.apply = (ctx, config) => {
   ctx.inject(['settings'], (settingsCtx) => {
-    settingsCtx.settings.register(settingsNamespace(SETTINGS_NAMESPACE), Config, { base: config })
+    settingsCtx.settings.register(SETTINGS_NAMESPACE, createSettingsSchema(), { base: config })
   })
 }

package/inline-source.cjs

@@ -242,9 +242,11 @@ function __ch4acko3DshTurnFoldActivityGroup(props) {
   var foldKey = props.foldKey;
   var toolCount = 0;
   var reasoningCount = 0;
+  var contextCount = 0;
   for (var itemIndex = 0; itemIndex < props.items.length; itemIndex++) {
     if (props.items[itemIndex].kind === "tool") toolCount++;
-    else reasoningCount++;
+    else if (props.items[itemIndex].kind === "reasoning") reasoningCount++;
+    else if (props.items[itemIndex].kind === "context") contextCount++;
   }
   var initialOpen = __ch4acko3DshTurnFoldOpenKeys.has(foldKey);
   var openState = react.useState(initialOpen);
@@ -265,12 +267,15 @@ function __ch4acko3DshTurnFoldActivityGroup(props) {
     };
   }, []);
   var reasoningTitle = reasoningCount === 0 ? null : __ch4acko3DshTurnFoldText("activityGroup.reasoning." + (reasoningCount === 1 ? "one" : "many"), { count: reasoningCount });
+  var contextTitle = contextCount === 0 ? null : __ch4acko3DshTurnFoldText("activityGroup.context." + (contextCount === 1 ? "one" : "many"), { count: contextCount });
   var toolTitle = toolCount === 0 ? null : __ch4acko3DshTurnFoldText("activityGroup.tools." + (toolCount === 1 ? "one" : "many"), { count: toolCount });
-  var title = reasoningTitle === null ? toolTitle : toolTitle === null ? reasoningTitle : react_jsx_runtime.jsxs(react_jsx_runtime.Fragment, { children: [
-    reasoningTitle,
-    react_jsx_runtime.jsx("span", { className: "__ch4acko3-dsh-turn-fold-activity__separator", "aria-hidden": true }),
-    toolTitle
-  ] });
+  var titleParts = [reasoningTitle, contextTitle, toolTitle].filter(function (part) { return part !== null; });
+  var titleChildren = [];
+  for (var titleIndex = 0; titleIndex < titleParts.length; titleIndex++) {
+    if (titleIndex > 0) titleChildren.push(react_jsx_runtime.jsx("span", { className: "__ch4acko3-dsh-turn-fold-activity__separator", "aria-hidden": true }, "separator-" + String(titleIndex)));
+    titleChildren.push(titleParts[titleIndex]);
+  }
+  var title = titleParts.length === 1 ? titleParts[0] : react_jsx_runtime.jsx(react_jsx_runtime.Fragment, { children: titleChildren });
   var failure = props.failed === 0 ? null : __ch4acko3DshTurnFoldText("activityGroup.failures." + (props.failed === 1 ? "one" : "many"), { count: props.failed });
   var state = props.running ? "running" : props.failed > 0 ? "error" : "ok";
   function toggle() {
@@ -829,7 +834,7 @@ function __ch4acko3DshTurnFoldHasToolCallBlock(node) {
   return Array.isArray(blocks) && blocks.some(function (block) { return block !== void 0 && block.kind === "tool-call"; });
 }
 function __ch4acko3DshTurnFoldIsActivityNode(node) {
-  if (node.kind === "tool-call") return true;
+  if (node.kind === "tool-call" || node.kind === "context") return true;
   if (node.kind !== "assistant-step" || __ch4acko3DshTurnFoldReasoningTexts(node).length === 0) return false;
   return __ch4acko3DshTurnFoldHasToolCallBlock(node) || !__ch4acko3DshTurnFoldHasVisibleNonReasoning(node);
 }
@@ -877,6 +882,8 @@ function __ch4acko3DshTurnFoldRenderEntries(entries, nodeStore, renderNode, sess
         if (activityEntry.node.kind === "tool-call") {
           toolKeys.push(activityEntry.key);
           items.push({ kind: "tool", key: activityEntry.key });
+        } else if (activityEntry.node.kind === "context") {
+          items.push({ kind: "context", key: activityEntry.key });
         } else {
           var texts = __ch4acko3DshTurnFoldReasoningTexts(activityEntry.node);
           for (var textIndex = 0; textIndex < texts.length; textIndex++) items.push({ kind: "reasoning", key: String(activityEntry.key) + ":" + String(textIndex), text: texts[textIndex] });

package/locales/en.json

@@ -17,6 +17,8 @@
   "summary.interruptedSuffix": " - Interrupted",
   "activityGroup.reasoning.one": "{count} reasoning step",
   "activityGroup.reasoning.many": "{count} reasoning steps",
+  "activityGroup.context.one": "{count} context injection",
+  "activityGroup.context.many": "{count} context injections",
   "activityGroup.tools.one": "{count} tool call",
   "activityGroup.tools.many": "{count} tool calls",
   "activityGroup.failures.one": "{count} failed",

package/locales/zh.json

@@ -17,6 +17,8 @@
   "summary.interruptedSuffix": " - 已中断",
   "activityGroup.reasoning.one": "{count} 段思考",
   "activityGroup.reasoning.many": "{count} 段思考",
+  "activityGroup.context.one": "{count} 次上下文注入",
+  "activityGroup.context.many": "{count} 次上下文注入",
   "activityGroup.tools.one": "{count} 次工具调用",
   "activityGroup.tools.many": "{count} 次工具调用",
   "activityGroup.failures.one": "{count} 个失败",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ch4acko3/dsh-turn-fold",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Codex-style turn folding for the DSH WebUI conversation, implemented as a dsh-harmony provider.",
   "main": "./index.cjs",
   "engines": {
@@ -30,7 +30,9 @@
       "patch": "./harmony.patch.yml"
     },
     "harmony": {
-      "patches": ["./patch.cjs"]
+      "patches": [
+        "./patch.cjs"
+      ]
     },
     "plugin": {
       "schemaVersion": 1,
@@ -53,17 +55,18 @@
     "@deepseek-ai/schemastery": "^3.18.1"
   },
   "peerDependencies": {
-    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.8",
-    "dsh-harmony": "^0.7.0"
+    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.0-rc.8 || ^0.1.1-0",
+    "@deepseek-ai/dsh-settings": "^0.1.0-rc.8 || ^0.1.1-0",
+    "dsh-harmony": "^0.7.0 || ^0.8.0"
   },
   "devDependencies": {
     "@deepseek-ai/dsh-client-ui-conversation": "0.1.0-rc.8",
     "@deepseek-ai/dsh-settings": "0.1.0-rc.8",
     "@phenomnomnominal/tsquery": "^6.2.0",
-    "dsh-harmony": "^0.7.0",
+    "dsh-harmony": "^0.8.0",
     "react": "18.3.1",
     "react-test-renderer": "18.3.1",
+    "semver": "^7.8.5",
     "typescript": "^6.0.3"
   }
 }

package/patch.cjs

@@ -13,20 +13,21 @@
 //   3. install-turn-fold-services — registers the plugin's native DSH locale
 //      namespace and binds its native settings scope during conversation boot.
 //
-// All three selectors are pinned with an exact `expect: 1` and a target version so
-// a compiled-shape drift fails loudly in `dsh harmony status`.
+// 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`.
 
 const INLINE = require('./inline-source.cjs')
 
 const TARGET = {
   package: '@deepseek-ai/dsh-client-ui-conversation',
-  version: '0.1.0-rc.8',
+  version: '>=0.1.0-rc.8 <0.2.0-0',
   file: 'lib/client.js',
 }
 
 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,
@@ -36,6 +37,7 @@ module.exports = [
   },
   {
     id: 'rewrite-node-render-loop',
+    description: 'Routes ChatView node rendering through Turn Fold while preserving the native node renderer.',
     target: TARGET,
     select: 'CallExpression[expression.name.name="map"][expression.expression.name="order"]',
     expect: 1,
@@ -52,6 +54,7 @@ module.exports = [
   },
   {
     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,

package/settings.cjs

@@ -1,7 +1,5 @@
 'use strict'
 
-const z = require('@deepseek-ai/schemastery')
-
 const SETTINGS_NAMESPACE = 'dsh-turn-fold'
 
 const SUMMARY_FIELDS = [
@@ -24,12 +22,50 @@ const DEFAULT_SUMMARY_FIELDS = [
   'outputTokens',
 ]
 
-const Config = z.object({
-  summaryFields: z.array(z.union(SUMMARY_FIELDS)).default(DEFAULT_SUMMARY_FIELDS),
+function decodeConfig(value) {
+  const source = value == null ? {} : value
+  if (typeof source !== 'object' || Array.isArray(source)) throw new TypeError('expected config to be an object')
+  const summaryFields = source.summaryFields === undefined ? DEFAULT_SUMMARY_FIELDS : source.summaryFields
+  if (!Array.isArray(summaryFields)) throw new TypeError('summaryFields must be an array')
+  for (const field of summaryFields) {
+    if (!SUMMARY_FIELDS.includes(field)) throw new TypeError(`unknown summary field: ${String(field)}`)
+  }
+  return { ...source, summaryFields: summaryFields.slice() }
+}
+
+function Config(value) {
+  return decodeConfig(value)
+}
+
+Object.defineProperty(Config, '~standard', {
+  value: {
+    version: 1,
+    vendor: '@ch4acko3/dsh-turn-fold',
+    validate(value) {
+      try {
+        return { value: decodeConfig(value) }
+      } catch (error) {
+        return { issues: [{ message: error instanceof Error ? error.message : String(error) }] }
+      }
+    },
+  },
 })
 
+let settingsSchema
+function createSettingsSchema() {
+  if (settingsSchema !== undefined) return settingsSchema
+  // The Host loads CommonJS providers alongside the ESM settings graph. Defer
+  // Schemastery until that service is ready to avoid a Node 24 CJS/ESM race.
+  const z = require('@deepseek-ai/schemastery')
+  settingsSchema = z.object({
+    summaryFields: z.array(z.union(SUMMARY_FIELDS)).default(DEFAULT_SUMMARY_FIELDS),
+  })
+  return settingsSchema
+}
+
 module.exports = {
   Config,
+  createSettingsSchema,
   DEFAULT_SUMMARY_FIELDS,
   SETTINGS_NAMESPACE,
   SUMMARY_FIELDS,