dsh-edit-turn 0.5.0 → 0.5.2

package/README.md

@@ -252,8 +252,56 @@ ln -s /path/to/dsh-install/node_modules ./node_modules
 
    **「点了保存没反应」先看这里**：记录里有没有 `apply`。没有 → 点击丢在浏览器半边（此前的成因是宿主在 mousedown/mouseup 之间重建了行，按钮已改为 pointerdown 激活）；有 `apply` 但 `ok:false` → 宿主拒绝了，`code` 就是原因（`busy`/`stale`/...）。
 
+### 为什么没有 `replyMode: replace`（把回复也走 surface 替换）
+
+试过：像 `dsh-chat-thinking-editor` 那样 append 一条新的 `assistant/message`、用 replace op 遮蔽旧的那条，让宿主原生渲染。**当前宿主（0.2.1-rc.2）的 surface 校验直接拒绝**，两条独立规则：
+
+1. `session event "assistant/message" carries an invalid replace surfaceOp` —— replace op 的键必须是 `{op, startSeq, endSeq}`（对方的代码用 `{start, end}`）
+2. `assistant/message embeds its source stream and cannot carry sourceEventSeqs`，而同一校验又要求 `surface replace: sourceEventSeqs must include every shadowed surface node; missing N` —— 两条互相矛盾 ⇒ **assistant 消息不能被另一条 assistant 消息替换**
+
+### 为什么没有走 `conversation.chat.reasoning.body` 槽位渲染
+
+也试过：注册官方 `conversation.chat.reasoning.body`（assistant-step 的子槽，`kind: single`、`scope: session`，宿主默认实现 `priority: 100`，并转交工厂槽 `conversation.chat.reasoning.content` 画 markdown），用它原生渲染改写后的思维链。
+
+实测（真页面，2026-10-22）：**注册成功但拿不到槽位**——
+
+- 注入回调确实执行（在 `document.documentElement.dataset` 上留了标记，读到 `1`）
+- 组件从不渲染：`[data-dshet-reason-body]` 计数恒为 0
+- `priority: 200` / `priority: 50` / 不传（由 runner 分配负值）三种都试过，宿主默认实现始终是渲染者
+- 没有出现任何「registration refused」告警，说明注册被接受、但 `single` 槽位仍由宿主持有
+
+结论：**当前版本下第三方插件无法接管这个 single 子槽位**。所以「原生渲染」的两条路都封着：assistant 替换被 session 校验拒绝；思维链正文槽位不可顶替。界面侧只能继续用本插件的 DOM 补丁（已验证可用：`[data-dshet-patch]` 落在 `_text_*` 思维链节点上，内容为投影后的文本）。
+
+要真正摆脱 DOM 补丁，需要上游给投影一个原生渲染口，或者允许 assistant 替换、或允许插件 shadow 一个 single 子槽位。
+
 ### 更新日志
 
+**0.5.2（工作区）** —— 回复编辑不再等这一轮回复结束；编辑器跟着当前皮肤走。
+
+- **回复编辑不再被「正在回复中」挡住**：就地记录（patch）只 append 一条 `ignorable` 事件，不改任何 surface 节点，所以它可以在 agent 还在写的时候落盘 —— 模型下一次折叠就读到。宿主侧只在**会移动 surface** 的路径上保留忙时拒绝：改写提示词（surface replace）和 replay 兜底（遮蔽窗口 + 重放尾部）。客户端同步：回复就地编辑不再禁用保存、不再显示「该会话正在回复中」横幅；提示词编辑与 replay 路径照旧拦下并说明。
+- **测试**：回复编辑在未闭合的 turn 中保存成功、提示词改写仍被拒、整轮多块在忙时保存成功。
+
+- **颜色/圆角/阴影改用主题令牌**：文字、次级文字、三级文字、描边、主色、圆角（`--dsw-radius-panel/xl/lg/md/sm`）、阴影（`--dsw-shadow-lv3`）都读当前主题的令牌，取不到时退回本插件原来的值；悬停底色用 `color-mix` 从主题墨色算出来。
+- **面板底色取皮肤的“色相”，不取它的透明**：皮肤把界面画在插画上时会把表面色做成半透明（靠自己的文字描边保证可读），插件元素没有描边。现在运行时探测 `--dsw-alias-bg-layer-1/2`：把它的**颜色**原样拿来、透明度强制为 1，于是「中秋」这类**深色插画皮肤**得到的是同色系的深色面板，而不是插件自带的浅色面板（这类皮肤不设 `data-ds-dark-theme`，旧代码只能退回浅色）。
+- **调色板挂在 `body` 上**：主题令牌声明在 `body`，而自定义属性是在**定义处**作用域内做替换的 —— 原来挂在 `:root` 上，所有 `var(--dsw-*)` 都静默取了 fallback（实测：改了等于没改）。
+- **就地编辑器不再刷白底**：`pageBackground()` 原来读 `body` 背景，插画皮肤下 `body` 是透明的 → 退回 `#ffffff`，于是深色皮肤上出现一个白框。现在优先用已解析的 `--dshet-panel`（按上面规则一定不透明）。
+- **改写后的提示词气泡用皮肤自己的气泡色**（`--dsw-specific-bubble`），圆角用 `--dsw-radius-xl`，与真实用户气泡一致。
+- **测试**：`npm test` **241/241**、`npm run verify:contract` **96** 项、`npm run verify:client` **192** 项。
+
+**0.5.1（工作区）** —— 思维链就地画出来、保存不再“点不动”、同一个块可以反复编辑。
+
+- **删掉「思维链已改写（模型可见）」卡片**：reasoning 正文只要在 DOM 里就就地改写；没有正文时不再插入任何占位卡片。
+- **无限次编辑**：记录「上一次画上去的文本」，第二、第三次编辑同一个块时仍能找到元素并更新。
+- **projection 缺失不再 500**：宿主用 `... was removed or replaced` 拒绝时，单块回复保存自动降级走 replay 路径；「全部」多块保存返回 `projection-missing`，提示重启 DSH。
+- **忙时不再假死**：客户端从 `/state` 读 `busy`，会话还在回复时直接禁用保存并显示整条提示「该会话正在回复中…」，每 3 秒复查一次，回复结束自动解除。
+- **失败提示变醒目**：in-place 的 `.dshet-error` 从底栏左侧小字改成整条横幅（左右 8px、底 52px、带边框/阴影）。
+- **确认步不再死循环**：保存键处理函数改读实时 controller 状态；确认步给按钮加可见强调圈；`/apply` 增加 20 秒超时，宿主挂住时恢复按钮并报错。
+- **从「全部」切回单块不再残留**：选择器切回某一块时没有把 `allBlocks` 置回 false，重绘又画成「全部」视图、选择器却写着「正文」（两个输入框 + 单块选择）。现在切回单块会明确退出全部视图，`allBlocks` 也进了编辑器重建标记；选到不存在的块时同样退出全部视图并保留原先选中的块。
+- **思考行找对了**：官方把 reasoning 画在**它自己那一行**（flow key 带 `,reasoning` 分组），而按 seq 找到的行是**正文行** —— 旧代码只在那一行里找，所以思维链改写永远落不到 DOM（正文改写正常，因为正文就在那一行）。现在思维链的搜索改为**在整个会话里找“文本等于记录原文”的最深节点**，并和其它块一样登记 `data-dshet-patch`（可回退）。
+- **折叠的思考也能看到改写**：思考面板收起时正文根本不在 DOM 里，而头部那行 `思考 · <截断片段>` 是宿主按**记录的原文**画的 —— 于是改了模型上下文、界面却像没生效。现在保存后连**头部片段**一起按改写后的文本重画（保留宿主的省略号与截断长度、不碰它自己的标签）。
+- **长内容不再被底栏压住**：输入框高度原来只减了顶栏（`height - offsetTop - 8`），底部 40px 落在控制带下面 —— 框内能滚动，但最后几行永远被 X/保存那条带子盖住。现在按底栏实际高度（`offsetHeight`，取不到时用 46px 常量）预留，输入框正好停在控制带上方；内容更高时在框内滚动。
+- **测试**：`npm test` **235/235**、`npm run verify:contract` **96** 项、`npm run verify:client` **184** 项。
+
 **0.5.0** —— 从「一个气泡的编辑器」长成「整轮可编辑 + 可导航的文档」。
 
 - **整轮所有块**：一条回答里每个 step 的 reasoning 与每个 text 都进 picker，同类自动编号（思维链 1 / 正文 1 …），每块带自己的 seq，保存时 patch 到它所在的消息。

package/lib/client.js

@@ -45,7 +45,7 @@ window.__ModuleLoader__.load({
     const RERUN_PREFIX = '/dsh-rerun-turn'
 
     /** Keep in sync with package.json and lib/index.js. */
-    const PLUGIN_VERSION = '0.5.0'
+    const PLUGIN_VERSION = '0.5.2'
 
     // --- copy -----------------------------------------------------------------
 
@@ -103,7 +103,6 @@ window.__ModuleLoader__.load({
       'editor.block.reasoning': '思维链',
       'editor.placeholder-block': '只改这一块；工具调用、其余内容和后续对话保持不变。',
       'confirm.body-block': '确认后只替换这一块，工具调用、其他内容和后续对话保持不变。原始会话日志不会改写。',
-      'editor.patch-note': '思维链已改写（模型可见）',
       'editor.review': '确认执行',
       'editor.cancel': '取消',
       'editor.pending': '正在保存…',
@@ -132,6 +131,7 @@ window.__ModuleLoader__.load({
       'error.already-retired': '这一轮的内容已经不在当前上下文里了。',
       'error.rerunning': '已经有一次重跑在进行中，请等它结束。',
       'error.internal': '服务器内部错误，请稍后重试。',
+      'error.projection-missing': '编辑投影未注册，请重启 DSH 后重试。',
       'error.attachment-refused': '附件没能存下来，本次修改没有执行。',
       'error.attachments-dropped': '已保存，但这条消息的图片或文件没能保留：当前部署没有可用的附件存储。',
       'error.attachment-unreadable': '这个附件读不出来，请换一个文件。',
@@ -189,7 +189,6 @@ window.__ModuleLoader__.load({
       'editor.block.reasoning': 'Reasoning',
       'editor.placeholder-block': 'Only this block changes; tool calls, the rest of the reply and later turns stay.',
       'confirm.body-block': 'Confirming replaces only this block; tool calls, the rest of the reply and later turns stay. The original session log is never rewritten.',
-      'editor.patch-note': 'Reasoning patched (model-visible)',
       'editor.review': 'Confirm',
       'editor.cancel': 'Cancel',
       'editor.pending': 'Working...',
@@ -218,6 +217,7 @@ window.__ModuleLoader__.load({
       'error.already-retired': 'This turn is no longer part of the current context.',
       'error.rerunning': 'A re-run is already in flight; wait for it to finish.',
       'error.internal': 'The host hit an internal error; try again shortly.',
+      'error.projection-missing': 'The edit projection is not registered; restart DSH and retry.',
       'error.attachment-refused': 'The attachment could not be stored, so nothing was changed.',
       'error.attachments-dropped': 'Saved, but the images or files on this message could not be kept: this deployment mounts no attachment store.',
       'error.attachment-unreadable': 'That attachment could not be read; try another file.',
@@ -237,6 +237,92 @@ window.__ModuleLoader__.load({
     }
 
     // --- style ----------------------------------------------------------------
+    /**
+     * Take the active skin's own surfaces when they are actually opaque.
+     *
+     * A skin may paint its surfaces translucent so artwork shows through, and it
+     * compensates with its own text halo - which a plugin element does not have.
+     * So the theme's surfaces are adopted only after resolving them to a real
+     * colour and finding them opaque; a translucent skin leaves this editor on
+     * its own opaque palette. Colours, radii and shadows need no such guard:
+     * those are hue and geometry, and they survive any skin.
+     *
+     * The result is written as inline variables on `body`, which beats both the
+     * `:root` defaults and the dark-theme rule below them.
+     *
+     * @returns nothing; the stylesheet defaults stand when no probe is possible.
+     */
+    function resolveSkinPalette() {
+      if (typeof document === 'undefined' || !document.body || typeof document.createElement !== 'function') return
+      if (typeof getComputedStyle !== 'function') return
+      const probe = document.createElement('span')
+      probe.setAttribute('aria-hidden', 'true')
+      probe.style.cssText = 'position:absolute;left:-9999px;top:0;width:0;height:0;pointer-events:none'
+      document.body.appendChild(probe)
+      const read = (name) => {
+        try {
+          probe.style.color = `var(${name})`
+          const match = /rgba?\(([^)]+)\)/.exec(getComputedStyle(probe).color)
+          if (match === null) return null
+          const parts = match[1].split(',').map((value) => Number.parseFloat(value))
+          if (parts.length < 3 || parts.some((value) => !Number.isFinite(value))) return null
+          return { r: parts[0], g: parts[1], b: parts[2], a: parts.length > 3 ? parts[3] : 1 }
+        } catch {
+          return null
+        }
+      }
+      const css = (color) => `rgba(${Math.round(color.r)},${Math.round(color.g)},${Math.round(color.b)},${color.a})`
+      const style = document.body.style
+      const setVar = (name, value) => {
+        if (style === undefined || style === null) return
+        if (typeof style.setProperty === 'function') style.setProperty(name, value)
+        else style[name] = value
+      }
+      const clearVar = (name) => {
+        if (style === undefined || style === null) return
+        if (typeof style.removeProperty === 'function') style.removeProperty(name)
+        else delete style[name]
+      }
+      try {
+        const panel = read('--dsw-alias-bg-layer-1')
+        const layer2 = read('--dsw-alias-bg-layer-2')
+        const accent = read('--dsw-alias-button-primary-fill')
+        // The skin's surface HUE is taken; its transparency is not. A skin paints
+        // its own elements translucent over artwork and gives them a text halo -
+        // a plugin element has none, so the same colour is adopted at full
+        // opacity. That keeps a dark artwork skin dark (instead of falling back
+        // to this plugin's light palette, which is what a skin that never sets
+        // `data-ds-dark-theme` used to get) without ever painting text on art.
+        const solid = (color) => (color === null ? null : { r: color.r, g: color.g, b: color.b, a: 1 })
+        const panelSolid = solid(panel)
+        if (panelSolid === null) {
+          clearVar('--dshet-panel')
+          clearVar('--dshet-chip')
+          clearVar('--dshet-field')
+        } else {
+          const fieldSolid = solid(layer2) ?? panelSolid
+          setVar('--dshet-panel', css(panelSolid))
+          setVar('--dshet-chip', css(panelSolid))
+          setVar('--dshet-field', css(fieldSolid))
+        }
+        if (accent === null) {
+          clearVar('--dshet-on-accent')
+        } else {
+          // The label that sits ON the accent fill: the platform exposes no
+          // inverse token here, so it is picked from the fill's own luminance.
+          const channel = (value) => {
+            const v = value / 255
+            return v <= 0.03928 ? v / 12.92 : ((v + 0.055) / 1.055) ** 2.4
+          }
+          const luminance = 0.2126 * channel(accent.r) + 0.7152 * channel(accent.g) + 0.0722 * channel(accent.b)
+          setVar('--dshet-on-accent', luminance > 0.35 ? '#0f1115' : '#fff')
+        }
+      } finally {
+        if (typeof probe.remove === 'function') probe.remove()
+      }
+    }
+
+
 
     // A skin is free to make the theme's surface colours translucent - that is
     // the point of one: the artwork shows through, and the skin compensates by
@@ -251,8 +337,21 @@ window.__ModuleLoader__.load({
     // UI packages use. Theme variables are still used for *colours* (hue,
     // semantic tones) - those survive a skin; it is alpha that does not.
     const CSS = [
-      ':root{--dshet-panel:rgba(255,255,255,.96);--dshet-field:rgba(244,247,252,.98);--dshet-chip:rgba(255,255,255,.82);--dshet-line:rgba(16,24,40,.16);--dshet-ink:#0f1524;--dshet-ink-dim:#4b5872;--dshet-hover:rgba(16,24,40,.07);--dshet-shadow:0 12px 32px rgba(9,18,40,.22);--dshet-accent:#4d6bfe;--dshet-on-accent:#fff}',
-      'body[data-ds-dark-theme]{--dshet-panel:rgba(22,28,44,.96);--dshet-field:rgba(14,19,33,.98);--dshet-chip:rgba(22,28,44,.82);--dshet-line:rgba(255,255,255,.18);--dshet-ink:#eef2f8;--dshet-ink-dim:#a6b1c6;--dshet-hover:rgba(255,255,255,.11);--dshet-shadow:0 12px 32px rgba(0,0,0,.5)}',
+      // Colours, radii and shadows come from the active theme's own tokens, so a
+      // skin restyles this editor the way it restyles the rest of the app; every
+      // one of them falls back to the value this plugin shipped with. The palette
+      // hangs off `body`, not `:root`: a custom property substitutes against the
+      // values in scope where it is DEFINED, and the theme declares its tokens on
+      // body - on `:root` every reference would silently fall back. Only the
+      // SURFACES stay namespaced: a skin is free to make its own surfaces
+      // translucent (that is the point of one), and a plugin's element has no
+      // artwork-aware halo to stay readable behind. The surfaces are taken from
+      // the theme too, but only when a runtime probe finds them opaque (see
+      // resolveSkinPalette).
+      'body{--dshet-panel:rgba(255,255,255,.96);--dshet-field:rgba(244,247,252,.98);--dshet-chip:rgba(255,255,255,.82);--dshet-line:var(--dsw-alias-border-l2,rgba(16,24,40,.16));--dshet-ink:var(--dsw-alias-label-primary,#0f1524);--dshet-ink-dim:var(--dsw-alias-label-secondary,#4b5872);--dshet-ink-soft:var(--dsw-alias-label-tertiary,#81858c);--dshet-hover:rgba(16,24,40,.07);--dshet-shadow:var(--dsw-shadow-lv3,0 12px 32px rgba(9,18,40,.22));--dshet-accent:var(--dsw-alias-button-primary-fill,#4d6bfe);--dshet-on-accent:#fff;--dshet-bubble:var(--dsw-specific-bubble,var(--dshet-field));--dshet-radius-panel:var(--dsw-radius-panel,16px);--dshet-radius-xl:var(--dsw-radius-xl,16px);--dshet-radius-lg:var(--dsw-radius-lg,16px);--dshet-radius-md:var(--dsw-radius-md,12px);--dshet-radius-sm:var(--dsw-radius-sm,8px)}',
+      'body[data-ds-dark-theme]{--dshet-panel:rgba(22,28,44,.96);--dshet-field:rgba(14,19,33,.98);--dshet-chip:rgba(22,28,44,.82);--dshet-hover:rgba(255,255,255,.11);--dshet-shadow:var(--dsw-shadow-lv3,0 12px 32px rgba(0,0,0,.5))}',
+      // A hover wash that follows the skin's ink instead of a fixed grey.
+      '@supports (color:color-mix(in srgb,red,blue)){body{--dshet-hover:color-mix(in srgb,var(--dsw-alias-label-primary) 8%,transparent)}body[data-ds-dark-theme]{--dshet-hover:color-mix(in srgb,var(--dsw-alias-label-primary) 14%,transparent)}}',
       // The pencil sits among the platform's own action icons, so it takes the
       // platform's icon colour: our own `--dshet-ink-dim` is a blue-grey and
       // read as a different, "active" icon next to the neutral grey ones. The
@@ -278,7 +377,7 @@ window.__ModuleLoader__.load({
       // inherit picks up the row's 16px, fixed ignores the reader's content
       // font setting, and either way the rewritten text changed size against
       // the bubble it replaces.
-      '.dshet-revision{box-sizing:border-box;align-self:flex-end;width:fit-content;max-width:min(72ch,86%);margin:6px 0 6px auto;padding:9px 14px;border-radius:16px;background:var(--dshet-field);color:var(--dshet-ink);font:inherit;font-size:var(--dsh-content-font-size,14px);line-height:calc(22px + var(--dsh-content-font-delta,0px));white-space:pre-wrap;overflow-wrap:anywhere;min-width:0}',
+      '.dshet-revision{box-sizing:border-box;align-self:flex-end;width:fit-content;max-width:min(72ch,86%);margin:6px 0 6px auto;padding:9px 14px;border-radius:var(--dshet-radius-xl);background:var(--dshet-bubble);color:var(--dshet-ink);font:inherit;font-size:var(--dsh-content-font-size,14px);line-height:calc(22px + var(--dsh-content-font-delta,0px));white-space:pre-wrap;overflow-wrap:anywhere;min-width:0}',
       '.dshet-revision:empty{display:none}',
       '.dshet-revision{position:relative}',
       // Fallback only: a row with no action bar to keep is displayed away
@@ -289,7 +388,7 @@ window.__ModuleLoader__.load({
       '.dshet-revision.dshet-revision-action{padding-inline-end:40px}',
       '.dshet-revision-text{display:block}',
       '.dshet-revision-files{display:flex;flex-wrap:wrap;gap:6px;margin-top:6px}',
-      '.dshet-revision-file{display:inline-flex;align-items:center;gap:6px;max-width:100%;padding:2px 6px 2px 2px;border:1px solid var(--dshet-line);border-radius:8px;background:var(--dshet-chip);font-size:12px;line-height:18px}',
+      '.dshet-revision-file{display:inline-flex;align-items:center;gap:6px;max-width:100%;padding:2px 6px 2px 2px;border:1px solid var(--dshet-line);border-radius:var(--dshet-radius-sm);background:var(--dshet-chip);font-size:12px;line-height:18px}',
       '.dshet-revision .dshet-action-host{position:absolute;inset-inline-end:6px;top:6px;opacity:0;transition:opacity .12s ease}',
       '.dshet-revision:hover .dshet-action-host,.dshet-revision:focus-within .dshet-action-host{opacity:1}',
       // A sibling plugin can append its own button (dsh-delete-turn's bin) into
@@ -331,15 +430,16 @@ window.__ModuleLoader__.load({
       '.dshet-layer[data-dshet-inline="1"]{position:absolute;left:0;top:0;right:auto;bottom:auto;width:100%;height:0}',
       '.dshet-layer{position:fixed;left:0;top:0;right:0;bottom:0;pointer-events:none;z-index:40}',
       '.dshet-layer .dshet-editor{position:absolute;pointer-events:auto}',
-      '.dshet-editor{display:flex;flex-direction:column;max-height:calc(100vh - 24px);overflow-y:auto;overscroll-behavior:contain;margin:0;border:1px solid var(--dshet-line);border-radius:16px;background:var(--dshet-panel);backdrop-filter:blur(18px) saturate(1.2);box-shadow:var(--dshet-shadow);color:var(--dshet-ink);transition:border-color .12s}',
+      '.dshet-editor{display:flex;flex-direction:column;max-height:calc(100vh - 24px);overflow-y:auto;overscroll-behavior:contain;margin:0;border:1px solid var(--dshet-line);border-radius:var(--dshet-radius-panel);background:var(--dshet-panel);backdrop-filter:blur(var(--dsh-input-card-blur,18px)) saturate(1.2);box-shadow:var(--dshet-shadow);color:var(--dshet-ink);transition:border-color .12s}',
       '.dshet-editor[data-dshet-drop="1"]{outline:2px dashed #4a7dff;outline-offset:-4px}',
       '.dshet-editor:focus-within{border-color:var(--dsw-alias-button-primary-fill,var(--dshet-accent))}',
-      '.dshet-editor[data-dshet-inplace="1"]{overflow:hidden;border:1.5px solid var(--dsw-alias-button-primary-fill,#4a7dff);border-radius:12px;background:var(--dshet-panel);backdrop-filter:none;box-shadow:none}',
+      '.dshet-editor[data-dshet-inplace="1"]{overflow:hidden;border:1.5px solid var(--dsw-alias-button-primary-fill,#4a7dff);border-radius:var(--dshet-radius-md);background:var(--dshet-panel);backdrop-filter:none;box-shadow:none}',
       '.dshet-editor[data-dshet-inplace="1"] textarea{position:absolute;min-height:0;max-height:none;padding:6px 10px;border:0;border-radius:8px;background:transparent;overflow-y:auto}',
-      '.dshet-editor[data-dshet-inplace="1"] .dshet-footer{position:absolute;top:auto;left:0;right:0;bottom:0;height:46px;align-items:center;padding:6px 10px;box-sizing:border-box;background:var(--dshet-panel);border-radius:0 0 12px 12px;gap:6px}',
+      '.dshet-editor[data-dshet-inplace="1"] .dshet-footer{position:absolute;top:auto;left:0;right:0;bottom:0;height:46px;align-items:center;padding:6px 10px;box-sizing:border-box;background:var(--dshet-panel);border-radius:0 0 var(--dshet-radius-md) var(--dshet-radius-md);gap:6px}',
       '.dshet-editor[data-dshet-inplace="1"] .dshet-btn{padding:2px 8px;font-size:12px;line-height:18px;border-radius:8px}',
       '.dshet-editor[data-dshet-inplace="1"] .dshet-pick{position:static;top:auto;left:auto;padding:0;background:transparent;border-radius:0}',
-      '.dshet-editor[data-dshet-inplace="1"] .dshet-note,.dshet-editor[data-dshet-inplace="1"] .dshet-warn,.dshet-editor[data-dshet-inplace="1"] .dshet-error{position:absolute;left:8px;bottom:6px;max-width:60%;margin:0;background:var(--dshet-panel);border-radius:8px;padding:2px 6px}',
+      '.dshet-editor[data-dshet-inplace="1"] .dshet-note,.dshet-editor[data-dshet-inplace="1"] .dshet-warn{position:absolute;left:8px;bottom:6px;max-width:60%;margin:0;background:var(--dshet-panel);border-radius:8px;padding:2px 6px}',
+      '.dshet-editor[data-dshet-inplace="1"] .dshet-error{position:absolute;left:8px;right:8px;bottom:52px;max-width:none;margin:0;padding:6px 10px;border:1px solid var(--dshet-line);border-radius:8px;background:var(--dshet-panel);box-shadow:var(--dshet-shadow);font-weight:500}',
 
       '.dshet-editor textarea{display:block;width:100%;min-height:47px;max-height:min(46vh,420px);overflow-y:auto;resize:none;box-sizing:border-box;padding:11px 14px 0;border:0;background:transparent;color:inherit;font:inherit;font-size:var(--dsh-content-font-size,14px);line-height:calc(22px + var(--dsh-content-font-delta,0px));outline:none}',
       '.dshet-editor textarea::placeholder{color:var(--dshet-ink-dim)}',
@@ -368,7 +468,7 @@ window.__ModuleLoader__.load({
       '.dshet-note{color:var(--dshet-ink-dim)}',
       '.dshet-warn{color:var(--dsw-alias-state-warning-primary,#a2650a)}',
       '.dshet-error{color:var(--dsw-alias-state-error-primary,#c93a31)}',
-      '.dshet-footer{position:absolute;left:0;right:0;bottom:0;top:auto;z-index:3;display:flex;align-items:center;justify-content:space-between;gap:6px;height:46px;padding:6px 10px;box-sizing:border-box;background:var(--dshet-panel);border-radius:0 0 16px 16px}',
+      '.dshet-footer{position:absolute;left:0;right:0;bottom:0;top:auto;z-index:3;display:flex;align-items:center;justify-content:space-between;gap:6px;height:46px;padding:6px 10px;box-sizing:border-box;background:var(--dshet-panel);border-radius:0 0 var(--dshet-radius-panel) var(--dshet-radius-panel)}',
       '.dshet-footer-actions{display:flex;align-items:center;gap:6px}',
       '.dshet-all-nav{position:sticky;top:0;z-index:2;display:flex;flex-wrap:nowrap;align-items:center;gap:6px;min-height:28px;padding:4px 0 6px;background:var(--dshet-panel);overflow-x:auto;scrollbar-width:none}',
       '.dshet-all-nav button{flex:none;border:0;border-radius:999px;background:var(--dshet-hover);color:var(--dshet-ink-dim);font:inherit;font-size:12px;line-height:18px;padding:3px 10px;cursor:pointer;white-space:nowrap}',
@@ -392,10 +492,11 @@ window.__ModuleLoader__.load({
       '.dshet-sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border:0}',
       '.dshet-btn-primary{border-color:var(--dsw-alias-button-primary-fill,var(--dshet-accent));background:var(--dsw-alias-button-primary-fill,var(--dshet-accent));color:var(--dsw-alias-label-primary-foreground,var(--dshet-on-accent))}',
       '.dshet-btn-primary:hover:not(:disabled){background:var(--dsw-alias-button-primary-fill,var(--dshet-accent));filter:brightness(1.08)}',
-'.dshet-btn.dshet-btn-save{width:28px;height:28px;padding:0;border:0;border-radius:50%;background:transparent;color:#81858c;filter:none}',
+'.dshet-btn.dshet-btn-save{width:28px;height:28px;padding:0;border:0;border-radius:50%;background:transparent;color:var(--dshet-ink-soft);filter:none}',
       '.dshet-btn.dshet-btn-save:hover:not(:disabled){background:var(--dshet-hover);filter:none}',
+      '.dshet-btn.dshet-btn-save.dshet-btn-confirm{background:var(--dshet-hover);box-shadow:inset 0 0 0 1.5px var(--dshet-accent)}',
       '.dshet-editor .dshet-footer .dshet-btn.dshet-btn-icon{width:28px;height:28px;padding:0;border:0;border-radius:50%;background:transparent;color:#81858c;filter:none}',
-      '.dshet-editor .dshet-footer .dshet-btn.dshet-btn-icon:hover:not(:disabled){background:var(--dshet-hover);color:#81858c;filter:none}',
+      '.dshet-editor .dshet-footer .dshet-btn.dshet-btn-icon:hover:not(:disabled){background:var(--dshet-hover);color:var(--dshet-ink-soft);filter:none}',
       '.dshet-btn-icon svg{width:15px;height:15px;display:block;fill:none;stroke:currentColor;stroke-width:1.2;stroke-linecap:round;stroke-linejoin:round}',
       '.dshet-editor[data-dshet-inplace="1"] .dshet-btn.dshet-btn-save{width:28px;height:28px;padding:0;border:0;border-radius:50%;background:transparent;color:#81858c;filter:none}',
       '.dshet-editor[data-dshet-inplace="1"] .dshet-btn.dshet-btn-save:hover:not(:disabled){background:var(--dshet-hover);filter:none}',
@@ -403,13 +504,10 @@ window.__ModuleLoader__.load({
       '.dshet-config{display:flex;flex-direction:column;gap:10px}',
       '.dshet-config-row{display:flex;align-items:center;justify-content:space-between;gap:12px}',
       '.dshet-config-hint{margin:0;color:var(--dsw-alias-label-tertiary,#8a8f98);font-size:13px;line-height:20px}',
-      '.dshet-select{padding:3px 8px;border:1px solid var(--dshet-line);border-radius:8px;background:var(--dshet-field);color:var(--dshet-ink);font:inherit;font-size:12px;line-height:18px}',
+      '.dshet-select{padding:3px 8px;border:1px solid var(--dshet-line);border-radius:var(--dshet-radius-sm);background:var(--dshet-field);color:var(--dshet-ink);font:inherit;font-size:12px;line-height:18px}',
       '.dshet-pick .dshet-select{height:28px;padding:0 6px;border:0;border-radius:8px;background:transparent;line-height:1;cursor:pointer;outline:none}',
       '.dshet-pick .dshet-select:hover{background:var(--dshet-hover)}',
       '[data-dshet-patch]{white-space:pre-wrap}',
-      '.dshet-patch-note{margin:6px 0;padding:6px 10px;border:1px dashed var(--dshet-line);border-radius:10px;background:var(--dshet-panel);color:var(--dshet-ink-dim);font-size:12px;line-height:18px}',
-      '.dshet-patch-note summary{cursor:pointer}',
-      '.dshet-patch-note-body{margin:6px 0 0;white-space:pre-wrap;color:var(--dshet-ink);font-size:12px;line-height:18px}',
       '.dshet-notice{margin:4px 0;padding:6px 10px;border:1px solid var(--dshet-line);border-radius:8px;background:var(--dshet-panel);backdrop-filter:blur(18px) saturate(1.2);box-shadow:var(--dshet-shadow);color:var(--dsw-alias-state-error-primary,#c93a31);font-size:12px;line-height:19px}',
       '@media (prefers-reduced-motion:reduce){.dshet-collapsing{transition:none}.dshet-floating{transition:none}}',
     ].join('')
@@ -634,6 +732,7 @@ window.__ModuleLoader__.load({
                 ? data.config.editorStyle
                 : 'frame',
               surfaceReady: true,
+              busy: data.busy === true,
               loaded: true,
               loadError: false,
               confirmStep: !(data.config && data.config.confirm === false),
@@ -648,6 +747,14 @@ window.__ModuleLoader__.load({
           })
           .finally(() => {
             this.inflight = null
+            // While the session is replying, the editor stays open but cannot
+            // save; re-check so the banner clears itself when the turn ends.
+            if (this.view.busy === true && this.editor !== null) {
+              const token = (this.busyToken = (this.busyToken ?? 0) + 1)
+              window.setTimeout(() => {
+                if (this.busyToken === token && this.editor !== null) this.load()
+              }, 3000)
+            }
           })
         this.inflight = pending
         return pending
@@ -769,19 +876,27 @@ window.__ModuleLoader__.load({
           this.publish({ allBlocks: true, blockIndex: null, blockKind: null, targetSeq: null, failure: null })
           return
         }
-        this.editorAll = false
         const split = raw.includes(':') ? raw.split(':') : ['', raw]
         const seq = split[0] === '' ? null : Number(split[0])
         const index = Number(split[1])
         const block = target.blocks.find((entry) =>
           entry.index === index && (seq === null || entry.seq === undefined || entry.seq === seq))
-        if (block === undefined || block.kind === undefined) return
+        // Leaving the all-blocks view has to say so: the picker change alone left
+        // `allBlocks` true, so the box was redrawn as the all view again with a
+        // picker that said "正文" - two fields over a single-block selection.
+        this.editorAll = false
+        if (block === undefined || block.kind === undefined) {
+          // Nothing matched: still leave the all view, keeping the block that was
+          // selected before it, so the picker describes the box again.
+          this.publish({ allBlocks: false, failure: null })
+          return
+        }
         this.editorBlockIndex = block.index
         this.editorBlockKind = block.kind
         this.editorTargetSeq = typeof block.seq === 'number' ? block.seq : this.editorTargetSeq
         this.editorDraft = block.text
         this.editorElement = null
-        this.publish({ draft: block.text, blockIndex: block.index, blockKind: block.kind, targetSeq: this.editorTargetSeq, failure: null })
+        this.publish({ draft: block.text, blockIndex: block.index, blockKind: block.kind, targetSeq: this.editorTargetSeq, allBlocks: false, failure: null })
       }
 
       close() {
@@ -905,16 +1020,21 @@ window.__ModuleLoader__.load({
           this.publish({ editing: null })
           return
         }
-        this.publish({ pending: true, failure: null })
+        this.publish({ pending: true, failure: null, failureDetail: null })
         try {
           const res = await fetch(`${ROUTE_PREFIX}/apply`, {
             method: 'POST',
             headers: { 'content-type': 'application/json' },
+            ...(typeof AbortSignal !== 'undefined' && typeof AbortSignal.timeout === 'function'
+              ? { signal: AbortSignal.timeout(20000) }
+              : {}),
             body: JSON.stringify({ sessionId: this.sessionId, targets }),
           })
           const data = await res.json().catch(() => ({}))
           if (!res.ok || !data.ok) {
-            this.publish({ pending: false, failure: data && data.code ? String(data.code) : 'generic' })
+            const code = data && data.code ? String(data.code) : 'generic'
+            const detail = data && typeof data.error === 'string' && data.error !== '' ? data.error : null
+            this.publish({ pending: false, failure: code, failureDetail: detail })
             return
           }
           this.editor = null
@@ -983,11 +1103,16 @@ window.__ModuleLoader__.load({
         const parts = target.mode === 'prompt' && this.view.attachmentsOk === true
           ? this.editorParts.map((part) => (part.keep !== undefined ? { keep: part.keep } : { add: part.add }))
           : undefined
-        this.publish({ pending: true, failure: null })
+        this.publish({ pending: true, failure: null, failureDetail: null })
         try {
           const res = await fetch(`${ROUTE_PREFIX}/apply`, {
             method: 'POST',
             headers: { 'content-type': 'application/json' },
+            // A hung host must not leave the editor pending forever with a
+            // button that looks dead.
+            ...(typeof AbortSignal !== 'undefined' && typeof AbortSignal.timeout === 'function'
+              ? { signal: AbortSignal.timeout(20000) }
+              : {}),
             body: JSON.stringify({
               sessionId: this.sessionId,
               seq: target.seq,
@@ -1007,7 +1132,9 @@ window.__ModuleLoader__.load({
           })
           const data = await res.json().catch(() => ({}))
           if (!res.ok || !data.ok) {
-            this.publish({ pending: false, failure: data && data.code ? String(data.code) : 'generic' })
+            const code = data && data.code ? String(data.code) : 'generic'
+            const detail = data && typeof data.error === 'string' && data.error !== '' ? data.error : null
+            this.publish({ pending: false, failure: code, failureDetail: detail })
             return
           }
           const shadowed = Array.isArray(data.shadowed) ? data.shadowed : []
@@ -2229,9 +2356,28 @@ window.__ModuleLoader__.load({
       element.style[property] = value
     }
 
+    /**
+     * The surface an in-place editor paints itself with, so the recorded text
+     * underneath cannot show through the draft.
+     *
+     * The skin's own panel colour comes first. A skin that paints the app on
+     * artwork usually leaves `body` transparent (the artwork is a layer behind
+     * it), and the white fallback then put a white box on a night sky. The
+     * palette keeps the skin's hue and drops its transparency, so what comes back
+     * here is opaque by construction.
+     *
+     * @returns a CSS colour for the editor's own background.
+     */
     function pageBackground() {
       try {
-        if (typeof getComputedStyle === 'function' && typeof document !== 'undefined') {
+        if (typeof getComputedStyle === 'function' && typeof document !== 'undefined' && document.body) {
+          const panel = String(getComputedStyle(document.body).getPropertyValue('--dshet-panel') || '').trim()
+          const match = /rgba?\(([^)]+)\)/.exec(panel)
+          if (match !== null) {
+            const parts = match[1].split(',').map((value) => Number.parseFloat(value))
+            const opaque = parts.length >= 3 && parts.every((value) => Number.isFinite(value)) && (parts.length < 4 || parts[3] >= 0.9)
+            if (opaque) return panel
+          }
           const value = getComputedStyle(document.body).backgroundColor
           if (value && value !== 'transparent' && !/rgba?\(0, 0, 0, 0\)/.test(value)) return value
         }
@@ -2659,7 +2805,15 @@ window.__ModuleLoader__.load({
         // Reserve a header band for the controls; when the prompt carries image
         // chips they sit above the text, so the text starts below them too.
         const offsetTop = headerOffset
-        const available = Math.max(40, height - offsetTop - 8)
+        // The control band is painted over the box's bottom edge, so the field
+        // has to stop above it: the old `height - offsetTop - 8` let the field
+        // run 40px under the footer, and the last lines of a long block were
+        // covered for good (the field scrolled, the footer never moved).
+        const footerHeight =
+          footerEl !== null && footerEl !== undefined && typeof footerEl.offsetHeight === 'number' && footerEl.offsetHeight > 0
+            ? footerEl.offsetHeight
+            : FOOTER_BAND
+        const available = Math.max(40, height - offsetTop - footerHeight)
         area.style.position = 'absolute'
         area.style.boxSizing = 'border-box'
         area.style.left = `${Math.round(offsetLeft)}px`
@@ -2840,6 +2994,9 @@ window.__ModuleLoader__.load({
         // saving would write, so both have to redraw the strip - and the chip
         // keys are enough to tell one list from another.
         view.parts.map((part) => part.key).join('.'),
+        // The mode itself: leaving the all-blocks view must rebuild even when the
+        // single block that comes back is the one that was selected before it.
+        view.allBlocks === true ? 'all' : 'one',
         // The selected reply block: switching blocks has to rebuild the box.
         view.blockIndex === null || view.blockIndex === undefined ? '' : String(view.blockIndex),
         view.targetSeq === null || view.targetSeq === undefined ? '' : String(view.targetSeq),
@@ -3099,13 +3256,15 @@ window.__ModuleLoader__.load({
         if (event.isComposing === true || event.keyCode === 229) return
         if (event.key === 'Enter' && event.shiftKey !== true) {
           event.preventDefault()
-          if (view.confirming) controller.confirm()
+          const live = liveView()
+          if (live !== null && live !== undefined && live.confirming === true) controller.confirm()
           else controller.review()
           return
         }
         if (event.key === 'Escape') {
           event.preventDefault()
-          if (view.confirming) controller.back()
+          const live = liveView()
+          if (live !== null && live !== undefined && live.confirming === true) controller.back()
           else controller.close()
         }
       })
@@ -3234,14 +3393,34 @@ window.__ModuleLoader__.load({
         warn.textContent = texts.warn
         box.appendChild(warn)
       }
-      if (typeof view.failure === 'string' && view.failure !== '') {
+      // A running turn only blocks the paths that move the surface (a prompt
+      // rewrite, or a reply edit on a host without the in-place record). The
+      // in-place record appends one event and changes nothing that is already
+      // on the surface, so waiting for the agent to finish is not required -
+      // the model picks the edit up on its next fold.
+      const inPlaceEdit = target.mode === 'reply' && target.patch === true
+      const busyBlocked = view.busy === true && !inPlaceEdit
+      const failureCode = typeof view.failure === 'string' && view.failure !== ''
+        ? view.failure
+        : busyBlocked
+          ? 'busy'
+          : null
+      if (failureCode !== null) {
         const error = document.createElement('p')
         error.className = 'dshet-error'
         error.setAttribute('role', 'status')
-        error.textContent = errorText(t, view.failure)
+        const detail = typeof view.failureDetail === 'string' && view.failureDetail !== '' ? view.failureDetail : null
+        error.textContent = (failureCode === 'internal' || failureCode === 'generic') && detail !== null
+          ? `${errorText(t, failureCode)}（${detail.slice(0, 300)}）`
+          : errorText(t, failureCode)
         box.appendChild(error)
       }
 
+      // Handlers must read the CURRENT controller state: the host may not have
+      // rebuilt the button after the first press, and a stale `view.confirming`
+      // made the confirmation step a dead end (press again -> review again).
+      const liveView = () => (typeof controller.getSnapshot === 'function' ? controller.getSnapshot() : view)
+
       const footer = document.createElement('div')
       footer.className = 'dshet-footer'
       const footerActions = document.createElement('div')
@@ -3282,11 +3461,17 @@ window.__ModuleLoader__.load({
       submit.appendChild(submitText)
       submit.title = `${submitLabel} (Enter)`
       submit.setAttribute('aria-label', submitLabel)
-      submit.disabled = view.pending
+      submit.disabled = view.pending || busyBlocked
       pressable(submit, () => {
-        if (view.confirming) controller.confirm()
+        const live = liveView()
+        if (live !== null && live !== undefined && live.confirming === true) controller.confirm()
         else controller.review()
       })
+      if (view.confirming === true) {
+        // The save label is visually hidden, so the confirmation step needs a
+        // visible state of its own or the first press looks like nothing.
+        submit.classList.add('dshet-btn-confirm')
+      }
 
       footerActions.appendChild(cancel)
       // The re-run button belongs to the sibling (dsh-rerun-turn): it appears
@@ -3377,8 +3562,11 @@ window.__ModuleLoader__.load({
     // collapsed panel that may not be in the DOM at all.
 
     const PATCH_ATTR = 'data-dshet-patch'
-    const NOTE_ATTR = 'data-dshet-patch-note'
     const patchOriginals = new WeakMap()
+    // The text this plugin last painted for a key, so a second edit of the same
+    // block can still find the element after the first text replaced the
+    // recorded original in the DOM.
+    const patchedTexts = new Map()
     // React may re-render the assistant container and reset its attributes and
     // style while leaving the text node we replaced. Remember the element by
     // seq:block so the next pass can restore the marker and, on a later edit,
@@ -3456,10 +3644,11 @@ window.__ModuleLoader__.load({
     // element in the owning row whose whole text is exactly the recorded text;
     // never a button, a timestamp, our own chrome, or an ancestor that merely
     // contains the text.
-    function findPatchTextFallback(owner, wanted) {
+    function findPatchTextFallback(owner, wanted, previousText = '') {
       if (owner === null || owner === undefined || typeof owner.querySelectorAll !== 'function') return null
       const original = matchText(wanted.original)
-      if (original === '') return null
+      const previous = matchText(previousText)
+      if (original === '' && previous === '') return null
       let scope = owner
       try {
         const node = owner.querySelector('[data-slot="conversation.chat.node"]')
@@ -3471,12 +3660,12 @@ window.__ModuleLoader__.load({
         if (el === scope) continue
         if (el.getAttribute(PATCH_ATTR) !== null) continue
         try {
-          if (el.closest('.dshet-editor, .dshet-action, .dshet-pick, .dshet-patch-note, button, time') !== null) continue
+          if (el.closest('.dshet-editor, .dshet-action, .dshet-pick, button, time') !== null) continue
         } catch {
           continue
         }
         const text = matchText(el.textContent)
-        if (text !== original) continue
+        if (text !== original && !(previous !== '' && text === previous)) continue
         let deeper = false
         for (const child of el.children ?? []) {
           if (matchText(child.textContent) === text) {
@@ -3489,6 +3678,97 @@ window.__ModuleLoader__.load({
       return null
     }
 
+    /**
+     * The collapsed reasoning header draws its own truncation of the RECORDED
+     * text ("思考 · ..."), and when the panel is closed the body is not in the
+     * DOM at all - so a patch of the reasoning body alone leaves the edit
+     * invisible. Rewrite that snippet too, keeping whatever the host appended
+     * (its ellipsis) and its own truncation length.
+     */
+    function patchReasoningSummary(owner, wanted) {
+      if (owner === null || owner === undefined || typeof owner.querySelectorAll !== 'function') return false
+      const original = String(wanted.original ?? '')
+      const patched = String(wanted.text ?? '')
+      if (original === '' || patched === '') return false
+      const head = original.slice(0, 12)
+      let changed = false
+      const apply = (get, set) => {
+        const data = String(get() ?? '')
+        if (data === '' || !data.includes(head)) return
+        // A node holding the whole text gets the whole replacement; a truncated
+        // snippet keeps the host's length and gains an ellipsis when the new
+        // text is longer.
+        const next = data.length >= original.length ? patched : `${patched.slice(0, data.length)}${patched.length > data.length ? '…' : ''}`
+        if (next === data) return
+        set(next)
+        changed = true
+      }
+      const walk = (node) => {
+        for (const child of node.childNodes ?? []) {
+          const type = child.nodeType
+          if (type === 3) {
+            apply(() => child.data, (value) => { child.data = value })
+            continue
+          }
+          if (type !== 1) continue
+          try {
+            if (typeof child.closest === 'function' && child.closest('.dshet-editor, .dshet-action, .dshet-pick, button, time') !== null) continue
+          } catch {
+            /* a node without closest is walked anyway */
+          }
+          const kids = child.childNodes ?? []
+          if (kids.length === 0) {
+            apply(() => child.textContent, (value) => { child.textContent = value })
+            continue
+          }
+          walk(child)
+        }
+      }
+      walk(owner)
+      return changed
+    }
+
+    /**
+     * The reasoning body on this host is its own row (the flow key carries a
+     * `,reasoning` group part), so neither the answer row nor the first chat node
+     * the shared fallback picks contains it. Search the whole conversation for
+     * the deepest element whose text is the recorded original (or what we last
+     * painted there).
+     */
+    function findReasoningElement(root, wanted, previousText) {
+      if (root === null || root === undefined || typeof root.querySelectorAll !== 'function') return null
+      const original = matchText(wanted.original)
+      const previous = matchText(previousText)
+      if (original === '' && previous === '') return null
+      let best = null
+      let bestScore = Infinity
+      for (const el of root.querySelectorAll('*')) {
+        if (el.getAttribute(PATCH_ATTR) !== null) continue
+        try {
+          if (el.closest('.dshet-editor, .dshet-action, .dshet-pick, button, time') !== null) continue
+        } catch {
+          /* a detached node is still a candidate */
+        }
+        const text = matchText(el.textContent)
+        if (text === '') continue
+        if (text !== original && !(previous !== '' && text === previous)) continue
+        let deeper = false
+        for (const child of el.children ?? []) {
+          if (matchText(child.textContent) === text) {
+            deeper = true
+            break
+          }
+        }
+        if (deeper) continue
+        const score = Math.abs(text.length - original.length)
+        if (score < bestScore) {
+          best = el
+          bestScore = score
+        }
+      }
+      return best
+    }
+
     function applyPatchDisplay(snapshot, view, t) {
       // Map a reply seq to the host row that draws it, so a short answer like
       // "好的" cannot be matched in a different row. Fall back to a global
@@ -3522,7 +3802,7 @@ window.__ModuleLoader__.load({
       if (root === null) return
       const replies = view.replies instanceof Map ? view.replies : new Map()
       const wantedText = new Map()
-      const wantedNotes = new Map()
+      const wantedReasoning = new Map()
       for (const patch of Array.isArray(view.patches) ? view.patches : []) {
         const reply = replies.get(patch.seq)
         if (reply === undefined || !Array.isArray(reply.blocks)) continue
@@ -3536,8 +3816,10 @@ window.__ModuleLoader__.load({
             text: String(patch.text ?? ''),
           })
         } else if (patch.kind === 'reasoning') {
-          wantedNotes.set(`${patch.seq}:${patch.blockIndex}`, {
+          wantedReasoning.set(`${patch.seq}:${patch.blockIndex}`, {
             key: `${patch.seq}:${patch.blockIndex}`,
+            seq: patch.seq,
+            original: String(block.original ?? ''),
             text: String(patch.text ?? ''),
             reply,
             block,
@@ -3548,7 +3830,7 @@ window.__ModuleLoader__.load({
       // A patch that no longer exists must give the host's recorded text back,
       // even when a re-render already stripped our marker from the element.
       for (const [key, el] of [...patchedElements]) {
-        if (wantedText.has(key)) continue
+        if (wantedText.has(key) || wantedReasoning.has(key)) continue
         patchedElements.delete(key)
         if (el.isConnected === true) restorePatchedBlock(el)
       }
@@ -3566,18 +3848,14 @@ window.__ModuleLoader__.load({
           el.textContent = shown
         }
       }
-      for (const note of [...root.querySelectorAll(`[${NOTE_ATTR}]`)]) {
-        const key = note.getAttribute(NOTE_ATTR)
-        if (!wantedNotes.has(key)) note.remove()
-      }
-      if (wantedText.size === 0 && wantedNotes.size === 0) return
+      if (wantedText.size === 0 && wantedReasoning.size === 0) return
 
       const nodes = [...root.querySelectorAll('[data-slot="conversation.chat.node"]')]
       const containers = []
       for (const node of nodes) {
         for (const el of node.querySelectorAll('*')) {
           try {
-            if (isMarkdownContainer(el) && el.closest('.dshet-editor, .dshet-pick, .dshet-patch-note') === null) containers.push(el)
+            if (isMarkdownContainer(el) && el.closest('.dshet-editor, .dshet-pick') === null) containers.push(el)
           } catch {
             /* a detached node is skipped */
           }
@@ -3608,7 +3886,8 @@ window.__ModuleLoader__.load({
           continue
         }
         const original = matchText(wanted.original)
-        if (original === '') continue
+        const previous = matchText(patchedTexts.get(key) ?? '')
+        if (original === '' && previous === '') continue
         let best = null
         let bestScore = Infinity
         for (const el of containers) {
@@ -3622,7 +3901,7 @@ window.__ModuleLoader__.load({
           }
           const text = matchText(el.textContent)
           if (text === '') continue
-          const exact = text === original
+          const exact = text === original || (previous !== '' && text === previous)
           const prefix = text.startsWith(original.slice(0, 60)) || original.startsWith(text.slice(0, 60))
           if (!exact && !prefix) continue
           // Prefer the exact match, then the container closest in length: a
@@ -3634,47 +3913,90 @@ window.__ModuleLoader__.load({
             bestScore = score
           }
         }
-        if (best === null) best = findPatchTextFallback(owner, wanted)
+        if (best === null) best = findPatchTextFallback(owner, wanted, patchedTexts.get(key) ?? '')
         if (best === null) continue
         patchOriginals.set(best, { html: best.innerHTML, text: best.textContent })
         best.textContent = displayText(wanted.text)
         best.setAttribute(PATCH_ATTR, key)
         best.style.whiteSpace = 'pre-wrap'
         patchedElements.set(key, best)
+        patchedTexts.set(key, wanted.text)
       }
 
-      // Reasoning notes: put one under the reply row, found by the reply's own
-      // answer text (the panel itself may be collapsed and absent).
-      for (const [key, wanted] of wantedNotes) {
-        let note = [...root.querySelectorAll(`[${NOTE_ATTR}]`)].find((el) => el.getAttribute(NOTE_ATTR) === key)
-        let row = rowBySeq.get(wanted.reply.seq) ?? null
-        const replyText = matchText(wanted.reply.text)
-        for (const node of row === null ? nodes : []) {
-          const text = matchText(node.textContent)
-          if (text === '') continue
-          if (replyText !== '' && text.includes(replyText)) {
-            row = node
-            break
+      // A reasoning patch is drawn in place when the host renders that
+      // reasoning body; the note is only the fallback for a panel that is not
+      // in the DOM (or is drawn as a short summary without the full text).
+      for (const [key, wanted] of wantedReasoning) {
+        const owner = rowBySeq.get(wanted.seq)
+        const remembered = patchedElements.get(key)
+        if (remembered !== undefined) {
+          // The reasoning part is its own row (the flow key carries a
+          // `,reasoning` group part), so it is NOT the row `rowBySeq` picked for
+          // the seq - that one draws the answer. Only connectivity matters here.
+          const stillThere = remembered.isConnected === true
+          if (stillThere) {
+            const shown = displayText(wanted.text)
+            if (normalizedText(remembered.textContent) !== normalizedText(shown)) remembered.textContent = shown
+            if (remembered.getAttribute(PATCH_ATTR) !== key) remembered.setAttribute(PATCH_ATTR, key)
+            remembered.style.whiteSpace = 'pre-wrap'
+            patchedTexts.set(key, wanted.text)
+            continue
           }
-          if (matchText(wanted.block.original) !== '' && text.includes(matchText(wanted.block.original))) {
-            row = node
-            break
+          patchedElements.delete(key)
+        }
+        const done = [...root.querySelectorAll(`[${PATCH_ATTR}]`)].find((el) => el.getAttribute(PATCH_ATTR) === key)
+        if (done !== undefined) {
+          patchedElements.set(key, done)
+          continue
+        }
+        const original = matchText(wanted.original)
+        const previous = matchText(patchedTexts.get(key) ?? '')
+        const previousText = patchedTexts.get(key) ?? ''
+        let best = null
+        if (original !== '' || previous !== '') {
+          // The owning row first (a host that draws the reasoning inside the
+          // answer row), then the whole conversation: on this host the reasoning
+          // is its own row, so the answer row holds no reasoning text at all.
+          for (const scope of owner === undefined ? [null] : [owner, null]) {
+            let bestScore = Infinity
+            for (const el of containers) {
+              if (el.getAttribute(PATCH_ATTR) !== null) continue
+              if (scope !== null) {
+                try {
+                  if (el.closest('[data-chat-flow-key]') !== scope) continue
+                } catch {
+                  /* keep the global match */
+                }
+              }
+              const text = matchText(el.textContent)
+              if (text === '') continue
+              if (text !== original && !(previous !== '' && text === previous)) continue
+              const score = Math.abs(text.length - original.length)
+              if (score < bestScore) {
+                best = el
+                bestScore = score
+              }
+            }
+            if (best !== null) break
           }
+          if (best === null) best = findPatchTextFallback(owner ?? null, wanted, previousText)
+          if (best === null) best = findReasoningElement(root, wanted, previousText)
         }
-        if (note === undefined || note === null) {
-          note = document.createElement('details')
-          note.className = 'dshet-patch-note'
-          note.setAttribute(NOTE_ATTR, key)
-          const summary = document.createElement('summary')
-          summary.textContent = t('editor.patch-note')
-          const body = document.createElement('pre')
-          body.className = 'dshet-patch-note-body'
-          note.appendChild(summary)
-          note.appendChild(body)
+        if (best === null) {
+          // No body in the DOM (the panel is closed): the header snippet is the
+          // only place the edit can show.
+          if (owner !== undefined) patchReasoningSummary(owner, wanted)
+          patchReasoningSummary(root, wanted)
+          continue
         }
-        const body = note.querySelector('.dshet-patch-note-body')
-        if (body !== null && body.textContent !== wanted.text) body.textContent = wanted.text
-        if (note.isConnected !== true && row !== null) row.after(note)
+        patchOriginals.set(best, { html: best.innerHTML, text: best.textContent })
+        best.textContent = displayText(wanted.text)
+        best.setAttribute(PATCH_ATTR, key)
+        best.style.whiteSpace = 'pre-wrap'
+        patchedElements.set(key, best)
+        patchedTexts.set(key, wanted.text)
+        if (owner !== undefined) patchReasoningSummary(owner, wanted)
+        patchReasoningSummary(root, wanted)
       }
     }
 
@@ -4292,6 +4614,31 @@ window.__ModuleLoader__.load({
       // A reply's edit entry lives in the official assistant-actions strip, one
       // entry per assistant message. order 5 puts it ahead of the feedback
       // entries (order 10), so the pencil sits with the leading icons.
+      // The active skin repaints its surfaces at any time (switching one
+      // rewrites body's attributes and inline variables), so the palette is
+      // resolved once and then again on every theme or skin change.
+      ctx.effect(() => {
+        const run = () => {
+          try {
+            resolveSkinPalette()
+          } catch {
+            /* the stylesheet defaults stand */
+          }
+        }
+        run()
+        const observer =
+          typeof MutationObserver === 'function' && document && document.body
+            ? new MutationObserver(run)
+            : null
+        if (observer !== null) {
+          observer.observe(document.body, { attributes: true, attributeFilter: ['class', 'style', 'data-ds-dark-theme'] })
+          if (document.documentElement) observer.observe(document.documentElement, { attributes: true, attributeFilter: ['class', 'style'] })
+        }
+        return () => {
+          if (observer !== null) observer.disconnect()
+        }
+      }, 'dsh-edit-turn:skin-palette')
+
       ctx.slots.inject('conversation.chat.assistant-actions', () =>
         ctx.slots.register(
           {

package/lib/index.js

@@ -80,7 +80,7 @@ export const PLUGIN_ID = 'dsh-edit-turn'
 export const name = PLUGIN_ID
 
 /** Keep in sync with package.json and lib/client.js. */
-export const PLUGIN_VERSION = '0.5.0'
+export const PLUGIN_VERSION = '0.5.2'
 
 // A ring of the last few requests, answering "did the browser half even ask, and
 // what did it get?" without needing its console. Read-only diagnostics: the
@@ -162,6 +162,10 @@ export const Config =
          * replay splice otherwise; `patch` refuses to run without the
          * projection; `replay` always uses the old path. Prompt edits always use
          * the official surface replacement.
+         *
+         * There is deliberately no `replace` value: appending a fresh
+         * `assistant/message` with a replace op is refused by the session's own
+         * surface validation (see the note in the README).
          */
         replyMode: z.string().default('auto'),
         /**
@@ -1868,7 +1872,9 @@ async function applyTargetsEdit(ctx, sessionId, body, config) {
   }
   const events = await readEvents(ctx, sessionId)
   if (!events) throw new HttpError(404, 'session-not-found', 'no session log for this id')
-  if (isBusy(events)) throw new HttpError(409, 'busy', 'the session is still working')
+  // No busy gate here: this path only appends the in-place patch record, which
+  // leaves every surface node where it is. A running turn keeps writing its own
+  // events; the record lands between them and the fold ignores it.
   const surfaceNodes = surfaceOf(ctx, sessionId, events)
   const patches = patchesOf(events)
   const plans = []
@@ -1900,7 +1906,11 @@ async function applyTargetsEdit(ctx, sessionId, body, config) {
       buildPatchData(plans.map(({ plan, text }) => ({ seq: plan.targetSeq, blockIndex: plan.blockIndex, kind: plan.kind, text }))),
     )
   } catch (error) {
-    throw new HttpError(409, 'stale', `the session refused the patch record: ${String((error && error.message) || error)}`)
+    const message = String((error && error.message) || error)
+    if (isProjectionUnavailable(message)) {
+      throw new HttpError(409, 'projection-missing', 'the edit-turn projection is not registered for this session; restart DSH so the owning plugin registers it, then retry')
+    }
+    throw new HttpError(409, 'stale', `the session refused the patch record: ${message}`)
   }
   const flush = await flushSession(ctx, session)
   return {
@@ -1927,22 +1937,23 @@ async function applyEdit(ctx, sessionId, body, config) {
   }
   const events = await readEvents(ctx, sessionId)
   if (!events) throw new HttpError(404, 'session-not-found', 'no session log for this id')
-  if (isBusy(events)) throw new HttpError(409, 'busy', 'the session is still working')
+  const busy = isBusy(events)
 
   const surfaceNodes = surfaceOf(ctx, sessionId, events)
   const patches = patchesOf(events)
   const patchMode = config.patch === true
+  const request = {
+    // A block from another step of the same turn names its own seq; that is
+    // the message the projection has to patch.
+    seq: typeof body.targetSeq === 'number' ? body.targetSeq : typeof body.seq === 'number' ? body.seq : undefined,
+    messageId: typeof body.messageId === 'string' ? body.messageId : undefined,
+    turn: typeof body.turn === 'number' ? body.turn : undefined,
+    blockIndex: typeof body.blockIndex === 'number' ? body.blockIndex : undefined,
+    kind: typeof body.kind === 'string' ? body.kind : undefined,
+  }
   let plan
   try {
-    plan = planRollback(events, surfaceNodes, {
-      // A block from another step of the same turn names its own seq; that is
-      // the message the projection has to patch.
-      seq: typeof body.targetSeq === 'number' ? body.targetSeq : typeof body.seq === 'number' ? body.seq : undefined,
-      messageId: typeof body.messageId === 'string' ? body.messageId : undefined,
-      turn: typeof body.turn === 'number' ? body.turn : undefined,
-      blockIndex: typeof body.blockIndex === 'number' ? body.blockIndex : undefined,
-      kind: typeof body.kind === 'string' ? body.kind : undefined,
-    }, { patches, patch: patchMode })
+    plan = planRollback(events, surfaceNodes, request, { patches, patch: patchMode })
   } catch (error) {
     if (error instanceof EditPlanError) {
       const status = error.code === 'not-editable' ? 400 : 409
@@ -1951,6 +1962,13 @@ async function applyEdit(ctx, sessionId, body, config) {
     throw error
   }
 
+  // A running turn is a hard stop for every path that moves the surface: the
+  // prompt rewrite shadows a message the turn may still be reading, and the
+  // replay splice shadows a window and regenerates the tail. The in-place record
+  // below moves nothing, so it is allowed to land while the agent is still
+  // writing - the model reads it on its next fold.
+  if (busy && plan.patch !== true) throw new HttpError(409, 'busy', 'the session is still working')
+
   // The in-place reply path: one small plugin record, interpreted by this
   // plugin's projection. Nothing leaves the surface, so there is no window to
   // check, no turn to open and no tail to replay. The record is append-only and
@@ -1980,8 +1998,19 @@ async function applyEdit(ctx, sessionId, body, config) {
         buildPatchData([{ seq: plan.targetSeq, blockIndex: plan.blockIndex, kind: plan.kind, text }]),
       )
     } catch (error) {
-      throw new HttpError(409, 'stale', `the session refused the patch record: ${String((error && error.message) || error)}`)
+      const message = String((error && error.message) || error)
+      // The projection is not registered for this session (a live reload that
+      // dropped it). The same edit can land through the replay path, which
+      // needs no projection - so fall through instead of failing the save.
+      if (isProjectionUnavailable(message)) {
+        // The fallback replays the tail, which a running turn forbids.
+        if (busy) throw new HttpError(409, 'busy', 'the session is still working')
+        plan = planRollback(events, surfaceNodes, request, { patches, patch: false })
+      } else {
+        throw new HttpError(409, 'stale', `the session refused the patch record: ${message}`)
+      }
     }
+    if (plan.patch === true) {
     const flush = await flushSession(ctx, session)
     return {
       kind: 'reply',
@@ -1999,6 +2028,7 @@ async function applyEdit(ctx, sessionId, body, config) {
       shadowed: [],
       ...flush,
     }
+    }
   }
 
   // The live surface is the append authority; a node that vanished between the
@@ -2433,9 +2463,25 @@ function requireSessionId(value) {
   return value
 }
 
+/**
+ * Whether the host refused a plugin record because its projection is no longer
+ * registered for this session (a live reload that dropped it, or a session
+ * loaded before the owning plugin). Such a save can still go through the replay
+ * path, so it is not fatal.
+ *
+ * @param message - the host's error text.
+ * @returns true when the record's projection is gone.
+ */
+export function isProjectionUnavailable(message) {
+  return typeof message === 'string' && /projection .*was removed or replaced/i.test(message)
+}
+
 function failure(res, error) {
   const status = error instanceof HttpError ? error.status : 500
   const code = error instanceof HttpError ? error.code : 'internal'
+  // An unexpected throw is the only case the client cannot explain; leave the
+  // stack in the host log so a report can name the cause.
+  if (!(error instanceof HttpError)) console.error('[dsh-edit-turn] internal error', error)
   sendJson(res, status, { ok: false, code, error: String((error && error.message) || error) })
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-edit-turn",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Edit any message in DeepSeek Harness in place: a prompt is replaced where it stands; a model reply block (answer text or reasoning) is patched through a plugin record and a message projection, so the turn stays where it is, later turns are untouched and the log grows by one small record. Falls back to the replay splice on hosts without the projection API. The append-only session log is never rewritten.",
   "type": "module",
   "main": "lib/index.js",