@aipanel/dsh-plugin 1.2.27 → 1.2.28

package/dist/index.js

@@ -628,6 +628,22 @@ function parseTscDiags(rawOutput, filePath, projectDir, source = "tsc") {
   }
   return diags;
 }
+function filterTscOutputForFile(rawOutput, filePath, projectDir) {
+  const resolved = path.resolve(filePath);
+  const errorLinePat = /^(.+?)\((\d+),(\d+)\):\s+(error|warning)\s+TS\d+:/;
+  const filtered = [];
+  let keep = false;
+  for (const line of rawOutput.split("\n")) {
+    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);
+  }
+  return filtered.join("\n");
+}
 async function runTypeCheck(filePath, cwd) {
   const dir = cwd;
   const projectDir = filePath ? findTsconfigDir(filePath) ?? dir : dir;
@@ -658,21 +674,7 @@ async function runTypeCheck(filePath, cwd) {
   }
   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");
+    rawOutput = filterTscOutputForFile(rawOutput, filePath, projectDir);
   }
   log2.debug("type-check finished", {
     engine: engine.source,
@@ -682,6 +684,32 @@ async function runTypeCheck(filePath, cwd) {
   });
   return { rawOutput, exitCode, diagnostics, source: engine.source };
 }
+async function runTypeChecksForFiles(files, cwd) {
+  const groups = /* @__PURE__ */ new Map();
+  for (const file of files) {
+    const resolved = path.resolve(file);
+    const projectDir = findTsconfigDir(resolved) ?? cwd;
+    const group = groups.get(projectDir);
+    if (group) group.push(resolved);
+    else groups.set(projectDir, [resolved]);
+  }
+  const results = /* @__PURE__ */ new Map();
+  for (const [projectDir, group] of groups) {
+    const whole = await runTypeCheck(void 0, projectDir).catch(() => ({
+      rawOutput: "",
+      exitCode: 0
+    }));
+    for (const file of group) {
+      results.set(file, {
+        rawOutput: filterTscOutputForFile(whole.rawOutput, file, projectDir),
+        exitCode: whole.exitCode,
+        diagnostics: (whole.diagnostics ?? []).filter((d) => d.file === file),
+        source: whole.source
+      });
+    }
+  }
+  return results;
+}
 async function runAllChecks(pattern, cwd) {
   log2.debug("runAllChecks", { pattern, cwd });
   const [eslintOutput, tscOutput] = await Promise.all([
@@ -690,6 +718,18 @@ async function runAllChecks(pattern, cwd) {
   ]);
   return { eslintOutput, tscOutput };
 }
+async function runAllChecksForFiles(files, cwd) {
+  const targets = [...new Set(files.map((file) => path.resolve(file)))];
+  const tscByFile = await runTypeChecksForFiles(targets, cwd);
+  const results = /* @__PURE__ */ new Map();
+  for (const file of targets) {
+    results.set(file, {
+      eslintOutput: await lintFiles(file, cwd),
+      tscOutput: tscByFile.get(file) ?? { rawOutput: "", exitCode: 0 }
+    });
+  }
+  return results;
+}
 async function runProjectDiagnostics(workspace) {
   const tscDirs = fs.existsSync(path.join(workspace, "tsconfig.json")) ? [workspace] : findAllTsconfigDirs(workspace);
   log2.debug("Tsc dirs to check", { count: tscDirs.length, dirs: tscDirs });
@@ -711,18 +751,36 @@ function tscSectionTitle(tscOutput) {
 function lintSectionTitle(lintOutput) {
   return lintOutput.engines?.length ? lintOutput.engines.join(" + ") : "ESLint";
 }
-function formatDiagnosticsSections(title, eslintOutput, tscOutput) {
+function omittedFindingsHint(omitted) {
+  return `\u2026\u8FD8\u6709 ${omitted} \u6761\uFF0C\u5B8C\u6574\u7ED3\u679C\u8BF7\u8C03\u7528 run_diagnostics`;
+}
+function boundFindings(text, maxFindings) {
+  if (!maxFindings || !text) return text;
+  const lines = text.split("\n").filter((line) => line.trim() !== "");
+  if (lines.length <= maxFindings) return text;
+  return [...lines.slice(0, maxFindings), omittedFindingsHint(lines.length - maxFindings)].join(
+    "\n"
+  );
+}
+function formatDiagnosticsSections(title, eslintOutput, tscOutput, options = {}) {
+  const lintLines = boundFindings(eslintOutput.text, options.maxFindingsPerSection);
+  const tscLines = boundFindings(tscOutput.rawOutput.trim(), options.maxFindingsPerSection);
   const parts = [];
-  parts.push(`## ${lintSectionTitle(eslintOutput)}
+  if (!options.onlyFindings || lintLines) {
+    parts.push(`## ${lintSectionTitle(eslintOutput)}
 
-` + (eslintOutput.text || "\u6CA1\u6709\u53D1\u73B0\u95EE\u9898"));
-  const tscLines = tscOutput.rawOutput.trim();
-  parts.push(`## ${tscSectionTitle(tscOutput)}
+` + (lintLines || "\u6CA1\u6709\u53D1\u73B0\u95EE\u9898"));
+  }
+  if (!options.onlyFindings || tscLines) {
+    parts.push(`## ${tscSectionTitle(tscOutput)}
 
 ` + (tscLines || "\u6CA1\u6709\u53D1\u73B0\u7C7B\u578B\u9519\u8BEF"));
-  return `${title}
+  }
+  if (parts.length === 0) return "";
+  const body = parts.join("\n\n");
+  return title ? `${title}
 
-` + parts.join("\n\n");
+${body}` : body;
 }
 
 // ../../core/es/common/utils.mjs
@@ -971,46 +1029,66 @@ function buildNodeContext(e) {
   if (e.previewPageUrl) lines.push(`\u7528\u6237\u9009\u4E2D\u8282\u70B9\u65F6\u7684\u9875\u9762 URL\uFF1A${e.previewPageUrl}`);
   return lines.join("\n");
 }
-function buildPluginMessage(text) {
+function buildPluginMessage(text, notice) {
   return {
     role: "user",
     id: randomUUID(),
     content: [{ type: "text", text }],
-    source: { kind: "plugin", plugin: name }
+    source: { kind: "plugin", plugin: name, ...notice }
   };
 }
-function registerPtcEdit(targets, rootKey, exec, result, decision, cwd) {
+var DIAGNOSTICS_MESSAGE_MAX_CHARS = 4e3;
+var MAX_FINDINGS_PER_SECTION = 3;
+function editTarget(exec) {
+  const rawArgs = exec.arguments;
+  const filePath = typeof rawArgs?.file_path === "string" ? rawArgs.file_path : rawArgs?.filePath;
+  return typeof filePath === "string" && filePath ? filePath : void 0;
+}
+function registerPendingEdit(pending, exec, result, decision, cwd) {
   if (!MUTATING_TOOLS.has(exec.name)) return;
   if (result.isError) return;
   if (decision.kind !== "accept") return;
-  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;
-  let files = targets.get(rootKey);
+  const filePath = editTarget(exec);
+  if (!filePath || !isJsFile(filePath)) return;
+  const { agent } = exec;
+  if (!agent) return;
+  let files = pending.get(agent);
   if (!files) {
     files = /* @__PURE__ */ new Set();
-    targets.set(rootKey, files);
+    pending.set(agent, files);
   }
   files.add(path2.resolve(cwd, filePath));
 }
-async function collectPtcDiagnostics(files, cwd) {
+function truncateDiagnostics(text) {
+  if (text.length <= DIAGNOSTICS_MESSAGE_MAX_CHARS) return text;
+  return `${text.slice(0, DIAGNOSTICS_MESSAGE_MAX_CHARS)}
+
+\u2026\uFF08\u8BCA\u65AD\u8F93\u51FA\u8FC7\u957F\uFF0C\u5DF2\u622A\u65AD\uFF1B\u53EF\u8C03\u7528 run_diagnostics \u67E5\u770B\u5B8C\u6574\u7ED3\u679C\uFF09`;
+}
+async function collectPendingDiagnostics(pending, cwd) {
+  const files = [...pending];
+  const checks = await runAllChecksForFiles(files, cwd).catch(
+    () => /* @__PURE__ */ new Map()
+  );
+  const empty = {
+    eslintOutput: {},
+    tscOutput: { rawOutput: "", exitCode: 0 }
+  };
   const blocks = [];
   for (const file of files) {
-    const { eslintOutput, tscOutput } = await runAllChecks(file, cwd).catch(
-      () => ({
-        eslintOutput: {},
-        tscOutput: { rawOutput: "", exitCode: 0 }
-      })
-    );
-    if (!eslintOutput.text && !tscOutput.rawOutput.trim()) continue;
-    blocks.push(
-      formatDiagnosticsSections(`### ${path2.relative(cwd, file)}`, eslintOutput, tscOutput)
+    const { eslintOutput, tscOutput } = checks.get(file) ?? empty;
+    const section = formatDiagnosticsSections(
+      `### ${path2.relative(cwd, file)}`,
+      eslintOutput,
+      tscOutput,
+      { onlyFindings: true, maxFindingsPerSection: MAX_FINDINGS_PER_SECTION }
     );
+    if (!section) continue;
+    blocks.push(section);
   }
-  return blocks.length > 0 ? `\u81EA\u52A8\u8BCA\u65AD\uFF08PTC \u6279\u91CF\u7F16\u8F91\u540E\uFF09\uFF1A
+  return blocks.length > 0 ? truncateDiagnostics(`\u81EA\u52A8\u8BCA\u65AD\uFF08\u7F16\u8F91\u540E\uFF09\uFF1A
 
-${blocks.join("\n\n")}` : "";
+${blocks.join("\n\n")}`) : "";
 }
 function toDiagnosticEntries(items) {
   return items.map((d) => ({
@@ -1189,64 +1267,39 @@ function apply(ctx, config = {}) {
       }
     };
     tools.register(diagnosticsTool);
-    const pendingPtcEdits = /* @__PURE__ */ new Map();
+    const pendingEdits = /* @__PURE__ */ new WeakMap();
     ctx.on(
       "tools/post-execute",
       async (exec, result, next) => {
         const decision = await next();
         if (!autoDiagnose) return decision;
-        if (exec.parent !== void 0) {
-          registerPtcEdit(pendingPtcEdits, String(exec.rootCallId), exec, result, decision, cwd);
-          return decision;
-        }
-        const rootKey = String(exec.rootCallId);
-        const ptcTargets = pendingPtcEdits.get(rootKey);
-        if (ptcTargets !== void 0) {
-          pendingPtcEdits.delete(rootKey);
-          if (decision.kind !== "accept") return decision;
-          const ptcDiagText = await collectPtcDiagnostics(ptcTargets, cwd);
-          if (!ptcDiagText) return decision;
-          return {
-            ...decision,
-            additionalContexts: [
-              ...decision.additionalContexts ?? [],
-              buildPluginMessage(ptcDiagText)
-            ]
-          };
-        }
-        if (!MUTATING_TOOLS.has(exec.name)) return decision;
-        if (result.isError) return decision;
-        if (decision.kind !== "accept") return decision;
-        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;
-        const { eslintOutput, tscOutput } = await runAllChecks(
-          path2.resolve(cwd, filePath),
-          cwd
-        ).catch(() => ({
-          eslintOutput: {},
-          tscOutput: { rawOutput: "", exitCode: 0 }
-        }));
-        const parts = [];
-        if (tscOutput.rawOutput.trim())
-          parts.push(`## ${tscSectionTitle(tscOutput)}
-
-` + tscOutput.rawOutput.trim());
-        if (eslintOutput.text)
-          parts.push(`## ${lintSectionTitle(eslintOutput)}
-
-` + eslintOutput.text);
-        const diagText = parts.join("\n\n");
-        if (!diagText) return decision;
-        const existing = decision.kind === "accept" && decision.content || result.content;
+        registerPendingEdit(pendingEdits, exec, result, decision, cwd);
+        return decision;
+      }
+    );
+    ctx.on(
+      "agent/pre-step",
+      async ({ agent }, next) => {
+        const decision = await next();
+        if (!autoDiagnose) return decision;
+        const files = pendingEdits.get(agent);
+        if (!files || files.size === 0) return decision;
+        pendingEdits.delete(agent);
+        if (decision.kind === "reject") return decision;
+        const text = await collectPendingDiagnostics(files, cwd);
+        if (!text) return decision;
         return {
-          kind: "accept",
-          content: [...existing, { type: "text", text: `
-
-${diagText}` }]
+          ...decision,
+          messages: [
+            ...decision.messages,
+            buildPluginMessage(text, {
+              form: "notice",
+              summary: `\u7F16\u8F91\u540E\u81EA\u52A8\u8BCA\u65AD\uFF1A${files.size} \u4E2A\u6587\u4EF6`
+            })
+          ]
         };
-      }
+      },
+      { prepend: true }
     );
   }
   if (vitePort > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aipanel/dsh-plugin",
-  "version": "1.2.27",
+  "version": "1.2.28",
   "type": "module",
   "description": "AIPanel for DeepSeek Harness (dsh)：注入审查工具 run_diagnostics、编辑后自动诊断。",
   "main": "./dist/index.js",
@@ -16,7 +16,7 @@
     "vue-tsc": "^3.3.9"
   },
   "devDependencies": {
-    "@aipanel/core": "1.2.27",
+    "@aipanel/core": "1.2.28",
     "@deepseek-ai/cordis": "^4.0.2",
     "@deepseek-ai/dsh-agent": "^0.1.6-alpha.2",
     "@deepseek-ai/dsh-llm": "^0.1.6-alpha.2",