dsh-lark-bot 0.19.2 → 0.19.3

package/dist/plugin.d.ts

@@ -1321,9 +1321,11 @@ interface GuardianUpdateState {
     route: GuardianUpdateRoute;
     startedAt: string;
     finishedAt?: string;
+    errorCode?: GuardianUpdateErrorCode;
     error?: string;
     delivered?: boolean;
 }
+type GuardianUpdateErrorCode = 'filesystem-access' | 'registry-unavailable' | 'bootstrap-unavailable' | 'upgrade-failed';
 interface GuardianUpdateHandoffOptions {
     file: string;
     packageName: string;

package/dist/plugin.js

@@ -864,9 +864,9 @@ async function writeFileAtomic(target, data, options = {}) {
   }
 }
 async function rmSilently(path) {
-  const { rm: rm10 } = await import("fs/promises");
+  const { rm: rm11 } = await import("fs/promises");
   try {
-    await rm10(path, { force: true });
+    await rm11(path, { force: true });
   } catch {
   }
 }
@@ -15008,14 +15008,14 @@ function matchProfileProcess(cmdline, dshProfile) {
   if (/(?:^|\s)plugin(?:\s|$)/.test(cmdline)) return false;
   return hasProfileFlag(cmdline, dshProfile) && looksLikeDshProcess(cmdline);
 }
-async function listProcesses() {
-  if (process.platform === "win32") {
-    return listProcessesWindows();
+async function listProcesses(platform = process.platform, run = captureOutput) {
+  if (platform === "win32") {
+    return listProcessesWindows(run);
   }
-  return listProcessesPosix();
+  return listProcessesPosix(run);
 }
-async function listProcessesPosix() {
-  const { stdout } = await captureOutput("ps", ["-axo", "pid=,args="], 1e4);
+async function listProcessesPosix(run) {
+  const { stdout } = await run("ps", ["-axo", "pid=,args="], 1e4);
   const result = [];
   for (const line of stdout.split("\n")) {
     const match = /^\s*(\d+)\s+(.+)$/.exec(line);
@@ -15025,33 +15025,46 @@ async function listProcessesPosix() {
   }
   return result;
 }
-async function listProcessesWindows() {
-  const { stdout } = await captureOutput(
+async function listProcessesWindows(run) {
+  const { stdout } = await run(
     "powershell.exe",
     [
       "-NoProfile",
       "-NonInteractive",
       "-Command",
-      "Get-CimInstance Win32_Process | Select-Object ProcessId, CommandLine | ConvertTo-Csv -NoTypeInformation"
+      "Get-CimInstance Win32_Process | Select-Object ProcessId, CommandLine | ConvertTo-Json -Compress"
     ],
     1e4
   );
-  const result = [];
-  for (const line of stdout.split("\n").slice(1)) {
-    const [pid, ...rest] = line.trim().split(",");
-    const numeric = Number(pid?.replace(/"/g, ""));
-    if (Number.isInteger(numeric) && rest.length > 0) {
-      result.push({ pid: numeric, cmdline: rest.join(",").replace(/^"|"$/g, "") });
-    }
+  try {
+    const parsed = JSON.parse(stdout);
+    const rows = Array.isArray(parsed) ? parsed : [parsed];
+    return rows.flatMap((row) => {
+      if (typeof row !== "object" || row === null) return [];
+      const record = row;
+      const pid = Number(record.ProcessId);
+      const cmdline = record.CommandLine;
+      return Number.isInteger(pid) && pid > 0 && typeof cmdline === "string" ? [{ pid, cmdline }] : [];
+    });
+  } catch {
+    return [];
   }
-  return result;
 }
-async function captureOutput(command, args, timeoutMs = 3e4) {
+async function captureOutput(command, args, timeoutMs = 3e4, options = {}) {
   return new Promise((resolve6) => {
-    const child = spawn5(command, [...args], {
-      stdio: ["ignore", "pipe", "pipe"],
-      windowsHide: true
-    });
+    const previousUmask = options.umask !== void 0 && process.platform !== "win32" ? process.umask(options.umask) : void 0;
+    const child = (() => {
+      try {
+        return spawn5(command, [...args], {
+          stdio: ["ignore", "pipe", "pipe"],
+          windowsHide: true,
+          ...options.cwd ? { cwd: options.cwd } : {},
+          ...options.env ? { env: options.env } : {}
+        });
+      } finally {
+        if (previousUmask !== void 0) process.umask(previousUmask);
+      }
+    })();
     let stdout = "";
     let stderr = "";
     child.stdout?.on("data", (chunk) => {
@@ -16374,11 +16387,35 @@ function buildSecretHandler(deps) {
 init_own_package();
 
 // src/guardian/update-handoff.ts
-import { randomUUID as randomUUID13 } from "crypto";
+import { createHash as createHash3, randomUUID as randomUUID13 } from "crypto";
 import { spawn as spawn7 } from "child_process";
-import { mkdir as mkdir20, readFile as readFile28 } from "fs/promises";
+import { chmod, mkdir as mkdir20, readFile as readFile28, rm as rm10 } from "fs/promises";
 import { dirname as dirname15, join as join23 } from "path";
 init_own_package();
+function guardianUpdateFailureHint(code) {
+  switch (code) {
+    case "filesystem-access":
+      return {
+        zh: "\u66F4\u65B0\u5DE5\u4F5C\u76EE\u5F55\u4E0D\u53EF\u8BBF\u95EE\uFF1B\u8BF7\u53D1\u9001 `/doctor` \u68C0\u67E5\u6587\u4EF6\u6743\u9650\u540E\u91CD\u8BD5\u3002",
+        en: "The private update workspace is inaccessible. Send `/doctor` to check file permissions, then retry."
+      };
+    case "registry-unavailable":
+      return {
+        zh: "\u65E0\u6CD5\u8FDE\u63A5 npm \u6B63\u5F0F\u6E90\uFF1B\u8BF7\u68C0\u67E5\u7F51\u7EDC\u540E\u91CD\u8BD5\u3002",
+        en: "The npm registry is unreachable. Check the network, then retry."
+      };
+    case "bootstrap-unavailable":
+      return {
+        zh: "\u65E0\u6CD5\u542F\u52A8 npm/npx\uFF1B\u8BF7\u53D1\u9001 `/doctor` \u68C0\u67E5 Node.js \u4E0E npm\u3002",
+        en: "npm/npx could not start. Send `/doctor` to check Node.js and npm."
+      };
+    default:
+      return {
+        zh: "\u5347\u7EA7\u547D\u4EE4\u672A\u5B8C\u6210\uFF1B\u8BF7\u53D1\u9001 `/doctor` \u68C0\u67E5\u540E\u91CD\u8BD5\u3002",
+        en: "The upgrade command did not complete. Send `/doctor`, then retry."
+      };
+  }
+}
 async function loadState(file) {
   try {
     const parsed = JSON.parse(await readFile28(file, "utf8"));
@@ -17171,12 +17208,13 @@ async function startBridgeEngine(options) {
   const deliverUpdateResult = async () => {
     await updateHandoff.deliverResult(async (state) => {
       if (!streaming) throw new Error("channel is not ready");
+      const failureHint = guardianUpdateFailureHint(state.errorCode);
       const markdown2 = state.status === "succeeded" ? bilingualMarkdown(
         `\u2705 dsh-lark-bot \u5DF2\u66F4\u65B0\u5230 \`${state.targetVersion}\`\uFF0C\u673A\u5668\u4EBA\u5DF2\u5B8C\u6210\u91CD\u8F7D\u3002`,
         `\u2705 dsh-lark-bot was updated to \`${state.targetVersion}\` and reloaded.`
       ) : bilingualMarkdown(
-        `\u26A0\uFE0F dsh-lark-bot \u66F4\u65B0\u5230 \`${state.targetVersion}\` \u5931\u8D25\u3002\u8BF7\u91CD\u65B0\u53D1\u9001 \`/upgrade\`\uFF1B\u5982\u4ECD\u5931\u8D25\uFF0C\u53D1\u9001 \`/doctor\` \u68C0\u67E5\u3002`,
-        `\u26A0\uFE0F Failed to update dsh-lark-bot to \`${state.targetVersion}\`. Send \`/upgrade\` to retry, or \`/doctor\` if it still fails.`
+        `\u26A0\uFE0F dsh-lark-bot \u66F4\u65B0\u5230 \`${state.targetVersion}\` \u5931\u8D25\u3002${failureHint.zh}`,
+        `\u26A0\uFE0F Failed to update dsh-lark-bot to \`${state.targetVersion}\`. ${failureHint.en}`
       );
       await streaming.sendMarkdown(state.route.chatId, markdown2, {
         ...state.route.threadId ? { threadId: state.route.threadId } : {}