@weniatall/dsh-file-viewer 0.3.1 → 0.3.3

package/README.md

@@ -86,7 +86,9 @@ dsh plugin --profile web add <release-tgz-url>
 - **提交记录**：按 30 条一页加载，显示标题、短 SHA、作者与日期，底部「加载更多」按需追加，并显示「已显示 N / 总数」。
 - **改动文件列表**：点击任一提交，右侧显示该提交的完整信息（标题、完整 SHA、作者、时间、正文）与相对**第一父提交**的改动文件列表（合并提交同理；根提交与空树比对）。`A / M / D / R / C` 等状态用颜色区分。
 - **该提交的 diff**：提交详情有「变更文件 / 改动内容」两个页签，后者是该提交针对同一基准（第一父提交）的完整 patch，按文件分段并各自标注 `+N -M`。两个页签取的是同一对 revision，不会出现列表与 diff 基准不一致的情况。
-- **跳转到文件**：点击改动文件会在右侧已有的预览器里打开**该提交中的版本**，而不是工作区当前内容——两者恰恰在历史最有价值的时候不同。被该提交删除的文件从父提交读取，所以删除行也能打开；重命名显示旧路径的内容。预览顶部会标明来源提交，避免被误认为当前文件。`‹` 返回侧栏继续浏览提交。
+- **跳转到文件**：点击改动文件会在右侧已有的预览器里打开**该提交中的版本**，而不是工作区当前内容——两者恰恰在历史最有价值的时候不同。被该提交删除的文件从父提交读取，所以删除行也能打开；重命名显示旧路径的内容。预览顶部会标明来源提交，避免被误认为当前文件。`‹` 返回 「变更文件」列表继续浏览。
+
+  打开后有两个页签：**改动**（这个提交对该文件做了什么，默认显示）和**完整内容**（该版本文件的全文，可翻页、切换语法高亮）。重命名的 diff 会保留为「重命名」而不是退化成「删除 + 新增」——宿主端把新旧两侧路径一起交给 git，否则 `-M` 无法配对。
 
 只读操作（列出仓库、分支、历史、改动文件）不会修改仓库；面板中唯一的写操作是用户显式点击「检出」。
 

package/lib/client.js

@@ -378,6 +378,10 @@ window.__ModuleLoader__.load({
       .fv-crumb:hover{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary)}
       .fv-crumb-sep{flex:none;opacity:.5}
       .fv-icon-button{display:inline-grid;flex:none;place-items:center;width:30px;height:30px;padding:0;border:none;border-radius:8px;background:none;color:var(--dsw-alias-label-secondary);cursor:pointer;transition:color .12s,background .12s;line-height:1}
+      /* A control with nowhere to go must look unavailable, not merely behave
+         that way — otherwise a disabled back button reads as broken. */
+      .fv-icon-button:disabled{opacity:.35;cursor:default}
+      .fv-icon-button:disabled:hover{background:none;color:var(--dsw-alias-label-secondary)}
       .fv-icon-button svg{display:block;flex:none}
       .fv-icon-button:hover{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary)}
       .fv-icon-button[aria-pressed="true"]{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary)}
@@ -3343,6 +3347,9 @@ window.__ModuleLoader__.load({
         // from the working tree: the two differ exactly when the history is
         // interesting, and a deleted file has no working-tree copy at all.
         const fromCommit = typeof commit === "string" && commit !== "";
+        // Whether the reader has picked a view themselves. The automatic landing
+        // on the diff happens once per mount and then stays out of the way.
+        const viewChosen = react.useRef(false);
 
         react.useEffect(() => {
           let live = true;
@@ -3362,10 +3369,40 @@ window.__ModuleLoader__.load({
           }).catch((error) => {
             if (live) setState({ status: "error", data: null, error });
           });
-          // The working-tree diff is meaningless for a historical blob: it
-          // compares the file with the index, not with the parent commit.
+          // A historical file is diffed against its own commit, not against the
+          // index: the working-tree comparison would answer a different
+          // question and show changes made after this commit.
+          const diffSha = typeof meta.diffSha === "string" && meta.diffSha !== "" ? meta.diffSha : "";
           if (fromCommit) {
-            setDiffData(null);
+            if (diffSha === "") {
+              setDiffData(null);
+              return () => { live = false; };
+            }
+            request("gitCommitDiff", {
+              root,
+              repo,
+              sha: diffSha,
+              path: meta.rowPath || meta.path,
+              ...(meta.oldPath ? { oldPath: meta.oldPath } : {}),
+            }).then((val) => {
+              if (!live) return;
+              // `gitCommitDiff` returns per-file sections; this view shows the
+              // one file it asked for.
+              const first = val !== null && Array.isArray(val.files) ? val.files[0] : null;
+              const loaded = first === null || first === undefined
+                ? null
+                : { hasDiff: first.rows.length > 0, rows: first.rows, diffs: [], summary: { added: first.added, removed: first.removed } };
+              setDiffData(loaded);
+              // The reader opened this file *from* the change list, so the
+              // change is what they came to see; the full text is one press
+              // away and their own choice wins from then on.
+              if (!viewChosen.current && loaded !== null && loaded.hasDiff) {
+                viewChosen.current = true;
+                setDiffMode(true);
+              }
+            }).catch(() => {
+              if (live) setDiffData(null);
+            });
             return () => { live = false; };
           }
           request("diff", { root, path: meta.path }).then((val) => {
@@ -3374,7 +3411,7 @@ window.__ModuleLoader__.load({
             if (live) setDiffData(null);
           });
           return () => { live = false; };
-        }, [root, meta.path, offset, lang, fromCommit, commit, repo]);
+        }, [root, meta.path, offset, lang, fromCommit, commit, repo, meta.diffSha, meta.rowPath, meta.oldPath]);
 
         if (state.status === "error") {
           return react.createElement("div", { className: "fv-note fv-error" }, messageOf(state.error));
@@ -3385,7 +3422,10 @@ window.__ModuleLoader__.load({
         // A rendered preview needs the whole document. Past the host's preview
         // budget only windowed lines arrive, so the source view is all there is.
         const canPreview = (data.kind === "markdown" || data.kind === "json") && typeof data.text === "string";
-        const hasDiff = Boolean(diffData && diffData.hasDiff && diffData.diffs && diffData.diffs.length > 0);
+        const hasDiff = Boolean(diffData && diffData.hasDiff && (
+          (Array.isArray(diffData.rows) && diffData.rows.length > 0)
+          || (Array.isArray(diffData.diffs) && diffData.diffs.length > 0)
+        ));
         const diffSummary = diffData && diffData.summary;
         const showTabs = canPreview || hasDiff;
 
@@ -3461,36 +3501,42 @@ window.__ModuleLoader__.load({
         // Only the source view scrolls sideways; a rendered preview already
         // reflows, so the attribute is pointless there and would just confuse.
         const wrapping = wrap && (!canPreview || raw);
+        // Both answers belong to the same question when a file is opened from a
+        // commit: "what changed here" and "what does it contain". The diff leads
+        // in that case, because it is what the reader came for; opening the
+        // working-tree copy keeps the content tab first.
+        const diffTab = hasDiff
+          ? react.createElement("button", {
+            key: "diff",
+            type: "button", className: "fv-tab fv-tab-diff", "aria-selected": diffMode ? "true" : "false",
+            onClick: () => { viewChosen.current = true; setDiffMode(true); },
+          },
+            "改动",
+            diffSummary && (diffSummary.added > 0 || diffSummary.removed > 0)
+              ? react.createElement("span", { className: "fv-diff-stat" },
+                  diffSummary.added > 0 ? react.createElement("span", { className: "fv-diff-add" }, `+${diffSummary.added}`) : null,
+                  (diffSummary.added > 0 && diffSummary.removed > 0) ? " " : "",
+                  diffSummary.removed > 0 ? react.createElement("span", { className: "fv-diff-del" }, `-${diffSummary.removed}`) : null)
+              : null)
+          : null;
+        const contentTab = react.createElement("button", {
+          key: "content",
+          type: "button", className: "fv-tab", "aria-selected": (!raw && !diffMode) ? "true" : "false",
+          onClick: () => { viewChosen.current = true; setRaw(false); setDiffMode(false); },
+        }, canPreview ? (data.kind === "markdown" ? "预览" : "结构") : (fromCommit ? "完整内容" : "内容"));
+        const sourceTab = canPreview
+          ? react.createElement("button", {
+            key: "source",
+            type: "button", className: "fv-tab", "aria-selected": (raw && !diffMode) ? "true" : "false",
+            onClick: () => { viewChosen.current = true; setRaw(true); setDiffMode(false); },
+          }, "源码")
+          : null;
+
         const tabs = showTabs
           ? react.createElement("div", { className: "fv-sheet-tabs", role: "tablist" },
-            canPreview
-              ? react.createElement("button", {
-                type: "button", className: "fv-tab", "aria-selected": (!raw && !diffMode) ? "true" : "false",
-                onClick: () => { setRaw(false); setDiffMode(false); },
-              }, data.kind === "markdown" ? "预览" : "结构")
-              : react.createElement("button", {
-                type: "button", className: "fv-tab", "aria-selected": (!raw && !diffMode) ? "true" : "false",
-                onClick: () => { setRaw(false); setDiffMode(false); },
-              }, "内容"),
-            canPreview
-              ? react.createElement("button", {
-                type: "button", className: "fv-tab", "aria-selected": (raw && !diffMode) ? "true" : "false",
-                onClick: () => { setRaw(true); setDiffMode(false); },
-              }, "源码")
-              : null,
-            hasDiff
-              ? react.createElement("button", {
-                type: "button", className: "fv-tab fv-tab-diff", "aria-selected": diffMode ? "true" : "false",
-                onClick: () => setDiffMode(true),
-              },
-                "改动",
-                diffSummary && (diffSummary.added > 0 || diffSummary.removed > 0)
-                  ? react.createElement("span", { className: "fv-diff-stat" },
-                      diffSummary.added > 0 ? react.createElement("span", { className: "fv-diff-add" }, `+${diffSummary.added}`) : null,
-                      (diffSummary.added > 0 && diffSummary.removed > 0) ? " " : "",
-                      diffSummary.removed > 0 ? react.createElement("span", { className: "fv-diff-del" }, `-${diffSummary.removed}`) : null)
-                  : null)
-              : null)
+            ...(fromCommit && diffTab !== null
+              ? [diffTab, contentTab, sourceTab]
+              : [contentTab, sourceTab, diffTab]).filter((tab) => tab !== null))
           : null;
         return react.createElement(react.Fragment, null,
           tabs,
@@ -4032,6 +4078,22 @@ window.__ModuleLoader__.load({
         const [previewCommit, setPreviewCommit] = react.useState("");
         // Which half of the commit pane is showing: the file list or the patch.
         const [commitView, setCommitView] = react.useState("files");
+        /**
+         * What the main pane was showing before the current file preview.
+         *
+         * The back control has to undo exactly one step. Opening a file from a
+         * commit's changed-file list must return to that list — not to the file
+         * tree, which is a different place entirely — so the origin is recorded
+         * when the file is opened rather than guessed when back is pressed.
+         *
+         * `null` means there is nowhere to go back to.
+         * @type {"commit" | "changes" | null}
+         */
+        const [previewOrigin, setPreviewOrigin] = react.useState(null);
+        // The working-tree change shown in the main pane. It cannot ride on the
+        // commit detail, which is keyed by hash, and `meta` belongs to the file
+        // preview — so the row the reader clicked is kept here.
+        const [previewChangePath, setPreviewChangePath] = react.useState("");
         const gitState = useStore(git.store);
 
         react.useEffect(() => {
@@ -4189,6 +4251,19 @@ window.__ModuleLoader__.load({
         react.useEffect(() => {
           if (request_ === null) return undefined;
           let live = true;
+          // The drawer stays mounted while closed (`open` only gates rendering),
+          // so every view state survives from the previous visit. Opening a
+          // plain file after browsing Git used to inherit the old commit hash
+          // and the Git sidebar, and the file rendered as "history preview"
+          // instead of its content. A new open is a new session: clear it all.
+          setSide("files");
+          setShowCommit(false);
+          setCommitView("files");
+          setPreviewCommit("");
+          setPreviewOrigin(null);
+          setPreviewChangePath("");
+          setMeta(null);
+          setError(null);
           const payload = {
             ...(request_.sessionId !== undefined ? { sessionId: request_.sessionId } : {}),
             ...(request_.filePath !== undefined ? { filePath: request_.filePath } : {}),
@@ -4402,6 +4477,9 @@ window.__ModuleLoader__.load({
             setShowCommit(false);
             setPane("content");
             setPreviewCommit(readSha);
+            // Back must return to the changed-file list this row came from,
+            // not to the file tree, which is somewhere else entirely.
+            setPreviewOrigin("commit");
             setLangChoice("auto");
             const ticket = metaTicket.current + 1;
             metaTicket.current = ticket;
@@ -4413,10 +4491,20 @@ window.__ModuleLoader__.load({
               // The blob path is what the host reads; the display path keeps the
               // row the reader clicked.
               path: blobPath,
+              // A rename is read from its old path but highlighted as the row
+              // the reader actually clicked.
+              rowPath: file.path,
               name: baseNameOf(blobPath),
               displayPath: baseNameOf(blobPath) + " @ " + readSha.slice(0, 7),
               kind: component,
               commit: readSha,
+              // Opening a changed file must offer both halves of the question:
+              // what this commit changed in it, and what the file looks like.
+              // `diffSha` is the commit being viewed (the blob may come from
+              // its parent for a deletion), and `oldPath` is what lets the host
+              // keep rename detection intact when filtering the patch.
+              diffSha: sha,
+              oldPath: typeof file.oldPath === "string" && file.oldPath !== "" ? file.oldPath : null,
               // The commit records whether the file was added, modified or
               // deleted; the preview says so instead of looking like a normal
               // working-tree file.
@@ -4431,6 +4519,44 @@ window.__ModuleLoader__.load({
           selectFile({ path: file.path, name: baseNameOf(file.path), type: "file" });
         };
 
+        /**
+         * Step back one place from the main pane.
+         *
+         * Three destinations, in the order the reader arrived from: a commit's
+         * changed-file list, the working-tree change list, or the file tree.
+         * Each step clears the state that belonged to the place being left, so
+         * a stale hash or blob path cannot leak into the next preview.
+         */
+        const goBack = () => {
+          if (previewOrigin === "commit") {
+            // Re-open the changed-file view of the commit still in `detail`;
+            // its hash is what the sidebar is highlighting.
+            setShowCommit(true);
+            setCommitView("files");
+            setPreviewCommit("");
+            setPreviewOrigin(null);
+            setPane("content");
+            return;
+          }
+          if (previewOrigin === "changes") {
+            setShowCommit(true);
+            setCommitView("changes");
+            setPreviewCommit("");
+            setPreviewOrigin(null);
+            setPane("content");
+            return;
+          }
+          // Nothing to undo inside the pane: hand control back to the sidebar.
+          // On a phone that actually swaps panes; on desktop the tree is
+          // already alongside, so the selection is cleared instead of the
+          // button doing nothing at all.
+          setPreviewCommit("");
+          setPreviewOrigin(null);
+          setMeta(null);
+          setError(null);
+          setPane("tree");
+        };
+
         /**
          * Open one working-tree change as a diff.
          *
@@ -4443,7 +4569,10 @@ window.__ModuleLoader__.load({
           setPane("content");
           setCommitView("changes");
           setPreviewCommit("");
-          void row;
+          setPreviewOrigin(null);
+          // The pane diffs exactly this path; ignoring the row left it reading
+          // whatever file happened to be selected before.
+          setPreviewChangePath(row.path);
         };
 
         // Clicking two files quickly must not let the slower answer win: only
@@ -4451,8 +4580,11 @@ window.__ModuleLoader__.load({
         const selectFile = (entry) => {
           setPane("content");
           // Selecting from the file tree is always the working tree, so any
-          // commit a preview was read from is dropped here.
+          // commit a preview was read from is dropped here — and there is no
+          // intermediate pane to return to.
           setPreviewCommit("");
+          setPreviewOrigin(null);
+          setPreviewChangePath("");
           // The remembered choice for this file takes effect immediately, so
           // the read that follows is already resolved with it.
           setLangChoice(readLangOverride(root, entry.path));
@@ -4712,9 +4844,28 @@ window.__ModuleLoader__.load({
               }),
               react.createElement("div", { className: "fv-main" },
                 react.createElement("div", { className: "fv-main-head" },
-                  react.createElement("button", {
-                    type: "button", className: "fv-icon-button", "aria-label": "返回文件列表", onClick: () => setPane("tree"),
-                  }, react.createElement("span", { "aria-hidden": "true" }, "‹")),
+                  (() => {
+                    // The control returns one step, so it names that step and
+                    // is disabled when there is nowhere to go — a button that
+                    // silently does nothing reads as broken.
+                    const backTarget = previewOrigin === "commit"
+                      ? "返回变更文件列表"
+                      : (previewOrigin === "changes" ? "返回工作区改动列表" : "返回文件列表");
+                    // On a phone the panes are exclusive, so leaving the content
+                    // pane is always meaningful; on desktop the sidebar is
+                    // already visible and only an origin is worth returning to.
+                    const canGoBack = isMobile || pane === "content"
+                      ? (previewOrigin !== null || meta !== null || showCommit)
+                      : false;
+                    return react.createElement("button", {
+                      type: "button",
+                      className: "fv-icon-button fv-btn-back",
+                      "aria-label": backTarget,
+                      title: backTarget,
+                      disabled: !canGoBack,
+                      onClick: goBack,
+                    }, react.createElement("span", { "aria-hidden": "true" }, "‹"));
+                  })(),
                   react.createElement("span", { className: "fv-main-name" },
                     commitHeadline !== ""
                       ? commitHeadline
@@ -4755,13 +4906,15 @@ window.__ModuleLoader__.load({
                     }, commitView === "changes"
                       ? react.createElement(WorkspaceChangeDetail, {
                         state: gitState,
-                        path: meta === null ? "" : meta.path,
+                        path: previewChangePath,
                         request,
                         repo: gitState.repoId,
                       })
                       : react.createElement(CommitDetail, {
                         state: gitState,
-                        selectedPath: meta === null ? "" : meta.path,
+                        // A rename is read from its old path but highlighted as
+                        // the row that was clicked, so the two stay in step.
+                        selectedPath: meta === null ? "" : (meta.rowPath || meta.path),
                         onSelectFile: openCommitFile,
                         view: commitView,
                         onSwitchView: setCommitView,

package/lib/index.js

@@ -1931,11 +1931,24 @@ export async function readGitCommitDiff(ctx, options, payload, signal) {
   if (wanted === null && typeof payload?.path === 'string' && payload.path !== '') {
     throw new ViewerError('outside-root', '该文件不在当前根目录内')
   }
+  // A rename has two paths, and filtering by only one of them defeats rename
+  // detection: git then reports the pair as an unrelated delete plus an add
+  // (measured — `-- new-name` prints "new file mode", `-- old-name` prints
+  // "deleted file mode"). Passing both keeps `-M` able to pair them.
+  const wantedOld = typeof payload?.oldPath === 'string' && payload.oldPath !== ''
+    ? repoRelativeFromRoot(placement, payload.oldPath)
+    : null
+  if (wantedOld === null && typeof payload?.oldPath === 'string' && payload.oldPath !== '') {
+    throw new ViewerError('outside-root', '该文件不在当前根目录内')
+  }
 
   const base = hasParent
     ? ['diff', '--no-color', '-M', parentSha, sha]
     : ['show', '--no-color', '--format=', '--first-parent', sha]
-  const args = wanted === null ? base : [...base, '--', wanted]
+  const paths = wanted === null
+    ? []
+    : [...new Set([wanted, ...(wantedOld === null ? [] : [wantedOld])])]
+  const args = paths.length === 0 ? base : [...base, '--', ...paths]
   const result = await run(repo.toplevel, args, signal)
   if (result?.ok !== true) throw new ViewerError('git-failed', '无法读取该提交的改动内容')
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weniatall/dsh-file-viewer",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Workspace file viewer and Git panel for DeepSeek Harness: file tree, syntax-highlighted code, images, PDF, Excel and Word, plus local/remote branches, paged commit history, commit diffs, working-tree changes and changed-file navigation",
   "type": "module",
   "main": "lib/index.js",