@aipanel/dsh-plugin 1.2.25 → 1.2.27

package/dist/index.js

@@ -288,7 +288,7 @@ var PerformanceTimer = class {
 // ../../core/es/node/diagnostics.mjs
 import fs from "node:fs";
 import path from "node:path";
-import { exec } from "node:child_process";
+import { execa } from "execa";
 import { createRequire } from "node:module";
 var log2 = createNodeLogger("Diagnostics");
 var JS_EXTENSIONS = /* @__PURE__ */ new Set([
@@ -475,41 +475,35 @@ function parseOxlintOutput(stdout, cwd) {
 async function runOxlintFiles(pattern, cwd, warnLimit) {
   const bin = resolveOxlintBin(cwd);
   if (!bin) return {};
-  return new Promise((resolve) => {
-    exec(
-      // 与 ESLint 默认行为对齐：忽略 node_modules（oxlint 默认不排除）
-      `node "${bin}" --format=json --ignore-pattern node_modules "${pattern}"`,
-      { cwd, timeout: 6e4, maxBuffer: 50 * 1024 * 1024 },
-      (error, stdout, stderr) => {
-        const killed = error?.killed;
-        if (killed) {
-          log2.warn("oxlint timed out", { pattern });
-          resolve({
-            text: "[oxlint] \u8FD0\u884C\u5931\u8D25\uFF1A\u68C0\u67E5\u8D85\u65F6\uFF0C\u8BF7\u5C1D\u8BD5\u7F29\u5C0F\u68C0\u67E5\u8303\u56F4\u3002",
-            diagnostics: [],
-            engines: ["oxlint"]
-          });
-          return;
-        }
-        try {
-          const messages = parseOxlintOutput(stdout, cwd);
-          log2.debug("oxlint lint", {
-            pattern,
-            messageCount: messages.length,
-            stderr: stderr || void 0
-          });
-          resolve(formatLintMessages(messages, { label: "oxlint", source: "oxlint" }, warnLimit));
-        } catch (e) {
-          log2.warn("oxlint failed", { pattern, error: e.message });
-          resolve({
-            text: `[oxlint] \u8FD0\u884C\u5931\u8D25\uFF1A${e.message}`,
-            diagnostics: [],
-            engines: ["oxlint"]
-          });
-        }
-      }
-    );
-  });
+  const result = await execa(
+    "node",
+    [bin, "--format=json", "--ignore-pattern", "node_modules", pattern],
+    { cwd, timeout: 6e4, maxBuffer: 50 * 1024 * 1024, reject: false }
+  );
+  if (result.timedOut || result.isTerminated || result.isMaxBuffer) {
+    log2.warn("oxlint timed out", { pattern });
+    return {
+      text: "[oxlint] \u8FD0\u884C\u5931\u8D25\uFF1A\u68C0\u67E5\u8D85\u65F6\uFF0C\u8BF7\u5C1D\u8BD5\u7F29\u5C0F\u68C0\u67E5\u8303\u56F4\u3002",
+      diagnostics: [],
+      engines: ["oxlint"]
+    };
+  }
+  try {
+    const messages = parseOxlintOutput(result.stdout, cwd);
+    log2.debug("oxlint lint", {
+      pattern,
+      messageCount: messages.length,
+      stderr: result.stderr || void 0
+    });
+    return formatLintMessages(messages, { label: "oxlint", source: "oxlint" }, warnLimit);
+  } catch (e) {
+    log2.warn("oxlint failed", { pattern, error: e.message });
+    return {
+      text: `[oxlint] \u8FD0\u884C\u5931\u8D25\uFF1A${e.message}`,
+      diagnostics: [],
+      engines: ["oxlint"]
+    };
+  }
 }
 var _vueTscBin;
 function resolveVueTscBin() {
@@ -650,45 +644,43 @@ async function runTypeCheck(filePath, cwd) {
   }
   const timeout = filePath ? 6e4 : 12e4;
   const maxBuffer = filePath ? 10 * 1024 * 1024 : 50 * 1024 * 1024;
-  return new Promise((resolve) => {
-    exec(
-      `node "${engine.bin}" --build --noEmit --pretty false`,
-      { cwd: projectDir, timeout, maxBuffer },
-      (error, stdout, stderr) => {
-        let rawOutput = stdout + stderr;
-        const killed = error?.killed;
-        const exitCode = typeof error?.code === "number" ? error.code : killed ? 1 : 0;
-        if (killed && !rawOutput) {
-          rawOutput = `${engine.source} \u68C0\u67E5\u8D85\u65F6\uFF0C\u8BF7\u5C1D\u8BD5\u7F29\u5C0F\u68C0\u67E5\u8303\u56F4\u6216\u4F18\u5316\u9879\u76EE\u914D\u7F6E\u3002`;
-        }
-        const diagnostics = parseTscDiags(rawOutput, filePath, projectDir, engine.source);
-        if (filePath) {
-          const resolved = path.resolve(filePath);
-          const errorLinePat = /^(.+?)\((\d+),(\d+)\):\s+(error|warning)\s+TS\d+:/;
-          const lines = rawOutput.split("\n");
-          const filtered = [];
-          let keep = false;
-          for (const line of lines) {
-            const m = errorLinePat.exec(line);
-            if (m) {
-              keep = path.resolve(projectDir, m[1]) === resolved;
-            } else if (!/^\s/.test(line)) {
-              keep = false;
-            }
-            if (keep) filtered.push(line);
-          }
-          rawOutput = filtered.join("\n");
-        }
-        log2.debug("type-check finished", {
-          engine: engine.source,
-          filePath: filePath || "(all)",
-          exitCode,
-          outputLength: rawOutput.length
-        });
-        resolve({ rawOutput, exitCode, diagnostics, source: engine.source });
+  const result = await execa("node", [engine.bin, "--build", "--noEmit", "--pretty", "false"], {
+    cwd: projectDir,
+    timeout,
+    maxBuffer,
+    reject: false
+  });
+  let rawOutput = result.stdout + result.stderr;
+  const killed = result.timedOut || result.isTerminated || result.isMaxBuffer;
+  const exitCode = typeof result.exitCode === "number" ? result.exitCode : killed ? 1 : 0;
+  if (killed && !rawOutput) {
+    rawOutput = `${engine.source} \u68C0\u67E5\u8D85\u65F6\uFF0C\u8BF7\u5C1D\u8BD5\u7F29\u5C0F\u68C0\u67E5\u8303\u56F4\u6216\u4F18\u5316\u9879\u76EE\u914D\u7F6E\u3002`;
+  }
+  const diagnostics = parseTscDiags(rawOutput, filePath, projectDir, engine.source);
+  if (filePath) {
+    const resolved = path.resolve(filePath);
+    const errorLinePat = /^(.+?)\((\d+),(\d+)\):\s+(error|warning)\s+TS\d+:/;
+    const lines = rawOutput.split("\n");
+    const filtered = [];
+    let keep = false;
+    for (const line of lines) {
+      const m = errorLinePat.exec(line);
+      if (m) {
+        keep = path.resolve(projectDir, m[1]) === resolved;
+      } else if (!/^\s/.test(line)) {
+        keep = false;
       }
-    );
+      if (keep) filtered.push(line);
+    }
+    rawOutput = filtered.join("\n");
+  }
+  log2.debug("type-check finished", {
+    engine: engine.source,
+    filePath: filePath || "(all)",
+    exitCode,
+    outputLength: rawOutput.length
   });
+  return { rawOutput, exitCode, diagnostics, source: engine.source };
 }
 async function runAllChecks(pattern, cwd) {
   log2.debug("runAllChecks", { pattern, cwd });
@@ -987,11 +979,11 @@ function buildPluginMessage(text) {
     source: { kind: "plugin", plugin: name }
   };
 }
-function registerPtcEdit(targets, rootKey, exec2, result, decision, cwd) {
-  if (!MUTATING_TOOLS.has(exec2.name)) return;
+function registerPtcEdit(targets, rootKey, exec, result, decision, cwd) {
+  if (!MUTATING_TOOLS.has(exec.name)) return;
   if (result.isError) return;
   if (decision.kind !== "accept") return;
-  const rawArgs = exec2.arguments;
+  const rawArgs = exec.arguments;
   const filePath = typeof rawArgs?.file_path === "string" ? rawArgs.file_path : rawArgs?.filePath;
   if (typeof filePath !== "string" || !filePath) return;
   if (!isJsFile(filePath)) return;
@@ -1200,14 +1192,14 @@ function apply(ctx, config = {}) {
     const pendingPtcEdits = /* @__PURE__ */ new Map();
     ctx.on(
       "tools/post-execute",
-      async (exec2, result, next) => {
+      async (exec, result, next) => {
         const decision = await next();
         if (!autoDiagnose) return decision;
-        if (exec2.parent !== void 0) {
-          registerPtcEdit(pendingPtcEdits, String(exec2.rootCallId), exec2, result, decision, cwd);
+        if (exec.parent !== void 0) {
+          registerPtcEdit(pendingPtcEdits, String(exec.rootCallId), exec, result, decision, cwd);
           return decision;
         }
-        const rootKey = String(exec2.rootCallId);
+        const rootKey = String(exec.rootCallId);
         const ptcTargets = pendingPtcEdits.get(rootKey);
         if (ptcTargets !== void 0) {
           pendingPtcEdits.delete(rootKey);
@@ -1222,10 +1214,10 @@ function apply(ctx, config = {}) {
             ]
           };
         }
-        if (!MUTATING_TOOLS.has(exec2.name)) return decision;
+        if (!MUTATING_TOOLS.has(exec.name)) return decision;
         if (result.isError) return decision;
         if (decision.kind !== "accept") return decision;
-        const rawArgs = exec2.arguments;
+        const rawArgs = exec.arguments;
         const filePath = typeof rawArgs?.file_path === "string" ? rawArgs.file_path : rawArgs?.filePath;
         if (typeof filePath !== "string" || !filePath) return decision;
         if (!isJsFile(filePath)) return decision;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aipanel/dsh-plugin",
-  "version": "1.2.25",
+  "version": "1.2.27",
   "type": "module",
   "description": "AIPanel for DeepSeek Harness (dsh)：注入审查工具 run_diagnostics、编辑后自动诊断。",
   "main": "./dist/index.js",
@@ -12,10 +12,11 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
+    "execa": "^9.6.1",
     "vue-tsc": "^3.3.9"
   },
   "devDependencies": {
-    "@aipanel/core": "1.2.25",
+    "@aipanel/core": "1.2.27",
     "@deepseek-ai/cordis": "^4.0.2",
     "@deepseek-ai/dsh-agent": "^0.1.6-alpha.2",
     "@deepseek-ai/dsh-llm": "^0.1.6-alpha.2",
@@ -29,7 +30,7 @@
     "esbuild": "^0.25.0"
   },
   "scripts": {
-    "build": "esbuild src/index.ts --bundle --outfile=dist/index.js --platform=node --format=esm --target=node18 --external:@deepseek-ai/* --external:node:* --external:vue-tsc",
+    "build": "esbuild src/index.ts --bundle --outfile=dist/index.js --platform=node --format=esm --target=node18 --external:@deepseek-ai/* --external:node:* --external:vue-tsc --external:execa",
     "typecheck": "tsc -p tsconfig.json"
   }
 }