dsh-session-rewind 1.3.1 → 1.4.0

package/README.md

@@ -11,9 +11,7 @@ conversation at that Turn and restoring the files that Turn changed.
 
 | 位置 | 作用 |
 | --- | --- |
-| **你发出的那条消息旁的 ↶** | 点开选「仅回退对话」或「回退对话并恢复文件」。**就地回退**：这条消息及之后的对话内容从模型上下文撤回，原话立刻回到本会话输入框，改完直接重发。 |
-| 会话标题栏的 ↶（`conversation.session.header.actions`） | 列出本会话**所有**可回退的消息（第 N 轮 + 提问预览 + 文件数），↑↓ 选择、Enter 确认、Esc 返回；选中后同样是就地回退，也可以选「在新会话中分支」。 |
-| 每个已完成回合末尾的 `回退`（`conversation.chat.turnTail`） | 旧入口，保留兼容：就这一轮做分叉回退，面板里可勾选要恢复的文件。 |
+| **你发出的那条消息旁的 ↶**（唯一入口，常显） | 点开选「仅回退对话」或「回退对话并恢复文件」。**就地回退**：这条消息及之后的对话内容从模型上下文里撤回，原话立刻回到本会话输入框，改完直接重发。回合结束（含自动终止/停止）后按钮自动出现。 |
 
 **核心行为（就地回退）**：选中你某条消息 → 追加一条 `surfaceOp: replace` 标记，把模型可见的
 surface 从这条消息起整体撤回 → 被撤回的行从对话里消失（轨迹面板仍可查，日志从未删改）→

package/lib/client.js

@@ -66,7 +66,7 @@ loader.load({
     const CUTS_ROUTE = '/api/session-rewind.cuts';
     const DIAGNOSE_ROUTE = '/api/session-rewind.diagnose';
     const TAIL_ROUTE = '/api/session-rewind.tail';
-    const BOOT_REVISION = '1.3.1';
+    const BOOT_REVISION = '1.4.0';
     const HIDDEN_ATTR = 'data-session-rewind-hidden';
 
     /** One per-message bridge per session, shared by every TurnRewind instance. */
@@ -239,6 +239,9 @@ loader.load({
       '.dshSessionRewindModeText{margin:0;font-size:12px;line-height:18px;color:var(--dsw-alias-label-primary);',
       'font-family:var(--dsw-font-family);word-break:break-word;max-height:96px;overflow:auto}',
     '[data-session-rewind-hidden="true"]{display:none !important}',
+    '.dshSessionRewindHost{display:flex;justify-content:flex-end;align-items:center;gap:6px;',
+    'padding:2px 6px 0;min-height:20px}',
+    '.dshSessionRewindHost:hover button{color:var(--dsw-alias-label-primary)}',
     ].join('\n');
     //#endregion
 
@@ -718,8 +721,14 @@ loader.load({
 
       if (sessionId === undefined || target === undefined) return null;
 
+      // This control is mounted for every finished Turn only so the per-message
+      // bridge above has a guaranteed mount point. Its own button was retired on
+      // request — the rewind control now lives next to the user's own message —
+      // so the output is kept invisible instead of dropping the component.
       return jsxs('span', {
         className: 'dshSessionRewind',
+        hidden: true,
+        style: { display: 'none' },
         ref: wrapRef,
         children: [
           jsxs('button', {
@@ -951,11 +960,10 @@ loader.load({
       };
 
       const runRewind = async (seq, restoreFiles, notice, fromTurn = null) => {
-        notice(tr('notice.working'));
         try {
+          notice(tr('notice.working'));
           const result = await postJson(INPLACE_ROUTE, { sessionId, seq, restoreFiles });
           if (state.disposed) return;
-          if (Number.isInteger(result.hiddenFromTurn)) state.cutTurn = result.hiddenFromTurn;
           if (Array.isArray(result.hiddenTurns) && result.hiddenTurns.length > 0) {
             for (const turn of result.hiddenTurns) {
               if (Number.isInteger(turn)) state.hiddenTurns.add(turn);
@@ -1005,7 +1013,7 @@ loader.load({
         }
       };
 
-      const openPopover = (anchor, seq, notice) => {
+      const openPopover = (anchor, seq, notice, turn = null) => {
         closePopover();
         const popover = document.createElement('div');
         popover.setAttribute('data-session-rewind-popover', '');
@@ -1048,7 +1056,18 @@ loader.load({
           button.addEventListener('mouseleave', () => {
             button.style.background = 'transparent';
           });
-          button.addEventListener('click', onClick);
+          button.addEventListener('click', () => {
+            try {
+              onClick();
+            } catch (error) {
+              sendDiagnose(sessionId, {
+                reason: 'option-failed',
+                error: String(error && error.message ? error.message : error),
+                boot: BOOT_REVISION,
+                sequence: seq,
+              });
+            }
+          });
           return button;
         };
         popover.appendChild(makeButton(tr('popover.chat'), () => {
@@ -1132,18 +1151,13 @@ loader.load({
           const seq = state.turnToSeq.get(turn);
           if (seq === undefined || seq === null) continue;
           if (row.querySelector('[data-session-rewind-btn]') !== null) continue;
-          const buttons = Array.from(row.querySelectorAll('button')).filter(
-            (button) => !button.hasAttribute('data-session-rewind-btn'),
-          );
-          let anchor = buttons.length > 0 ? buttons[buttons.length - 1].parentElement : null;
-          if (anchor === null || anchor === undefined) {
-            // A plain hover-less user bubble carries no buttons: host the control
-            // in its own container at the end of the row.
-            anchor = document.createElement('span');
-            anchor.setAttribute('data-session-rewind-host', '');
-            anchor.style.cssText = 'display:inline-flex;align-items:center;margin-left:6px;vertical-align:middle';
-            row.appendChild(anchor);
-          }
+          // Always host the control in its own container at the end of the row.
+          // The official action row only paints on hover, so putting the control
+          // there made it invisible until the pointer was over the message.
+          const anchor = document.createElement('div');
+          anchor.setAttribute('data-session-rewind-host', '');
+          anchor.className = 'dshSessionRewindHost';
+          row.appendChild(anchor);
           const button = document.createElement('button');
           button.type = 'button';
           button.setAttribute('data-session-rewind-btn', '');
@@ -1172,7 +1186,7 @@ loader.load({
             'border-radius:4px',
             'background:transparent',
             'cursor:pointer',
-            'color:inherit',
+            'color:var(--dsw-alias-label-secondary, currentColor)',
             'line-height:0',
             'vertical-align:middle',
           ].join(';');
@@ -1186,7 +1200,7 @@ loader.load({
             event.preventDefault();
             event.stopPropagation();
             sendDiagnose(sessionId, { reason: 'click', turn, seq, buttons: state.buttons.size, mapped: state.turnToSeq.size });
-            openPopover(button, seq, notice);
+            openPopover(button, seq, notice, turn);
           });
           anchor.appendChild(button);
           state.buttons.set(row, button);
@@ -1710,17 +1724,8 @@ loader.load({
           } catch (error) {
             warn(error);
           }
-          try {
-            scope.slots.inject(HEADER_SLOT, () => scope.slots.register({
-              name: HEADER_SLOT,
-              id: PLUGIN_ID,
-              order: -1,
-              inject: () => ({ tr }),
-            }, headerComponent));
-            injected.push(HEADER_SLOT);
-          } catch (error) {
-            warn(error);
-          }
+          // The session-header entry was retired: rewriting is now offered only on
+          // the user's own message row, so no second entry point is registered.
           sendDiagnose('__boot__', {
             reason: 'apply',
             slots: injected,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-session-rewind",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "type": "module",
   "description": "Rewind a finished Turn: branch the conversation at any Turn (session header or per-Turn control) and restore every workspace file that Turn changed. · 回合回退：从任意已完成的回合重新开始，并把该回合改动过的工作区文件恢复原状。",
   "icon": "./icon.svg",

package/test/client-smoke.mjs

@@ -8,6 +8,7 @@
 
 import assert from 'node:assert/strict';
 import { readFile } from 'node:fs/promises';
+import { readFileSync } from 'node:fs';
 
 //#region stubs
 const listeners = new Map();
@@ -181,13 +182,13 @@ const context = {
   },
 };
 clientModule.apply(context);
-assert.equal(registrations.length, 2);
+// Only the turn-tail slot is registered: it exists purely as a guaranteed mount
+// point for the per-message bridge, and its own button is hidden. The header
+// entry was retired so the rewind control has exactly one place — the user's row.
+assert.equal(registrations.length, 1);
 const registration = registrations.find((entry) => entry.options.name === 'conversation.chat.turnTail');
-const headerRegistration = registrations.find((entry) => entry.options.name === 'conversation.session.header.actions');
 assert.ok(registration !== undefined, 'turn-tail registration');
-assert.ok(headerRegistration !== undefined, 'header registration');
-assert.equal(headerRegistration.options.id, 'session-rewind');
-assert.equal(headerRegistration.options.order, -1);
+assert.equal(registrations.some((entry) => entry.options.name === 'conversation.session.header.actions'), false);
 assert.equal(registration.options.name, 'conversation.chat.turnTail');
 assert.equal(registration.options.id, 'session-rewind');
 assert.equal(registration.options.order, -1);
@@ -341,100 +342,21 @@ const noBoundary = registration.component({ ...props, turn: { turn: 3 }, seq: un
 assert.deepEqual(findAll(noBoundary, (node) => node.type === 'button'), []);
 //#endregion
 
-//#region session-header entry: candidate list -> mode -> fork
-const headerChildId = 'session-child-header';
-fetchCalls.length = 0;
-forkCalls.length = 0;
-opened.length = 0;
-sessionsService.fork = async (request) => {
-  forkCalls.push(request);
-  return headerChildId;
-};
-
-const headerProps = {
-  sessionId: 'session-parent-1',
-  useAccess: () => true,
-  ctx: {
-    get: (name) => {
-      if (name === 'sessions') return sessionsService;
-      if (name === 'uiWorkspace') return workspaceService;
-      return undefined;
-    },
-  },
-};
-
-// The trigger renders even with nothing loaded yet.
-// `renderHeader()` forces one full render pass (the tree is built lazily).
-const renderHeader = () => {
-  const tree = headerRegistration.component(headerProps);
-  findAll(tree, () => false);
-  return tree;
-};
-let headerTree = renderHeader();
-let headerTrigger = findAll(headerTree, (node) => node.type === 'button'
-  && String(node.props.className ?? '').includes('dshSessionRewindHeaderBtn'));
-assert.equal(headerTrigger.length, 1);
-
-// Opening it asks the Host for the finished Turns.
-headerTrigger[0].props.onClick();
-await flush();
-assert.equal(fetchCalls.length, 1);
-assert.equal(fetchCalls[0].route, '/api/session-rewind.candidates');
-assert.deepEqual(fetchCalls[0].body, { sessionId: 'session-parent-1' });
-headerTree = renderHeader();
-
-let headerRounds = findAll(headerTree, (node) => node.type === 'button'
-  && String(node.props.className ?? '').includes('dshSessionRewindRound'));
-assert.equal(headerRounds.length, 2, 'two candidate rounds');
-assert.match(textOf(headerTree), /session-rewind\.list\.round/u);
-assert.match(textOf(headerTree), /第二条提问/u);
-assert.match(textOf(headerTree), /session-rewind\.list\.files/u);
-
-// Choosing a round switches to the mode step: in-place is the primary action
-// and branching is still offered.
-headerRounds[0].props.onClick();
-assert.match(textOf(headerTree), /session-rewind\.mode\.inplace/u);
-assert.match(textOf(headerTree), /session-rewind\.mode\.inplaceFiles/u);
-assert.match(textOf(headerTree), /session-rewind\.mode\.fork/u);
-assert.match(textOf(headerTree), /session-rewind\.mode\.back/u);
-
-// Branch mode forks at that round's committed turn end, with no file write.
-const headerFork = findAll(headerTree, (node) => node.type === 'button'
-  && String(node.props.children ?? '') === 'session-rewind.mode.fork');
-assert.equal(headerFork.length, 1);
-headerFork[0].props.onClick();
-await flush(12);
-assert.deepEqual(forkCalls, [{ sessionId: 'session-parent-1', atSeq: 28, increaseTitle: true }]);
-assert.deepEqual(opened, [headerChildId]);
-assert.deepEqual(
-  JSON.parse(store.get(`dsh.conversation.${headerChildId}`)).draft,
-  { text: '第二条提问：把登录页改成深色主题', references: [] },
-);
-assert.equal(fetchCalls.filter((call) => call.route === '/api/session-rewind.restore').length, 0);
-
-// "Rewind and restore" reaches the restore route first, then forks.
-fetchCalls.length = 0;
-forkCalls.length = 0;
-opened.length = 0;
-headerTrigger = findAll(renderHeader(), (node) => node.type === 'button'
-  && String(node.props.className ?? '').includes('dshSessionRewindHeaderBtn'));
-headerTrigger[0].props.onClick();
-await flush();
-headerTree = renderHeader();
-headerRounds = findAll(headerTree, (node) => node.type === 'button'
-  && String(node.props.className ?? '').includes('dshSessionRewindRound'));
-assert.equal(headerRounds.length, 2);
-headerRounds[0].props.onClick();
-headerTree = renderHeader();
-const restoreBoth = findAll(headerTree, (node) => node.type === 'button'
-  && String(node.props.children ?? '') === 'session-rewind.mode.inplaceFiles');
-assert.equal(restoreBoth.length, 1);
-// In-place mode without a mount-less bridge must degrade to a visible error
-// instead of throwing (the DOM bridge only exists in a real page).
-restoreBoth[0].props.onClick();
-await flush(12);
-assert.match(textOf(headerTree), /session-rewind\.notice\.unavailable/u);
-assert.equal(forkCalls.length, 0);
+//#region retired header entry
+// The session-header entry is no longer registered: the rewind control lives on
+// the user's own message row, so there must be exactly one place to click.
+assert.equal(registrations.some((entry) => entry.options.name === 'conversation.session.header.actions'), false);
 //#endregion
 
+// --- popover wiring --------------------------------------------------------
+// v1.3.1 shipped a popover whose option callbacks referenced a `turn` the
+// enclosing function never declared. That throws inside a DOM listener, which the
+// browser swallows: clicking a control did nothing at all. Pin the wiring.
+{
+  const source = readFileSync(new URL('../lib/client.js', import.meta.url), 'utf8');
+  assert.match(source, /const openPopover = \(anchor, seq, notice, turn/u);
+  assert.match(source, /runRewind\(seq, false, notice, turn\)/u);
+  assert.match(source, /runRewind\(seq, true, notice, turn\)/u);
+}
+
 console.log('client smoke: all assertions passed');