dsh-edit-turn 0.5.24 → 0.6.1

package/lib/client.js

@@ -457,7 +457,7 @@ window.__ModuleLoader__.load({
       // read as a different, "active" icon next to the neutral grey ones. The
       // variable resolves on the action bar (and everywhere above it); the
       // fallback is the value it resolves to in the default theme.
-      '.dshet-action{width:28px;height:28px;padding:6px;display:inline-flex;align-items:center;justify-content:center;border:none;border-radius:28px;background:transparent;color:var(--dsw-alias-label-tertiary,#81858c);cursor:pointer;transition:background-color .12s,color .12s}',
+      '.dshet-action{width:calc(28px + var(--dsh-content-font-delta,0px));height:calc(28px + var(--dsh-content-font-delta,0px));padding:6px;display:inline-flex;align-items:center;justify-content:center;border:none;border-radius:28px;background:transparent;color:var(--dsw-alias-label-tertiary,#81858c);cursor:pointer;transition:background-color .12s,color .12s}',
       // The fallback strip for a turn with no closing body.
       //
       // The gate is the host's OWN marker: TurnTailNodeView renders
@@ -473,7 +473,7 @@ window.__ModuleLoader__.load({
       '.dshet-action:hover:not(:disabled){background:var(--dshet-chip);box-shadow:inset 0 0 0 1px var(--dshet-line);color:var(--dsw-alias-label-primary,var(--dshet-ink))}',
       '.dshet-action:focus-visible{outline:2px solid var(--dsw-alias-button-primary-fill,var(--dshet-accent));outline-offset:2px}',
       '.dshet-action:disabled{cursor:default;opacity:.4}',
-      '.dshet-action svg{width:15px;height:15px}',
+      '.dshet-action svg{width:calc(16px + var(--dsh-content-font-delta,0px));height:calc(16px + var(--dsh-content-font-delta,0px))}',
       // The reply pencil leads its strip. The host draws the copy button ahead of
       // the slot this entry is rendered into, and the strip lays its children out
       // in DOM order, so in DOM position the pencil can only ever come second -
@@ -547,7 +547,7 @@ window.__ModuleLoader__.load({
       '.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: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 var(--dshet-radius-md) var(--dshet-radius-md);gap:6px}',
+      '.dshet-editor[data-dshet-inplace="1"] .dshet-footer{position:absolute;top:auto;left:0;right:0;bottom:0;height:calc(46px + var(--dsh-content-font-delta,0px));align-items:center;padding:6px 10px;box-sizing:border-box;background:transparent;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{position:absolute;left:8px;bottom:6px;max-width:60%;margin:0;background:var(--dshet-panel);border-radius:8px;padding:2px 6px}',
@@ -598,19 +598,19 @@ window.__ModuleLoader__.load({
       '.dshet-btn:hover:not(:disabled){background:var(--dshet-hover)}',
       '.dshet-btn:focus-visible{outline:2px solid var(--dsw-alias-button-primary-fill,var(--dshet-accent));outline-offset:2px}',
       '.dshet-btn:disabled{cursor:default;opacity:.5}',
-      '.dshet-btn-save{width:28px;height:28px;padding:0;border:0;border-radius:50%;background:transparent;color:#81858c}',
+      '.dshet-btn-save{width:calc(28px + var(--dsh-content-font-delta,0px));height:calc(28px + var(--dsh-content-font-delta,0px));padding:0;border:0;border-radius:50%;background:transparent;color:#81858c}',
       '.dshet-btn-save:hover:not(:disabled){background:var(--dshet-hover)}',
-      '.dshet-btn-save svg{width:15px;height:15px;display:block;stroke:currentColor;fill:none;stroke-width:1.2;stroke-linecap:round;stroke-linejoin:round}',
+      '.dshet-btn-save svg{width:calc(16px + var(--dsh-content-font-delta,0px));height:calc(16px + var(--dsh-content-font-delta,0px));display:block;stroke:currentColor;fill:none;stroke-width:1.2;stroke-linecap:round;stroke-linejoin:round}',
       '.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:var(--dshet-ink-soft);filter:none}',
+'.dshet-btn.dshet-btn-save{width:calc(28px + var(--dsh-content-font-delta,0px));height:calc(28px + var(--dsh-content-font-delta,0px));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{width:calc(28px + var(--dsh-content-font-delta,0px));height:calc(28px + var(--dsh-content-font-delta,0px));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: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-btn-icon svg{width:calc(16px + var(--dsh-content-font-delta,0px));height:calc(16px + var(--dsh-content-font-delta,0px));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:calc(28px + var(--dsh-content-font-delta,0px));height:calc(28px + var(--dsh-content-font-delta,0px));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}',
       '.dshet-pick{display:flex;align-items:center;gap:4px;padding:0;font-size:12px;color:var(--dshet-ink-dim)}',
       '.dshet-config{display:flex;flex-direction:column;gap:10px}',
@@ -3845,6 +3845,8 @@ window.__ModuleLoader__.load({
         })
         box.addEventListener('dragover', (event) => {
           event.preventDefault()
+          // 不让事件传到输入框：否则宿主也会把这次拖拽当成它的附件。
+          event.stopPropagation()
           box.dataset.dshetDrop = '1'
         })
         box.addEventListener('dragleave', () => {
@@ -3852,9 +3854,17 @@ window.__ModuleLoader__.load({
         })
         box.addEventListener('drop', (event) => {
           event.preventDefault()
+          event.stopPropagation()
           delete box.dataset.dshetDrop
           const files = filesFromData(event.dataTransfer)
           if (files.length > 0) controller.attachFiles(files)
+          // 宿主的「文件或图片拖动到此处即可添加」遮罩是靠它自己的 document drop
+          // 关闭的；我们把事件拦下来了，就得替它收尾，否则遮罩会一直挂着。
+          try {
+            window.dispatchEvent(new DragEvent('dragend', { bubbles: true }))
+          } catch {
+            /* 老环境没有 DragEvent 就算了 */
+          }
         })
       }
 
@@ -4376,7 +4386,16 @@ window.__ModuleLoader__.load({
             }
           }
         }
-        if (block === undefined) continue
+        if (block === undefined) {
+          // `/state` 的回复只有身份，没有 blocks。补丁自带 original 时按文本匹配；
+          // 老宿主没带 original 时也不必放弃——按「同一行 + 块类型」在 DOM 里定位。
+          const key = `${patch.seq}:${patch.blockIndex}`
+          const original = typeof patch.original === 'string' ? patch.original : ''
+          const wanted = { key, seq: patch.seq, original, text: String(patch.text ?? '') }
+          if (patch.kind === 'text') wantedText.set(key, wanted)
+          else if (patch.kind === 'reasoning') wantedReasoning.set(key, { ...wanted, reply: null, block: null })
+          continue
+        }
         if (patch.kind === 'text') {
           wantedText.set(`${patch.seq}:${patch.blockIndex}`, {
             key: `${patch.seq}:${patch.blockIndex}`,
@@ -4456,7 +4475,31 @@ window.__ModuleLoader__.load({
         }
         const original = matchText(wanted.original)
         const previous = matchText(patchedTexts.get(key) ?? '')
-        if (original === '' && previous === '') continue
+        if (original === '' && previous === '') {
+          // 没有旧文本可比：按「该补丁所在行 + 正文容器」直接换掉。
+          const scope = owner !== undefined ? owner : root
+          let target = null
+          for (const el of containers) {
+            if (el.getAttribute(PATCH_ATTR) !== null) continue
+            try {
+              if (el.closest('[data-chat-flow-key]') !== scope) continue
+              if (el.closest('[data-variant="think"]') !== null) continue
+            } catch {
+              continue
+            }
+            if ((el.textContent || '').trim() === '') continue
+            target = el
+            break
+          }
+          if (target === null) continue
+          patchOriginals.set(target, { html: target.innerHTML, text: target.textContent })
+          target.textContent = displayText(wanted.text)
+          target.setAttribute(PATCH_ATTR, key)
+          target.style.whiteSpace = 'pre-wrap'
+          patchedElements.set(key, target)
+          patchedTexts.set(key, wanted.text)
+          continue
+        }
         let best = null
         let bestScore = Infinity
         for (const el of containers) {
@@ -4709,25 +4752,39 @@ window.__ModuleLoader__.load({
           if (typeof unsubscribe === 'function') unsubscribe()
         }
       }, [controller])
-      const entry = view === null ? undefined : view.repliesByMessage.get(messageId)
-      if (entry === undefined || entry === null || view.hidden.has(entry.seq)) return null
+      // 先渲染、后确认：/state 还没回来时也把铅笔画出来（置灰），
+      // 否则宿主和别的插件都在了，只有我们要等一次请求才出现。
+      // 没有 messageId 就无从谈起：这种行不进入口。
+      if (messageId === undefined || messageId === null || messageId === '') return null
+      const loaded = view !== null
+      const entry = loaded ? view.repliesByMessage.get(messageId) : undefined
+      if (loaded && (entry === undefined || entry === null || view.hidden.has(entry.seq))) return null
       const label = t === null ? '' : t('action.edit-reply')
-      const open = (event) => {
+      const open = async (event) => {
         event.preventDefault()
         event.stopPropagation()
+        if (entry === undefined) return
+        // `/state` 只发回复的身份（textLength / blockCount），正文和多块内容要按需
+        // 取一次；不取就打开成空框 + 占位符，也没有正文/思维链页。
+        const body = typeof controller.replyBody === 'function' ? await controller.replyBody(entry.messageId) : null
+        const blocks = body !== null && Array.isArray(body.blocks) && body.blocks.length > 0
+          ? body.blocks
+          : Array.isArray(entry.blocks) ? entry.blocks : []
         controller.open({
           anchor: event.currentTarget,
           seq: entry.seq,
           mode: 'reply',
           turn: entry.turn,
           messageId: entry.messageId,
-          text: typeof entry.text === 'string' ? entry.text : '',
+          text: body !== null && typeof body.text === 'string'
+            ? body.text
+            : typeof entry.text === 'string' ? entry.text : '',
           attachments: typeof entry.attachments === 'number' ? entry.attachments : 0,
           // On the in-place path the reply keeps its tool calls and other
           // blocks, so the editor can offer each editable block (output text
           // and reasoning). On the replay path there is no block picker: the
           // whole reply is replaced.
-          ...(Array.isArray(entry.blocks) ? { blocks: entry.blocks, patch: true } : { blocks: [] }),
+          ...(blocks.length > 0 ? { blocks, patch: true } : { blocks: [] }),
         })
       }
       // The config object is always an object: this runtime's `jsx` reads
@@ -4738,6 +4795,7 @@ window.__ModuleLoader__.load({
         className: 'dshet-action dshet-row-action dshet-reply-action',
         'aria-label': label,
         title: label,
+        disabled: entry === undefined,
         onClick: open,
         children: jsx(PencilIcon, {}),
       })

package/lib/index.js

@@ -78,7 +78,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.24'
+export const PLUGIN_VERSION = '0.6.1'
 
 // 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
@@ -1821,7 +1821,20 @@ async function stateOf(ctx, sessionId, config) {
     // The landed in-place patches, latest per block. The browser half uses them
     // to draw the projected text in place of the recorded one; the model already
     // sees them through the host projection.
-    patches: patchList(activePatches),
+    // 每个补丁带上原文：`/state` 的回复只发身份（没有 blocks），浏览器端
+    // 投影时需要一个用于匹配 DOM 的旧文本，否则保存成功却不会重绘。
+    patches: (() => {
+      const seqs = new Set(activePatches.keys())
+      const messageBySeq = new Map()
+      for (const event of events) {
+        if (seqs.has(event.seq)) messageBySeq.set(event.seq, event.data && event.data.message !== undefined ? event.data.message : event.data)
+      }
+      return patchList(activePatches).map((patch) => {
+        const message = messageBySeq.get(patch.seq)
+        const block = message === undefined ? undefined : editableBlocks(message).find((entry) => entry.index === patch.blockIndex)
+        return { ...patch, original: block === undefined ? '' : block.text }
+      })
+    })(),
     mode: config.patch === true ? 'patch' : 'replay',
     live: Boolean(live),
     busy: isBusy(events),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-edit-turn",
-  "version": "0.5.24",
+  "version": "0.6.1",
   "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",