@aipanel/dsh-plugin 1.2.10 → 1.2.11

package/dist/index.js

@@ -594,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 = () => {
@@ -611,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;
@@ -672,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);
     }
   };
@@ -699,8 +751,39 @@ 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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aipanel/dsh-plugin",
-  "version": "1.2.10",
+  "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.10"
+    "@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",