@aipanel/dsh-plugin 1.2.9 → 1.2.11

package/dist/index.js

@@ -26,6 +26,17 @@ var EXT_MSG = {
 };
 var SEVERITY_ERROR = 1;
 var SEVERITY_WARN = 2;
+var MUTATING_TOOLS = /* @__PURE__ */ new Set(["write", "edit", "apply_patch"]);
+var OPENCODE_ENV = {
+  CONFIG_DIR: "OPENCODE_CONFIG_DIR",
+  CONTEXT_API_URL: "OPENCODE_CONTEXT_API_URL",
+  VITE_LOGS_API_URL: "OPENCODE_VITE_LOGS_API_URL",
+  LOG_FILES_JSON: "OPENCODE_LOG_FILES_JSON",
+  VERBOSE: "OPENCODE_VERBOSE",
+  ENABLE_LINT: "OPENCODE_ENABLE_LINT",
+  VUE_DEVTOOLS_API_URL: "OPENCODE_VUE_DEVTOOLS_API_URL",
+  WORKSPACE: "OPENCODE_WORKSPACE"
+};
 
 // ../../core/es/common/logger-core.mjs
 var LogLevel = /* @__PURE__ */ ((LogLevel2) => {
@@ -36,6 +47,28 @@ var LogLevel = /* @__PURE__ */ ((LogLevel2) => {
   LogLevel2[LogLevel2["NONE"] = 4] = "NONE";
   return LogLevel2;
 })(LogLevel || {});
+var LEVEL_NAMES = {
+  [
+    0
+    /* DEBUG */
+  ]: "DEBUG",
+  [
+    1
+    /* INFO */
+  ]: "INFO",
+  [
+    2
+    /* WARN */
+  ]: "WARN",
+  [
+    3
+    /* ERROR */
+  ]: "ERROR",
+  [
+    4
+    /* NONE */
+  ]: "NONE"
+};
 var globalConfig = {
   verbose: false,
   level: 1,
@@ -47,6 +80,14 @@ var globalConfig = {
 function getConfig() {
   return globalConfig;
 }
+function getTimestamp() {
+  const now = /* @__PURE__ */ new Date();
+  const hours = String(now.getHours()).padStart(2, "0");
+  const minutes = String(now.getMinutes()).padStart(2, "0");
+  const seconds = String(now.getSeconds()).padStart(2, "0");
+  const ms = String(now.getMilliseconds()).padStart(3, "0");
+  return `${hours}:${minutes}:${seconds}.${ms}`;
+}
 function formatValue(value, depth = 0) {
   if (depth > 3) return "...";
   if (value === null) return "null";
@@ -119,21 +160,6 @@ var LEVEL_COLORS = {
   [LogLevel.ERROR]: COLORS.red,
   [LogLevel.NONE]: COLORS.reset
 };
-var LEVEL_NAMES = {
-  [LogLevel.DEBUG]: "DEBUG",
-  [LogLevel.INFO]: "INFO",
-  [LogLevel.WARN]: "WARN",
-  [LogLevel.ERROR]: "ERROR",
-  [LogLevel.NONE]: "NONE"
-};
-function getTimestamp() {
-  const now = /* @__PURE__ */ new Date();
-  const hours = String(now.getHours()).padStart(2, "0");
-  const minutes = String(now.getMinutes()).padStart(2, "0");
-  const seconds = String(now.getSeconds()).padStart(2, "0");
-  const ms = String(now.getMilliseconds()).padStart(3, "0");
-  return `${hours}:${minutes}:${seconds}.${ms}`;
-}
 function getCallerInfo(depth = 3) {
   const stack = new Error().stack;
   if (!stack) return "";
@@ -279,6 +305,19 @@ var JS_EXTENSIONS = /* @__PURE__ */ new Set([
 function isJsFile(filePath) {
   return JS_EXTENSIONS.has(path.extname(filePath));
 }
+var DIAGNOSTICS_TOOL_DESCRIPTION = [
+  "\u8FD0\u884C ESLint \u4E0E TypeScript \u7C7B\u578B\u8BCA\u65AD\uFF0C\u8FD4\u56DE\u8BCA\u65AD\u7ED3\u679C\u3002",
+  "",
+  "**\u652F\u6301\u7684\u6587\u4EF6\u7C7B\u578B**\uFF1A",
+  `- ESLint\uFF1AJavaScript / TypeScript / Vue \u6E90\u7801\uFF08${[...JS_EXTENSIONS].map((e) => `*${e}`).join(" ")}\uFF09`,
+  "- TypeScript \u7C7B\u578B\u68C0\u67E5\uFF1A*.ts *.tsx *.vue",
+  "",
+  "**\u4F55\u65F6\u4F7F\u7528\u6B64\u5DE5\u5177**\uFF1A",
+  "- \u521A\u5B8C\u6210\u4EE3\u7801\u4FEE\u6539\uFF0C\u60F3\u9A8C\u8BC1\u662F\u5426\u6709 ESLint \u9519\u8BEF\u6216\u7C7B\u578B\u9519\u8BEF",
+  "- \u5728\u63D0\u4EA4\u4EE3\u7801\u524D\u8FDB\u884C\u8D28\u91CF\u68C0\u67E5",
+  "- \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 loadESLint(workspace) {
   if (ESLintClass) return;
@@ -294,7 +333,12 @@ function loadESLint(workspace) {
 }
 async function lintFiles(pattern, cwd, warnLimit = 5) {
   loadESLint(cwd);
-  if (!ESLintClass) return {};
+  if (!ESLintClass) {
+    return {
+      text: `[ESLint] \u672A\u8FD0\u884C\uFF1A\u65E0\u6CD5\u5728 workspace "${cwd}" \u89E3\u6790\u5230 eslint\uFF08\u4EC5\u663E\u793A TypeScript \u8BCA\u65AD\uFF09`,
+      diagnostics: []
+    };
+  }
   try {
     const eslint = new ESLintClass({ cwd });
     const results = await eslint.lintFiles(pattern);
@@ -342,7 +386,10 @@ async function lintFiles(pattern, cwd, warnLimit = 5) {
     return { text: lines.length > 0 ? lines.join("\n") : void 0, diagnostics };
   } catch (err) {
     log2.warn("ESLint failed", { pattern, error: err.message });
-    return {};
+    return {
+      text: `[ESLint] \u8FD0\u884C\u5931\u8D25\uFF1A${err.message}\uFF08\u4EC5\u663E\u793A TypeScript \u8BCA\u65AD\uFF09`,
+      diagnostics: []
+    };
   }
 }
 var _vueTscBin;
@@ -506,6 +553,21 @@ async function runProjectDiagnostics(workspace) {
   return { eslintOutput, tscOutput: mergedTsc };
 }
 
+// ../../core/es/common/utils.mjs
+var NODE_MENTION_RE = /@节点\[(n[0-9a-z]+)\]/g;
+function parseNodeMentions(text) {
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const m of text.matchAll(NODE_MENTION_RE)) {
+    const id = m[1];
+    if (!seen.has(id)) {
+      seen.add(id);
+      out.push(id);
+    }
+  }
+  return out;
+}
+
 // dsh-plugin/src/events-relay.ts
 var log3 = createNodeLogger("DshEventRelay");
 var FLUSH_DELAY_MS = 120;
@@ -532,6 +594,8 @@ function setupEventRelay(ctx, config) {
   const lastSent = /* @__PURE__ */ new Map();
   const lastTitles = /* @__PURE__ */ new Map();
   const dirty = /* @__PURE__ */ new Set();
+  const childOf = /* @__PURE__ */ new Map();
+  const subagentRunningByParent = /* @__PURE__ */ new Map();
   let flushTimer = null;
   let lastPostErrorAt = 0;
   const scheduleFlush = () => {
@@ -549,15 +613,48 @@ function setupEventRelay(ctx, config) {
   const ensureState = (sessionId) => {
     let s = states.get(sessionId);
     if (s === void 0) {
-      s = { running: false, thinking: false };
+      s = { running: false, thinking: false, pending: false, subagentRunning: 0 };
       states.set(sessionId, s);
     }
     return s;
   };
+  const updateSubagentCount = (parentId, childId, running) => {
+    let set = subagentRunningByParent.get(parentId);
+    if (running) {
+      if (set === void 0) {
+        set = /* @__PURE__ */ new Set();
+        subagentRunningByParent.set(parentId, set);
+      }
+      set.add(childId);
+    } else if (set !== void 0) {
+      set.delete(childId);
+    }
+    const count = set === void 0 || set.size === 0 ? 0 : set.size;
+    if (set !== void 0 && set.size === 0) subagentRunningByParent.delete(parentId);
+    const s = ensureState(parentId);
+    if (s.subagentRunning !== count) {
+      s.subagentRunning = count;
+      markDirty(parentId);
+    }
+  };
+  const setPending = (sessionId, pending, kind) => {
+    const s = ensureState(sessionId);
+    if (s.pending === pending && s.pendingKind === kind) return;
+    s.pending = pending;
+    s.pendingKind = pending ? kind : void 0;
+    markDirty(sessionId);
+  };
   const handleAgentStatus = ({ agent, status }) => {
     const sessionId = String(agent.session.id);
     if (!sessionId) return;
     const running = status === "running";
+    const header = agent.session.header;
+    if (header?.origin === "subagent" && header.parentSession !== void 0) {
+      const parentId = String(header.parentSession);
+      childOf.set(sessionId, parentId);
+      updateSubagentCount(parentId, sessionId, running);
+      return;
+    }
     const s = ensureState(sessionId);
     if (s.running === running) return;
     s.running = running;
@@ -610,8 +707,25 @@ function setupEventRelay(ctx, config) {
       if (last === void 0 || last.thinking !== s.thinking) {
         events.push({ type: "thinking", sessionId, thinking: s.thinking });
       }
+      if (last === void 0 || last.pending !== s.pending || last.pendingKind !== s.pendingKind) {
+        events.push({
+          type: "session.pending",
+          sessionId,
+          pending: s.pending,
+          ...s.pendingKind === void 0 ? {} : { kind: s.pendingKind }
+        });
+      }
+      if (last === void 0 || last.subagentRunning !== s.subagentRunning) {
+        events.push({ type: "session.subagents", sessionId, running: s.subagentRunning });
+      }
       if (events.length === 0) continue;
-      lastSent.set(sessionId, { running: s.running, thinking: s.thinking });
+      lastSent.set(sessionId, {
+        running: s.running,
+        thinking: s.thinking,
+        pending: s.pending,
+        pendingKind: s.pendingKind,
+        subagentRunning: s.subagentRunning
+      });
       for (const event of events) post(event);
     }
   };
@@ -637,22 +751,45 @@ function setupEventRelay(ctx, config) {
       }
     });
   };
-  ctx.on("agent/status", handleAgentStatus);
+  ctx.on("agent/status", handleAgentStatus, { global: true });
   ctx.on("session/event", handleSessionEvent, { global: true });
+  ctx.on(
+    "approval/request",
+    async (request, next) => {
+      const sessionId = String(request.agent?.session?.id ?? "");
+      if (!sessionId) return next();
+      setPending(sessionId, true, "approval");
+      try {
+        return await next();
+      } finally {
+        setPending(sessionId, false);
+      }
+    },
+    // scoped（Scoped<Agent>）事件：root ctx 需 global 才能收到所有 agent
+    { global: true }
+  );
+  ctx.on(
+    "user-questions/request",
+    async (request, next) => {
+      const sessionId = String(request.agent?.session?.id ?? "");
+      if (!sessionId) return next();
+      const isPlanReview = request.questions?.some((q) => q.intent?.kind === "plan-review");
+      setPending(sessionId, true, isPlanReview ? "plan-review" : "question");
+      try {
+        return await next();
+      } finally {
+        setPending(sessionId, false);
+      }
+    },
+    // scoped（Scoped<Agent>）事件：root ctx 需 global 才能收到所有 agent
+    { global: true }
+  );
 }
 
 // dsh-plugin/src/index.ts
 var name = "aipanel";
 var inject = ["tools"];
 var log4 = createNodeLogger("DshPlugin");
-var MUTATING_TOOLS = /* @__PURE__ */ new Set(["write", "edit", "apply_patch"]);
-function collectNodeIds(text) {
-  const ids = [];
-  const re = new RegExp("@\u8282\u70B9\\[(n[0-9a-z]+)\\]", "g");
-  let m;
-  while ((m = re.exec(text)) !== null) ids.push(m[1]);
-  return ids;
-}
 function buildNodeContext(e) {
   const lines = [`\u8282\u70B9 ID\uFF1A${e.id ?? ""}`];
   const loc = e.line ? e.column ? `:${e.line}:${e.column}` : `:${e.line}` : "";
@@ -757,14 +894,14 @@ function applyProviderSettings(ctx, config) {
 function apply(ctx, config = {}) {
   const cwd = config.cwd ?? process.cwd();
   const enableDiagnostics = config.enableDiagnostics ?? false;
-  const autoDiagnose = config.autoDiagnose ?? process.env.OPENCODE_ENABLE_LINT === "1";
+  const autoDiagnose = config.autoDiagnose ?? process.env[OPENCODE_ENV.ENABLE_LINT] === "1";
   const vitePort = config.vitePort ?? 0;
   const contextApiPath = config.contextApiPath ?? CONTEXT_API_PATH;
   const tools = ctx.tools;
   if (enableDiagnostics) {
     const diagnosticsTool = {
       name: "run_diagnostics",
-      description: "\u8FD0\u884C ESLint \u548C vue-tsc \u7C7B\u578B\u68C0\u67E5\uFF0C\u8FD4\u56DE\u8BCA\u65AD\u7ED3\u679C\u3002\n\n**\u4F55\u65F6\u4F7F\u7528\u6B64\u5DE5\u5177**\uFF1A\n- \u521A\u5B8C\u6210\u4EE3\u7801\u4FEE\u6539\uFF0C\u60F3\u9A8C\u8BC1\u662F\u5426\u6709 ESLint \u9519\u8BEF\u6216\u7C7B\u578B\u9519\u8BEF\n- \u5728\u63D0\u4EA4\u4EE3\u7801\u524D\u8FDB\u884C\u8D28\u91CF\u68C0\u67E5\n- \u6392\u67E5\u7F16\u8F91\u5668\u672A\u663E\u793A\u4F46\u5B9E\u9645\u5B58\u5728\u7684\u7C7B\u578B\u95EE\u9898\n- \u4E0D\u4F20\u53C2\u6570\u53EF\u5168\u91CF\u8BCA\u65AD\u6574\u4E2A\u9879\u76EE\n\n**\u8BCA\u65AD\u5185\u5BB9**\uFF1A\n- ESLint \u89C4\u5219\u68C0\u67E5\uFF08error \u548C warning\uFF09\n- vue-tsc \u7C7B\u578B\u68C0\u67E5\uFF08TypeScript \u7C7B\u578B\u9519\u8BEF\u548C\u8B66\u544A\uFF09",
+      description: DIAGNOSTICS_TOOL_DESCRIPTION,
       parameters: {
         type: "object",
         additionalProperties: false,
@@ -885,7 +1022,7 @@ ${diagText}` }]
           if (message.source.kind !== "user") continue;
           for (const block of message.content) {
             if (block.type !== "text") continue;
-            for (const id of collectNodeIds(block.text)) ids.add(id);
+            for (const id of parseNodeMentions(block.text)) ids.add(id);
           }
         }
         if (ids.size === 0) return decision;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aipanel/dsh-plugin",
-  "version": "1.2.9",
+  "version": "1.2.11",
   "type": "module",
   "description": "AIPanel for DeepSeek Harness (dsh)：注入审查工具 run_diagnostics、编辑后自动诊断。",
   "main": "./dist/index.js",
@@ -16,14 +16,16 @@
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-settings": "^0.1.2-rc.1",
     "@deepseek-ai/dsh-agent": "^0.1.2-rc.1",
     "@deepseek-ai/dsh-llm": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-session": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-settings": "^0.1.2-rc.1",
     "@deepseek-ai/dsh-tools": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-user-approval": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-user-questions": "^0.1.2-rc.1",
     "@deepseek-ai/dsh-util-values": "^0.1.2-rc.1",
-    "@deepseek-ai/dsh-session": "^0.1.2-rc.1",
     "esbuild": "^0.25.0",
-    "@aipanel/core": "1.2.9"
+    "@aipanel/core": "1.2.11"
   },
   "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",