dsh-rewind-plugin 0.1.10 → 0.2.1

package/docs/harness-reference.md

@@ -0,0 +1,34 @@
+# DeepSeek Harness interface reference
+
+> Maintainer doc: the harness subsystems this plugin depends on, and the key
+> source files behind each interface. Local fork (if present):
+> `<workspace>/oss/deepseek-harness/` — official repo:
+> [github.com/deepseek-ai/deepseek-harness](https://github.com/deepseek-ai/deepseek-harness)
+
+## Subsystem docs (`docs/subsystems/`)
+
+- [session.md](https://github.com/deepseek-ai/deepseek-harness/blob/main/docs/subsystems/session.md) — `Session` / `SessionStore` / event model (`Session.append`, `surfaceOp`, `sourceEventSeqs`)
+- [core.md](https://github.com/deepseek-ai/deepseek-harness/blob/main/docs/subsystems/core.md) — `Agent` (`status`, `session`) and other core types
+- [commands.md](https://github.com/deepseek-ai/deepseek-harness/blob/main/docs/subsystems/commands.md) — command registration (`ctx.commands.register`, `CommandInvocation`, `CommandResult`)
+- [tools.md](https://github.com/deepseek-ai/deepseek-harness/blob/main/docs/subsystems/tools.md) — tool execution seam (`tools/pre-execute` / `tools/post-execute`, `ToolExecution`)
+- [session-query.md](https://github.com/deepseek-ai/deepseek-harness/blob/main/docs/subsystems/session-query.md) — session query / `foldSurface` read-only interfaces
+
+Also under `docs/` at the repo root: `persistence-catalog.md` (full
+`SessionEventMap`), `tool-catalog.md` (tool inventory), `config-catalog.md`
+(configuration inventory).
+
+## Key source (`packages/`)
+
+| Interface | File |
+|---|---|
+| `Session.append`, surface validation | [packages/core/session/src/index.ts](https://github.com/deepseek-ai/deepseek-harness/blob/main/packages/core/session/src/index.ts) |
+| `foldSurface`, replacement rules | [packages/core/session/src/surface.ts](https://github.com/deepseek-ai/deepseek-harness/blob/main/packages/core/session/src/surface.ts) |
+| `SessionEventMap`, `SurfaceOp` | [packages/core/session/src/types.ts](https://github.com/deepseek-ai/deepseek-harness/blob/main/packages/core/session/src/types.ts) |
+| `createUserMessage`, `MessageSource` | [packages/llm/llm/src/message.ts](https://github.com/deepseek-ai/deepseek-harness/blob/main/packages/llm/llm/src/message.ts) |
+| `CommandDefinition`, `CommandInvocation` | [packages/interaction/commands/src/index.ts](https://github.com/deepseek-ai/deepseek-harness/blob/main/packages/interaction/commands/src/index.ts) |
+| `Agent` (`status` / `session`) | [packages/core/agent/src/runtime-types.ts](https://github.com/deepseek-ai/deepseek-harness/blob/main/packages/core/agent/src/runtime-types.ts) |
+| `tools/pre-execute` / `execute` / `post-execute` | [packages/core/tools/src/index.ts](https://github.com/deepseek-ai/deepseek-harness/blob/main/packages/core/tools/src/index.ts) |
+| Client DOM anchors (`data-chat-flow-kind` / `data-chat-anchor-key`) | [packages/client/ui-conversation/src/client/chat/ChatNodeSeat.tsx](https://github.com/deepseek-ai/deepseek-harness/blob/main/packages/client/ui-conversation/src/client/chat/ChatNodeSeat.tsx) |
+| User bubble rendering | [packages/client/ui-conversation/src/client/chat/MessageItem.tsx](https://github.com/deepseek-ai/deepseek-harness/blob/main/packages/client/ui-conversation/src/client/chat/MessageItem.tsx) |
+| Client `SessionFace` (`command` / `cancel`) | [packages/client/runtime/src/client/contract/session.ts](https://github.com/deepseek-ai/deepseek-harness/blob/main/packages/client/runtime/src/client/contract/session.ts) |
+| Client `PendingWait` (`respond`) | [packages/client/runtime/src/client/sessions/pending.ts](https://github.com/deepseek-ai/deepseek-harness/blob/main/packages/client/runtime/src/client/sessions/pending.ts) |

package/lib/client.js

@@ -32,40 +32,80 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
+// src/client/hidden.ts
+function targetOfOutcome(text) {
+  if (text === void 0) return void 0;
+  const match = text.match(/seq (\d+)/);
+  return match !== null ? Number(match[1]) : void 0;
+}
+function hiddenSeqsOf(snap) {
+  const hidden = /* @__PURE__ */ new Set();
+  let minTarget = Number.POSITIVE_INFINITY;
+  let maxMarker = Number.NEGATIVE_INFINITY;
+  for (const key of snap.order) {
+    const node = snap.nodes.get(key);
+    if (node === void 0 || node.kind !== "command") continue;
+    const command = node.data;
+    if (command.name !== "rewind") continue;
+    if (command.outcome?.kind !== "success") continue;
+    if (command.outcome.sourceEventSeq === void 0) continue;
+    hidden.add(command.seq);
+    const marker = command.outcome.sourceEventSeq;
+    const target = targetOfOutcome(command.outcome.text);
+    if (target !== void 0) {
+      if (target < minTarget) minTarget = target;
+      if (marker > maxMarker) maxMarker = marker;
+    }
+  }
+  if (Number.isFinite(minTarget)) {
+    for (const key of snap.order) {
+      const node = snap.nodes.get(key);
+      if (node === void 0) continue;
+      const anchor = node.anchorSeq;
+      if (anchor >= minTarget && anchor <= maxMarker) hidden.add(anchor);
+    }
+  }
+  return hidden;
+}
+
 // src/client/locales.ts
 var zh = {
   "button.aria": "\u56DE\u9000\u5230\u6B64\u6D88\u606F",
   "button.title": "\u56DE\u9000",
   "popover.title": "\u56DE\u9000\u5230\u8FD9\u6761\u6D88\u606F",
-  "popover.target": "seq {seq} \xB7 {time}",
+  "popover.noText": "\uFF08\u65E0\u6587\u672C\uFF09",
   "popover.chat": "\u4EC5\u56DE\u9000\u5BF9\u8BDD",
   "popover.chat.hint": "\u53EA\u56DE\u9000\u6A21\u578B\u4E0A\u4E0B\u6587\uFF0C\u4E0D\u52A8\u5DE5\u4F5C\u533A\u6587\u4EF6",
   "popover.both": "\u56DE\u9000\u5BF9\u8BDD\u548C\u4EE3\u7801",
   "popover.both.hint": "\u5BF9\u8BDD\u56DE\u9000\u5E76\u8FD8\u539F\u5DE5\u4F5C\u533A\u6587\u4EF6",
+  "popover.checking": "\u6B63\u5728\u68C0\u67E5\u6587\u4EF6\u53D8\u66F4\u2026",
+  "popover.noChanges": "\u6B64\u6D88\u606F\u4E4B\u540E\u6CA1\u6709\u53EF\u8FD8\u539F\u7684\u6587\u4EF6\u53D8\u66F4\uFF0C\u4EC5\u53EF\u56DE\u9000\u5BF9\u8BDD",
   "popover.cancel": "\u53D6\u6D88",
   "popover.impact.loading": "\u6B63\u5728\u83B7\u53D6\u5F71\u54CD\u6E05\u5355\u2026",
   "popover.impact.failed": "\u65E0\u6CD5\u83B7\u53D6\u5F71\u54CD\u6E05\u5355\uFF1A{message}",
-  "popover.impact.none": "\u76EE\u6807\u4E4B\u540E\u6CA1\u6709\u53F0\u8D26\u8BB0\u5F55\u7684\u5199\u7C7B\u53D8\u66F4\uFF0C\u65E0\u9700\u8FD8\u539F\u6587\u4EF6\u3002",
+  "popover.impact.none": "\u76EE\u6807\u4E4B\u540E\u6CA1\u6709\u8DDF\u8E2A\u5230\u7684\u5199\u7C7B\u53D8\u66F4\uFF0C\u65E0\u9700\u8FD8\u539F\u6587\u4EF6\u3002",
   "popover.confirm": "\u786E\u8BA4\u56DE\u9000",
   "popover.back": "\u8FD4\u56DE",
-  "guard.hint": "/rewind \u4E0D\u63A5\u53D7\u53C2\u6570\uFF0C\u53EA\u80FD\u64A4\u56DE\u6700\u8FD1\u4E00\u6761\u6D88\u606F\uFF1B\u56DE\u9000\u5230\u66F4\u65E9\u6D88\u606F\u8BF7\u7528\u8BE5\u6D88\u606F\u65C1\u7684 \u21B6 \u6309\u94AE"
+  "guard.hint": "/rewind \u547D\u4EE4\u4E0D\u652F\u6301\u624B\u52A8\u8F93\u5165\uFF0C\u8BF7\u4F7F\u7528\u6D88\u606F\u65C1\u7684 \u21B6 \u56DE\u9000\u6309\u94AE"
 };
 var en = {
   "button.aria": "Rewind to this message",
   "button.title": "Rewind",
   "popover.title": "Rewind to this message",
-  "popover.target": "seq {seq} \xB7 {time}",
+  "popover.noText": "(no text)",
   "popover.chat": "Rewind conversation only",
   "popover.chat.hint": "Cut the model context only; workspace files stay untouched",
   "popover.both": "Rewind conversation and code",
   "popover.both.hint": "Cut the context and restore workspace files",
+  "popover.checking": "Checking for file changes\u2026",
+  "popover.noChanges": "No tracked file changes after this message; conversation-only rewind",
   "popover.cancel": "Cancel",
   "popover.impact.loading": "Fetching impact list\u2026",
   "popover.impact.failed": "Could not fetch the impact list: {message}",
-  "popover.impact.none": "No ledger-recorded file changes after the target; nothing to restore.",
+  "popover.impact.none": "No tracked file changes after the target; nothing to restore.",
   "popover.confirm": "Confirm rewind",
   "popover.back": "Back",
-  "guard.hint": "/rewind takes no parameters \u2014 it only withdraws the most recent message. To rewind to an earlier message, use the \u21B6 button on that message."
+  "guard.hint": "/rewind cannot be typed manually \u2014 use the \u21B6 button on a message to rewind."
 };
 
 // src/client/styles.ts
@@ -114,9 +154,10 @@ var STYLE = `
   z-index: 1000;
   width: 288px;
   padding: 12px;
+  border: 1px solid var(--dsw-alias-border-l2);
   border-radius: 12px;
-  background: var(--dsw-specific-surface-1, var(--dsw-alias-surface-1, #1f2127));
-  box-shadow: 0 8px 28px rgba(0, 0, 0, 0.32);
+  background: var(--dsw-specific-menu, var(--dsw-alias-bg-layer-3));
+  box-shadow: var(--dsw-shadow-lv3);
   font-size: 14px;
   line-height: 20px;
   color: var(--dsw-alias-label-primary);
@@ -151,6 +192,10 @@ var STYLE = `
 .dsh-rewind-popover-option:hover {
   background: var(--dsw-alias-interactive-bg-hover);
 }
+.dsh-rewind-popover-option:disabled {
+  opacity: 0.5;
+  cursor: default;
+}
 .dsh-rewind-popover-option-label {
   font-weight: 500;
 }
@@ -187,8 +232,11 @@ var STYLE = `
   cursor: pointer;
 }
 .dsh-rewind-popover-primary {
-  background: var(--dsw-alias-accent, var(--dsw-accent, #5b8cff));
-  color: var(--dsw-alias-on-accent, #fff);
+  background: var(--dsw-alias-button-primary-fill);
+  color: var(--dsw-alias-label-primary-foreground);
+}
+.dsh-rewind-popover-primary:hover:not(:disabled) {
+  background: var(--dsw-alias-button-primary-hover);
 }
 .dsh-rewind-popover-primary:disabled {
   opacity: 0.5;
@@ -207,9 +255,10 @@ var STYLE = `
   z-index: 1000;
   max-width: min(440px, calc(100vw - 24px));
   padding: 8px 12px;
+  border: 1px solid var(--dsw-alias-border-l2);
   border-radius: 10px;
-  background: var(--dsw-specific-surface-1, var(--dsw-alias-surface-1, #1f2127));
-  box-shadow: 0 8px 28px rgba(0, 0, 0, 0.32);
+  background: var(--dsw-specific-menu, var(--dsw-alias-bg-layer-3));
+  box-shadow: var(--dsw-shadow-lv3);
   font-size: 13px;
   line-height: 18px;
   color: var(--dsw-alias-label-primary);
@@ -230,11 +279,11 @@ function closePopover() {
     disposeOutside = null;
   }
 }
-function formatTarget(seq, time, preview) {
+function formatTarget(t, seq, time, preview) {
   const d = new Date(time);
   const hh = String(d.getHours()).padStart(2, "0");
   const mm = String(d.getMinutes()).padStart(2, "0");
-  const previewText = preview.length > 0 ? preview : "(no text)";
+  const previewText = preview.length > 0 ? preview : t("popover.noText");
   return `seq ${seq} \xB7 ${hh}:${mm} \xB7 ${previewText}`;
 }
 function findCommand(snapshot, match) {
@@ -269,6 +318,15 @@ function waitForCommand(session, match, timeoutMs = 8e3) {
     check();
   });
 }
+function isPreviewFor(node, seq) {
+  const args = node.args ?? "";
+  return node.name === "rewind" && args.includes("preview") && new RegExp(`(?:^|\\s)@${seq}(?=\\s|$)`).test(args);
+}
+async function previewImpact(session, seq) {
+  const result = await session.command(`/rewind preview @${seq} both`);
+  if (!result.ok || result.value?.matched !== true) return null;
+  return waitForCommand(session, (node) => isPreviewFor(node, seq));
+}
 function el(tag, className, text) {
   const node = document.createElement(tag);
   node.className = className;
@@ -285,7 +343,7 @@ function modeOption(label, hint, onClick) {
   button.addEventListener("click", onClick);
   return button;
 }
-function renderImpactStep(root, opts, back) {
+function renderImpactStep(root, opts, back, cached) {
   const { session, seq, t } = opts;
   const impact = el("div", CLASS.popoverImpact, t("popover.impact.loading"));
   const actions = el("div", CLASS.popoverActions);
@@ -302,24 +360,10 @@ function renderImpactStep(root, opts, back) {
   confirm.disabled = true;
   actions.append(confirm);
   root.replaceChildren(impact, actions);
-  let outcome = null;
   void (async () => {
-    const result = await session.command(`/rewind preview @${seq} both`);
-    if (!result.ok || result.value?.matched !== true) {
-      impact.textContent = t("popover.impact.failed", {
-        message: result.ok ? "command not matched" : result.error?.message ?? "unknown error"
-      });
-      return;
-    }
-    outcome = await waitForCommand(
-      session,
-      (node) => {
-        const args = node.args ?? "";
-        return node.name === "rewind" && args.includes("preview") && new RegExp(`(?:^|\\s)@${seq}(?=\\s|$)`).test(args);
-      }
-    );
+    const outcome = cached ?? await previewImpact(session, seq);
     if (outcome === null) {
-      impact.textContent = t("popover.impact.failed", { message: "timeout" });
+      impact.textContent = t("popover.impact.failed", { message: "preview command failed or timed out" });
       return;
     }
     if (outcome.kind === "error") {
@@ -342,41 +386,65 @@ function openPopover(opts) {
   const root = el("div", CLASS.popover);
   root.setAttribute("role", "dialog");
   root.setAttribute("aria-label", t("popover.title"));
-  root.append(
-    el("div", CLASS.popoverTitle, t("popover.title")),
-    el("div", CLASS.popoverTarget, formatTarget(seq, time, preview))
-  );
+  let bothState = { state: "loading" };
+  let impactOutcome = null;
   const renderModes = () => {
-    root.replaceChildren(
+    const children = [
       el("div", CLASS.popoverTitle, t("popover.title")),
-      el("div", CLASS.popoverTarget, formatTarget(seq, time, preview)),
+      el("div", CLASS.popoverTarget, formatTarget(t, seq, time, preview)),
       modeOption(t("popover.chat"), t("popover.chat.hint"), () => {
         closePopover();
         void session.command(`/rewind @${seq} chat`);
-      }),
-      modeOption(t("popover.both"), t("popover.both.hint"), () => {
-        renderImpactStep(root, opts, renderModes);
-      }),
-      (() => {
-        const actions = el("div", CLASS.popoverActions);
-        const cancel = document.createElement("button");
-        cancel.type = "button";
-        cancel.className = CLASS.popoverGhost;
-        cancel.textContent = t("popover.cancel");
-        cancel.addEventListener("click", closePopover);
-        actions.append(cancel);
-        return actions;
-      })()
-    );
+      })
+    ];
+    if (bothState.state === "noChanges") {
+      children.push(el("div", CLASS.popoverImpact, t("popover.noChanges")));
+    } else {
+      const option = modeOption(
+        t("popover.both"),
+        bothState.state === "loading" ? t("popover.checking") : t("popover.both.hint"),
+        () => {
+          renderImpactStep(root, opts, renderModes, impactOutcome);
+        }
+      );
+      if (bothState.state === "loading") option.disabled = true;
+      children.push(option);
+    }
+    const actions = el("div", CLASS.popoverActions);
+    const cancel = document.createElement("button");
+    cancel.type = "button";
+    cancel.className = CLASS.popoverGhost;
+    cancel.textContent = t("popover.cancel");
+    cancel.addEventListener("click", closePopover);
+    actions.append(cancel);
+    children.push(actions);
+    root.replaceChildren(...children);
+  };
+  const position = () => {
+    const rect = anchor.getBoundingClientRect();
+    const gap = 4;
+    const height = root.offsetHeight;
+    const top = rect.bottom + gap + height <= window.innerHeight - 8 ? rect.bottom + gap : Math.max(8, rect.top - gap - height);
+    root.style.top = `${Math.round(top)}px`;
+    root.style.left = `${Math.round(Math.min(rect.right, window.innerWidth - 8 - root.offsetWidth))}px`;
   };
   renderModes();
   document.body.append(root);
-  const rect = anchor.getBoundingClientRect();
-  const gap = 4;
-  const height = root.offsetHeight;
-  const top = rect.bottom + gap + height <= window.innerHeight - 8 ? rect.bottom + gap : Math.max(8, rect.top - gap - height);
-  root.style.top = `${Math.round(top)}px`;
-  root.style.left = `${Math.round(Math.min(rect.right, window.innerWidth - 8 - root.offsetWidth))}px`;
+  position();
+  const hasFileImpact = (text) => text === void 0 || text.includes("\u5C06\u5F71\u54CD");
+  void (async () => {
+    const outcome = await previewImpact(session, seq);
+    impactOutcome = outcome;
+    if (outcome !== null && outcome.kind === "success") {
+      bothState = { state: hasFileImpact(outcome.text) ? "hasChanges" : "noChanges" };
+    }
+    renderModes();
+    position();
+  })().catch(() => {
+    bothState = { state: "hasChanges" };
+    renderModes();
+    position();
+  });
   popoverEl = root;
   const onPointerDown = (event) => {
     const target = event.target;
@@ -405,41 +473,9 @@ var USER_SEAT_SELECTOR = '[data-chat-flow-kind="user"]';
 var CHAT_SEAT_SELECTOR = "[data-chat-anchor-key]";
 var ACTIONS_ROOT_SELECTOR = "[data-time-hover-root]";
 var COMPOSER_SELECTOR = "[data-input-scroll] textarea, textarea[data-phase]";
-function targetOfOutcome(text) {
-  if (text === void 0) return void 0;
-  const match = text.match(/seq (\d+)/);
-  return match !== null ? Number(match[1]) : void 0;
-}
 function messagePreviewOf(node) {
-  return node.content.map((block) => block.type === "text" && typeof block.text === "string" ? block.text : "").join("").replace(/\s+/g, " ").trim().slice(0, 80);
-}
-function hiddenSeqsOf(session) {
-  const hidden = /* @__PURE__ */ new Set();
-  const snap = session.getSnapshot();
-  let latest = null;
-  for (const key of snap.chat.order) {
-    const node = snap.chat.nodes.get(key);
-    if (node === void 0 || node.kind !== "command") continue;
-    const command = node.data;
-    if (command.name !== "rewind") continue;
-    if (command.outcome?.kind !== "success") continue;
-    if (command.outcome.sourceEventSeq === void 0) continue;
-    hidden.add(command.seq);
-    const marker = command.outcome.sourceEventSeq;
-    const target = targetOfOutcome(command.outcome.text);
-    if (target !== void 0 && (latest === null || marker > latest.marker)) {
-      latest = { marker, target };
-    }
-  }
-  if (latest !== null) {
-    for (const key of snap.chat.order) {
-      const node = snap.chat.nodes.get(key);
-      if (node === void 0) continue;
-      const anchor = node.anchorSeq;
-      if (anchor >= latest.target && anchor <= latest.marker) hidden.add(anchor);
-    }
-  }
-  return hidden;
+  const text = node.content.map((block) => block.type === "text" && typeof block.text === "string" ? block.text : "").join("").replace(/\s+/g, " ").trim();
+  return text.length <= 80 ? text : `${text.slice(0, 79)}\u2026`;
 }
 function userTextAt(session, seq) {
   const snap = session.getSnapshot();
@@ -474,6 +510,13 @@ function apply(ctx) {
     const hidden = /* @__PURE__ */ new WeakSet();
     const buttons = /* @__PURE__ */ new Map();
     let observer = null;
+    const refreshButtonLabels = () => {
+      for (const button of buttons.values()) {
+        button.setAttribute("aria-label", t("button.aria"));
+        button.title = t("button.title");
+      }
+    };
+    const unsubscribeLocale = ctx.locale.subscribe(refreshButtonLabels);
     const sessionFor = () => {
       const sessionId = ctx.sessions.list.getSnapshot().current;
       if (sessionId === void 0) return void 0;
@@ -524,7 +567,7 @@ function apply(ctx) {
         if (!button.isConnected) buttons.delete(key);
       }
       const session = sessionFor();
-      const hiddenSeqs = session !== void 0 ? hiddenSeqsOf(session) : /* @__PURE__ */ new Set();
+      const hiddenSeqs = session !== void 0 ? hiddenSeqsOf(session.getSnapshot().chat) : /* @__PURE__ */ new Set();
       let hiddenCount = 0;
       for (const seat of document.querySelectorAll(CHAT_SEAT_SELECTOR)) {
         const key = seat.dataset.chatAnchorKey;
@@ -564,11 +607,11 @@ function apply(ctx) {
         if (fillComposer(text)) filled.add(target);
       }
     };
-    const REWIND_WITH_ARGS = /^\s*\/rewind\s+\S/i;
+    const MANUAL_REWIND = /^\s*\/rewind(?:\s|$)/i;
     const composerTextarea = () => document.querySelector(COMPOSER_SELECTOR);
     const hasBlockedRewindDraft = () => {
       const textarea = composerTextarea();
-      return textarea !== null && REWIND_WITH_ARGS.test(textarea.value);
+      return textarea !== null && MANUAL_REWIND.test(textarea.value);
     };
     let guardHintEl = null;
     let guardHintTimer;
@@ -621,6 +664,7 @@ function apply(ctx) {
     observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ["style"] });
     scan();
     yield () => {
+      unsubscribeLocale();
       document.removeEventListener("keydown", onKeyDownGuard, true);
       document.removeEventListener("click", onClickGuard, true);
       if (guardHintEl !== null) guardHintEl.remove();