dsh-edit-turn 0.5.23 → 0.6.0

package/lib/client.js

@@ -371,11 +371,39 @@ window.__ModuleLoader__.load({
           clearVar('--dshet-panel')
           clearVar('--dshet-chip')
           clearVar('--dshet-field')
+          clearVar('--dshet-ink')
+          clearVar('--dshet-ink-dim')
+          clearVar('--dshet-ink-soft')
         } else {
           const fieldSolid = solid(layer2) ?? panelSolid
           setVar('--dshet-panel', css(panelSolid))
           setVar('--dshet-chip', css(panelSolid))
           setVar('--dshet-field', css(fieldSolid))
+          // 文字颜色必须和「我们自己画的那块底」配，而不是和主题的底色配：
+          // 皮肤可能只覆盖了表面色、没覆盖 label-primary（或把它定义在别的
+          // 作用域），这时 `var(--dsw-alias-label-primary, #0f1524)` 会落到近黑，
+          // 深色面板上就是「黑底黑字」——看起来像整块黑板。
+          // 用面板亮度直接决定前景色。
+          const channel = (value) => {
+            const v = value / 255
+            return v <= 0.03928 ? v / 12.92 : ((v + 0.055) / 1.055) ** 2.4
+          }
+          const panelLuminance = 0.2126 * channel(panelSolid.r) + 0.7152 * channel(panelSolid.g) + 0.0722 * channel(panelSolid.b)
+          const declaredInk = read('--dsw-alias-label-primary')
+          const readableOnDark = panelLuminance < 0.4
+          const declaredContrast = declaredInk === null
+            ? 0
+            : Math.abs(0.2126 * channel(declaredInk.r) + 0.7152 * channel(declaredInk.g) + 0.0722 * channel(declaredInk.b) - panelLuminance)
+          if (declaredContrast < 0.24) {
+            // 主题给的前景在这个面板上没有对比度（或根本没给）——自己配一套。
+            setVar('--dshet-ink', readableOnDark ? '#f2f4f8' : '#0f1524')
+            setVar('--dshet-ink-dim', readableOnDark ? 'rgba(242,244,248,.76)' : 'rgba(15,21,36,.72)')
+            setVar('--dshet-ink-soft', readableOnDark ? 'rgba(242,244,248,.58)' : 'rgba(15,21,36,.55)')
+          } else {
+            clearVar('--dshet-ink')
+            clearVar('--dshet-ink-dim')
+            clearVar('--dshet-ink-soft')
+          }
         }
         if (accent === null) {
           clearVar('--dshet-on-accent')
@@ -429,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
@@ -445,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 -
@@ -519,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}',
@@ -570,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}',
@@ -3817,6 +3845,8 @@ window.__ModuleLoader__.load({
         })
         box.addEventListener('dragover', (event) => {
           event.preventDefault()
+          // 不让事件传到输入框：否则宿主也会把这次拖拽当成它的附件。
+          event.stopPropagation()
           box.dataset.dshetDrop = '1'
         })
         box.addEventListener('dragleave', () => {
@@ -3824,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 就算了 */
+          }
         })
       }
 
@@ -4681,12 +4719,18 @@ 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) => {
         event.preventDefault()
         event.stopPropagation()
+        if (entry === undefined) return
         controller.open({
           anchor: event.currentTarget,
           seq: entry.seq,
@@ -4710,6 +4754,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.23'
+export const PLUGIN_VERSION = '0.6.0'
 
 // 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/package.json

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