@aipanel/dsh-client 1.2.9 → 1.2.11

package/lib/client.js

@@ -67,6 +67,20 @@ var WIDGET_MSG = {
   SESSION_READY: "AIPANEL_SESSION_READY"
 };
 
+// ../../core/es/common/utils.mjs
+function ensureNodeId(element) {
+  if (element.id) return element.id;
+  const random = typeof crypto !== "undefined" && typeof crypto.randomUUID === "function" ? crypto.randomUUID().replace(/-/g, "").slice(0, 8) : Math.random().toString(36).slice(2, 10);
+  element.id = `n${random}`;
+  return element.id;
+}
+function toNodeMention(id) {
+  return `@\u8282\u70B9[${id}]`;
+}
+function widgetEnvelope(type, data) {
+  return { type, ...data };
+}
+
 // dsh-client/src/client/diagnostics-view.tsx
 var import_react = require("react");
 var import_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
@@ -74,12 +88,39 @@ var import_jsx_runtime = require("react/jsx-runtime");
 function isSettledToolResult(block) {
   return typeof block === "object" && block !== null && "kind" in block && block.kind === "tool-result";
 }
+var TEXT_ESLINT_RE = /^[ \t]*(ERROR|WARN) \[([^\]\r\n]+?):(\d+):(\d+)\] (.*)$/gm;
+var TEXT_TSC_RE = /^[ \t]*([^():\r\n]+)\((\d+),(\d+)\):\s*(error|warning)\s+(.*)$/gm;
+function parseTextDiagnostics(text) {
+  const out = [];
+  if (!text) return out;
+  for (const m of text.matchAll(TEXT_ESLINT_RE)) {
+    out.push({
+      file: m[2],
+      line: Number(m[3]),
+      column: Number(m[4]),
+      severity: m[1].toLowerCase(),
+      message: m[5].trim()
+    });
+  }
+  for (const m of text.matchAll(TEXT_TSC_RE)) {
+    out.push({
+      file: m[1].trim(),
+      line: Number(m[2]),
+      column: Number(m[3]),
+      severity: m[4],
+      message: m[5].trim()
+    });
+  }
+  return out;
+}
 function readDiagnostics(block) {
   if (!isSettledToolResult(block)) return void 0;
   const meta = block.meta;
-  const diagnostics = meta?.diagnostics;
-  if (!Array.isArray(diagnostics)) return void 0;
-  return diagnostics.every(isEntry) ? diagnostics : void 0;
+  if (Array.isArray(meta?.diagnostics) && meta.diagnostics.every(isEntry)) {
+    return meta.diagnostics;
+  }
+  const parsed = parseTextDiagnostics(extractBlockText(block));
+  return parsed.length > 0 ? parsed : void 0;
 }
 function extractBlockText(block) {
   if (!isSettledToolResult(block)) return "";
@@ -214,6 +255,7 @@ function DiagnosticsRow({ block, cwd, toolName, openFile }) {
   const errors = (diagnostics ?? []).filter((d) => d.severity === "error");
   const warnings = (diagnostics ?? []).filter((d) => d.severity === "warning");
   const contentText = extractBlockText(block);
+  const textHasIssues = /^[ \t]*(?:ERROR|WARN)\s+\[/m.test(contentText);
   const firstLine = (contentText.split("\n")[0] || "").trim();
   const isFullProject = /^全量诊断结果/.test(firstLine);
   const scope = isFullProject ? "project" : "file";
@@ -250,7 +292,7 @@ function DiagnosticsRow({ block, cwd, toolName, openFile }) {
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: styles.sep, "aria-hidden": true }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: styles.summary, children: "\u8BCA\u65AD\u8FD0\u884C\u4E2D\u2026" })
     ] });
-  } else if (diagnostics && diagnostics.length === 0) {
+  } else if (diagnostics && diagnostics.length === 0 && !textHasIssues) {
     collapsed = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: styles.sep, "aria-hidden": true }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { style: styles.summary, children: [
@@ -322,12 +364,7 @@ var MSG = WIDGET_MSG;
 var inject = ["slots", "sessions", "inputTriggers", "conversation"];
 var SESSION_SETTLE_MS = 400;
 var FOCUS_OPEN_MAX_ATTEMPTS = 3;
-function ensureNodeId(e) {
-  if (e.id) return e.id;
-  const random = typeof crypto !== "undefined" && typeof crypto.randomUUID === "function" ? crypto.randomUUID().replace(/-/g, "").slice(0, 8) : Math.random().toString(36).slice(2, 10);
-  e.id = `n${random}`;
-  return e.id;
-}
+var FOCUS_INFLIGHT_TIMEOUT_MS = 1e4;
 function elementContextRef(e) {
   return JSON.stringify(e);
 }
@@ -335,7 +372,7 @@ function serializeElement(ref) {
   try {
     const e = JSON.parse(ref);
     if (!e || typeof e !== "object") throw new Error("not an element payload");
-    return `@\u8282\u70B9[${ensureNodeId(e)}]`;
+    return toNodeMention(ensureNodeId(e));
   } catch {
     return `@${ref}`;
   }
@@ -360,7 +397,7 @@ function isEmbedded() {
 function postToHost(type, data = {}) {
   if (!isEmbedded()) return;
   try {
-    window.parent.postMessage({ type, ...data }, "*");
+    window.parent.postMessage(widgetEnvelope(type, data), "*");
   } catch {
   }
 }
@@ -376,6 +413,7 @@ function apply(ctx, config = {}) {
     let lastCurrent;
     let settleTimer = null;
     let targetSessionId;
+    let focusDeadline = 0;
     let pendingFocusId;
     let focusAttempts = 0;
     let refreshing = false;
@@ -395,6 +433,10 @@ function apply(ctx, config = {}) {
       if (!id) return;
       const snap = sessions.list.getSnapshot();
       if (!hasBaseline(snap)) return;
+      if (Date.now() >= focusDeadline) {
+        clearFocusTarget();
+        return;
+      }
       pendingFocusId = void 0;
       focusAttempts = 0;
       void tryOpenTarget(id);
@@ -403,7 +445,10 @@ function apply(ctx, config = {}) {
       if (focusAttempts >= FOCUS_OPEN_MAX_ATTEMPTS) return;
       focusAttempts += 1;
       const snap = sessions.list.getSnapshot();
-      if (snap.current === id) return;
+      if (snap.current === id) {
+        clearFocusTarget();
+        return;
+      }
       if (!listContains(snap, id) && !refreshing) {
         refreshing = true;
         try {
@@ -423,8 +468,16 @@ function apply(ctx, config = {}) {
       } catch {
       }
     };
-    const handleFocus = (sessionId) => {
+    const clearFocusTarget = () => {
+      targetSessionId = void 0;
+      focusDeadline = 0;
+      pendingFocusId = void 0;
+    };
+    const handleFocus = (sessionId, source2 = "host") => {
       targetSessionId = sessionId;
+      if (source2 === "host") {
+        focusDeadline = Date.now() + FOCUS_INFLIGHT_TIMEOUT_MS;
+      }
       const snap = sessions.list.getSnapshot();
       if (!hasBaseline(snap)) {
         pendingFocusId = sessionId;
@@ -451,8 +504,14 @@ function apply(ctx, config = {}) {
         settleTimer = null;
         if (sessions.list?.getSnapshot?.()?.current === current) {
           notifyReady(current);
-          if (targetSessionId && targetSessionId !== current) {
-            handleFocus(targetSessionId);
+          if (targetSessionId) {
+            if (current === targetSessionId) {
+              clearFocusTarget();
+            } else if (Date.now() < focusDeadline) {
+              handleFocus(targetSessionId, "refocus");
+            } else {
+              clearFocusTarget();
+            }
           }
         }
       }, SESSION_SETTLE_MS);
@@ -568,7 +627,7 @@ function apply(ctx, config = {}) {
       if (data.type === MSG.SET_THEME && typeof data.theme === "string") {
         applyThemeFromHost(data.theme);
       } else if (data.type === MSG.FOCUS_SESSION && typeof data.sessionId === "string") {
-        handleFocus(data.sessionId);
+        handleFocus(data.sessionId, "host");
       } else if (data.type === MSG.INSERT_FILE_PART && data.element) {
         insertElement(data.element);
       } else if (data.type === MSG.SELECT_MODE_CHANGE) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aipanel/dsh-client",
-  "version": "1.2.9",
+  "version": "1.2.11",
   "type": "module",
   "description": "AIPanel 浏览器侧插件（dsh web Web Client）：注册 @aipanel 文件引用 source，选中元素以 file chip 高亮插入并可供模型解析。",
   "publishConfig": {
@@ -22,7 +22,7 @@
     "@types/react": "^18.3.0",
     "esbuild": "^0.25.0",
     "react": "^18.3.0",
-    "@aipanel/core": "1.2.9"
+    "@aipanel/core": "1.2.11"
   },
   "exports": {
     ".": "./lib/index.js",