@aipanel/dsh-plugin 1.3.2 → 1.3.4

package/dist/index.js

@@ -329,23 +329,48 @@ var DIAGNOSTICS_TOOL_DESCRIPTION = [
   "- \u6392\u67E5\u7F16\u8F91\u5668\u672A\u663E\u793A\u4F46\u5B9E\u9645\u5B58\u5728\u7684\u7C7B\u578B\u95EE\u9898",
   "- \u4E0D\u4F20\u53C2\u6570\u53EF\u5168\u91CF\u8BCA\u65AD\u6574\u4E2A\u9879\u76EE"
 ].join("\n");
-var ESLintClass;
+function cachedResolve(cache, key, resolve) {
+  const hit = cache.get(key);
+  if (hit !== void 0) return hit;
+  const value = resolve();
+  cache.set(key, value);
+  return value;
+}
+var _packageBinCache = /* @__PURE__ */ new Map();
+function resolvePackageBin(basePkgJson, pkgName, binName) {
+  return cachedResolve(_packageBinCache, `${basePkgJson}\0${pkgName}`, () => {
+    try {
+      const req = createRequire(basePkgJson);
+      const pkgJsonPath = req.resolve(`${pkgName}/package.json`);
+      const pkg = JSON.parse(fs.readFileSync(pkgJsonPath, "utf8"));
+      const binRel = typeof pkg.bin === "string" ? pkg.bin : pkg.bin?.[binName];
+      return binRel ? path.join(path.dirname(pkgJsonPath), binRel) : null;
+    } catch {
+      return null;
+    }
+  });
+}
+var _eslintClassByBase = /* @__PURE__ */ new Map();
 function loadESLint(workspace) {
-  if (ESLintClass) return;
-  log2.debug("Loading eslint", { workspace });
-  try {
-    const req = createRequire(path.join(workspace, "package.json"));
-    const eslintModule = req("eslint");
-    ESLintClass ?? (ESLintClass = eslintModule.ESLint ?? eslintModule.FlatESLint);
-    log2.debug("eslint loaded", { hasClass: !!ESLintClass });
-  } catch (e) {
-    log2.warn("eslint not found", { error: e.message });
-  }
+  const basePkgJson = path.join(workspace, "package.json");
+  return cachedResolve(_eslintClassByBase, basePkgJson, () => {
+    log2.debug("Loading eslint", { workspace });
+    try {
+      const req = createRequire(basePkgJson);
+      const eslintModule = req("eslint");
+      const eslintClass = eslintModule.ESLint ?? eslintModule.FlatESLint ?? null;
+      log2.debug("eslint loaded", { hasClass: !!eslintClass });
+      return eslintClass;
+    } catch (e) {
+      log2.warn("eslint not found", { error: e.message });
+      return null;
+    }
+  });
 }
 async function lintFiles(pattern, cwd, warnLimit = 5) {
-  loadESLint(cwd);
+  const eslintClass = loadESLint(cwd);
   const [eslintOutput, oxlintOutput] = await Promise.all([
-    ESLintClass ? runEslintFiles(pattern, cwd, warnLimit) : Promise.resolve(null),
+    eslintClass ? runEslintFiles(eslintClass, pattern, cwd, warnLimit) : Promise.resolve(null),
     runOxlintFiles(pattern, cwd, warnLimit)
   ]);
   const engines = [];
@@ -405,9 +430,9 @@ function formatLintMessages(messages, engine, warnLimit) {
     engines: [engine.label]
   };
 }
-async function runEslintFiles(pattern, cwd, warnLimit) {
+async function runEslintFiles(eslintClass, pattern, cwd, warnLimit) {
   try {
-    const eslint = new ESLintClass({ cwd });
+    const eslint = new eslintClass({ cwd });
     const results = await eslint.lintFiles(pattern);
     const messages = results.flatMap(
       (r) => (r.messages ?? []).map((m) => ({ ...m, filePath: r.filePath }))
@@ -427,19 +452,8 @@ async function runEslintFiles(pattern, cwd, warnLimit) {
     };
   }
 }
-var _oxlintBin;
 function resolveOxlintBin(workspace) {
-  if (_oxlintBin !== void 0) return _oxlintBin;
-  try {
-    const req = createRequire(path.join(workspace, "package.json"));
-    const pkgJsonPath = req.resolve("oxlint/package.json");
-    const pkg = JSON.parse(fs.readFileSync(pkgJsonPath, "utf8"));
-    const binRel = typeof pkg.bin === "string" ? pkg.bin : pkg.bin?.oxlint;
-    _oxlintBin = binRel ? path.join(path.dirname(pkgJsonPath), binRel) : null;
-  } catch {
-    _oxlintBin = null;
-  }
-  return _oxlintBin;
+  return resolvePackageBin(path.join(workspace, "package.json"), "oxlint", "oxlint");
 }
 function oxlintRuleName(code) {
   if (!code) return null;
@@ -516,18 +530,9 @@ async function runOxlintFiles(pattern, cwd, warnLimit) {
     };
   }
 }
-var _vueTscBin;
-function resolveVueTscBin() {
-  if (_vueTscBin !== void 0) return _vueTscBin;
-  try {
-    const req = createRequire(import.meta.url);
-    _vueTscBin = req.resolve("vue-tsc/bin/vue-tsc.js");
-  } catch {
-    _vueTscBin = null;
-  }
-  return _vueTscBin;
-}
-var _tscBinByPkgDir = /* @__PURE__ */ new Map();
+var BUNDLED_ENGINE_KEY = "<bundled>";
+var _engineCache = /* @__PURE__ */ new Map();
+var _tsVersionCache = /* @__PURE__ */ new Map();
 function nearestPackageJsonDir(startDir) {
   let dir = path.resolve(startDir);
   while (true) {
@@ -546,26 +551,53 @@ function isVuePackage(pkgDir) {
     return false;
   }
 }
-function resolveTypeCheckBin(projectDir) {
-  const pkgDir = nearestPackageJsonDir(projectDir);
-  if (!pkgDir || isVuePackage(pkgDir)) {
-    const bin2 = resolveVueTscBin();
-    return bin2 ? { bin: bin2, source: "vue-tsc" } : null;
+function readPackageMeta(pkgJsonPath) {
+  try {
+    return JSON.parse(fs.readFileSync(pkgJsonPath, "utf8"));
+  } catch {
+    return null;
   }
-  let bin = _tscBinByPkgDir.get(pkgDir);
-  if (bin === void 0) {
+}
+function resolveEngineTsVersion(bin) {
+  const pkgDir = nearestPackageJsonDir(path.dirname(bin));
+  if (!pkgDir) return null;
+  return cachedResolve(_tsVersionCache, pkgDir, () => {
+    const own = readPackageMeta(path.join(pkgDir, "package.json"));
+    if (own?.name === "typescript" && own.version) return own.version;
     try {
       const req = createRequire(path.join(pkgDir, "package.json"));
-      bin = req.resolve("typescript/bin/tsc");
+      return readPackageMeta(req.resolve("typescript/package.json"))?.version ?? null;
     } catch {
-      bin = null;
+      return null;
     }
-    _tscBinByPkgDir.set(pkgDir, bin);
-    if (!bin) log2.debug("workspace tsc not resolvable, fallback to vue-tsc", { pkgDir });
-  }
-  if (bin) return { bin, source: "tsc" };
-  const vueBin = resolveVueTscBin();
-  return vueBin ? { bin: vueBin, source: "vue-tsc" } : null;
+  });
+}
+function toEngine(bin, source, origin) {
+  return bin ? { bin, source, origin, tsVersion: resolveEngineTsVersion(bin) } : null;
+}
+function resolveWorkspaceEngine(pkgDir, kind) {
+  const basePkgJson = path.join(pkgDir, "package.json");
+  return kind === "tsc" ? toEngine(resolvePackageBin(basePkgJson, "typescript", "tsc"), "tsc", "workspace") : toEngine(resolvePackageBin(basePkgJson, "vue-tsc", "vue-tsc"), "vue-tsc", "workspace");
+}
+function resolveBundledVueTscEngine() {
+  return toEngine(resolvePackageBin(import.meta.url, "vue-tsc", "vue-tsc"), "vue-tsc", "bundled");
+}
+function resolveTypeCheckEngine(projectDir) {
+  const pkgDir = nearestPackageJsonDir(projectDir);
+  return cachedResolve(_engineCache, pkgDir ?? BUNDLED_ENGINE_KEY, () => {
+    if (!pkgDir) return resolveBundledVueTscEngine();
+    const candidates = isVuePackage(pkgDir) ? [resolveWorkspaceEngine(pkgDir, "vue-tsc")] : [resolveWorkspaceEngine(pkgDir, "tsc"), resolveWorkspaceEngine(pkgDir, "vue-tsc")];
+    for (const engine of candidates) {
+      if (engine) return engine;
+    }
+    return resolveBundledVueTscEngine();
+  });
+}
+var BUILD_NO_EMIT_MIN_TS = { major: 5, minor: 6 };
+function supportsBuildNoEmit(tsVersion) {
+  if (!tsVersion) return false;
+  const [major, minor] = tsVersion.split(".").map((part) => Number.parseInt(part, 10));
+  return major > BUILD_NO_EMIT_MIN_TS.major || major === BUILD_NO_EMIT_MIN_TS.major && minor >= BUILD_NO_EMIT_MIN_TS.minor;
 }
 function findTsconfigDir(filePath) {
   const resolved = path.resolve(filePath);
@@ -655,6 +687,77 @@ function filterTscOutputForFile(rawOutput, filePath, projectDir) {
   }
   return filtered.join("\n");
 }
+async function readResolvedTsconfig(engine, configPath, projectDir) {
+  const result = await execa(
+    "node",
+    [
+      engine.bin,
+      "-p",
+      projectRelativeConfig(projectDir, configPath),
+      "--showConfig",
+      "--pretty",
+      "false"
+    ],
+    { cwd: projectDir, timeout: 3e4, maxBuffer: 10 * 1024 * 1024, reject: false }
+  ).catch(() => null);
+  if (!result || result.timedOut || result.isTerminated || result.isMaxBuffer) return null;
+  const stdout = result.stdout ?? "";
+  const start = stdout.indexOf("{");
+  const end = stdout.lastIndexOf("}");
+  if (start < 0 || end <= start) return null;
+  try {
+    return JSON.parse(stdout.slice(start, end + 1));
+  } catch {
+    return null;
+  }
+}
+async function resolveProjectConfigs(engine, projectDir) {
+  const configs = [];
+  const visited = /* @__PURE__ */ new Set();
+  const visit = async (configPath) => {
+    const resolved = path.resolve(configPath);
+    if (visited.has(resolved)) return;
+    visited.add(resolved);
+    const config = await readResolvedTsconfig(engine, resolved, projectDir);
+    const hasProgram = !config || (config.files?.length ?? 0) > 0 || (config.include?.length ?? 0) > 0;
+    if (hasProgram) configs.push(resolved);
+    for (const ref of config?.references ?? []) {
+      if (ref.path) await visit(path.resolve(path.dirname(resolved), ref.path));
+    }
+  };
+  const rootConfig = path.join(projectDir, "tsconfig.json");
+  await visit(fs.existsSync(rootConfig) ? rootConfig : projectDir);
+  return configs;
+}
+function projectRelativeConfig(projectDir, configPath) {
+  return path.relative(projectDir, configPath) || ".";
+}
+async function typeCheckArgGroups(engine, projectDir) {
+  const pretty = ["--pretty", "false"];
+  if (supportsBuildNoEmit(engine.tsVersion)) return [["--build", "--noEmit", ...pretty]];
+  const configs = await resolveProjectConfigs(engine, projectDir);
+  return configs.map((config) => [
+    "-p",
+    projectRelativeConfig(projectDir, config),
+    "--noEmit",
+    ...pretty
+  ]);
+}
+async function runTypeCheckCli(engine, args, cwd, timeout, maxBuffer) {
+  const result = await execa("node", [engine.bin, ...args], {
+    cwd,
+    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`;
+  }
+  return { rawOutput, exitCode };
+}
 async function runTypeCheck(filePath, cwd) {
   const dir = cwd;
   const projectDir = filePath ? findTsconfigDir(filePath) ?? dir : dir;
@@ -664,31 +767,27 @@ async function runTypeCheck(filePath, cwd) {
     projectDir,
     processCwd: process.cwd()
   });
-  const engine = resolveTypeCheckBin(projectDir);
+  const engine = resolveTypeCheckEngine(projectDir);
   if (!engine) {
     log2.warn("type-check bin not found", { projectDir });
     return { rawOutput: "", exitCode: 0 };
   }
   const timeout = filePath ? 6e4 : 12e4;
   const maxBuffer = filePath ? 10 * 1024 * 1024 : 50 * 1024 * 1024;
-  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 argGroups = await typeCheckArgGroups(engine, projectDir);
+  const results = await Promise.all(
+    argGroups.map((args) => runTypeCheckCli(engine, args, projectDir, timeout, maxBuffer))
+  );
+  let rawOutput = results.map((result) => result.rawOutput).filter(Boolean).join("\n");
+  const exitCode = results.reduce((max, result) => Math.max(max, result.exitCode), 0);
   const diagnostics = parseTscDiags(rawOutput, filePath, projectDir, engine.source);
   if (filePath) {
     rawOutput = filterTscOutputForFile(rawOutput, filePath, projectDir);
   }
   log2.debug("type-check finished", {
     engine: engine.source,
+    engineOrigin: engine.origin,
+    tsVersion: engine.tsVersion,
     filePath: filePath || "(all)",
     exitCode,
     outputLength: rawOutput.length
@@ -1025,7 +1124,8 @@ function setupEventRelay(ctx, config) {
 }
 
 // dsh-plugin/src/index.ts
-var name = "aipanel";
+var SOURCE_KIND = "aipanel";
+var name = SOURCE_KIND;
 var inject = ["tools"];
 var log4 = createNodeLogger("DshPlugin");
 function buildNodeContext(e) {
@@ -1041,11 +1141,12 @@ function buildNodeContext(e) {
   return lines.join("\n");
 }
 function buildPluginMessage(text, notice) {
+  const source = notice ? { kind: SOURCE_KIND, form: "notice", summary: notice.summary } : { kind: SOURCE_KIND };
   return {
     role: "user",
     id: randomUUID(),
     content: [{ type: "text", text }],
-    source: { kind: "plugin", plugin: name, ...notice }
+    source
   };
 }
 var DIAGNOSTICS_MESSAGE_MAX_CHARS = 4e3;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aipanel/dsh-plugin",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "type": "module",
   "description": "AIPanel for DeepSeek Harness (dsh)：注入审查工具 run_diagnostics、编辑后自动诊断。",
   "main": "./dist/index.js",
@@ -16,17 +16,17 @@
     "vue-tsc": "^3.3.9"
   },
   "devDependencies": {
-    "@aipanel/core": "1.3.2",
-    "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-agent": "^0.1.6-alpha.2",
-    "@deepseek-ai/dsh-llm": "^0.1.6-alpha.2",
-    "@deepseek-ai/dsh-session": "^0.1.6-alpha.2",
-    "@deepseek-ai/dsh-session-title": "^0.1.6-alpha.2",
-    "@deepseek-ai/dsh-settings": "^0.1.6-alpha.2",
-    "@deepseek-ai/dsh-tools": "^0.1.6-alpha.2",
-    "@deepseek-ai/dsh-user-approval": "^0.1.6-alpha.2",
-    "@deepseek-ai/dsh-user-questions": "^0.1.6-alpha.2",
-    "@deepseek-ai/dsh-util-values": "^0.1.6-alpha.2",
+    "@aipanel/core": "1.3.4",
+    "@deepseek-ai/cordis": "~4.0.4",
+    "@deepseek-ai/dsh-agent": "^0.1.7-alpha.2",
+    "@deepseek-ai/dsh-llm": "^0.1.7-alpha.2",
+    "@deepseek-ai/dsh-session": "^0.1.7-alpha.2",
+    "@deepseek-ai/dsh-session-title": "^0.1.7-alpha.2",
+    "@deepseek-ai/dsh-settings": "^0.1.7-alpha.2",
+    "@deepseek-ai/dsh-tools": "^0.1.7-alpha.2",
+    "@deepseek-ai/dsh-user-approval": "^0.1.7-alpha.2",
+    "@deepseek-ai/dsh-user-questions": "^0.1.7-alpha.2",
+    "@deepseek-ai/dsh-util-values": "^0.1.7-alpha.2",
     "esbuild": "^0.25.0"
   },
   "scripts": {