local-diff-reviewer 4.0.2 → 4.0.4

package/README.md

@@ -29,6 +29,7 @@ npx skills add Mone-Lee/diff-review
 
 - 查看当前工作区 diff、staged diff、指定 revision diff。
 - 代码文件使用 GitHub 风格 unified diff。
+- 图片文件支持 diff 查看。
 - Markdown 文件支持 `Preview / Code diff` 切换；`Code diff` 当前只支持 side-by-side，不支持 inline。
 - 支持文件级评论、代码行级评论、Markdown source line 评论。
 - Markdown 评论在两种视图间会按视图能力降级展示：
@@ -59,7 +60,7 @@ local-diff-reviewer --repo /path/to/project
 
 停止当前项目已启动的 review 进程：
 
-- `stop`：按当前 Git 仓库范围清理该仓库启动过的 review 运行进程（包含其 API 端口进程）。
+- `stop`：按当前 Git 仓库范围强制关闭该仓库启动过的 review 运行进程（包含其 API 端口进程）；会先尝试优雅退出，超时后自动升级为强制终止。
 
 ```bash
 local-diff-reviewer stop
@@ -107,7 +108,7 @@ local-diff-reviewer --repo /path/to/project staged
 npx skills add Mone-Lee/diff-review
 ```
 
-skill 会以目标 workspace 作为命令工作目录运行 `npx --yes local-diff-reviewer [args...]`，因此 `/diff-review` 会审查当前项目，而不是 skill 安装目录。
+skill 会以目标 workspace 作为命令工作目录运行 `npx --yes local-diff-reviewer [args...]`，因此 `/diff-review` 会审查当前项目，而不是 skill 安装目录。用户要求停止、关闭或结束当前项目的 Diff Review 时，skill 应直接执行 `/diff-review stop`，而不是只提示这条命令。
 
 ### 预置 agent 评论
 

package/SKILL.md

@@ -16,7 +16,7 @@ Use this skill when the user asks for `/diff-review`, wants to inspect current w
 - `/diff-review staged`: review staged diff.
 - `/diff-review <base> <target>`: review diff between two Git revisions.
 - `/diff-review --new-session`: preserve the current snapshot and open a separate review session.
-- `/diff-review stop`: stop all review runtimes created for the current workspace repository.
+- `/diff-review stop`: force close all review runtimes created for the current workspace repository.
 
 Do not ask the user to run a shell CLI manually. Determine the target workspace/repository from the user's active environment context, then run the package command with that repository as the command working directory:
 
@@ -26,6 +26,8 @@ npx --yes local-diff-reviewer [args...]
 
 Set the shell/tool `cwd` to `/absolute/path/to/target/workspace` before running the command. Do not pass `--repo` from this skill; older published CLI versions treat unknown args as revision args. Do not use the skill package directory or this skill's install directory as the review target unless that is the workspace the user asked to review.
 
+When the user asks to `stop`, `关闭`, `结束`, or otherwise shut down Diff Review for the current project, execute `/diff-review stop` immediately. Do not only explain the command or leave the existing runtime running.
+
 When you have concrete review findings or answers to existing review comments, preload them with one `--comment` JSON argument per comment before launching the viewer:
 
 ```bash

package/dist/cli/start.js

@@ -718,6 +718,9 @@ import { createHash as createHash4 } from "node:crypto";
 import { access, mkdir as mkdir2, readFile as readFile3, writeFile as writeFile2 } from "node:fs/promises";
 import { homedir as homedir2, platform as platform2 } from "node:os";
 import { basename as basename2, dirname as dirname2, join as join3 } from "node:path";
+var TERM_WAIT_MS = 800;
+var KILL_WAIT_MS = 1200;
+var POLL_INTERVAL_MS = 100;
 async function recordRuntime(entry) {
   const path = runtimePath(entry.repoRoot);
   const store = await readRuntime(path);
@@ -734,6 +737,7 @@ async function stopRecordedRuntimes(repoRoot) {
   const path = runtimePath(repoRoot);
   const store = await readRuntime(path);
   const stopped = [];
+  const forced = [];
   const stale = [];
   for (const entry of store.entries) {
     const parentAlive = isPidAlive(entry.pid);
@@ -742,16 +746,21 @@ async function stopRecordedRuntimes(repoRoot) {
       stale.push(entry);
       continue;
     }
-    try {
-      if (parentAlive) process.kill(entry.pid, "SIGTERM");
-      if (viteAlive) process.kill(entry.vitePid, "SIGTERM");
+    const termination = await terminateRuntime(entry);
+    if (termination.status === "stopped") {
       stopped.push(entry);
-    } catch {
+      continue;
+    }
+    if (termination.status === "forced") {
+      forced.push(entry);
+      continue;
+    }
+    if (termination.status === "stale") {
       stale.push(entry);
     }
   }
   await writeRuntime(path, { entries: [] });
-  return { stopped, stale };
+  return { stopped, forced, stale };
 }
 function runtimePath(repoRoot) {
   const repoName = basename2(repoRoot) || "repo";
@@ -793,6 +802,45 @@ function isPidAlive(pid) {
     return false;
   }
 }
+async function terminateRuntime(entry) {
+  const pids = collectTargetPids(entry);
+  if (pids.length === 0) return { status: "stale" };
+  const terminated = await terminatePids(pids, "SIGTERM", TERM_WAIT_MS);
+  if (terminated) return { status: "stopped" };
+  const forced = await terminatePids(pids, "SIGKILL", KILL_WAIT_MS);
+  return forced ? { status: "forced" } : { status: "stale" };
+}
+function collectTargetPids(entry) {
+  const pids = [];
+  if (typeof entry.vitePid === "number" && isPidAlive(entry.vitePid)) pids.push(entry.vitePid);
+  if (isPidAlive(entry.pid)) pids.push(entry.pid);
+  return pids;
+}
+async function terminatePids(pids, signal, waitMs) {
+  let signaled = false;
+  for (const pid of pids) {
+    if (!isPidAlive(pid)) continue;
+    try {
+      process.kill(pid, signal);
+      signaled = true;
+    } catch {
+      return false;
+    }
+  }
+  if (!signaled) return true;
+  return waitForExit(pids, waitMs);
+}
+async function waitForExit(pids, waitMs) {
+  const deadline = Date.now() + waitMs;
+  while (Date.now() < deadline) {
+    if (pids.every((pid) => !isPidAlive(pid))) return true;
+    await sleep(POLL_INTERVAL_MS);
+  }
+  return pids.every((pid) => !isPidAlive(pid));
+}
+function sleep(ms) {
+  return new Promise((resolve3) => setTimeout(resolve3, ms));
+}
 async function hasRuntimeRecord(repoRoot) {
   try {
     await access(runtimePath(repoRoot));
@@ -1644,8 +1692,8 @@ function logImportResult(comments, result) {
 async function stopCommand(repo) {
   const repoRoot = await getRepoRoot(repo ?? process.cwd());
   const hasRecord = await hasRuntimeRecord(repoRoot);
-  const { stopped, stale } = await stopRecordedRuntimes(repoRoot);
-  const total = stopped.length + stale.length;
+  const { stopped, forced, stale } = await stopRecordedRuntimes(repoRoot);
+  const total = stopped.length + forced.length + stale.length;
   if (total === 0) {
     if (hasRecord) {
       console.log("No running review process found for this repo.");
@@ -1660,6 +1708,14 @@ async function stopCommand(repo) {
       `- pid=${entry.pid} vitePid=${entry.vitePid ?? "-"} apiPort=${entry.apiPort} vitePort=${entry.vitePort ?? "-"} vite=${entry.usesVite ? "yes" : "no"} startedAt=${entry.startedAt}`
     );
   }
+  if (forced.length > 0) {
+    console.log(`Force killed review runtimes: ${forced.length}`);
+    for (const entry of forced) {
+      console.log(
+        `- pid=${entry.pid} vitePid=${entry.vitePid ?? "-"} apiPort=${entry.apiPort} vitePort=${entry.vitePort ?? "-"} vite=${entry.usesVite ? "yes" : "no"} startedAt=${entry.startedAt}`
+      );
+    }
+  }
   if (stale.length > 0) {
     console.log(`Skipped stale records: ${stale.length}`);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "local-diff-reviewer",
-  "version": "4.0.2",
+  "version": "4.0.4",
   "private": false,
   "description": "Open a local GitHub-style diff review Web UI for the current repository.",
   "repository": {