dsh-as-aistudio 0.4.0 → 0.4.2

package/CHANGELOG.md

@@ -4,6 +4,18 @@
 
 ## 中文
 
+**0.4.2** —— 复制拿到改写后的文本（改到平台写入器这一层）。
+
+- **组件跟进**：`dsh-edit-turn` **0.5.8**（另三个不变：`dsh-rerun-turn` 0.2.6、`dsh-delete-turn` 0.1.15、`dsh-markdown-bubble` 0.1.5）。
+
+- 0.4.1 里跟进的 0.5.7 没修好：它把"回答复制按下"从按钮节点挪到文档级捕获监听，实测仍复制出原文，说明这次按下没有经过那条路。0.5.8 换到**所有复制都要经过的唯一关口**——`navigator.clipboard.writeText`（宿主自己的 `writeClipboard` 原语内部就是调它）：写入的文本如果正是某条被改写消息的原文，就换成改写后的文本，其余写入一字不动。登记表放在页级（`globalThis` 上的 Symbol），因为实时重载后旧 bundle 装的包装器仍在写入路径上。
+
+**0.4.1** —— 编辑过的消息，复制按钮被宿主重画之后仍然复制改写后的文本。
+
+- **组件跟进**：`dsh-edit-turn` **0.5.7**（另三个不变：`dsh-rerun-turn` 0.2.6、`dsh-delete-turn` 0.1.15、`dsh-markdown-bubble` 0.1.5）。
+
+- **复制拿到的是改写前的原文**：编辑一条消息后，界面上显示的是改写后的文本，但点那一排的复制按钮，粘出来的是原文。原因是这次按下原本由**挂在宿主那个按钮节点上**的捕获期监听回答，而动作条是宿主 React 画的——任何一次重渲染都可能换掉那个按钮节点，监听就跟着旧节点一起消失，按下于是落到宿主自己的处理上（它复制"这一行被画出来时的那条消息"）。现在改由**文档级捕获期监听按行**回答：与按钮是不是同一个节点无关，捕获期在 React 根节点之前，宿主自己的处理看不到这次按下。本包已把修好的 `dsh-edit-turn` 0.5.7 重新 vendor 进来并重建了浏览器 bundle。
+
 **0.4.0** —— 少要一个平台包；四个组件跟进到最新。
 
 - **不再要求 `dsh-tools`**：本包内置的宿主半部以前要 `@deepseek-ai/dsh-tools`，唯一原因是 `dsh-edit-turn` 向模型暴露了一个工具（`edit_turn_targets`）。那个工具已经删掉——编辑是靠 UI 面板做的，模型不需要知道这件事——于是整族插件都不再声明模型可见的工具，宿主半部的解析只需要 `dsh-session`。少一个平台包，就少一处跟宿主版本绑定的地方。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-as-aistudio",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Google-AI-Studio-style turn controls for DeepSeek Harness, in one install: edit a prompt and re-run it, re-run a reply in place, delete a turn from the model context, and render sent prompts as Markdown. Self-contained: the plugin list shows this one row, and the four components are vendored inside it - installing the studio installs nothing else.",
   "type": "module",
   "main": "src/index.js",

package/src/client.js

@@ -43,7 +43,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.6'
+    const PLUGIN_VERSION = '0.5.8'
 
     // --- copy -----------------------------------------------------------------
 
@@ -1935,6 +1935,39 @@ window.__ModuleLoader__.load({
     const COPY_TIMER = 'dshetCopyTimer'
     /** The host draws its own check for a second; this is the same second. */
     const COPY_FEEDBACK_MS = 1000
+    /** 标记：这一页的剪贴板写入已经被本半部包过一次（重载会复用同一个 page）。 */
+    const CLIPBOARD_WRAPPED = Symbol.for('dshetClipboardWrapped')
+    /** 页级登记表：重载后新 bundle 与旧包装器共用同一份。 */
+    const COPY_REGISTRY = Symbol.for('dshetCopyRegistry')
+    /**
+     * Row key -> the text that row's copy button must hand over.
+     *
+     * The host's copy button copies the message the row was drawn for, so on a row
+     * this plugin rewrote it would copy the wording the user just replaced. The
+     * press is answered from a document-level listener keyed by ROW rather than by
+     * button node: the host re-renders its action bar, and a listener planted on
+     * the button it drew goes away with that node (the button it draws next is a
+     * different one).
+     */
+    /**
+     * Row key -> the text that row's copy must hand over, and the wording the host
+     * would hand over instead.
+     *
+     * Both live on the PAGE rather than in this module: a live reload builds a new
+     * bundle with new maps, and the clipboard wrapper the previous bundle installed
+     * is still the one in the write path (wrapping is idempotent, by design). Two
+     * maps would leave that wrapper reading a registry nobody fills.
+     */
+    const copyRegistry = (() => {
+      const page = typeof globalThis !== 'undefined' ? globalThis : {}
+      const existing = page[COPY_REGISTRY]
+      if (existing !== undefined && existing !== null && existing.text instanceof Map) return existing
+      const created = { text: new Map(), host: new Map() }
+      page[COPY_REGISTRY] = created
+      return created
+    })()
+    const rowCopyText = copyRegistry.text
+    const rowHostText = copyRegistry.host
 
     /**
      * A button another plugin put in this bar.
@@ -1998,7 +2031,94 @@ window.__ModuleLoader__.load({
      * host's own clipboard writer the button keeps the host's behaviour too: a
      * takeover that cannot copy is worse than none.
      */
+    /**
+     * The wording the host's own copy button would hand over for this row.
+     *
+     * It is the message the row was drawn for - the pre-edit text - and it is read
+     * off the row itself, because that is where it still is: this plugin hides the
+     * row's own bubble and stands its revision in front of it.
+     *
+     * @param {Element} row - the row.
+     * @returns {string|null} the host's text, or null when it cannot be read.
+     */
+    function hostCopyTextOf(row) {
+      try {
+        const bubble = ownRevisionBubble(row)
+        let text = ''
+        const children = row.childNodes
+        if (children === undefined || children === null) return null
+        for (const child of children) {
+          if (bubble !== null && child === bubble) continue
+          if (typeof child.textContent === 'string') text += child.textContent
+        }
+        const normalized = text.replace(/\s+/g, ' ').trim()
+        return normalized === '' ? null : normalized
+      } catch {
+        return null
+      }
+    }
+
+    /**
+     * The wording that must actually land on the clipboard.
+     *
+     * The host's copy button copies the message its row was drawn for, so on a row
+     * this plugin rewrote it hands over the pre-edit text. The press itself is
+     * answered earlier when this half can find the button, but the action bar is the
+     * host's own React and it may draw a button this half never marked - so the last
+     * say belongs to the write itself, which no button and no handler can bypass.
+     *
+     * @param {string} text - what the platform is about to write.
+     * @returns {string|null} the text to write instead, or null to leave it alone.
+     */
+    function rewriteCopiedText(text) {
+      const wanted = text.replace(/\s+/g, ' ').trim()
+      if (wanted === '') return null
+      for (const [key, edited] of rowCopyText) {
+        if (typeof edited !== 'string') continue
+        if (edited.replace(/\s+/g, ' ').trim() === wanted) return null
+        const hostText = rowHostText.get(key)
+        if (typeof hostText === 'string' && (hostText === wanted || hostText.includes(wanted))) return edited
+      }
+      return null
+    }
+
+    /**
+     * Wrap the platform's clipboard writer, once per page.
+     *
+     * `navigator.clipboard.writeText` is the single choke point every copy goes
+     * through - the host's own `writeClipboard` primitive calls it, and so does a
+     * browser's native copy of a selection.
+     *
+     * @returns {() => void} undo.
+     */
+    function installClipboardRewrite() {
+      const clipboard = typeof navigator !== 'undefined' ? navigator.clipboard : undefined
+      if (clipboard === undefined || clipboard === null || typeof clipboard.writeText !== 'function') return () => {}
+      if (clipboard.writeText[CLIPBOARD_WRAPPED] === true) return () => {}
+      const native = clipboard.writeText.bind(clipboard)
+      const wrapped = (value) => {
+        const rewritten = rewriteCopiedText(String(value ?? ''))
+        return rewritten === null ? native(value) : native(rewritten)
+      }
+      wrapped[CLIPBOARD_WRAPPED] = true
+      clipboard.writeText = wrapped
+      return () => {
+        if (clipboard.writeText === wrapped) clipboard.writeText = native
+      }
+    }
+
     function takeOverRowCopy(row, text, t) {
+      // Registered before the button lookup on purpose: the handover has to work
+      // even when this pass cannot find the button to mark (the next one may, and
+      // the document-level press answers from this table either way).
+      {
+        const key = row.getAttribute('data-chat-flow-key')
+        if (typeof key === 'string' && key !== '') {
+          rowCopyText.set(key, text)
+          const hostText = hostCopyTextOf(row)
+          if (hostText !== null) rowHostText.set(key, hostText)
+        }
+      }
       const button = nativeCopyButton(row, t)
       if (button === null) return
       const write = primitives !== null && primitives !== undefined && typeof primitives.writeClipboard === 'function'
@@ -2127,6 +2247,11 @@ window.__ModuleLoader__.load({
 
     /** The copy handover of a row, wherever the last pass left it. */
     function releaseRowCopy(row) {
+      const key = row.getAttribute('data-chat-flow-key')
+      if (typeof key === 'string' && key !== '') {
+        rowCopyText.delete(key)
+        rowHostText.delete(key)
+      }
       const button = nativeCopyButton(row)
       if (button !== null) releaseCopyButton(button)
     }
@@ -4771,10 +4896,53 @@ window.__ModuleLoader__.load({
         controller.load()
       }, [controller])
 
+      // The last say on what lands: whatever route the press takes, the write
+      // itself goes through here.
+      react.useEffect(() => installClipboardRewrite(), [])
+
       // Pressing outside the editor is the one signal that means "the user
       // left". Blur cannot be that signal: a host re-render replaces the node
       // (blur without a related target) and a save temporarily disables it -
       // both used to drop the caret for good.
+      // The press that matters: the host's own copy button on a row this plugin
+      // rewrote. Capture phase, so the host's handler (which listens at the React
+      // root, below the document) never sees the press; by row key, so a button
+      // the host re-rendered is still answered.
+      react.useEffect(() => {
+        if (typeof document.addEventListener !== 'function' || typeof document.removeEventListener !== 'function') {
+          return undefined
+        }
+        const onCopyPress = (event) => {
+          const target = event.target
+          if (target === null || target === undefined || typeof target.closest !== 'function') return
+          const button = target.closest('button')
+          if (button === null) return
+          // Our own buttons sit in the same bar: theirs is not this press.
+          if (pluginOwned(button)) return
+          const row = button.closest('[data-chat-flow-key]')
+          if (row === null) return
+          const key = row.getAttribute('data-chat-flow-key')
+          if (typeof key !== 'string' || key === '') return
+          const text = rowCopyText.get(key)
+          if (typeof text !== 'string') return
+          const write = primitives !== null && primitives !== undefined && typeof primitives.writeClipboard === 'function'
+            ? primitives.writeClipboard
+            : null
+          if (write === null) return
+          if (typeof event.preventDefault === 'function') event.preventDefault()
+          if (typeof event.stopPropagation === 'function') event.stopPropagation()
+          if (typeof event.stopImmediatePropagation === 'function') event.stopImmediatePropagation()
+          Promise.resolve(write(text)).then(
+            (ok) => {
+              if (ok === true) flashRowCopy(button, typeof t === 'function' ? t('action.copied') : null)
+            },
+            () => {},
+          )
+        }
+        document.addEventListener('click', onCopyPress, true)
+        return () => document.removeEventListener('click', onCopyPress, true)
+      }, [t])
+
       react.useEffect(() => {
         if (typeof document.addEventListener !== 'function' || typeof document.removeEventListener !== 'function') {
           return undefined
@@ -8979,7 +9147,7 @@ window.__ModuleLoader__.load({
     const NS = 'dsh-as-aistudio'
 
     /** Keep in sync with package.json and src/components.js. */
-    const PLUGIN_VERSION = '0.4.0'
+    const PLUGIN_VERSION = '0.4.2'
 
     /** Presence marker the live verifier reads. */
     const DEBUG_KEY = '__DSH_AS_AISTUDIO__'

package/src/components.js

@@ -26,7 +26,7 @@
 export const STUDIO_ID = 'dsh-as-aistudio'
 
 /** Keep in sync with package.json and src/client.js. */
-export const STUDIO_VERSION = '0.4.0'
+export const STUDIO_VERSION = '0.4.2'
 
 /**
  * The AI Studio action strip this studio composes, in the order the user meets

package/src/vendor/host/dsh-edit-turn.js

@@ -1,6 +1,6 @@
 // dsh-edit-turn host half (dsh-edit-turn.js), VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-edit-turn/lib/index.js  (v0.5.6, sha256 c4da00d187ff461d)
+// Source: ../dsh-edit-turn/lib/index.js  (v0.5.8, sha256 5c6fa30edaffed61)
 // Regenerate with `npm run vendor`; test/sync.test.js fails when this is stale.
 //
 // src/shell.js imports the copy named after the component, which is why the
@@ -85,7 +85,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.6'
+export const PLUGIN_VERSION = '0.5.8'
 
 // 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

package/src/vendor/host/dsh-edit-turn.patch.js

@@ -1,6 +1,6 @@
 // dsh-edit-turn host half (dsh-edit-turn.patch.js), VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-edit-turn/lib/patch.js  (v0.5.6, sha256 5e1e8cce1d168f6c)
+// Source: ../dsh-edit-turn/lib/patch.js  (v0.5.8, sha256 5e1e8cce1d168f6c)
 // Regenerate with `npm run vendor`; test/sync.test.js fails when this is stale.
 //
 // src/shell.js imports the copy named after the component, which is why the

package/src/vendor/versions.json

@@ -1,5 +1,5 @@
 {
-  "dsh-edit-turn": "0.5.6",
+  "dsh-edit-turn": "0.5.8",
   "dsh-rerun-turn": "0.2.6",
   "dsh-delete-turn": "0.1.15",
   "dsh-markdown-bubble": "0.1.5"