@aipanel/dsh-plugin 1.2.8 → 1.2.10

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,25 @@ 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;
+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/logger-core.mjs
+// ../../core/es/common/logger-core.mjs
 var LogLevel = /* @__PURE__ */ ((LogLevel2) => {
   LogLevel2[LogLevel2["DEBUG"] = 0] = "DEBUG";
   LogLevel2[LogLevel2["INFO"] = 1] = "INFO";
@@ -32,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,
@@ -43,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";
@@ -92,7 +137,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);
@@ -115,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 "";
@@ -275,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;
@@ -290,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);
@@ -338,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;
@@ -502,22 +553,33 @@ 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 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 +588,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 +608,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,31 +699,21 @@ 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 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");
-  let m;
-  while ((m = re.exec(text)) !== null) ids.push(m[1]);
-  return ids;
-}
+var log4 = createNodeLogger("DshPlugin");
 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,17 +746,79 @@ ${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 autoDiagnose = config.autoDiagnose ?? process.env[OPENCODE_ENV.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 = {
       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,
@@ -836,7 +939,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;
@@ -883,9 +986,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.10",
   "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.10"
   },
   "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",