dsh-rewind-plugin 0.2.6 → 0.2.8

package/lib/index.js

@@ -309,7 +309,7 @@ function mutationPathOf(exec) {
 }
 function anchorSeqOf(session, cache) {
   const events = session.events;
-  const cached = cache.get(session.id);
+  const cached = cache.get(session);
   if (cached !== void 0 && cached.eventsLength === events.length) return cached.anchor;
   let anchor = cached?.anchor;
   for (let i = events.length - 1; i >= (cached?.eventsLength ?? 0); i--) {
@@ -318,7 +318,7 @@ function anchorSeqOf(session, cache) {
       break;
     }
   }
-  cache.set(session.id, { anchor, eventsLength: events.length });
+  cache.set(session, { anchor, eventsLength: events.length });
   return anchor;
 }
 async function resolveTarget(fs, path, cwd, signal) {
@@ -342,6 +342,8 @@ async function readTextOrUndefined(fs, target, signal) {
 }
 async function captureBefore(fs, exec, pending) {
   if (!TRACKED_TOOLS.has(exec.name)) return;
+  const header = exec.agent?.session.header;
+  if (header !== void 0 && (header.origin === "subagent" || (header.delegationDepth ?? 0) > 0)) return;
   const path = mutationPathOf(exec);
   if (path === void 0) return;
   const cwd = execSessionCwd(exec, path);
@@ -388,6 +390,7 @@ function formatPlan(plan, files) {
   } else {
     lines.push("\u76EE\u6807\u4E4B\u540E\u6CA1\u6709\u5FEB\u7167\u8BB0\u5F55\u7684\u5199\u7C7B\u53D8\u66F4\uFF0C\u65E0\u9700\u8FD8\u539F\u6587\u4EF6\u3002");
   }
+  lines.push(`impact=${files.length}`);
   return lines.join("\n");
 }
 function resolveOrError(events, surface, raw) {
@@ -402,56 +405,81 @@ function renderFailures(failed) {
   return `\uFF1B${failed.length} \u4E2A\u6587\u4EF6\u8FD8\u539F\u5931\u8D25\uFF1A${failed.map((f) => `${f.path}\uFF08${f.message}\uFF09`).join("\u3001")}`;
 }
 async function waitForAgentIdle(agent, signal, timeoutMs = 15e3) {
-  const deadline = Date.now() + timeoutMs;
-  while (agent.status !== "idle") {
-    if (signal.aborted || Date.now() > deadline) return false;
-    await new Promise((resolve) => setTimeout(resolve, 50));
+  if (signal.aborted) return false;
+  let timer;
+  let onAbort;
+  try {
+    await Promise.race([
+      agent.whenIdle(),
+      new Promise((_resolve, reject) => {
+        timer = setTimeout(() => reject(new Error("rewind idle wait timed out")), timeoutMs);
+        onAbort = () => reject(new Error("rewind idle wait aborted"));
+        signal.addEventListener("abort", onAbort, { once: true });
+      })
+    ]);
+    return true;
+  } catch {
+    return false;
+  } finally {
+    if (timer !== void 0) clearTimeout(timer);
+    if (onAbort !== void 0) signal.removeEventListener("abort", onAbort);
   }
-  return true;
 }
-async function executeRewind(ctx, store, invocation, rawTarget, mode) {
+async function executeRewind(ctx, store, invocation, rawTarget, mode, inflight) {
   const { agent } = invocation;
-  if (agent.status !== "idle") {
-    agent.cancel({ kind: "user" });
-    const stopped = await waitForAgentIdle(agent, invocation.signal);
-    if (!stopped) {
-      return { kind: "error", text: "\u65E0\u6CD5\u505C\u6B62\u8FD0\u884C\u4E2D\u7684 agent\uFF0C\u56DE\u9000\u5DF2\u53D6\u6D88\u3002\u8BF7\u7A0D\u540E\u518D\u8BD5\u3002" };
-    }
-  }
-  let plan;
-  try {
-    plan = resolveOrError(agent.session.events, agent.session.surface.nodes, rawTarget);
-  } catch (error) {
-    return rewindErrorResult(error);
+  const sessionId = agent.session.id;
+  if (inflight.has(sessionId)) {
+    return { kind: "error", text: "\u8BE5\u4F1A\u8BDD\u5DF2\u6709\u4E00\u4E2A\u56DE\u9000\u6B63\u5728\u6267\u884C\uFF0C\u8BF7\u7A0D\u5019\u3002" };
   }
-  const marker = buildMarker();
-  let event;
+  inflight.add(sessionId);
   try {
-    event = agent.session.append("assistant/message", { turn: markerTurnOf(agent.session.events), step: 0, message: marker }, {
-      surfaceOp: { op: "replace", start: plan.surfaceStart, end: plan.surfaceEnd },
-      sourceEventSeqs: [...plan.shadowedSeqs]
-    });
-  } catch (error) {
+    if (agent.status !== "idle") {
+      agent.cancel({ kind: "user" });
+      const stopped = await waitForAgentIdle(agent, invocation.signal);
+      if (!stopped) {
+        return { kind: "error", text: "\u65E0\u6CD5\u505C\u6B62\u8FD0\u884C\u4E2D\u7684 agent\uFF0C\u56DE\u9000\u5DF2\u53D6\u6D88\u3002\u8BF7\u7A0D\u540E\u518D\u8BD5\u3002" };
+      }
+    }
+    if (invocation.signal.aborted) {
+      return { kind: "error", text: "\u56DE\u9000\u5DF2\u53D6\u6D88\u3002" };
+    }
+    let plan;
+    try {
+      plan = resolveOrError(agent.session.events, agent.session.surface.nodes, rawTarget);
+    } catch (error) {
+      return rewindErrorResult(error);
+    }
+    const marker = buildMarker();
+    let event;
+    try {
+      event = agent.session.append("assistant/message", { turn: markerTurnOf(agent.session.events), step: 0, message: marker }, {
+        surfaceOp: { op: "replace", start: plan.surfaceStart, end: plan.surfaceEnd },
+        sourceEventSeqs: [...plan.shadowedSeqs]
+      });
+    } catch (error) {
+      return {
+        kind: "error",
+        text: `\u56DE\u9000\u5931\u8D25\uFF1A${error instanceof Error ? error.message : String(error)}\u3002\u4F1A\u8BDD\u672A\u6539\u53D8\u3002`
+      };
+    }
+    let restore = "";
+    if (mode === "both") {
+      const outcome = await store.restoreAfter(agent.session.id, plan.targetSeq, (path) => unlink(path));
+      const parts = [];
+      if (outcome.restored.length > 0) parts.push(`\u8FD8\u539F ${outcome.restored.length} \u4E2A\u6587\u4EF6`);
+      if (outcome.deleted.length > 0) parts.push(`\u5220\u9664 ${outcome.deleted.length} \u4E2A\u6587\u4EF6`);
+      if (outcome.skipped.length > 0) parts.push(`\u8DF3\u8FC7 ${outcome.skipped.length} \u4E2A\u94FE\u63A5`);
+      restore = parts.length > 0 ? `\uFF1B${parts.join("\u3001")}` : "\uFF1B\u76EE\u6807\u4E4B\u540E\u6CA1\u6709\u53EF\u8FD8\u539F\u7684\u5199\u7C7B\u53D8\u66F4";
+      restore += renderFailures(outcome.failed);
+    }
     return {
-      kind: "error",
-      text: `\u56DE\u9000\u5931\u8D25\uFF1A${error instanceof Error ? error.message : String(error)}\u3002\u4F1A\u8BDD\u672A\u6539\u53D8\u3002`
+      kind: "success",
+      text: `\u5DF2\u64A4\u56DE seq ${plan.targetSeq} \u53CA\u4E4B\u540E\u5185\u5BB9\uFF08\u5BF9\u8BDD\u5DF2\u56DE\u5230\u6B64\u524D\uFF09${restore}\u3002`,
+      sourceEventSeq: event.seq
     };
+  } finally {
+    inflight.delete(sessionId);
   }
-  let restore = "";
-  if (mode === "both") {
-    const outcome = await store.restoreAfter(agent.session.id, plan.targetSeq, (path) => unlink(path));
-    const parts = [];
-    if (outcome.restored.length > 0) parts.push(`\u8FD8\u539F ${outcome.restored.length} \u4E2A\u6587\u4EF6`);
-    if (outcome.deleted.length > 0) parts.push(`\u5220\u9664 ${outcome.deleted.length} \u4E2A\u6587\u4EF6`);
-    if (outcome.skipped.length > 0) parts.push(`\u8DF3\u8FC7 ${outcome.skipped.length} \u4E2A\u94FE\u63A5`);
-    restore = parts.length > 0 ? `\uFF1B${parts.join("\u3001")}` : "\uFF1B\u76EE\u6807\u4E4B\u540E\u6CA1\u6709\u53EF\u8FD8\u539F\u7684\u5199\u7C7B\u53D8\u66F4";
-    restore += renderFailures(outcome.failed);
-  }
-  return {
-    kind: "success",
-    text: `\u5DF2\u64A4\u56DE seq ${plan.targetSeq} \u53CA\u4E4B\u540E\u5185\u5BB9\uFF08\u5BF9\u8BDD\u5DF2\u56DE\u5230\u6B64\u524D\uFF09${restore}\u3002`,
-    sourceEventSeq: event.seq
-  };
 }
 function rewindErrorResult(error) {
   if (error instanceof RewindError) {
@@ -465,7 +493,7 @@ function rewindErrorResult(error) {
   }
   throw error;
 }
-async function handleRewind(ctx, store, invocation) {
+async function handleRewind(ctx, store, invocation, inflight) {
   const session = invocation.agent.session;
   const input = invocation.rawInput.trim();
   if (input === "") {
@@ -473,7 +501,7 @@ async function handleRewind(ctx, store, invocation) {
     if (candidates.length === 0) {
       return { kind: "error", text: "\u5F53\u524D\u4F1A\u8BDD\u8FD8\u6CA1\u6709\u53EF\u56DE\u9000\u7684\u7528\u6237\u6D88\u606F\u3002" };
     }
-    return executeRewind(ctx, store, invocation, `@${candidates[0].seq}`, "chat");
+    return executeRewind(ctx, store, invocation, `@${candidates[0].seq}`, "chat", inflight);
   }
   const parts = input.split(/\s+/);
   if (parts[0] === "preview") {
@@ -503,17 +531,18 @@ async function handleRewind(ctx, store, invocation) {
   /rewind ${target} both  \u56DE\u9000\u5BF9\u8BDD\u5E76\u8FD8\u539F\u6587\u4EF6`
     };
   }
-  return executeRewind(ctx, store, invocation, target, mode);
+  return executeRewind(ctx, store, invocation, target, mode, inflight);
 }
 function apply(ctx, config) {
   const store = new SnapshotStore(config?.snapshotDir);
   const pending = /* @__PURE__ */ new Map();
-  const anchorCache = /* @__PURE__ */ new Map();
+  const anchorCache = /* @__PURE__ */ new WeakMap();
+  const inflight = /* @__PURE__ */ new Set();
   ctx.effect(function* () {
     yield ctx.commands.register({
       name: "rewind",
       description: "\u5728\u540C\u7A97\u53E3\u5185\u5C06\u5BF9\u8BDD\u56DE\u9000\u5230\u66F4\u65E9\u7684\u7528\u6237\u6D88\u606F\uFF08\u53EF\u540C\u65F6\u8FD8\u539F\u6587\u4EF6\uFF09",
-      handler: (invocation) => handleRewind(ctx, store, invocation)
+      handler: (invocation) => handleRewind(ctx, store, invocation, inflight)
     });
   }, "dsh-rewind command");
   ctx.inject(["fs"], (scope) => {

package/lib/types/client/hidden.d.ts

@@ -5,7 +5,7 @@
  *
  * @module dsh-rewind/client/hidden
  */
-import type { ChatConversationViewNode } from '@deepseek-ai/dsh-client-runtime/client';
+import type { ChatConversationViewNode, CommandNode } from '@deepseek-ai/dsh-client-runtime/client';
 /** Minimal chat snapshot reader the hiding logic needs. */
 export interface HiddenChat {
     readonly order: readonly string[];
@@ -15,6 +15,25 @@ export interface HiddenChat {
 }
 /** Extract the rewind target from a command outcome text ("已撤回 seq N..."). */
 export declare function targetOfOutcome(text: string | undefined): number | undefined;
+/**
+ * True when a `/rewind` command node is an EXECUTED rewind for `seq` — the
+ * admission form the popover drives (`@<seq> chat` / `both`) that settled
+ * with a marker-carrying success outcome. The composer refill waits for
+ * exactly this node after the user confirms, so a history-loaded command can
+ * never trigger a fill.
+ */
+export declare function isExecutedRewindCommand(node: CommandNode, seq: number): boolean;
+/**
+ * Whether a preview outcome reports tracked file changes — the availability
+ * of the "rewind conversation and code" option (Claude Code hides the
+ * code-restore options when the checkpoint has no tracked changes).
+ *
+ * Prefers the machine-readable `impact=<n>` trailer the current host appends
+ * to preview text. Older host output (or a history-loaded preview row from
+ * before the trailer existed) has none, so it falls back to the human copy
+ * ("将影响 …") to keep mixed-version deployments correct.
+ */
+export declare function hasFileImpact(text: string | undefined): boolean;
 /**
  * Anchor seqs that must be hidden from the rendered transcript so the user
  * sees the conversation as the agent sees it: every impact-preview flow node

package/lib/types/client/index.d.ts

@@ -1,23 +1,19 @@
 /**
- * dsh-rewind client half: the per-user-message ↶ rewind button and the
- * mode-selection popover, injected into the conversation DOM (pure plugin —
- * no harness source patches).
+ * dsh-rewind client half: the manual `/rewind` composer guard, the locale
+ * registration, and the session-scoped portal bridge that renders the
+ * per-message ↶ rewind button (see `portals.tsx` for the button itself).
  *
- * Anchoring: each chat node seat renders `[data-chat-flow-kind]` with
- * `data-chat-anchor-key`; a `MutationObserver` tracks newly rendered user
- * seats and appends the rewind button into the message's IconActions row.
- * The seq is never parsed from DOM text — the key is looked up in the runtime
- * snapshot (`session.getSnapshot().chat.nodes.get(key)`) to get the durable
- * `UserMessageNode.seq`.
- *
- * Interaction: clicking a message's button fixes the target (step one), the
- * popover offers the two modes (step two); "rewind conversation and code"
- * first fetches the impact list via `/rewind preview @seq both` and confirms
- * before executing. Execution always goes through `session.command(...)`, the
- * same host path the `/rewind` command uses.
+ * The button is NOT injected by hand into the DOM anymore: the plugin
+ * registers a bridge into the harness's `conversation.session.header.actions`
+ * list slot, and that bridge portals a React button into every user message's
+ * IconActions row — the same rendering family as the copy button (a React
+ * child of the actions row), without touching any harness source. The
+ * registration is typed structurally (see `SlotsLike` in portals.tsx), so the
+ * plugin never imports conversation UI types and survives harness version
+ * drift.
  *
  * Manual composer input of `/rewind` is deliberately blocked (the guard
- * below): the command exists only as the per-message button's internal
+ * below): the command exists only as the per-message ↶ button's internal
  * channel, so any `/rewind` line typed by hand — bare or with arguments — is
  * stopped with a hint pointing at the button.
  *
@@ -27,7 +23,7 @@ import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client';
 export declare const name = "dsh-rewind";
 export declare const inject: string[];
 /**
- * Client plugin body: button injection + popover wiring.
- * @param ctx - client root context carrying `sessions` and `locale`.
+ * Client plugin body: composer guard + locale + the portal bridge.
+ * @param ctx - client root context carrying `slots`, `sessions` and `locale`.
  */
 export declare function apply(ctx: ClientContext): void;

package/lib/types/client/popover.d.ts

@@ -7,6 +7,7 @@
  * @module dsh-rewind/client/popover
  */
 import type { SessionFace } from '@deepseek-ai/dsh-client-runtime/client';
+import type { CommandNode } from '@deepseek-ai/dsh-client-runtime/client';
 import type { RewindKey } from './locales.ts';
 type Translate = (key: RewindKey, params?: Record<string, unknown>) => string;
 export interface PopoverOptions {
@@ -17,9 +18,32 @@ export interface PopoverOptions {
     /** The button that opened the popover (outside-click ignore target). */
     readonly anchor: HTMLElement;
     readonly t: Translate;
+    /**
+     * Execute one rewind in the given mode. The popover closes itself first;
+     * the callback owns the command + composer-refill lifecycle (see
+     * runRewindAndFill in index.ts).
+     */
+    readonly onRewind: (mode: 'chat' | 'both') => void;
 }
 /** Close the current popover, if any. */
 export declare function closePopover(): void;
+/**
+ * Seqs of the command nodes currently matching `match`. Sample BEFORE issuing
+ * a new command of the same shape so the subsequent wait can exclude them: a
+ * repeated preview/rewind of the same target must not settle on the previous
+ * command's stale outcome (e.g. an older preview that found file changes,
+ * after those changes were already restored).
+ */
+export declare function knownCommandSeqs(session: SessionFace, match: (node: CommandNode) => boolean): Set<number>;
+/**
+ * Resolve the outcome of the newest matching rewind command by watching the
+ * session snapshot (command/run + command/done land as one CommandNode).
+ * @returns the outcome text-bearing node, or null on timeout.
+ */
+export declare function waitForCommand(session: SessionFace, match: (node: CommandNode) => boolean, timeoutMs?: number): Promise<{
+    kind: 'success' | 'error';
+    text?: string;
+} | null>;
 /** Open the mode-selection popover anchored near the given button. */
 export declare function openPopover(opts: PopoverOptions): void;
 export {};

package/lib/types/client/portals.d.ts

@@ -0,0 +1,66 @@
+/**
+ * dsh-rewind portal half: the per-user-message ↶ rewind button, rendered as a
+ * React portal inside the message's `MessageIconActions` row.
+ *
+ * Why portals (aligned with the copy button's own rendering): the copy button
+ * is a React child of the actions row, painted in the same commit as the
+ * bubble. A pure-DOM `appendChild` (the earlier approach) lands one microtask
+ * later and re-runs a full-transcript scan on EVERY mutation, which can push
+ * the paint of a newly sent bubble — the "occasional hiccup before the bubble
+ * shows". Portals let React own the button lifecycle (mount/unmount with the
+ * row, no orphaned buttons, no manual re-attach after harness re-renders),
+ * and the target collection is coalesced (one refresh per mutation batch) and
+ * diffed (no setState churn when nothing changed).
+ *
+ * Mount point: the plugin registers a session-scoped bridge into the harness's
+ * `conversation.session.header.actions` list slot. The bridge renders NO
+ * header UI — it only portals buttons into the user rows of the session the
+ * harness mounts it for. That slot is the harness-native way to get a
+ * per-session React mount without touching any source; the registration is
+ * typed structurally (see `SlotsLike`) so the plugin never imports the
+ * conversation UI package's types and survives its version drift.
+ *
+ * @module dsh-rewind/client/portals
+ */
+import { type ReactNode } from 'react';
+import type { SessionFace } from '@deepseek-ai/dsh-client-runtime/client';
+import type { RewindKey } from './locales.ts';
+type Translate = (key: RewindKey, params?: Record<string, unknown>) => string;
+/** Capabilities the session-scoped bridge receives from the plugin apply(). */
+export interface RewindBridgeDeps {
+    readonly sessionOf: (sessionId: string) => SessionFace | undefined;
+    readonly currentSessionId: () => string | undefined;
+    readonly t: Translate;
+    readonly subscribeLocale: (cb: () => void) => () => void;
+}
+/** Structural face of the runtime slot service (see the module doc). */
+export interface SlotsLike {
+    inject(key: string, install: () => () => void): () => void;
+    register(entry: {
+        readonly name: string;
+        readonly id: string;
+        readonly order: number;
+    }, component: (props: {
+        readonly sessionId: string;
+    }) => ReactNode): () => void;
+}
+interface RewindPortalsProps extends RewindBridgeDeps {
+    readonly sessionId: string;
+}
+/**
+ * Session-scoped portal bridge: renders the ↶ button of every user message
+ * row of the session the harness mounts it for. The refresh is coalesced
+ * (one pass per mutation batch via queueMicrotask) and diffed (setState is
+ * skipped when the target set is unchanged), so the plugin never runs a
+ * synchronous full-transcript scan inside a commit microtask.
+ */
+export declare function RewindPortals({ sessionId, sessionOf, currentSessionId, t, subscribeLocale }: RewindPortalsProps): ReactNode;
+/**
+ * Build the slot-entry component for the plugin apply(): a tiny bridge that
+ * injects the apply-time capabilities (session resolution, locale, rewind
+ * runner) into the module-level `RewindPortals`.
+ */
+export declare function createRewindBridge(deps: RewindBridgeDeps): (props: {
+    readonly sessionId: string;
+}) => ReactNode;
+export {};

package/lib/types/client/styles.d.ts

@@ -5,8 +5,6 @@
  *
  * @module dsh-rewind/client/styles
  */
-/** Marker attribute set on a seat row once its rewind button is attached. */
-export declare const REWIND_ATTACHED = "data-dsh-rewind-attached";
 /** Class names shared between the injected DOM and the stylesheet. */
 export declare const CLASS: {
     readonly button: 'dsh-rewind-btn';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-rewind-plugin",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "DeepSeek Harness plugin: in-place conversation rewind in the same session window (Claude Code /rewind semantics) with optional workspace file restore",
   "keywords": [
     "deepseek-harness",
@@ -54,7 +54,8 @@
     "client": {
       "inject": [
         "@deepseek-ai/dsh-client-locale",
-        "@deepseek-ai/dsh-client-runtime"
+        "@deepseek-ai/dsh-client-runtime",
+        "@deepseek-ai/dsh-client-ui-conversation"
       ],
       "platform": "web"
     }
@@ -126,7 +127,11 @@
     "@deepseek-ai/dsh-session": "^0.1.0-rc.7",
     "@deepseek-ai/dsh-tools": "^0.1.0-rc.7",
     "@types/node": "^24.0.0",
+    "@types/react": "^18.3.31",
+    "@types/react-dom": "^18.3.7",
     "esbuild": "^0.28.2",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "typescript": "^7.0.2",
     "vitest": "^4.1.10"
   }