@aipanel/dsh-client 1.2.4 → 1.2.6

package/lib/client.js

@@ -26,13 +26,275 @@ var index_exports = {};
 __export(index_exports, {
   INSERT_ELEMENT_EVENT: () => INSERT_ELEMENT_EVENT,
   SESSION_READY_EVENT: () => SESSION_READY_EVENT,
-  apply: () => apply
+  apply: () => apply,
+  inject: () => inject
 });
 module.exports = __toCommonJS(index_exports);
+
+// 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");
+var import_jsx_runtime = require("react/jsx-runtime");
+var DIAGNOSTICS_STORAGE_KEY = "dsh.bridge.diagnostics.enabled";
+function readDiagnostics(block) {
+  if (typeof block !== "object" || block === null) return void 0;
+  const settled = block;
+  if (settled.kind !== "tool-result") return void 0;
+  const meta = settled.meta;
+  const diagnostics = meta?.diagnostics;
+  if (!Array.isArray(diagnostics)) return void 0;
+  return diagnostics.every(isEntry) ? diagnostics : void 0;
+}
+function extractBlockText(block) {
+  if (typeof block !== "object" || block === null) return "";
+  const settled = block;
+  if (!Array.isArray(settled.content)) return "";
+  return (settled.content ?? []).filter((b) => b.type === "text" && typeof b.text === "string").map((b) => b.text).join("\n");
+}
+function isEntry(d) {
+  const e = d;
+  return !!e && typeof e.file === "string" && typeof e.line === "number" && typeof e.column === "number" && (e.severity === "error" || e.severity === "warning") && typeof e.message === "string";
+}
+function relativize(path, cwd) {
+  if (!cwd) return path;
+  const root = cwd.replace(/[/\\]+$/, "");
+  if (path.startsWith(`${root}/`) || path.startsWith(`${root}\\`)) {
+    return path.slice(root.length + 1);
+  }
+  return path;
+}
+var styles = {
+  sep: {
+    background: "var(--dsw-alias-label-caption)",
+    borderRadius: 1,
+    flex: "none",
+    width: 2,
+    height: 2,
+    margin: "0 8px"
+  },
+  summary: {
+    textOverflow: "ellipsis",
+    whiteSpace: "nowrap",
+    minWidth: 0,
+    color: "var(--dsw-alias-label-tertiary)",
+    flex: "auto",
+    fontSize: 12,
+    lineHeight: 24,
+    overflow: "hidden"
+  },
+  diagnostic: {
+    display: "flex",
+    alignItems: "flex-start",
+    gap: 8,
+    padding: "5px 0 5px 4px"
+  },
+  card: {
+    display: "flex",
+    flexDirection: "column",
+    gap: 2,
+    margin: "4px 0 4px 4px",
+    padding: "8px 12px",
+    borderRadius: 12,
+    background: "var(--dsw-alias-markdown-code-block)"
+  },
+  cardHead: {
+    display: "flex",
+    alignItems: "center",
+    justifyContent: "space-between",
+    gap: 8,
+    paddingBottom: 6,
+    marginBottom: 4,
+    borderBottom: "1px solid var(--dsw-alias-border-l1)"
+  },
+  cardTitle: {
+    color: "var(--dsw-alias-label-primary)",
+    fontWeight: 600,
+    fontSize: 12,
+    lineHeight: 1.4
+  },
+  scopeBadge: {
+    color: "var(--dsw-alias-label-secondary)",
+    fontSize: 11,
+    lineHeight: 1,
+    padding: "3px 8px",
+    borderRadius: 999,
+    border: "1px solid var(--dsw-alias-border-l2)"
+  },
+  target: {
+    display: "block",
+    width: "100%",
+    textAlign: "left",
+    border: "none",
+    background: "none",
+    padding: "0 0 4px 0",
+    margin: "0 0 4px 0",
+    color: "var(--dsw-alias-label-secondary)",
+    fontSize: 12,
+    fontFamily: "var(--ds-font-family-code, ui-monospace, SFMono-Regular, Menlo, monospace)",
+    cursor: "pointer",
+    textDecoration: "underline"
+  },
+  targetText: {
+    display: "block",
+    padding: "0 0 4px 0",
+    margin: "0 0 4px 0",
+    color: "var(--dsw-alias-label-secondary)",
+    fontSize: 12,
+    fontFamily: "var(--ds-font-family-code, ui-monospace, SFMono-Regular, Menlo, monospace)"
+  },
+  marker: { flex: "0 0 auto", width: 14, textAlign: "center", fontSize: 12, lineHeight: 1.6 },
+  diagBody: {
+    flex: 1,
+    minWidth: 0,
+    display: "flex",
+    flexDirection: "column",
+    gap: 3
+  },
+  loc: {
+    color: "var(--dsw-alias-label-tertiary)",
+    fontSize: 12,
+    lineHeight: 1.4
+  },
+  msg: {
+    color: "var(--dsw-alias-label-primary)",
+    fontSize: 12,
+    lineHeight: 1.6,
+    whiteSpace: "pre-wrap",
+    wordBreak: "break-word"
+  },
+  successMsg: {
+    color: "var(--dsw-alias-state-success-primary)",
+    fontSize: 12,
+    lineHeight: 1.6
+  }
+};
+function DiagnosticsRow({ block, cwd, toolName, openFile }) {
+  const diagnostics = readDiagnostics(block);
+  const [expanded, setExpanded] = (0, import_react.useState)(false);
+  const isSettled = block?.kind === "tool-result";
+  const hasDiagnostics = typeof diagnostics !== "undefined" && diagnostics.length > 0;
+  const errors = (diagnostics ?? []).filter((d) => d.severity === "error");
+  const warnings = (diagnostics ?? []).filter((d) => d.severity === "warning");
+  const contentText = extractBlockText(block);
+  const firstLine = (contentText.split("\n")[0] || "").trim();
+  const isFullProject = /^全量诊断结果/.test(firstLine);
+  const scope = isFullProject ? "project" : "file";
+  const scopeLabel = isFullProject ? "\u5168\u91CF" : "\u5355\u6587\u4EF6";
+  const cardTitle = "\u8BCA\u65AD\u7ED3\u679C";
+  const titleFileMatch = /^诊断结果:\s*(.+)$/.exec(firstLine);
+  const targetFile = scope === "file" && diagnostics && diagnostics.length > 0 ? diagnostics[0].file : null;
+  const targetDisplay = scope === "file" ? targetFile ? relativize(targetFile, cwd) : titleFileMatch ? titleFileMatch[1].trim() : null : null;
+  const errColor = "var(--dsw-alias-state-error-primary)";
+  const warnColor = "var(--dsw-alias-state-warn-primary)";
+  const state = !isSettled ? "ongoing" : errors.length > 0 ? "error" : warnings.length > 0 ? "warning" : "done";
+  const expandable = isSettled;
+  let collapsed;
+  if (hasDiagnostics) {
+    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: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: { color: "var(--dsw-alias-label-tertiary)" }, children: scopeLabel }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { "aria-hidden": true, children: " \xB7 " }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { style: { color: errColor }, children: [
+          errors.length,
+          " \u9519\u8BEF"
+        ] }),
+        " \xB7",
+        " ",
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { style: { color: warnColor }, children: [
+          warnings.length,
+          " \u8B66\u544A"
+        ] })
+      ] })
+    ] });
+  } else if (!isSettled) {
+    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.jsx)("span", { style: styles.summary, children: "\u8BCA\u65AD\u8FD0\u884C\u4E2D\u2026" })
+    ] });
+  } else if (diagnostics && diagnostics.length === 0) {
+    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: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: { color: "var(--dsw-alias-label-tertiary)" }, children: scopeLabel }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { "aria-hidden": true, children: " \xB7 " }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: { color: "var(--dsw-alias-state-success-primary)" }, children: "\u672A\u53D1\u73B0\u95EE\u9898" })
+      ] })
+    ] });
+  } else {
+    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.jsx)("span", { style: styles.summary, children: extractBlockText(block) || "\u65E0\u8F93\u51FA" })
+    ] });
+  }
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+    import_dsh_client_ui_primitives.DisclosureRow,
+    {
+      icon: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.StateDot, { state }),
+      title: toolName,
+      open: expanded,
+      expandable,
+      expandOnRowClick: expandable,
+      keepContentWhenOpen: true,
+      onToggle: () => setExpanded((v) => !v),
+      collapsedContent: collapsed,
+      children: expandable && expanded ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: styles.card, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: styles.cardHead, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: styles.cardTitle, children: cardTitle }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: styles.scopeBadge, children: scopeLabel })
+        ] }),
+        scope === "file" && targetDisplay ? targetFile && typeof openFile === "function" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", style: styles.target, onClick: () => openFile(targetFile), children: targetDisplay }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: styles.targetText, children: targetDisplay }) : null,
+        hasDiagnostics ? diagnostics.map((d, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: styles.diagnostic, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+            "span",
+            {
+              style: {
+                ...styles.marker,
+                color: d.severity === "error" ? errColor : warnColor
+              },
+              children: d.severity === "error" ? "\u2716" : "\u26A0"
+            }
+          ),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: styles.diagBody, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { style: styles.loc, children: [
+              relativize(d.file, cwd),
+              ":",
+              d.line,
+              ":",
+              d.column
+            ] }),
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: styles.msg, children: d.message })
+          ] })
+        ] }, i)) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: styles.successMsg, children: "\u672A\u53D1\u73B0\u95EE\u9898" })
+      ] }) : null
+    }
+  );
+}
+function registerDiagnosticsView(ctx) {
+  try {
+    if (localStorage.getItem(DIAGNOSTICS_STORAGE_KEY) !== "1") return;
+  } catch {
+    return;
+  }
+  const slots = ctx.slots;
+  if (!slots) return;
+  slots.inject("tool.call.toolview", function* () {
+    yield slots.register({ name: "tool.call.toolview", key: "run_diagnostics" }, DiagnosticsRow);
+  });
+}
+
+// dsh-client/src/client/index.ts
 var SELECTION_STORAGE_KEY = "dsh.bridge.selection";
+var inject = ["slots"];
 var SESSION_READY_EVENT = "aipanel:session-ready";
 var INSERT_ELEMENT_EVENT = "aipanel:insert-element";
 var SESSION_SETTLE_MS = 400;
+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;
+}
 function elementLabel(e) {
   if (e.description) return e.description;
   const text = e.innerText?.trim();
@@ -46,24 +308,19 @@ function serializeElement(ref) {
   try {
     const e = JSON.parse(ref);
     if (!e || typeof e !== "object") throw new Error("not an element payload");
-    const safe = (s) => s.replace(/[\\/]/g, (m) => m === "/" ? "\uFF0F" : "\uFF3C").replace(/["\n\r]+/g, " ");
-    const selector = safe(e.description || "element");
-    const text = e.innerText?.trim();
-    const textPreview = text ? text.length > 5 ? text.slice(0, 5) + "..." : text : "";
-    const body = `\u9009\u4E2D\u5143\u7D20:${selector}${textPreview ? `(${safe(textPreview)})` : ""}`;
-    return `@"${body}"`;
+    return `@\u8282\u70B9[${ensureNodeId(e)}]`;
   } catch {
     return `@${ref}`;
   }
 }
 function toReference(e) {
-  const label = elementLabel(e);
+  const mark = `\u8282\u70B9[${ensureNodeId(e)}]`;
   return {
     source: "aipanel",
     ref: elementContextRef(e),
-    label,
+    label: mark,
     appearance: "file",
-    clipboardText: label
+    clipboardText: `@${mark}`
   };
 }
 function toCandidate(e) {
@@ -85,6 +342,7 @@ function readSelectionCandidates() {
   }
 }
 function apply(ctx) {
+  registerDiagnosticsView(ctx);
   const inputTriggers = ctx.get("inputTriggers");
   if (!inputTriggers) return;
   const source = {
@@ -101,16 +359,35 @@ function apply(ctx) {
         (c) => c.name.toLowerCase().includes(query) || (c.description ?? "").toLowerCase().includes(query)
       );
     },
-    // 选定 → 铸造 file 引用：ref/label 分离（label 短，ref 携完整上下文）
-    onPick: (pick) => ({
-      insert: {
-        source: "aipanel",
-        ref: pick.candidate.value ?? pick.candidate.name,
-        label: pick.candidate.name,
-        appearance: "file",
-        clipboardText: pick.candidate.name
+    // 选定 → 铸造 file 引用：ref/label 分离（label 短，ref 携带完整元素 + 节点 id）
+    onPick: (pick) => {
+      try {
+        const parsed = JSON.parse(pick.candidate.value ?? "null");
+        if (parsed) {
+          ensureNodeId(parsed);
+          return {
+            insert: {
+              source: "aipanel",
+              ref: JSON.stringify(parsed),
+              label: pick.candidate.name,
+              appearance: "file",
+              // clipboardText 以 @ 开头（dsh backdrop 取首字符作 chip 触发 glyph）
+              clipboardText: `@${pick.candidate.name}`
+            }
+          };
+        }
+      } catch {
       }
-    }),
+      return {
+        insert: {
+          source: "aipanel",
+          ref: pick.candidate.value ?? pick.candidate.name,
+          label: pick.candidate.name,
+          appearance: "file",
+          clipboardText: `@${pick.candidate.name}`
+        }
+      };
+    },
     // 模型投影
     codec: {
       clipboardText: (ref) => ref,
@@ -161,16 +438,54 @@ function apply(ctx) {
     const current = sessions?.list?.getSnapshot()?.current;
     if (!current) return;
     try {
-      const actx = sessions.scope?.(current);
+      const actx = sessions?.scope?.(current);
+      if (!actx) return;
       const input = conversation?.input?.for?.(actx);
       if (!input || typeof input.insertReference !== "function") return;
       const snapshot = input.state?.getSnapshot?.();
       if (!snapshot) return;
-      const at = snapshot.draft.length;
-      input.insertReference(toReference(element), {
-        start: at,
-        end: at,
-        draftRev: snapshot.draftRev
+      let start = snapshot.draft.length;
+      let end = snapshot.draft.length;
+      try {
+        const el = document.querySelector("textarea[data-phase]");
+        if (el && el.value === snapshot.draft) {
+          const s = el.selectionStart ?? 0;
+          const e = el.selectionEnd ?? s;
+          start = Math.min(s, snapshot.draft.length);
+          end = Math.min(e, snapshot.draft.length);
+        }
+      } catch {
+      }
+      const reference = toReference(element);
+      const gap = snapshot.draft.slice(end)[0] === " " ? 0 : 1;
+      const insertedLen = reference.clipboardText.length + gap;
+      let leadingSpace = 0;
+      let rev = snapshot.draftRev;
+      const insertable = input;
+      if (start > 0 && !/\s/.test(snapshot.draft[start - 1])) {
+        try {
+          if (insertable.insertText?.(" ", { start, end, draftRev: rev })) {
+            const next = input.state?.getSnapshot?.();
+            if (next) {
+              leadingSpace = 1;
+              start += 1;
+              end += 1;
+              rev = next.draftRev;
+            }
+          }
+        } catch {
+        }
+      }
+      input.insertReference(reference, { start, end, draftRev: rev });
+      requestAnimationFrame(() => {
+        try {
+          const el = document.querySelector("textarea[data-phase]");
+          if (!el) return;
+          const caret = Math.min(start + insertedLen + leadingSpace, el.value.length);
+          el.focus();
+          el.setSelectionRange(caret, caret);
+        } catch {
+        }
       });
     } catch {
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aipanel/dsh-client",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "type": "module",
   "description": "AIPanel 浏览器侧插件（dsh web Web Client）：注册 @aipanel 文件引用 source，选中元素以 file chip 高亮插入并可供模型解析。",
   "publishConfig": {
@@ -10,11 +10,13 @@
   "files": [
     "lib"
   ],
-  "dependencies": {},
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
     "@deepseek-ai/dsh-client-ui-input-trigger": "^0.1.1-rc.2",
-    "esbuild": "^0.25.0"
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.0.1-rc.1",
+    "@types/react": "^18.3.0",
+    "esbuild": "^0.25.0",
+    "react": "^18.3.0"
   },
   "exports": {
     ".": "./lib/index.js",
@@ -24,7 +26,9 @@
   "dsh": {
     "client": {
       "platform": "web",
-      "inject": []
+      "inject": [
+        "slots"
+      ]
     }
   },
   "scripts": {