@240xu/dsh-message-ops 0.3.1 → 0.4.0

package/README.md

@@ -161,8 +161,8 @@ MIT
 针对 dsh 0.2.0-rc.2 的用户级操作面（agent 工具保留，但 UI 为主推入口）：
 
 - **每条 AI 消息旁的原生回撤按钮**：注入官方 `conversation.chat.assistant-actions`
-  槽（0.2.0 正式扩展点，条目收持久化 messageId）——「⏪ 回滚到此 / ✂ 删除此条 /
-  ⑂ 从此分支」直接出现在消息操作行，与官方点赞/点踩并列；0.1.x 无此槽自动 no-op。
+  槽（0.2.0 正式扩展点，条目收持久化 messageId）——「回滚到此 / 删除此条 /
+  从此分支」直接出现在消息操作行，与官方点赞/点踩并列；0.1.x 无此槽自动 no-op。
   messageId→seq 反查经 `/api/message-ops/messages`（每会话索引缓存）。
 - **分支双路径**：0.2.0+ 优先官方 `sessions.fork({sessionId, atSeq, increaseTitle})`
   （子会话自动进宿主列表，成功后可一键 `uiWorkspace.openSession` 打开）；
@@ -181,3 +181,20 @@ MIT
   （限已完成轮次最后一条）；任意位置分支保留在对话框（官方没有的能力）。
 - **原生观感**：按钮改用官方 primitives 图标（IconClockOutline/IconTrashOutline，
   require 失败回退内联 SVG）；S3 命中区 ≥44px；S11 双提交防护（busy 互斥）。
+
+### 0.3.2 · 图标规范化
+
+- 槽按钮去掉文字 emoji——0.2.0+ 直接用官方 primitives 图标（与原生操作行 1:1 同款）；
+  回退路径的 SVG 也改为官方 IconClockOutline/IconTrashOutline 的精确 path 数据
+  （1px stroke，与 Regular 变体一致），不再手绘。
+- 字典文案去 emoji（label 仅用于 tooltip/aria，不参与渲染）。
+
+### 0.4.0 · opencode 式回撤深化（composer 回填 + 回撤 dock）
+
+- **Composer 回填**：回滚**用户消息**后，原文经官方 `InputActions.setDraft`
+  自动回填输入框——「编辑重发」零按钮（opencode 招牌交互）。
+- **结构化回撤 dock**：注入官方 `conversation.input.dock` 槽（composer 卡片上方
+  全宽条目）——「已回撤 N 条（可恢复）」折叠面板，展开列出每个回撤/删除标记，
+  逐条「恢复」（restoring 中间态禁用，S11）；无标记时 dock 不渲染。
+- 数据链：messages 端点为 user 消息新增 `fullText` 字段（回填原文）。
+- 0.1.x 宿主两个槽均不存在，inject 自动 no-op。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@240xu/dsh-message-ops",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "Roll back, branch, and export any DSH conversation — from the UI or straight from the agent via a message_ops tool. Non-destructive: logs stay append-only and recoverable. 消息回滚/删除/分支/导出四合一，内置 message_ops agent 工具；非破坏语义，日志只追加可恢复。",
   "type": "module",
   "license": "MIT",

package/src/client.js

@@ -70,6 +70,9 @@ window.__ModuleLoader__.load({
       'busy.restore': '恢复中…',
       'confirm.restore': '恢复',
       'ack.restore': '我已了解：恢复将以新 seq 重放被遮蔽的消息（原日志不变）',
+      'dock.title': '已回撤 {n} 条（可恢复）',
+      'dock.restore': '恢复',
+      'dock.restoring': '恢复中…',
       'menu.ops': '消息操作',
     }
 
@@ -94,9 +97,9 @@ window.__ModuleLoader__.load({
       'op.branchDesc': 'Copies everything up to and including the picked message into a new session (original untouched, non-destructive).',
       'op.restore': 'Restore (replay shadowed messages)',
       'op.restoreDesc': 'Only when the selected row is a revert/delete marker. This is a replay, not an un-shadow: shadowed user/assistant messages are re-appended with NEW seqs and a [Restored] prefix; non-replayable events (tool calls) are skipped and counted.',
-      'slot.revert': '⏪ Revert here',
-      'slot.delete': '✂ Delete this',
-      'slot.branch': '⑂ Branch here',
+      'slot.revert': 'Revert to here',
+      'slot.delete': 'Delete this message',
+      'slot.branch': 'Branch from here',
       'toast.openNew': 'Open new session',
       'fork.official': 'Branched (official fork): new session {id}',
       'fork.disk': 'Branched: new session {id} (visible after list refresh)',
@@ -117,11 +120,15 @@ window.__ModuleLoader__.load({
       'done.delete': 'Deleted; reload to apply',
       'action.reload': 'Reload page',
       'errorPrefix': 'Operation failed: ',
+      'dock.title': '{n} rolled back (restorable)',
+      'dock.restore': 'Restore',
+      'dock.restoring': 'Restoring…',
       'menu.ops': 'Message ops',
     }
 
     var __locale = null
     var __sessionsSvc = null
+    var __inputActions = null // 0.4.0: 从 session 槽捕获（InputActions.setDraft → composer 回填）
     var __uiWorkspace = null
     // messageId→seq 索引缓存（每会话一次拉取；0.3.0 assistant-actions 槽用）
     var __seqIndexCache = new Map()
@@ -379,6 +386,11 @@ window.__ModuleLoader__.load({
             const okMsg = mode === 'restore'
               ? t('done.restore', { n: String(data.restoredCount != null ? data.restoredCount : '?'), s: String(data.skipped != null ? data.skipped : 0) })
               : t(mode === 'revert' ? 'done.revert' : 'done.delete')
+            // 0.4.0 composer 回填（opencode 式）：回滚用户消息 → 原文回填输入框，「编辑重发」零按钮
+            if (mode === 'revert' && pickedMsg && pickedMsg.role === 'user' && pickedMsg.fullText
+                && __inputActions && typeof __inputActions.setDraft === 'function') {
+              try { __inputActions.setDraft(pickedMsg.fullText) } catch { /* 回填失败不阻断成功反馈 */ }
+            }
             setDoneMsg(okMsg)
             setBusyMsg('')
             setState('done')
@@ -559,14 +571,19 @@ window.__ModuleLoader__.load({
       IconClock = P && P.IconClockOutlineRegular
       IconTrash = P && P.IconTrashOutlineRegular
     } catch { /* fallback below */ }
-    if (!IconClock) IconClock = function () {
-      return React.createElement('svg', { width: 16, height: 16, viewBox: '0 0 16 16', fill: 'none' },
-        React.createElement('circle', { cx: 8, cy: 8, r: 6.2, stroke: 'currentColor', strokeWidth: 1.3 }),
-        React.createElement('path', { d: 'M8 4.8V8l2.2 1.6', stroke: 'currentColor', strokeWidth: 1.3, strokeLinecap: 'round' }))
+    if (!IconClock) IconClock = function ClockFallback() {
+      // 官方 IconClockOutlineArtwork 1:1 路径（ Regular = 1px stroke）
+      return React.createElement('svg', { width: 16, height: 16, viewBox: '0 0 16 16', fill: 'none', 'aria-hidden': true, stroke: 'currentColor', strokeWidth: 1 },
+        React.createElement('path', { d: 'M8 14C11.3137 14 14 11.3137 14 8C14 4.68629 11.3137 2 8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14Z' }),
+        React.createElement('path', { d: 'M8 4.31V8.46L11 10.08' }))
     }
-    if (!IconTrash) IconTrash = function () {
-      return React.createElement('svg', { width: 16, height: 16, viewBox: '0 0 16 16', fill: 'none' },
-        React.createElement('path', { d: 'M3 5h10M6.5 5V3.5h3V5M4.5 5l.6 7.5h5.8L11.5 5', stroke: 'currentColor', strokeWidth: 1.3, strokeLinecap: 'round', strokeLinejoin: 'round' }))
+    if (!IconTrash) IconTrash = function TrashFallback() {
+      // 官方 IconTrashOutlineArtwork 1:1 路径
+      return React.createElement('svg', { width: 16, height: 16, viewBox: '0 0 16 16', fill: 'none', 'aria-hidden': true, stroke: 'currentColor', strokeWidth: 1 },
+        React.createElement('path', { d: 'M1.28149 3.88831H14.7187' }),
+        React.createElement('path', { d: 'M5.41602 3.88833V2.47962C5.41602 2.29282 5.52492 2.11366 5.71876 1.98157C5.9126 1.84948 6.17551 1.77527 6.44964 1.77527H9.55053C9.82466 1.77527 10.0876 1.84948 10.2814 1.98157C10.4752 2.11366 10.5841 2.29282 10.5841 2.47962V3.88833' }),
+        React.createElement('path', { d: 'M3.29749 5.10193L4.06585 13.0192C4.10899 13.4595 4.48223 13.7942 4.92504 13.7942H11.0751C11.5179 13.7942 11.8912 13.4595 11.9343 13.0192L12.7027 5.10193' }),
+        React.createElement('path', { d: 'M6.27637 7.51831V11.1829M9.72378 7.51831V11.1829' }))
     }
 
     // --- 0.3.0 assistant-actions 官方槽：每条 AI 消息旁的原生回撤按钮 ------------
@@ -577,7 +594,8 @@ window.__ModuleLoader__.load({
     const CHAT_ACTIONS_ID = 'message-ops-row'
 
     function MsgSlotActions(props) {
-      const { messageId, sessionId, useSessions } = props
+      const { messageId, sessionId, useSessions, inputActions } = props
+      if (inputActions && typeof inputActions.setDraft === 'function') __inputActions = inputActions
       const t = (props && props.t) || __t
       useLocaleRevision()
       const sessions = useSessions ? useSessions((s) => s) : undefined
@@ -651,6 +669,101 @@ window.__ModuleLoader__.load({
       )
     }
 
+    // --- 0.4.0 回撤 dock：composer 上方「N 条已回撤」结构化面板（opencode 式） ----
+    // 官方槽 conversation.input.dock（scope session，composer 卡片上方全宽条目）。
+    // ownerProps/standardProps 含 sessionId + useSessions + inputActions。
+    const INPUT_DOCK_SLOT = 'conversation.input.dock'
+    const INPUT_DOCK_ID = 'message-ops-revert-dock'
+
+    function RevertDock(props) {
+      const { sessionId, useSessions, inputActions } = props
+      const t = (props && props.t) || __t
+      useLocaleRevision()
+      if (inputActions && typeof inputActions.setDraft === 'function') __inputActions = inputActions
+      const sessions = useSessions ? useSessions((s) => s) : undefined
+      const summary = sessions && sessions.byId ? sessions.byId[sessionId] : undefined
+      const running = summary ? summary.running === true : false
+      const [open, setOpen] = useState(false)
+      const [rows, setRows] = useState(null)   // [{seq, snippet, role}] replace 标记行
+      const [shadowedCount, setShadowedCount] = useState(0)
+      const [restoring, setRestoring] = useState(null)
+
+      useEffect(() => {
+        let alive = true
+        fetch('/api/message-ops/messages?sessionId=' + encodeURIComponent(sessionId))
+          .then((r) => (r.ok ? r.json() : null))
+          .then((data) => {
+            if (!alive || !data || !data.ok) return
+            const msgs = data.messages || []
+            setShadowedCount(msgs.filter((m) => m.visible === false && m.role !== 'system').length)
+            setRows(msgs.filter((m) => m.marker))
+          })
+          .catch(() => {})
+        return () => { alive = false }
+      }, [sessionId])
+
+      if (!rows || !rows.length) return null   // 无回撤标记 → dock 不渲染
+
+      const restoreRow = (row) => {
+        if (restoring != null || running) return
+        setRestoring(row.seq)
+        fetch('/api/message-ops/restore', {
+          method: 'POST', headers: { 'content-type': 'application/json' },
+          body: JSON.stringify({ sessionId, seq: row.seq }),
+        })
+          .then(async (res) => {
+            let data = {}
+            try { data = await res.json() } catch { /* keep {} */ }
+            if (!res.ok || !data.ok) throw new Error(data.error || ('HTTP ' + res.status))
+            notifyDone(t('done.restore', { n: String(data.restoredCount != null ? data.restoredCount : '?'), s: String(data.skipped != null ? data.skipped : 0) }))
+            // 刷新 dock 数据（重放后标记行状态变化）
+            const fresh = await fetch('/api/message-ops/messages?sessionId=' + encodeURIComponent(sessionId)).then((r) => (r.ok ? r.json() : null)).catch(() => null)
+            if (fresh && fresh.ok) {
+              const msgs = fresh.messages || []
+              setShadowedCount(msgs.filter((m) => m.visible === false && m.role !== 'system').length)
+              setRows(msgs.filter((m) => m.marker))
+            }
+          })
+          .catch((reason) => {
+            notifyDone(t('errorPrefix') + (reason && reason.message ? reason.message : String(reason)), 'error')
+          })
+          .finally(() => setRestoring(null))
+      }
+
+      const rowEl = (row) => React.createElement('div', {
+        key: row.seq,
+        style: { display: 'flex', alignItems: 'center', gap: 8, padding: '4px 10px',
+                 borderTop: '1px solid var(--dsw-alias-border-l1,rgba(128,128,128,.15))' },
+      },
+        React.createElement('span', { style: { flex: 1, minWidth: 0, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', fontSize: 12, opacity: 0.85 } },
+          '#' + row.seq + ' ' + (row.role || '') + ' · ' + (row.snippet || '')),
+        React.createElement('button', {
+          type: 'button', 'aria-label': t('dock.restore'), disabled: restoring != null || running,
+          style: { border: 'none', background: 'transparent', color: 'var(--dsw-alias-link,#8ab4f8)',
+                   font: 'inherit', fontSize: 12, cursor: restoring != null || running ? 'default' : 'pointer',
+                   opacity: restoring != null || running ? 0.5 : 1, padding: '4px 8px', minHeight: 28 },
+          onClick: () => restoreRow(row),
+        }, restoring === row.seq ? t('dock.restoring') : t('dock.restore')),
+      )
+
+      return React.createElement('div', {
+        role: 'region', 'aria-label': t('dock.title', { n: String(shadowedCount) }),
+        style: { border: '1px solid var(--dsw-alias-border-l1,rgba(128,128,128,.25))', borderRadius: 8, margin: '0 0 8px', overflow: 'hidden',
+                 background: 'var(--dsw-alias-bg-elevated,rgba(128,128,128,.06))' },
+      },
+        React.createElement('button', {
+          type: 'button', 'aria-expanded': open,
+          style: { display: 'flex', width: '100%', alignItems: 'center', justifyContent: 'space-between',
+                   border: 'none', background: 'transparent', color: 'inherit',
+                   font: 'inherit', fontSize: 12, padding: '6px 10px', cursor: 'pointer', minHeight: 32 },
+          onClick: () => setOpen((v) => !v),
+        },
+          React.createElement('span', null, t('dock.title', { n: String(shadowedCount) })),
+          React.createElement('span', { style: { opacity: 0.6 } }, open ? '▾' : '▸')),
+        open ? React.createElement('div', { style: { maxHeight: 180, overflowY: 'auto' } }, rows.map(rowEl)) : null,
+      )
+    }
+
     // --- 侧栏行菜单注入（DOM 级，同 session-delete 模式） ------------------------
 
     function findOpenSessionRow() {
@@ -778,6 +891,11 @@ window.__ModuleLoader__.load({
         name: CHAT_ACTIONS_SLOT, id: CHAT_ACTIONS_ID, order: 20,
         ...(__locale ? { locale: NS } : {}),
       }, MsgSlotActions))
+      // 0.4.0：composer 上方回撤 dock（0.1.x 无此槽自动 no-op）
+      ctx.slots.inject(INPUT_DOCK_SLOT, () => ctx.slots.register({
+        name: INPUT_DOCK_SLOT, id: INPUT_DOCK_ID, order: 10,
+        ...(__locale ? { locale: NS } : {}),
+      }, RevertDock))
       ctx.slots.inject(OVERLAY_SLOT, () => ctx.slots.register({
         name: OVERLAY_SLOT, id: DIALOG_ID, order: 101,
         ...(__locale ? { locale: NS } : {}),

package/src/session-file.js

@@ -182,6 +182,8 @@ export function listMessages(events) {
         id: (msg && msg.id) || e.data.id || null,
         marker: isReplaceMarker,
         snippet: text.replace(/\s+/g, " ").trim().slice(0, 160),
+        // 0.4.0 composer 回填：user 消息携带全文（revert 后 setDraft 原文）
+        fullText: e.type === "user/message" ? text : null,
         time: e.time ?? null,
         turn: (e.data && e.data.turn) ?? null,
       });