@aipanel/dsh-client 1.2.8 → 1.2.9

package/lib/client.js

@@ -24,32 +24,70 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // dsh-client/src/client/index.ts
 var index_exports = {};
 __export(index_exports, {
-  INSERT_ELEMENT_EVENT: () => INSERT_ELEMENT_EVENT,
-  SESSION_READY_EVENT: () => SESSION_READY_EVENT,
   apply: () => apply,
   inject: () => inject
 });
 module.exports = __toCommonJS(index_exports);
 
+// ../../core/es/common/constants.mjs
+var EXT_BROADCAST = {
+  PAGE_CONTEXT: "PAGE_CONTEXT",
+  THEME_CHANGE: "THEME_CHANGE",
+  SERVICE_APPEARED: "SERVICE_APPEARED",
+  SERVICE_GONE: "SERVICE_GONE"
+};
+var EXT_MSG = {
+  ...EXT_BROADCAST,
+  GET_PORT_INFO: "GET_PORT_INFO",
+  TAB_SWITCHED: "TAB_SWITCHED",
+  REQUEST_PAGE_CONTEXT: "REQUEST_PAGE_CONTEXT",
+  SELECTION_START: "SELECTION_START",
+  SELECTION_STOP: "SELECTION_STOP",
+  CS_QUERY_WINDOW: "__CS_QUERY_WINDOW__",
+  /** Side Panel → Background：立即轮询一次并回传当前服务信息 */
+  FORCE_POLL: "FORCE_POLL"
+};
+var WIDGET_MSG = {
+  READY: "AIPANEL_READY",
+  KEYDOWN: "AIPANEL_KEYDOWN",
+  SET_THEME: "AIPANEL_SET_THEME",
+  INSERT_FILE_PART: "AIPANEL_INSERT_FILE_PART",
+  SELECT_MODE_CHANGE: "AIPANEL_SELECT_MODE_CHANGE",
+  ELEMENT_SELECTED: "AIPANEL_ELEMENT_SELECTED",
+  SELECTION_CANCELLED: "AIPANEL_SELECTION_CANCELLED",
+  SELECTOR_START: "AIPANEL_SELECTOR_START",
+  SELECTOR_STOP: "AIPANEL_SELECTOR_STOP",
+  SERVICE_INFO: "AIPANEL_SERVICE_INFO",
+  MINIMIZE_STATE: "MINIMIZE_STATE_CHANGE",
+  PROMPT_DOCK_VISIBILITY: "PROMPT_DOCK_VISIBILITY_CHANGE",
+  REVIEW_PANEL_TOGGLE: "REVIEW_PANEL_TOGGLE",
+  /** 无 deepLink 能力的 Provider：通知 iframe 聚焦指定会话 */
+  FOCUS_SESSION: "AIPANEL_FOCUS_SESSION",
+  /** 无 deepLink 能力的 Provider：iframe 确认目标会话已激活且渲染稳定（携带 sessionId） */
+  SESSION_READY: "AIPANEL_SESSION_READY"
+};
+
 // 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 isSettledToolResult(block) {
+  return typeof block === "object" && block !== null && "kind" in block && block.kind === "tool-result";
+}
 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;
+  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;
 }
 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");
+  if (!isSettledToolResult(block)) return "";
+  const content = block.content;
+  if (!Array.isArray(content)) return "";
+  return content.filter(
+    (b) => typeof b === "object" && b !== null && b.type === "text" && typeof b.text === "string"
+  ).map((b) => b.text).join("\n");
 }
 function isEntry(d) {
   const e = d;
@@ -171,7 +209,7 @@ var styles = {
 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 isSettled = isSettledToolResult(block);
   const hasDiagnostics = typeof diagnostics !== "undefined" && diagnostics.length > 0;
   const errors = (diagnostics ?? []).filter((d) => d.severity === "error");
   const warnings = (diagnostics ?? []).filter((d) => d.severity === "warning");
@@ -270,12 +308,8 @@ function DiagnosticsRow({ block, cwd, toolName, openFile }) {
     }
   );
 }
-function registerDiagnosticsView(ctx) {
-  try {
-    if (localStorage.getItem(DIAGNOSTICS_STORAGE_KEY) !== "1") return;
-  } catch {
-    return;
-  }
+function registerDiagnosticsView(ctx, enabled = true) {
+  if (!enabled) return;
   const slots = ctx.slots;
   if (!slots) return;
   slots.inject("tool.call.toolview", function* () {
@@ -284,23 +318,16 @@ function registerDiagnosticsView(ctx) {
 }
 
 // dsh-client/src/client/index.ts
-var SELECTION_STORAGE_KEY = "dsh.bridge.selection";
+var MSG = WIDGET_MSG;
 var inject = ["slots", "sessions", "inputTriggers", "conversation"];
-var SESSION_READY_EVENT = "aipanel:session-ready";
-var INSERT_ELEMENT_EVENT = "aipanel:insert-element";
 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;
 }
-function elementLabel(e) {
-  if (e.description) return e.description;
-  const text = e.innerText?.trim();
-  if (text) return text.slice(0, 40);
-  return "\u5143\u7D20";
-}
 function elementContextRef(e) {
   return JSON.stringify(e);
 }
@@ -323,90 +350,91 @@ function toReference(e) {
     clipboardText: `@${mark}`
   };
 }
-function toCandidate(e) {
-  return {
-    name: elementLabel(e),
-    description: e.description || e.innerText || void 0,
-    value: elementContextRef(e)
-  };
+function isEmbedded() {
+  try {
+    return window.parent !== window;
+  } catch {
+    return false;
+  }
 }
-function readSelectionCandidates() {
+function postToHost(type, data = {}) {
+  if (!isEmbedded()) return;
   try {
-    const raw = localStorage.getItem(SELECTION_STORAGE_KEY);
-    if (!raw) return [];
-    const elements = JSON.parse(raw);
-    if (!Array.isArray(elements)) return [];
-    return elements.filter((e) => !!e && typeof e === "object").slice(0, 20).map(toCandidate);
+    window.parent.postMessage({ type, ...data }, "*");
   } catch {
-    return [];
   }
 }
-function apply(ctx) {
-  registerDiagnosticsView(ctx);
-  const inputTriggers = ctx.get("inputTriggers");
-  if (!inputTriggers) return;
-  const source = {
-    trigger: "@",
-    name: "aipanel",
-    order: 300,
-    showGroupTitle: false,
-    // 候选 = 最近选中元素（bridge 写入），按输入查询过滤
-    candidates: async (_session, req) => {
-      const all = readSelectionCandidates();
-      const query = req.query.trim().toLowerCase();
-      if (!query) return all;
-      return all.filter(
-        (c) => c.name.toLowerCase().includes(query) || (c.description ?? "").toLowerCase().includes(query)
-      );
-    },
-    // 选定 → 铸造 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,
-      serialize: async (ref) => serializeElement(ref)
-    }
-  };
-  ctx.effect(() => inputTriggers.registerSource(source), "aipanel: @ source");
+function mapAipanelTheme(t) {
+  if (t === "light" || t === "dark") return t;
+  if (t === "system" || t === "auto") return "system";
+  return null;
+}
+function apply(ctx, config = {}) {
+  registerDiagnosticsView(ctx, config.enableDiagnostics !== false);
   const sessions = ctx.get("sessions");
-  if (sessions && sessions.list) {
+  if (sessions) {
     let lastCurrent;
     let settleTimer = null;
-    const notifyBridge = (sessionId) => {
+    let targetSessionId;
+    let pendingFocusId;
+    let focusAttempts = 0;
+    let refreshing = false;
+    const notifyReady = (sessionId) => {
+      postToHost(MSG.SESSION_READY, { sessionId });
+    };
+    const hasBaseline = (snap) => {
+      if (!snap) return false;
+      return !!snap.current || !!snap.ids?.length || Object.keys(snap.byId ?? {}).length > 0;
+    };
+    const listContains = (snap, id) => {
+      if (!snap) return false;
+      return !!snap.byId?.[id] || snap.ids?.includes(id) === true;
+    };
+    const drainPendingFocus = () => {
+      const id = pendingFocusId;
+      if (!id) return;
+      const snap = sessions.list.getSnapshot();
+      if (!hasBaseline(snap)) return;
+      pendingFocusId = void 0;
+      focusAttempts = 0;
+      void tryOpenTarget(id);
+    };
+    const tryOpenTarget = async (id) => {
+      if (focusAttempts >= FOCUS_OPEN_MAX_ATTEMPTS) return;
+      focusAttempts += 1;
+      const snap = sessions.list.getSnapshot();
+      if (snap.current === id) return;
+      if (!listContains(snap, id) && !refreshing) {
+        refreshing = true;
+        try {
+          await sessions.refresh();
+        } catch {
+        } finally {
+          refreshing = false;
+        }
+        const fresh = sessions.list.getSnapshot();
+        if (!listContains(fresh, id)) {
+          setTimeout(() => void tryOpenTarget(id), 500);
+          return;
+        }
+      }
       try {
-        window.dispatchEvent(new CustomEvent(SESSION_READY_EVENT, { detail: { sessionId } }));
+        sessions.open(id);
       } catch {
       }
     };
+    const handleFocus = (sessionId) => {
+      targetSessionId = sessionId;
+      const snap = sessions.list.getSnapshot();
+      if (!hasBaseline(snap)) {
+        pendingFocusId = sessionId;
+        return;
+      }
+      focusAttempts = 0;
+      void tryOpenTarget(sessionId);
+    };
     const probe = () => {
-      const snapshot = sessions.list.getSnapshot();
+      const snapshot = sessions.list?.getSnapshot?.();
       const current = snapshot?.current;
       if (!current) {
         lastCurrent = void 0;
@@ -421,148 +449,161 @@ function apply(ctx) {
       if (settleTimer) clearTimeout(settleTimer);
       settleTimer = setTimeout(() => {
         settleTimer = null;
-        if (sessions.list.getSnapshot()?.current === current) {
-          notifyBridge(current);
+        if (sessions.list?.getSnapshot?.()?.current === current) {
+          notifyReady(current);
+          if (targetSessionId && targetSessionId !== current) {
+            handleFocus(targetSessionId);
+          }
         }
       }, SESSION_SETTLE_MS);
+      if (hasBaseline(snapshot)) drainPendingFocus();
     };
     probe();
-    const dispose = sessions.list.subscribe(probe);
-    ctx.effect(() => dispose, "aipanel: session-ready watcher");
-  }
-  const conversation = ctx.get("conversation");
-  const insertElementListener = (event) => {
-    const detail = event.detail;
-    const element = detail?.element;
-    if (!element) return;
-    const current = sessions?.list?.getSnapshot()?.current;
-    if (!current) return;
-    try {
-      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;
-      let start = snapshot.draft.length;
-      let end = snapshot.draft.length;
+    const unsubscribe = sessions.list.subscribe?.(probe);
+    ctx.effect(() => unsubscribe ?? (() => {
+    }), "aipanel: session-ready watcher");
+    const embedded = isEmbedded();
+    let selectModeActive = false;
+    const applyThemeFromHost = (theme) => {
+      const id = typeof theme === "string" ? mapAipanelTheme(theme) : null;
+      if (!id) return;
       try {
-        const composer = document.querySelector(
+        const themeService = ctx.get("theme");
+        themeService?.setTheme(id);
+      } catch {
+      }
+    };
+    const LAYOUT_STYLE_ID = "aipanel-layout-overrides";
+    const injectLayoutOverrides = () => {
+      if (!embedded) return;
+      try {
+        if (document.getElementById(LAYOUT_STYLE_ID)) return;
+        const style = document.createElement("style");
+        style.id = LAYOUT_STYLE_ID;
+        style.textContent = [
+          "[data-sidebar-collapsed] {",
+          "  grid-template-columns: auto !important;",
+          "}",
+          "[data-sidebar-collapsed] > :first-child {",
+          "  display: none !important;",
+          "}",
+          '[aria-label="\u9009\u62E9\u5DE5\u4F5C\u533A"] {',
+          "  display: none !important;",
+          "}"
+        ].join("\n");
+        document.head.appendChild(style);
+      } catch {
+      }
+    };
+    const onKeydownCapture = (event) => {
+      if (event.key !== "Escape" && !(event.ctrlKey && event.key.toLowerCase() === "p")) return;
+      if (selectModeActive) {
+        event.preventDefault();
+        event.stopPropagation();
+      }
+      postToHost(MSG.KEYDOWN, {
+        key: event.key,
+        ctrlKey: event.ctrlKey,
+        metaKey: event.metaKey,
+        shiftKey: event.shiftKey,
+        altKey: event.altKey
+      });
+    };
+    const focusComposer = () => {
+      try {
+        const el = document.querySelector(
           '[role="textbox"][contenteditable="true"], textarea[data-phase]'
         );
-        if (composer) {
-          if (composer.isContentEditable) {
-            const draftInComposer = (composer.innerText ?? "").replace(/\n$/, "");
-            if (draftInComposer === snapshot.draft) {
-              const sel = window.getSelection();
-              if (sel && sel.rangeCount > 0 && sel.anchorNode && sel.focusNode && composer.contains(sel.anchorNode) && composer.contains(sel.focusNode)) {
-                const textNodes = [];
-                const walker = document.createTreeWalker(composer, NodeFilter.SHOW_TEXT);
-                let n = walker.nextNode();
-                while (n) {
-                  textNodes.push(n);
-                  n = walker.nextNode();
-                }
-                const posOf = (node, off) => {
-                  const idx = textNodes.indexOf(node);
-                  if (idx < 0) return null;
-                  let acc = 0;
-                  for (let i = 0; i < idx; i++) acc += textNodes[i].data.length;
-                  return acc + Math.min(off, textNodes[idx].data.length);
-                };
-                const s = posOf(sel.anchorNode, sel.anchorOffset);
-                const e = posOf(sel.focusNode, sel.focusOffset);
-                if (s !== null && e !== null) {
-                  start = Math.min(Math.max(s, 0), snapshot.draft.length);
-                  end = Math.min(Math.max(e, start), snapshot.draft.length);
-                }
-              }
-            }
-          } else {
-            const ta = composer;
-            if (ta.value === snapshot.draft) {
-              const s = ta.selectionStart ?? snapshot.draft.length;
-              const e = ta.selectionEnd ?? s;
-              start = Math.min(s, snapshot.draft.length);
-              end = Math.min(e, snapshot.draft.length);
-            }
-          }
-        }
+        el?.focus();
+      } catch {
+      }
+    };
+    const detectSpan = (inputFor, snapshot) => {
+      if (!snapshot) return null;
+      const caret = inputFor.caretSpan?.();
+      return caret ? { start: caret.start, end: caret.end, draftRev: snapshot.draftRev } : null;
+    };
+    const INSERT_RETRY_MAX = 5;
+    const INSERT_RETRY_DELAY_MS = 80;
+    const insertElement = (element) => {
+      if (!element) return;
+      const current = sessions.list.getSnapshot().current;
+      if (!current) return;
+      let inputFor;
+      try {
+        const actx = sessions.scope(current);
+        if (!actx) return;
+        const conversation = ctx.get("conversation");
+        if (!conversation) return;
+        inputFor = conversation.input.for(actx);
       } catch {
+        return;
       }
+      if (!inputFor) return;
       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])) {
+      const attempt = (left) => {
+        let applied = false;
         try {
-          if (insertable.insertText?.(" ", { start, end, draftRev: rev })) {
-            const next = input.state?.getSnapshot?.();
-            if (next) {
-              leadingSpace = 1;
-              start += 1;
-              end += 1;
-              rev = next.draftRev;
-            }
+          const snap = inputFor.state.getSnapshot();
+          if (snap) {
+            const span = detectSpan(inputFor, snap);
+            if (span) applied = inputFor.insertReference(reference, span);
           }
         } catch {
+          applied = false;
         }
-      }
-      input.insertReference(reference, { start, end, draftRev: rev });
-      requestAnimationFrame(() => {
-        try {
-          const el = document.querySelector(
-            '[role="textbox"][contenteditable="true"], textarea[data-phase]'
-          );
-          if (!el) return;
-          const caret = start + insertedLen + leadingSpace;
-          if (el.isContentEditable) {
-            const textNodes = [];
-            const walker = document.createTreeWalker(el, NodeFilter.SHOW_TEXT);
-            let n = walker.nextNode();
-            while (n) {
-              textNodes.push(n);
-              n = walker.nextNode();
-            }
-            let target = textNodes[textNodes.length - 1] ?? null;
-            let off = target ? target.data.length : 0;
-            let remaining = Math.max(0, caret);
-            if (target) {
-              for (const t of textNodes) {
-                if (remaining <= t.data.length) {
-                  target = t;
-                  off = remaining;
-                  break;
-                }
-                remaining -= t.data.length;
-              }
-            }
-            if (target) {
-              const range = document.createRange();
-              range.setStart(target, Math.min(off, target.data.length));
-              range.collapse(true);
-              const sel = window.getSelection();
-              sel?.removeAllRanges();
-              sel?.addRange(range);
-            }
-            el.focus();
-          } else {
-            const ta = el;
-            ta.focus();
-            ta.setSelectionRange(Math.min(caret, ta.value.length), Math.min(caret, ta.value.length));
-          }
-        } catch {
+        if (applied) {
+          focusComposer();
+          return;
         }
-      });
-    } catch {
+        if (left > 0) {
+          setTimeout(() => attempt(left - 1), INSERT_RETRY_DELAY_MS);
+        }
+      };
+      attempt(INSERT_RETRY_MAX);
+    };
+    const onWindowMessage = (event) => {
+      const data = event.data;
+      if (!data || typeof data.type !== "string") return;
+      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);
+      } else if (data.type === MSG.INSERT_FILE_PART && data.element) {
+        insertElement(data.element);
+      } else if (data.type === MSG.SELECT_MODE_CHANGE) {
+        selectModeActive = data.selectMode === true;
+      }
+    };
+    window.addEventListener("message", onWindowMessage);
+    ctx.effect(
+      () => () => window.removeEventListener("message", onWindowMessage),
+      "aipanel: host message listener"
+    );
+    injectLayoutOverrides();
+    if (embedded) {
+      window.addEventListener("keydown", onKeydownCapture, true);
+      ctx.effect(
+        () => () => window.removeEventListener("keydown", onKeydownCapture, true),
+        "aipanel: keydown capture"
+      );
+    }
+    if (typeof config.theme === "string") {
+      applyThemeFromHost(config.theme);
+    }
+  }
+  const inputTriggers = ctx.get("inputTriggers");
+  if (!inputTriggers) return;
+  const source = {
+    trigger: "@",
+    name: "aipanel",
+    candidates: async () => [],
+    onPick: () => void 0,
+    codec: {
+      clipboardText: (ref) => ref,
+      serialize: async (ref) => serializeElement(ref)
     }
   };
-  window.addEventListener(INSERT_ELEMENT_EVENT, insertElementListener);
-  ctx.effect(
-    () => () => window.removeEventListener(INSERT_ELEMENT_EVENT, insertElementListener),
-    "aipanel: insert-element listener"
-  );
+  ctx.effect(() => inputTriggers.registerSource(source), "aipanel: @ codec source");
 }
 return module.exports; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aipanel/dsh-client",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "type": "module",
   "description": "AIPanel 浏览器侧插件（dsh web Web Client）：注册 @aipanel 文件引用 source，选中元素以 file chip 高亮插入并可供模型解析。",
   "publishConfig": {
@@ -12,11 +12,17 @@
   ],
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
+    "@deepseek-ai/dsh-api-session-controller": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.2-rc.1",
     "@deepseek-ai/dsh-client-ui-input-trigger": "^0.1.2-rc.1",
     "@deepseek-ai/dsh-client-ui-primitives": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-theme": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-tool": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-session": "^0.1.2-rc.1",
     "@types/react": "^18.3.0",
     "esbuild": "^0.25.0",
-    "react": "^18.3.0"
+    "react": "^18.3.0",
+    "@aipanel/core": "1.2.9"
   },
   "exports": {
     ".": "./lib/index.js",