@aipanel/dsh-plugin 1.2.8 → 1.2.9

package/dist/index.js

@@ -3,8 +3,10 @@ import fs2 from "node:fs";
 import path2 from "node:path";
 import { randomUUID } from "node:crypto";
 
-// ../../core/es/constants.mjs
+// ../../core/es/common/constants.mjs
 var LOG_PREFIX = "[vite-plugin-aipanel]";
+var CONTEXT_API_PATH = "/__aipanel_context__";
+var HOST_EVENTS_API_PATH = "/__aipanel_host_events__";
 var EXT_BROADCAST = {
   PAGE_CONTEXT: "PAGE_CONTEXT",
   THEME_CHANGE: "THEME_CHANGE",
@@ -18,12 +20,14 @@ var EXT_MSG = {
   REQUEST_PAGE_CONTEXT: "REQUEST_PAGE_CONTEXT",
   SELECTION_START: "SELECTION_START",
   SELECTION_STOP: "SELECTION_STOP",
-  CS_QUERY_WINDOW: "__CS_QUERY_WINDOW__"
+  CS_QUERY_WINDOW: "__CS_QUERY_WINDOW__",
+  /** Side Panel → Background：立即轮询一次并回传当前服务信息 */
+  FORCE_POLL: "FORCE_POLL"
 };
 var SEVERITY_ERROR = 1;
 var SEVERITY_WARN = 2;
 
-// ../../core/es/logger-core.mjs
+// ../../core/es/common/logger-core.mjs
 var LogLevel = /* @__PURE__ */ ((LogLevel2) => {
   LogLevel2[LogLevel2["DEBUG"] = 0] = "DEBUG";
   LogLevel2[LogLevel2["INFO"] = 1] = "INFO";
@@ -92,7 +96,7 @@ function formatContext(context) {
   return parts.join(" ");
 }
 
-// ../../core/es/node-logger.mjs
+// ../../core/es/node/node-logger.mjs
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -504,20 +508,16 @@ async function runProjectDiagnostics(workspace) {
 
 // dsh-plugin/src/events-relay.ts
 var log3 = createNodeLogger("DshEventRelay");
-var DEFAULT_EVENTS_API_PATH = "/__aipanel_host_events__";
 var FLUSH_DELAY_MS = 120;
-var IDLE_DEBOUNCE_MS = 1200;
-function transitionOf(type) {
+function thinkingOf(type) {
   switch (type) {
     case "turn/start":
-      return { running: true, thinking: true };
     case "step/start":
     case "assistant/chunk":
-      return { thinking: true };
+      return true;
     case "assistant/message":
-      return { thinking: false };
     case "turn/end":
-      return { thinking: false };
+      return false;
     default:
       return null;
   }
@@ -526,13 +526,12 @@ function setupEventRelay(ctx, config) {
   const vitePort = config.vitePort ?? 0;
   const token = config.eventsToken;
   if (!token || vitePort <= 0) return;
-  const eventsPath = config.eventsPath ?? DEFAULT_EVENTS_API_PATH;
+  const eventsPath = config.eventsPath ?? HOST_EVENTS_API_PATH;
   const eventsUrl = `http://127.0.0.1:${vitePort}${eventsPath}`;
   const states = /* @__PURE__ */ new Map();
   const lastSent = /* @__PURE__ */ new Map();
   const lastTitles = /* @__PURE__ */ new Map();
   const dirty = /* @__PURE__ */ new Set();
-  const idleTimers = /* @__PURE__ */ new Map();
   let flushTimer = null;
   let lastPostErrorAt = 0;
   const scheduleFlush = () => {
@@ -547,61 +546,51 @@ function setupEventRelay(ctx, config) {
     dirty.add(sessionId);
     scheduleFlush();
   };
-  const scheduleIdleCheck = (sessionId) => {
-    const existing = idleTimers.get(sessionId);
-    if (existing !== void 0) clearTimeout(existing);
-    const timer = setTimeout(() => {
-      idleTimers.delete(sessionId);
-      const s = states.get(sessionId);
-      if (s !== void 0 && s.running) {
-        s.running = false;
-        markDirty(sessionId);
-      }
-    }, IDLE_DEBOUNCE_MS);
-    timer.unref?.();
-    idleTimers.set(sessionId, timer);
+  const ensureState = (sessionId) => {
+    let s = states.get(sessionId);
+    if (s === void 0) {
+      s = { running: false, thinking: false };
+      states.set(sessionId, s);
+    }
+    return s;
+  };
+  const handleAgentStatus = ({ agent, status }) => {
+    const sessionId = String(agent.session.id);
+    if (!sessionId) return;
+    const running = status === "running";
+    const s = ensureState(sessionId);
+    if (s.running === running) return;
+    s.running = running;
+    if (!running) s.thinking = false;
+    markDirty(sessionId);
   };
   const handleSessionEvent = (session, event) => {
-    const sessionId = session?.id;
-    if (!sessionId || !event || typeof event.type !== "string") return;
-    if (event.type === "session/title") {
-      const raw = event.data?.title;
-      const title = typeof raw === "string" ? raw.trim() : "";
+    const sessionId = String(session?.id ?? "");
+    if (!sessionId) return;
+    const type = typeof event?.type === "string" ? event.type : "";
+    if (type === "session/title") {
+      const titleData = event.data;
+      const title = typeof titleData?.title === "string" ? titleData.title.trim() : "";
       if (title.length > 0 && title !== lastTitles.get(sessionId)) {
         lastTitles.set(sessionId, title);
+        const ts = event.time;
         post({
           type: "session.updated",
           session: {
             id: sessionId,
             title,
-            // dsh session/event 自带提交时间戳，客户端据此刷新列表 meta（更新时刻）
-            updatedAt: typeof event.time === "number" ? event.time : Date.now()
+            updatedAt: typeof ts === "number" ? ts : Date.now()
           }
         });
       }
       return;
     }
-    const idleTimer = idleTimers.get(sessionId);
-    if (idleTimer !== void 0) {
-      clearTimeout(idleTimer);
-      idleTimers.delete(sessionId);
-    }
-    const tr = transitionOf(event.type);
-    if (tr === null) return;
-    let s = states.get(sessionId);
-    if (s === void 0) {
-      s = { running: false, thinking: false };
-      states.set(sessionId, s);
-    }
-    const next = {
-      running: tr.running !== void 0 ? tr.running : s.running,
-      thinking: tr.thinking !== void 0 ? tr.thinking : s.thinking
-    };
-    const changed = next.running !== s.running || next.thinking !== s.thinking;
-    s.running = next.running;
-    s.thinking = next.thinking;
-    if (event.type === "turn/end") scheduleIdleCheck(sessionId);
-    if (changed) markDirty(sessionId);
+    const thinking = thinkingOf(type);
+    if (thinking === null) return;
+    const s = ensureState(sessionId);
+    if (s.thinking === thinking) return;
+    s.thinking = thinking;
+    markDirty(sessionId);
   };
   const flush = () => {
     const pending = [...dirty];
@@ -648,15 +637,15 @@ function setupEventRelay(ctx, config) {
       }
     });
   };
-  const bus = ctx;
-  bus.on("session/event", handleSessionEvent, { global: true });
+  ctx.on("agent/status", handleAgentStatus);
+  ctx.on("session/event", handleSessionEvent, { 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"]);
-var DEFAULT_CONTEXT_API_PATH = "/__aipanel_context__";
 function collectNodeIds(text) {
   const ids = [];
   const re = new RegExp("@\u8282\u70B9\\[(n[0-9a-z]+)\\]", "g");
@@ -666,13 +655,11 @@ function collectNodeIds(text) {
 }
 function buildNodeContext(e) {
   const lines = [`\u8282\u70B9 ID\uFF1A${e.id ?? ""}`];
-  if (e.filePath) lines.push(`\u6E90\u7801\u6587\u4EF6\u8DEF\u5F84\uFF1A${e.filePath}${e.line ? `:${e.line}` : ""}`);
-  if (e.line) lines.push(`\u4EE3\u7801\u6240\u5728\u884C\u53F7\uFF1A${e.line}`);
-  if (e.column) lines.push(`\u4EE3\u7801\u6240\u5728\u5217\u53F7\uFF1A${e.column}`);
+  const loc = e.line ? e.column ? `:${e.line}:${e.column}` : `:${e.line}` : "";
+  if (e.filePath) lines.push(`\u6E90\u7801\u6587\u4EF6\u8DEF\u5F84\uFF1A${e.filePath}${loc}`);
   if (e.description) lines.push(`DOM \u5143\u7D20\u9009\u62E9\u5668\uFF1A${e.description}`);
   if (e.innerText) lines.push(`DOM \u5143\u7D20\u5185\u90E8\u6587\u672C\uFF1A${e.innerText.slice(0, 200)}`);
   if (e.previewPageUrl) lines.push(`\u7528\u6237\u9009\u4E2D\u8282\u70B9\u65F6\u7684\u9875\u9762 URL\uFF1A${e.previewPageUrl}`);
-  if (e.previewPageTitle) lines.push(`\u9875\u9762\u6807\u9898\uFF1A${e.previewPageTitle}`);
   return lines.join("\n");
 }
 function toDiagnosticEntries(items) {
@@ -705,12 +692,74 @@ ${s.text}`).join("\n\n");
 
 ${body}` : value.title;
 }
+function applyProviderSettings(ctx, config) {
+  const pending = [];
+  if (typeof config.agentPreset === "string" && config.agentPreset) {
+    pending.push({ ns: "agent-presets", patch: { default: config.agentPreset } });
+  }
+  if (typeof config.permissionPreset === "string" && config.permissionPreset) {
+    pending.push({ ns: "permission", patch: { defaultPreset: config.permissionPreset } });
+  }
+  if (typeof config.busyEnter === "string" && config.busyEnter) {
+    pending.push({ ns: "ui-conversation", patch: { busyEnter: config.busyEnter } });
+  }
+  if (pending.length === 0) return;
+  const settings = ctx.get("settings");
+  if (!settings) {
+    log4.warn("settings service unavailable; provider settings not applied via plugin");
+    return;
+  }
+  const registered = (ns) => settings.describe()?.some((d) => String(d.ns) === ns) ?? false;
+  const APPLY_TIMEOUT_MS = 12e3;
+  const APPLY_INTERVAL_MS = 300;
+  const deadline = Date.now() + APPLY_TIMEOUT_MS;
+  let timer = null;
+  const applied = /* @__PURE__ */ new Set();
+  const tick = () => {
+    timer = null;
+    let stillPending = false;
+    for (let i = 0; i < pending.length; i++) {
+      if (applied.has(i)) continue;
+      const entry = pending[i];
+      if (!registered(entry.ns)) {
+        stillPending = true;
+        continue;
+      }
+      void settings.update(entry.ns, entry.patch).then(() => {
+        applied.add(i);
+        log4.debug("applied provider setting via plugin", { ns: entry.ns });
+      }).catch((err) => {
+        log4.warn("failed to apply provider setting via plugin", {
+          ns: entry.ns,
+          error: err instanceof Error ? err.message : String(err)
+        });
+        applied.add(i);
+      });
+    }
+    if (!stillPending && applied.size === pending.length) return;
+    if (Date.now() < deadline) {
+      timer = setTimeout(tick, APPLY_INTERVAL_MS);
+      timer.unref?.();
+    } else if (stillPending) {
+      log4.warn("provider settings not fully applied: namespace registration timed out", {
+        pending: pending.filter((_, i) => !applied.has(i)).map((p) => p.ns)
+      });
+    }
+  };
+  tick();
+  ctx.effect(
+    () => () => {
+      if (timer) clearTimeout(timer);
+    },
+    "aipanel: settings apply timer"
+  );
+}
 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 vitePort = config.vitePort ?? 0;
-  const contextApiPath = config.contextApiPath ?? DEFAULT_CONTEXT_API_PATH;
+  const contextApiPath = config.contextApiPath ?? CONTEXT_API_PATH;
   const tools = ctx.tools;
   if (enableDiagnostics) {
     const diagnosticsTool = {
@@ -883,9 +932,11 @@ ${contextText}`
     eventsPath: config.eventsPath,
     eventsToken: config.eventsToken
   });
+  applyProviderSettings(ctx, config);
 }
 export {
   apply,
+  applyProviderSettings,
   inject,
   name
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aipanel/dsh-plugin",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "type": "module",
   "description": "AIPanel for DeepSeek Harness (dsh)：注入审查工具 run_diagnostics、编辑后自动诊断。",
   "main": "./dist/index.js",
@@ -16,12 +16,14 @@
   },
   "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-tools": "^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.8"
+    "@aipanel/core": "1.2.9"
   },
   "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",