dsh-rewind-plugin 0.15.2 → 0.16.0-alpha.1

package/SECURITY.md

@@ -120,8 +120,8 @@ hides the `[target, marker]` span from the rendered transcript.
 - **Restores name only recorded paths**: the store contains resolved display
   paths of the session's own write-class tool calls (plus boundary re-checks
   over that same tracked set) — a restore can never write an arbitrary path.
-- **Path resolution rule**: relative paths resolve against the session
-  workspace cwd, mirroring the fs tools' own rule (`src/session-cwd.ts`).
+- **Path resolution rule**: relative paths resolve against the session's current
+  working directory, read from the same service the fs tools resolve through.
 - **Bounded backups**: `prune` keeps the newest 100 anchor groups per session
   (`MAX_ANCHOR_GROUPS`), except groups a non-terminal restore journal still
   references (pinned so the op can be finished), so backup accumulation stays

package/lib/client.js

@@ -1359,9 +1359,9 @@ function createRewindBridge(deps) {
 }
 
 // src/client/build-info.ts
-var PLUGIN_VERSION = true ? "0.15.2" : "dev";
+var PLUGIN_VERSION = true ? "0.16.0-alpha.1" : "dev";
 var PLUGIN_PACKAGE = "dsh-rewind-plugin";
-var BUILD_HASH = true ? "75d20acc" : "dev";
+var BUILD_HASH = true ? "f36f8be8" : "dev";
 
 // src/client/locales.ts
 var zh = {
@@ -1586,10 +1586,10 @@ function apply(ctx) {
     };
     const restoreImages = async (sessionId, images) => {
       if (images.length === 0) return;
-      const ui = uiConversation();
+      const session = sessionOf(sessionId);
       const conversation = ctx.get("conversation");
       const scope = ctx.sessions.scope?.(sessionId);
-      if (ui?.imageUrl === void 0 || conversation?.input === void 0 || conversation.createDrafts === void 0 || scope === void 0) {
+      if (session === void 0 || conversation?.input === void 0 || conversation.createDrafts === void 0 || scope === void 0) {
         rewindLog.warn("refill", "image restore unavailable (conversation services not ready)");
         return;
       }
@@ -1601,11 +1601,12 @@ function apply(ctx) {
           continue;
         }
         try {
-          const url = await ui.imageUrl(sessionId, ref);
-          const blob = await (await fetch(url)).blob();
-          files.push(new File([blob], ref.name ?? `image-${index + 1}.${extension}`, { type: ref.mediaType }));
+          const result = await session.readAttachment(ref.attachmentId);
+          if (!result.ok) throw result.error;
+          const bytes = result.value.data;
+          files.push(new File([bytes], ref.name ?? `image-${index + 1}.${extension}`, { type: ref.mediaType }));
         } catch (error) {
-          rewindLog.warn("refill", `image fetch threw for ${ref.attachmentId}`, error);
+          rewindLog.warn("refill", `image read threw for ${ref.attachmentId}`, error);
         }
       }
       if (files.length === 0) return;

package/lib/index.js

@@ -224,14 +224,6 @@ function planRewind(events, surface, target) {
   };
 }
 
-// src/session-cwd.ts
-function sessionCwd(cwd) {
-  return cwd;
-}
-function execSessionCwd(exec) {
-  return sessionCwd(exec.agent?.session.header.cwd);
-}
-
 // src/snapshot.ts
 import { createHash } from "node:crypto";
 import { chmod, copyFile, lstat, mkdir, open, readFile, readdir, realpath, rename, rm, stat, writeFile } from "node:fs/promises";
@@ -2388,10 +2380,7 @@ function anchorSeqOf(session, cache) {
 }
 async function resolveTarget(fs, path, cwd, signal) {
   try {
-    return await fs.resolve(path, {
-      ...cwd !== void 0 ? { cwd } : {},
-      signal
-    });
+    return await fs.resolve(path, { cwd, signal });
   } catch {
     return void 0;
   }
@@ -2400,20 +2389,20 @@ function isNotFoundError(error) {
   const code = error?.code;
   return code === "ENOENT" || code === "FS_NOT_FOUND";
 }
-async function captureBefore(fs, store, exec, pending) {
+async function captureBefore(fs, workingDirectory, store, exec, pending) {
   if (!TRACKED_TOOLS.has(exec.name)) return;
-  const session = exec.agent?.session;
-  if (session !== void 0 && isSubagentSession(session)) return;
+  const agent = exec.agent;
+  if (agent === void 0) return;
+  if (isSubagentSession(agent.session)) return;
   const path = mutationPathOf(exec);
   if (path === void 0) return;
-  const cwd = execSessionCwd(exec);
+  const cwd = await workingDirectory.ensure(agent, exec.signal);
   const target = await resolveTarget(fs, path, cwd, exec.signal);
   if (target === void 0) return;
   const info = await fs.stat(target, exec.signal).catch((error) => {
     if (isNotFoundError(error)) return void 0;
     throw error;
   });
-  if (session === void 0) return;
   if (info !== void 0 && info.type !== "file") return;
   if (info !== void 0 && store.isOverFileCap(info.size)) return;
   const key = `${exec.agent?.id ?? "anon"}:${exec.callId}`;
@@ -2421,7 +2410,7 @@ async function captureBefore(fs, store, exec, pending) {
     pending.set(key, { path: target.displayPath, backup: null });
     return;
   }
-  const staged = await store.stageCapture(session.id, key);
+  const staged = await store.stageCapture(agent.session.id, key);
   let backup;
   try {
     await copyFile2(target.displayPath, staged);
@@ -2959,12 +2948,13 @@ function apply(ctx, config) {
       }
     })();
   }, { global: true });
-  ctx.inject(["fs"], (scope) => {
+  ctx.inject(["fs", "workingDirectory"], (scope) => {
     const fs = scope.fs;
+    const workingDirectory = scope.workingDirectory;
     fsService = fs;
     scope.on("tools/execute", async (exec, next) => {
       try {
-        await captureBefore(fs, store, exec, pending);
+        await captureBefore(fs, workingDirectory, store, exec, pending);
       } catch (error) {
         ctx.logger.warn(`[dsh-rewind] before-capture failed for ${exec.name}: ${error instanceof Error ? error.message : String(error)}`);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-rewind-plugin",
-  "version": "0.15.2",
+  "version": "0.16.0-alpha.1",
   "description": "In-window conversation rewind with workspace file restore · 同窗口内对话回退并可还原工作区文件",
   "icon": "./assets/icon.svg",
   "keywords": [
@@ -20,7 +20,7 @@
   "license": "MIT",
   "engines": {
     "node": "^22.19.0 || >=24.0.0",
-    "dsh": ">=0.2.0-rc.1"
+    "dsh": ">=0.2.1-alpha.2"
   },
   "type": "module",
   "main": "lib/index.js",
@@ -74,20 +74,21 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-client-locale": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-commands": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-plugin-manager": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-commands": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-fs": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-home-paths": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-llm": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-sandbox": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-session": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-settings": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-tools": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-client-locale": "^0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-commands": "^0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-plugin-manager": "^0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.2.1-alpha.2",
+    "@deepseek-ai/dsh-commands": "^0.2.1-alpha.2",
+    "@deepseek-ai/dsh-fs": "^0.2.1-alpha.2",
+    "@deepseek-ai/dsh-home-paths": "^0.2.1-alpha.2",
+    "@deepseek-ai/dsh-llm": "^0.2.1-alpha.2",
+    "@deepseek-ai/dsh-sandbox": "^0.2.1-alpha.2",
+    "@deepseek-ai/dsh-session": "^0.2.1-alpha.2",
+    "@deepseek-ai/dsh-settings": "^0.2.1-alpha.2",
+    "@deepseek-ai/dsh-tools": "^0.2.1-alpha.2",
+    "@deepseek-ai/dsh-working-directory": "^0.2.1-alpha.2",
     "@deepseek-ai/schemastery": "^3.18.4"
   },
   "peerDependenciesMeta": {
@@ -136,6 +137,9 @@
     "@deepseek-ai/dsh-tools": {
       "optional": true
     },
+    "@deepseek-ai/dsh-working-directory": {
+      "optional": true
+    },
     "@deepseek-ai/schemastery": {
       "optional": true
     }
@@ -143,41 +147,42 @@
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.3",
     "@deepseek-ai/cosmokit": "1.8.4",
-    "@deepseek-ai/dsh-agent": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-api-session-controller": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-attachment": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-client-connection": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-client-locale": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-client-store": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-client-ui-commands": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-client-ui-conversation": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-client-ui-input-trigger": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-client-ui-plugin-manager": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-client-ui-session": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-client-ui-settings": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-client-ui-slots": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-command-compact": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-commands": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-compaction": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-compaction-basic": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-compaction-image-offload": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-fs": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-goal": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-home-paths": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-llm": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-plan-mode": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-sandbox": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-scope": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-session": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-session-projection": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-session-stats": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-session-title": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-settings": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-token-meter": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-tools": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-typert-protocol": "0.2.1-alpha.1",
-    "@deepseek-ai/dsh-user-questions": "0.2.1-alpha.1",
+    "@deepseek-ai/dsh-agent": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-api-session-controller": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-attachment": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-connection": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-locale": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-store": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-commands": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-conversation": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-input-trigger": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-plugin-manager": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-session": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-settings": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-slots": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-command-compact": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-commands": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-compaction": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-compaction-basic": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-compaction-image-offload": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-fs": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-goal": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-home-paths": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-llm": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-plan-mode": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-sandbox": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-scope": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-session": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-session-projection": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-session-stats": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-session-title": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-settings": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-token-meter": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-tools": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-typert-protocol": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-user-questions": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-working-directory": "0.2.1-alpha.2",
     "@deepseek-ai/schemastery": "3.18.4",
     "@types/node": "^24.0.0",
     "@types/react": "^18.3.31",

package/lib/types/session-cwd.d.ts

@@ -1,27 +0,0 @@
-/**
- * Session-cwd resolution for snapshot tracking reads, mirroring the fs tools'
- * own rule (`@deepseek-ai/dsh-tool-fs/session-cwd.ts`): relative paths
- * resolve against the calling agent's session workspace
- * (`exec.agent.session.header.cwd`), not the server's launch dir.
- *
- * Pure functions: the session cwd is returned verbatim. The fs tools no longer
- * canonicalize a parent-traversing cwd (alpha line), so neither does the
- * plugin — snapshot tracking must resolve to the same base the tool wrote to.
- *
- * @module dsh-rewind/session-cwd
- */
-import type { ToolExecution } from '@deepseek-ai/dsh-tools';
-/**
- * The session workspace cwd to resolve a requested path against, or undefined
- * when no session cwd applies (the filesystem backend then uses its own
- * default base).
- * @param cwd - the session's `header.cwd`, if any.
- * @returns the cwd unchanged.
- */
-export declare function sessionCwd(cwd: string | undefined): string | undefined;
-/**
- * Session cwd for one tool execution (same rule as the fs tools).
- * @param exec - the tool-execution context; only its optional `agent` is read.
- * @returns the calling agent's session cwd, or undefined for a non-agent caller.
- */
-export declare function execSessionCwd(exec: ToolExecution): string | undefined;