@dipertq/dsh-openviking-status 0.1.7 → 0.1.8

package/lib/client.js

@@ -1,5 +1,12 @@
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+
 // src/client/OpenVikingStatusChip.tsx
-import {
+import React2, {
   useState as useState2,
   useEffect as useEffect2,
   useCallback as useCallback2,
@@ -89,6 +96,8 @@ var OpenVikingClient = class {
     } else if (raw.startsWith("dsh-")) {
       const suffix = raw.slice("dsh-".length);
       candidates.push(raw, `dsh-session-${suffix}`);
+    } else if (raw.startsWith("session-")) {
+      candidates.push(`dsh-${raw}`, raw);
     } else {
       candidates.push(`dsh-session-${raw}`, `dsh-${raw}`, raw);
     }
@@ -124,12 +133,16 @@ var OpenVikingClient = class {
     }
   }
   /**
-   * Получение метаданных сессии по идентификатору с автоматическим разрешением префикса.
-   * При сетевых сбоях или ошибках авторизации возвращает null, не выбрасывая исключений.
+   * Чтение метаданных сессии с явной причиной неудачи.
+   *
+   * Демон может работать с `auth_mode: api_key`: тогда `/health` остаётся
+   * открытым, а сессия отвечает 401. Схлопывать это в «нет данных» нельзя —
+   * иначе интерфейс покажет живой индикатор рядом с нулями и умолчит о том,
+   * что счётчики просто недоступны.
    */
-  async fetchSession(sessionId) {
+  async readSession(sessionId) {
     if (!sessionId || !sessionId.trim()) {
-      return null;
+      return { status: "missing" };
     }
     const candidates = this.getCandidateSessionIds(sessionId);
     for (const candidateId of candidates) {
@@ -144,30 +157,48 @@ var OpenVikingClient = class {
         if (res.status === 404) {
           continue;
         }
+        if (res.status === 401 || res.status === 403) {
+          return { status: "unauthorized" };
+        }
         if (!res.ok) {
-          return null;
+          return { status: "error", detail: `HTTP ${res.status}` };
         }
         const data = await res.json();
         const raw = data?.result ?? data?.data ?? data;
         if (!raw || typeof raw !== "object") {
-          return null;
+          return { status: "error", detail: "malformed response body" };
         }
         this.resolvedSessionIds.set(sessionId.trim(), candidateId);
         return {
-          session_id: typeof raw.session_id === "string" ? raw.session_id : candidateId,
-          peer_id: typeof raw.peer_id === "string" ? raw.peer_id : void 0,
-          pending_tokens: typeof raw.pending_tokens === "number" ? raw.pending_tokens : 0,
-          message_count: typeof raw.message_count === "number" ? raw.message_count : void 0,
-          commit_count: typeof raw.commit_count === "number" ? raw.commit_count : void 0,
-          last_commit_at: typeof raw.last_commit_at === "string" ? raw.last_commit_at : typeof raw.last_commit === "string" ? raw.last_commit : void 0,
-          created_at: typeof raw.created_at === "string" ? raw.created_at : void 0,
-          updated_at: typeof raw.updated_at === "string" ? raw.updated_at : void 0
+          status: "ok",
+          session: {
+            session_id: typeof raw.session_id === "string" ? raw.session_id : candidateId,
+            peer_id: typeof raw.peer_id === "string" ? raw.peer_id : void 0,
+            pending_tokens: typeof raw.pending_tokens === "number" ? raw.pending_tokens : 0,
+            message_count: typeof raw.message_count === "number" ? raw.message_count : void 0,
+            commit_count: typeof raw.commit_count === "number" ? raw.commit_count : void 0,
+            last_commit_at: typeof raw.last_commit_at === "string" ? raw.last_commit_at : typeof raw.last_commit === "string" ? raw.last_commit : void 0,
+            created_at: typeof raw.created_at === "string" ? raw.created_at : void 0,
+            updated_at: typeof raw.updated_at === "string" ? raw.updated_at : void 0
+          }
+        };
+      } catch (err) {
+        return {
+          status: "unreachable",
+          detail: err instanceof Error ? err.message : String(err)
         };
-      } catch {
-        return null;
       }
     }
-    return null;
+    return { status: "missing" };
+  }
+  /**
+   * Получение метаданных сессии по идентификатору.
+   * Обёртка над {@link readSession} для вызывающих, которым причина неудачи
+   * не нужна: любая неудача сводится к null.
+   */
+  async fetchSession(sessionId) {
+    const result = await this.readSession(sessionId);
+    return result.status === "ok" ? result.session : null;
   }
   /**
    * Алиас для fetchSession
@@ -233,6 +264,41 @@ function commitSession(sessionId, options, endpoint, apiKey) {
   return client.commitSession(sessionId, options);
 }
 
+// src/client/theme.ts
+var THEME = {
+  /** Фон всплывающей панели — тот же, что у меню и диалогов DSH. */
+  panelSurface: "--dsw-specific-menu",
+  /** Тень панели. */
+  panelElevation: "--dsw-elevation-prominent",
+  /** Контур панели; задаётся через переменную тени, а не через border. */
+  panelStroke: "--dsw-alias-border-l1",
+  /** Заголовки и акцентный текст. */
+  labelPrimary: "--dsw-alias-label-primary",
+  /** Основной текст панели. */
+  labelSecondary: "--dsw-alias-label-secondary",
+  /** Приглушённый текст: подписи, значения, текст чипа в покое. */
+  labelTertiary: "--dsw-alias-label-tertiary",
+  /** Разделительная линия внутри панели. */
+  hairline: "--dsw-alias-border-l2",
+  /** Подсветка интерактивного элемента под курсором. */
+  hoverBackground: "--dsw-alias-interactive-bg-hover",
+  /** Подсветка нажатого элемента. */
+  activeBackground: "--dsw-alias-interactive-bg-active",
+  /** Демон доступен. */
+  stateSuccess: "--dsw-alias-state-success-primary",
+  /** Демон недоступен или сессия нечитаема. */
+  stateError: "--dsw-alias-state-error-primary",
+  /** Идёт коммит, либо накоплено близко к порогу. */
+  stateWarning: "--dsw-alias-state-warn-primary",
+  /** Утопленная поверхность: дорожка прогресс-бара. */
+  insetSurface: "--dsw-alias-bg-layer-2",
+  /** Моноширинный шрифт для идентификаторов и путей. */
+  fontMono: "--dsw-font-markdown-code-font-family"
+};
+function themeVar(role) {
+  return `var(${THEME[role]})`;
+}
+
 // src/client/recallParser.ts
 var KNOWN_CATEGORIES = /* @__PURE__ */ new Set([
   "preferences",
@@ -541,6 +607,15 @@ function parseRecalledMemories(input) {
 // src/client/OpenVikingStatusPopover.tsx
 import { useState, useEffect, useCallback, useRef } from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+function dshIcon(name2) {
+  try {
+    const primitives = typeof __require === "function" ? __require("@deepseek-ai/dsh-client-ui-primitives") : null;
+    const icon = primitives?.[name2];
+    return typeof icon === "function" ? icon : null;
+  } catch {
+    return null;
+  }
+}
 function getProgressBarPercent(pendingTokens, threshold = COMMIT_THRESHOLD) {
   if (!threshold || threshold <= 0) return 0;
   const ratio = (pendingTokens || 0) / threshold;
@@ -548,9 +623,14 @@ function getProgressBarPercent(pendingTokens, threshold = COMMIT_THRESHOLD) {
 }
 function getProgressBarColor(percent) {
   if (percent >= 80) {
-    return "var(--dsw-status-warning, #fbbf24)";
+    return themeVar("stateWarning");
   }
-  return "var(--dsw-status-success, #34d399)";
+  return themeVar("stateSuccess");
+}
+function formatDaemonVersion(version) {
+  const value = version?.trim();
+  if (!value) return void 0;
+  return /^v/i.test(value) ? value : `v${value}`;
 }
 function formatRelativeTime(isoOrTimestamp, now = Date.now()) {
   if (!isoOrTimestamp) return void 0;
@@ -592,39 +672,8 @@ function truncateSessionId(id, maxLen = 16) {
   if (id.length <= maxLen) return id;
   return `${id.slice(0, maxLen)}...`;
 }
-function getCategoryBadgeStyle(category) {
-  switch (category?.toLowerCase()) {
-    case "preferences":
-      return {
-        backgroundColor: "rgba(168, 85, 247, 0.15)",
-        color: "var(--dsw-status-purple, #c084fc)"
-      };
-    case "entities":
-      return {
-        backgroundColor: "rgba(59, 130, 246, 0.15)",
-        color: "var(--dsw-status-info, #60a5fa)"
-      };
-    case "skills":
-      return {
-        backgroundColor: "rgba(236, 72, 153, 0.15)",
-        color: "var(--dsw-status-pink, #f472b6)"
-      };
-    case "events":
-      return {
-        backgroundColor: "rgba(245, 158, 11, 0.15)",
-        color: "var(--dsw-status-warning, #fbbf24)"
-      };
-    case "resources":
-      return {
-        backgroundColor: "rgba(20, 184, 166, 0.15)",
-        color: "var(--dsw-status-teal, #2dd4bf)"
-      };
-    default:
-      return {
-        backgroundColor: "rgba(148, 163, 184, 0.15)",
-        color: "var(--dsw-text-muted, #94a3b8)"
-      };
-  }
+function getCategoryBadgeStyle(_category) {
+  return { color: themeVar("labelTertiary") };
 }
 function handleEscapeKey(event, onClose) {
   if (event.key === "Escape") {
@@ -637,6 +686,7 @@ function OpenVikingStatusPopover({
   sessionId,
   health,
   sessionData,
+  sessionRead,
   recalledResult,
   endpoint,
   isCommitting = false,
@@ -656,13 +706,17 @@ function OpenVikingStatusPopover({
     };
   }, []);
   const isOnline = health?.ok === true;
-  const statusColor = isOnline ? "var(--dsw-status-success, #34d399)" : "var(--dsw-status-error, #f87171)";
+  const sessionUnreadable = isOnline && sessionRead != null && sessionRead.status !== "ok";
+  const unauthorized = sessionRead?.status === "unauthorized";
+  const statusColor = isOnline ? sessionUnreadable ? themeVar("stateWarning") : themeVar("stateSuccess") : themeVar("stateError");
   const displaySessionId = sessionData?.session_id || sessionId || "";
   const pendingTokens = sessionData?.pending_tokens ?? 0;
   const progressPercent = getProgressBarPercent(pendingTokens);
   const progressBarColor = getProgressBarColor(progressPercent);
   const memoryItems = recalledResult?.items || [];
   const recalledCount = recalledResult?.recalledCount ?? memoryItems.length;
+  const CopyIcon = dshIcon("IconCopyOutline16");
+  const CheckIcon = dshIcon("IconCheckOutline16");
   const handleCopySessionId = useCallback(() => {
     if (!displaySessionId) return;
     if (typeof navigator !== "undefined" && navigator.clipboard) {
@@ -678,7 +732,15 @@ function OpenVikingStatusPopover({
       }, 1500);
     }
   }, [displaySessionId]);
-  const isCommitDisabled = isCommitting || !isOnline || pendingTokens === 0;
+  const isCommitDisabled = isCommitting || !isOnline || sessionUnreadable || pendingTokens === 0;
+  const pendingLabel = sessionUnreadable ? "unavailable" : `${pendingTokens.toLocaleString()} / ${COMMIT_THRESHOLD.toLocaleString()}`;
+  const rowStyle = {
+    display: "flex",
+    justifyContent: "space-between",
+    alignItems: "center"
+  };
+  const mutedStyle = { color: themeVar("labelTertiary") };
+  const monoStyle = { fontFamily: themeVar("fontMono") };
   return /* @__PURE__ */ jsxs(
     "div",
     {
@@ -689,17 +751,23 @@ function OpenVikingStatusPopover({
         position: "absolute",
         bottom: "calc(100% + 8px)",
         right: 0,
-        width: "320px",
-        backgroundColor: "var(--dsw-surface-overlay, #1e293b)",
-        border: "1px solid var(--dsw-border-default, #334155)",
-        borderRadius: "8px",
-        padding: "12px",
-        boxShadow: "0 10px 25px -5px rgba(0, 0, 0, 0.5)",
-        zIndex: 1e3,
-        fontSize: "12px",
-        color: "var(--dsw-text-default, #f1f5f9)",
-        fontFamily: "var(--dsw-font-sans, system-ui, sans-serif)",
+        zIndex: 1100,
         boxSizing: "border-box",
+        width: "max-content",
+        minWidth: "min(300px, 100vw - 24px)",
+        maxWidth: "min(440px, 100vw - 24px)",
+        background: themeVar("panelSurface"),
+        boxShadow: themeVar("panelElevation"),
+        color: themeVar("labelSecondary"),
+        cursor: "default",
+        border: 0,
+        borderRadius: "12px",
+        padding: "16px",
+        fontSize: "12px",
+        lineHeight: "18px",
+        ...{
+          "--dsw-elevation-stroke-color": themeVar("panelStroke")
+        },
         ...style
       },
       children: [
@@ -710,58 +778,41 @@ function OpenVikingStatusPopover({
             style: {
               display: "flex",
               justifyContent: "space-between",
-              alignItems: "flex-start",
-              marginBottom: "10px",
-              paddingBottom: "8px",
-              borderBottom: "1px solid var(--dsw-border-subtle, rgba(255, 255, 255, 0.08))"
+              gap: "16px",
+              marginBottom: "8px",
+              color: themeVar("labelPrimary"),
+              fontWeight: 500
             },
             children: [
-              /* @__PURE__ */ jsxs("div", { children: [
-                /* @__PURE__ */ jsx(
-                  "div",
-                  {
-                    style: {
-                      fontWeight: 600,
-                      fontSize: "13px",
-                      color: "var(--dsw-text-default, #f1f5f9)"
-                    },
-                    children: "OpenViking Memory"
-                  }
-                ),
+              /* @__PURE__ */ jsxs("span", { style: { minWidth: 0 }, children: [
+                "OpenViking Memory",
+                " ",
                 /* @__PURE__ */ jsx(
-                  "div",
+                  "span",
                   {
                     "data-testid": "endpoint-label",
-                    style: {
-                      fontSize: "10px",
-                      color: "var(--dsw-text-muted, #94a3b8)",
-                      fontFamily: "var(--dsw-font-mono, monospace)",
-                      marginTop: "1px"
-                    },
+                    style: { ...mutedStyle, ...monoStyle, fontWeight: 400 },
                     children: formatEndpoint(endpoint)
                   }
                 )
               ] }),
               /* @__PURE__ */ jsxs(
-                "div",
+                "span",
                 {
                   "data-testid": "status-badge",
                   style: {
                     display: "inline-flex",
                     alignItems: "center",
-                    gap: "5px",
-                    fontSize: "10px",
-                    padding: "2px 7px",
-                    borderRadius: "4px",
-                    backgroundColor: isOnline ? "rgba(52, 211, 153, 0.15)" : "rgba(248, 113, 113, 0.15)",
+                    gap: "6px",
                     color: statusColor,
-                    fontWeight: 600
+                    flexShrink: 0
                   },
                   children: [
                     /* @__PURE__ */ jsx(
                       "span",
                       {
                         "data-testid": "status-badge-dot",
+                        "aria-hidden": "true",
                         style: {
                           width: "6px",
                           height: "6px",
@@ -771,13 +822,27 @@ function OpenVikingStatusPopover({
                         }
                       }
                     ),
-                    /* @__PURE__ */ jsx("span", { children: isOnline ? health?.version ? `ONLINE v${health.version}` : "ONLINE" : "OFFLINE" })
+                    /* @__PURE__ */ jsx("span", { children: isOnline ? [
+                      "ONLINE",
+                      formatDaemonVersion(health?.version),
+                      sessionUnreadable ? "\xB7 no session access" : null
+                    ].filter(Boolean).join(" ") : "OFFLINE" })
                   ]
                 }
               )
             ]
           }
         ),
+        /* @__PURE__ */ jsx(
+          "div",
+          {
+            style: {
+              borderTop: `.5px solid ${themeVar("hairline")}`,
+              marginBottom: "10px"
+            },
+            "aria-hidden": "true"
+          }
+        ),
         /* @__PURE__ */ jsxs(
           "div",
           {
@@ -788,142 +853,88 @@ function OpenVikingStatusPopover({
               marginBottom: "10px"
             },
             children: [
-              /* @__PURE__ */ jsxs(
-                "div",
-                {
-                  style: {
-                    display: "flex",
-                    justifyContent: "space-between",
-                    alignItems: "center"
-                  },
-                  children: [
-                    /* @__PURE__ */ jsx("span", { style: { color: "var(--dsw-text-muted, #94a3b8)" }, children: "Session ID:" }),
-                    /* @__PURE__ */ jsxs(
-                      "div",
-                      {
-                        style: {
-                          display: "flex",
-                          alignItems: "center",
-                          gap: "4px"
-                        },
-                        children: [
-                          /* @__PURE__ */ jsx(
-                            "span",
-                            {
-                              "data-testid": "session-id-value",
-                              role: "button",
-                              tabIndex: 0,
-                              onKeyDown: (e) => {
-                                if (e.key === "Enter" || e.key === " ") {
-                                  e.preventDefault();
-                                  handleCopySessionId();
-                                }
-                              },
-                              "aria-label": "Click to copy Session ID",
-                              style: {
-                                fontFamily: "var(--dsw-font-mono, monospace)",
-                                cursor: "pointer"
-                              },
-                              title: displaySessionId,
-                              onClick: handleCopySessionId,
-                              children: truncateSessionId(displaySessionId)
-                            }
-                          ),
-                          /* @__PURE__ */ jsx(
-                            "button",
-                            {
-                              type: "button",
-                              "data-testid": "copy-session-btn",
-                              onClick: handleCopySessionId,
-                              title: copied ? "Copied!" : "Copy Session ID",
-                              "aria-label": copied ? "Copied!" : "Copy Session ID",
-                              style: {
-                                background: "none",
-                                border: "none",
-                                cursor: "pointer",
-                                padding: "2px 4px",
-                                fontSize: "10px",
-                                color: copied ? "var(--dsw-status-success, #34d399)" : "var(--dsw-text-muted, #94a3b8)",
-                                borderRadius: "3px"
-                              },
-                              children: copied ? "\u2713" : "\u{1F4CB}"
-                            }
-                          )
-                        ]
-                      }
-                    )
-                  ]
-                }
-              ),
-              sessionData?.peer_id && /* @__PURE__ */ jsxs(
-                "div",
-                {
-                  style: {
-                    display: "flex",
-                    justifyContent: "space-between",
-                    alignItems: "center"
-                  },
-                  children: [
-                    /* @__PURE__ */ jsx("span", { style: { color: "var(--dsw-text-muted, #94a3b8)" }, children: "Peer ID:" }),
-                    /* @__PURE__ */ jsx(
-                      "span",
-                      {
-                        "data-testid": "peer-id-value",
-                        style: {
-                          maxWidth: "180px",
-                          overflow: "hidden",
-                          textOverflow: "ellipsis",
-                          whiteSpace: "nowrap",
-                          fontFamily: "var(--dsw-font-mono, monospace)"
-                        },
-                        title: sessionData.peer_id,
-                        children: sessionData.peer_id
-                      }
-                    )
-                  ]
-                }
-              ),
-              sessionData?.last_commit_at && /* @__PURE__ */ jsxs(
-                "div",
-                {
-                  style: {
-                    display: "flex",
-                    justifyContent: "space-between",
-                    alignItems: "center"
-                  },
-                  children: [
-                    /* @__PURE__ */ jsx("span", { style: { color: "var(--dsw-text-muted, #94a3b8)" }, children: "Last Commit:" }),
-                    /* @__PURE__ */ jsx(
-                      "span",
-                      {
-                        "data-testid": "last-commit-value",
-                        title: sessionData.last_commit_at,
-                        style: { color: "var(--dsw-text-default, #e2e8f0)" },
-                        children: formatRelativeTime(sessionData.last_commit_at) || sessionData.last_commit_at
-                      }
-                    )
-                  ]
-                }
-              )
+              /* @__PURE__ */ jsxs("div", { style: rowStyle, children: [
+                /* @__PURE__ */ jsx("span", { style: mutedStyle, children: "Session ID:" }),
+                /* @__PURE__ */ jsxs("span", { style: { display: "flex", alignItems: "center", gap: "4px" }, children: [
+                  /* @__PURE__ */ jsx(
+                    "span",
+                    {
+                      "data-testid": "session-id-value",
+                      role: "button",
+                      tabIndex: 0,
+                      onKeyDown: (e) => {
+                        if (e.key === "Enter" || e.key === " ") {
+                          e.preventDefault();
+                          handleCopySessionId();
+                        }
+                      },
+                      "aria-label": "Click to copy Session ID",
+                      style: { ...monoStyle, cursor: "pointer" },
+                      title: displaySessionId,
+                      onClick: handleCopySessionId,
+                      children: truncateSessionId(displaySessionId)
+                    }
+                  ),
+                  /* @__PURE__ */ jsx(
+                    "button",
+                    {
+                      type: "button",
+                      "data-testid": "copy-session-btn",
+                      onClick: handleCopySessionId,
+                      title: copied ? "Copied!" : "Copy Session ID",
+                      "aria-label": copied ? "Copied!" : "Copy Session ID",
+                      style: {
+                        background: "none",
+                        border: "none",
+                        cursor: "pointer",
+                        padding: "2px",
+                        display: "inline-flex",
+                        alignItems: "center",
+                        color: copied ? themeVar("stateSuccess") : themeVar("labelTertiary")
+                      },
+                      children: copied ? CheckIcon && /* @__PURE__ */ jsx(CheckIcon, { size: 14 }) : CopyIcon && /* @__PURE__ */ jsx(CopyIcon, { size: 14 })
+                    }
+                  )
+                ] })
+              ] }),
+              sessionData?.peer_id && /* @__PURE__ */ jsxs("div", { style: rowStyle, children: [
+                /* @__PURE__ */ jsx("span", { style: mutedStyle, children: "Peer ID:" }),
+                /* @__PURE__ */ jsx(
+                  "span",
+                  {
+                    "data-testid": "peer-id-value",
+                    style: {
+                      ...monoStyle,
+                      maxWidth: "180px",
+                      overflow: "hidden",
+                      textOverflow: "ellipsis",
+                      whiteSpace: "nowrap"
+                    },
+                    title: sessionData.peer_id,
+                    children: sessionData.peer_id
+                  }
+                )
+              ] }),
+              sessionData?.last_commit_at && /* @__PURE__ */ jsxs("div", { style: rowStyle, children: [
+                /* @__PURE__ */ jsx("span", { style: mutedStyle, children: "Last Commit:" }),
+                /* @__PURE__ */ jsx(
+                  "span",
+                  {
+                    "data-testid": "last-commit-value",
+                    title: sessionData.last_commit_at,
+                    children: formatRelativeTime(sessionData.last_commit_at) || sessionData.last_commit_at
+                  }
+                )
+              ] })
             ]
           }
         ),
         /* @__PURE__ */ jsxs("div", { style: { marginBottom: "12px" }, children: [
-          /* @__PURE__ */ jsxs(
-            "div",
-            {
-              style: {
-                display: "flex",
-                justifyContent: "space-between",
-                marginBottom: "4px"
-              },
-              children: [
-                /* @__PURE__ */ jsx("span", { style: { color: "var(--dsw-text-muted, #94a3b8)" }, children: "Pending Tokens:" }),
-                /* @__PURE__ */ jsx("span", { "data-testid": "pending-tokens-label", style: { fontWeight: 500 }, children: `${pendingTokens.toLocaleString()} / ${COMMIT_THRESHOLD.toLocaleString()}` })
-              ]
-            }
-          ),
-          /* @__PURE__ */ jsx(
+          /* @__PURE__ */ jsxs("div", { style: { ...rowStyle, marginBottom: "4px" }, children: [
+            /* @__PURE__ */ jsx("span", { style: mutedStyle, children: "Pending Tokens:" }),
+            /* @__PURE__ */ jsx("span", { "data-testid": "pending-tokens-label", children: pendingLabel })
+          ] }),
+          !sessionUnreadable && /* @__PURE__ */ jsx(
             "div",
             {
               "data-testid": "progress-bar-track",
@@ -931,7 +942,7 @@ function OpenVikingStatusPopover({
                 width: "100%",
                 height: "6px",
                 borderRadius: "3px",
-                backgroundColor: "rgba(255, 255, 255, 0.1)",
+                backgroundColor: themeVar("insetSurface"),
                 overflow: "hidden"
               },
               children: /* @__PURE__ */ jsx(
@@ -949,30 +960,34 @@ function OpenVikingStatusPopover({
             }
           )
         ] }),
+        sessionUnreadable && /* @__PURE__ */ jsx(
+          "div",
+          {
+            "data-testid": "session-unreadable-notice",
+            style: {
+              marginBottom: "12px",
+              color: themeVar("labelTertiary")
+            },
+            children: unauthorized ? "The daemon requires an API key. Set openviking_api_key in localStorage to read session counters." : "Session counters are unavailable right now."
+          }
+        ),
         /* @__PURE__ */ jsxs("div", { style: { marginBottom: "12px" }, children: [
           /* @__PURE__ */ jsx(
             "div",
             {
               style: {
-                display: "flex",
-                justifyContent: "space-between",
-                alignItems: "center",
-                marginBottom: "4px"
+                marginBottom: "4px",
+                color: themeVar("labelPrimary"),
+                fontWeight: 500
               },
-              children: /* @__PURE__ */ jsx("span", { style: { fontWeight: 600, fontSize: "11px" }, children: `Recalled Memories (${recalledCount})` })
+              children: `Recalled Memories (${recalledCount})`
             }
           ),
           memoryItems.length === 0 ? /* @__PURE__ */ jsx(
             "div",
             {
               "data-testid": "empty-memories-message",
-              style: {
-                padding: "8px 0",
-                color: "var(--dsw-text-muted, #94a3b8)",
-                fontStyle: "italic",
-                fontSize: "11px",
-                textAlign: "center"
-              },
+              style: { ...mutedStyle, padding: "4px 0" },
               children: "No memories recalled in this session"
             }
           ) : /* @__PURE__ */ jsx(
@@ -996,11 +1011,7 @@ function OpenVikingStatusPopover({
                     display: "flex",
                     alignItems: "center",
                     gap: "6px",
-                    padding: "4px 6px",
-                    borderRadius: "4px",
-                    backgroundColor: "rgba(255, 255, 255, 0.04)",
-                    border: "1px solid var(--dsw-border-subtle, rgba(255, 255, 255, 0.05))",
-                    fontSize: "11px"
+                    minWidth: 0
                   },
                   children: [
                     /* @__PURE__ */ jsx(
@@ -1008,10 +1019,6 @@ function OpenVikingStatusPopover({
                       {
                         "data-testid": "memory-category-badge",
                         style: {
-                          fontSize: "9px",
-                          fontWeight: 600,
-                          padding: "1px 4px",
-                          borderRadius: "3px",
                           textTransform: "uppercase",
                           flexShrink: 0,
                           ...getCategoryBadgeStyle(item.category)
@@ -1023,21 +1030,7 @@ function OpenVikingStatusPopover({
                       "span",
                       {
                         "data-testid": "memory-source-badge",
-                        style: {
-                          fontSize: "9px",
-                          fontWeight: 600,
-                          padding: "1px 4px",
-                          borderRadius: "3px",
-                          textTransform: "uppercase",
-                          flexShrink: 0,
-                          ...item.source === "profile" ? {
-                            backgroundColor: "rgba(99, 102, 241, 0.15)",
-                            color: "#818cf8"
-                          } : {
-                            backgroundColor: "rgba(16, 185, 129, 0.15)",
-                            color: "var(--dsw-status-success, #34d399)"
-                          }
-                        },
+                        style: { ...mutedStyle, flexShrink: 0 },
                         children: item.source
                       }
                     ),
@@ -1046,12 +1039,10 @@ function OpenVikingStatusPopover({
                       {
                         "data-testid": "memory-leaf-name",
                         style: {
-                          flex: 1,
                           overflow: "hidden",
                           textOverflow: "ellipsis",
                           whiteSpace: "nowrap",
-                          fontFamily: "var(--dsw-font-mono, monospace)",
-                          color: "var(--dsw-text-default, #f1f5f9)"
+                          minWidth: 0
                         },
                         children: formatMemoryLeafName(item.uri)
                       }
@@ -1067,16 +1058,7 @@ function OpenVikingStatusPopover({
           "div",
           {
             "data-testid": "commit-error-message",
-            style: {
-              marginBottom: "8px",
-              padding: "6px 8px",
-              borderRadius: "4px",
-              backgroundColor: "rgba(248, 113, 113, 0.1)",
-              border: "1px solid var(--dsw-status-error, #f87171)",
-              color: "var(--dsw-status-error, #f87171)",
-              fontSize: "11px",
-              wordBreak: "break-word"
-            },
+            style: { marginBottom: "8px", color: themeVar("stateError") },
             children: commitError
           }
         ),
@@ -1085,19 +1067,17 @@ function OpenVikingStatusPopover({
           {
             type: "button",
             "data-testid": "commit-now-btn",
-            onClick: () => onCommitNow?.(),
+            onClick: () => void onCommitNow?.(),
             disabled: isCommitDisabled,
             style: {
               width: "100%",
-              padding: "7px 0",
-              borderRadius: "6px",
-              border: "1px solid var(--dsw-border-default, #475569)",
-              backgroundColor: isCommitting ? "var(--dsw-surface-active, #334155)" : isCommitDisabled ? "rgba(255, 255, 255, 0.03)" : "var(--dsw-surface-base, #1e293b)",
-              color: isCommitDisabled ? "var(--dsw-text-muted, #64748b)" : "var(--dsw-text-default, #f8fafc)",
-              cursor: isCommitDisabled ? "not-allowed" : "pointer",
-              fontWeight: 600,
-              fontSize: "12px",
-              transition: "all 0.15s ease",
+              padding: "6px 10px",
+              borderRadius: "8px",
+              border: `.5px solid ${themeVar("hairline")}`,
+              background: isCommitDisabled ? "transparent" : themeVar("hoverBackground"),
+              color: isCommitDisabled ? themeVar("labelTertiary") : themeVar("labelPrimary"),
+              cursor: isCommitDisabled ? "default" : "pointer",
+              font: "inherit",
               display: "flex",
               alignItems: "center",
               justifyContent: "center",
@@ -1107,12 +1087,13 @@ function OpenVikingStatusPopover({
               /* @__PURE__ */ jsx(
                 "span",
                 {
+                  "aria-hidden": "true",
                   style: {
                     display: "inline-block",
                     width: "10px",
                     height: "10px",
                     borderRadius: "50%",
-                    border: "2px solid var(--dsw-status-warning, #fbbf24)",
+                    border: `2px solid ${themeVar("stateWarning")}`,
                     borderTopColor: "transparent",
                     animation: "ov-spin 1s linear infinite"
                   }
@@ -1144,11 +1125,15 @@ function formatTooltipTitle({
   isOnline,
   isCommitting = false,
   recalledCount,
-  pendingTokens
+  pendingTokens,
+  sessionUnreadable = false
 }) {
   if (!isOnline) {
     return "OpenViking: Offline";
   }
+  if (sessionUnreadable) {
+    return "OpenViking: session unreadable \u2014 the daemon requires an API key";
+  }
   const countLabel = `${recalledCount} recalled`;
   const tokenLabel = `${(pendingTokens || 0).toLocaleString()} pending tokens`;
   if (isCommitting) {
@@ -1156,36 +1141,69 @@ function formatTooltipTitle({
   }
   return `OpenViking: Online (${countLabel}, ${tokenLabel})`;
 }
-function getStatusIndicatorColor(isOnline, isCommitting = false) {
+function getStatusIndicatorColor(isOnline, isCommitting = false, sessionUnreadable = false) {
   if (!isOnline) {
-    return "var(--dsw-status-error, #f87171)";
+    return themeVar("stateError");
   }
-  if (isCommitting) {
-    return "var(--dsw-status-warning, #fbbf24)";
+  if (isCommitting || sessionUnreadable) {
+    return themeVar("stateWarning");
   }
-  return "var(--dsw-status-success, #34d399)";
+  return themeVar("stateSuccess");
 }
-function getStatusGlow(isOnline, isCommitting = false) {
-  if (isOnline && !isCommitting) {
-    return "0 0 6px var(--dsw-status-success, #34d399)";
-  }
-  return "none";
+function chatNodesToText(nodes) {
+  if (!nodes) return "";
+  const source = Array.isArray(nodes) ? nodes : typeof nodes === "object" ? Object.values(nodes) : [];
+  const parts = [];
+  const visit = (value, depth = 0) => {
+    if (depth > 4 || value === null || value === void 0) return;
+    if (typeof value === "string") {
+      parts.push(value);
+      return;
+    }
+    if (Array.isArray(value)) {
+      for (const item of value) visit(item, depth + 1);
+      return;
+    }
+    if (typeof value === "object") {
+      const record = value;
+      for (const key of ["content", "text", "data", "body"]) {
+        if (key in record) visit(record[key], depth + 1);
+      }
+    }
+  };
+  for (const node of source) visit(node);
+  return parts.join("\n");
 }
-function getFallbackSessionMessages(sessionId) {
-  if (!sessionId || typeof window === "undefined") {
-    return void 0;
+function OpenVikingStatusChip(props) {
+  const { useChat, ...rest } = props;
+  if (useChat && rest.contextText === void 0 && rest.messages === void 0) {
+    return /* @__PURE__ */ jsx2(ChatReadBoundary, { fallback: /* @__PURE__ */ jsx2(StatusChipView, { ...rest }), children: /* @__PURE__ */ jsx2(ChatBackedStatusChip, { useChat, ...rest }) });
   }
-  const win = window;
-  if (win.__DSH_STORE__?.getState) {
-    const state = win.__DSH_STORE__.getState();
-    return state?.conversations?.[sessionId]?.messages || state?.sessions?.[sessionId]?.messages;
+  return /* @__PURE__ */ jsx2(StatusChipView, { ...rest });
+}
+var ChatReadBoundary = class extends React2.Component {
+  state = { failed: false };
+  static getDerivedStateFromError() {
+    return { failed: true };
   }
-  if (win.__DSH_SESSION_MESSAGES__?.[sessionId]) {
-    return win.__DSH_SESSION_MESSAGES__[sessionId];
+  render() {
+    return this.state.failed ? this.props.fallback : this.props.children;
   }
-  return void 0;
+};
+function ChatBackedStatusChip({
+  useChat,
+  ...rest
+}) {
+  const nodes = useChat((snapshot) => {
+    try {
+      return snapshot?.legacy?.nodes !== void 0 ? snapshot.legacy.nodes : snapshot?.nodes;
+    } catch {
+      return void 0;
+    }
+  });
+  return /* @__PURE__ */ jsx2(StatusChipView, { ...rest, messages: nodes });
 }
-function OpenVikingStatusChip({
+function StatusChipView({
   sessionId,
   messages,
   contextText,
@@ -1194,32 +1212,28 @@ function OpenVikingStatusChip({
   className,
   initialHealth,
   initialSessionData,
+  initialSessionRead,
   initialOpen = false
 }) {
   const [health, setHealth] = useState2(
     initialHealth ?? null
   );
-  const [sessionData, setSessionData] = useState2(
-    initialSessionData ?? null
+  const [sessionRead, setSessionRead] = useState2(
+    initialSessionRead ?? (initialSessionData ? { status: "ok", session: initialSessionData } : null)
   );
   const [isOpen, setIsOpen] = useState2(initialOpen);
   const [isCommitting, setIsCommitting] = useState2(false);
   const [commitError, setCommitError] = useState2(null);
+  const [isHovered, setIsHovered] = useState2(false);
   const popoverRef = useRef2(null);
   const apiClient = client ?? defaultOpenVikingClient;
-  const fallbackMessages = useMemo(() => {
-    if (messages || contextText) return void 0;
-    return getFallbackSessionMessages(sessionId);
-  }, [sessionId, messages, contextText]);
-  const inputForParser = useMemo(() => {
-    if (contextText && messages) {
-      return [contextText, ...messages];
-    }
-    return contextText ?? messages ?? fallbackMessages;
-  }, [contextText, messages, fallbackMessages]);
+  const conversationText = useMemo(() => {
+    if (typeof contextText === "string") return contextText;
+    return chatNodesToText(messages);
+  }, [contextText, messages]);
   const recalledResult = useMemo(
-    () => parseRecalledMemories(inputForParser),
-    [inputForParser]
+    () => parseRecalledMemories(conversationText),
+    [conversationText]
   );
   const fetchStatus = useCallback2(async () => {
     try {
@@ -1228,8 +1242,7 @@ function OpenVikingStatusChip({
       if (!healthRes.ok) {
         return;
       }
-      const session = await apiClient.fetchSession(sessionId);
-      setSessionData(session);
+      setSessionRead(await apiClient.readSession(sessionId));
     } catch {
       setHealth({ ok: false });
     }
@@ -1282,26 +1295,28 @@ function OpenVikingStatusChip({
     }
   };
   const isOnline = health?.ok === true;
+  const sessionData = sessionRead?.status === "ok" ? sessionRead.session : null;
+  const sessionUnreadable = isOnline && sessionRead !== null && sessionRead.status !== "ok";
   const pendingTokens = sessionData?.pending_tokens ?? 0;
-  const pendingTokensK = Math.round(pendingTokens / 1e3);
   const recalledCount = recalledResult.recalledCount;
-  const statusColor = getStatusIndicatorColor(isOnline, isCommitting);
-  const statusGlow = getStatusGlow(isOnline, isCommitting);
+  const statusColor = getStatusIndicatorColor(
+    isOnline,
+    isCommitting,
+    sessionUnreadable
+  );
   const tooltipTitle = formatTooltipTitle({
     isOnline,
     isCommitting,
     recalledCount,
-    pendingTokens
+    pendingTokens,
+    sessionUnreadable
   });
+  const label = !isOnline ? "OV offline" : sessionUnreadable ? `OV: ${recalledCount} rec \xB7 no access` : `OV: ${recalledCount} rec \xB7 ${Math.round(pendingTokens / 1e3)}k pend`;
   return /* @__PURE__ */ jsxs2(
-    "div",
+    "span",
     {
       className,
-      style: {
-        position: "relative",
-        display: "inline-flex",
-        alignItems: "center"
-      },
+      style: { minWidth: 0, display: "inline-flex", position: "relative" },
       ref: popoverRef,
       children: [
         /* @__PURE__ */ jsxs2(
@@ -1309,23 +1324,28 @@ function OpenVikingStatusChip({
           {
             type: "button",
             onClick: () => setIsOpen(!isOpen),
+            onMouseEnter: () => setIsHovered(true),
+            onMouseLeave: () => setIsHovered(false),
             "aria-expanded": isOpen,
             "aria-haspopup": "dialog",
             style: {
-              display: "inline-flex",
+              // Геометрия и типографика повторяют штатный чип статистики DSH:
+              // прозрачный фон, без рамки, шрифт и кегль наследуются от строки.
+              boxSizing: "border-box",
+              maxWidth: "100%",
+              color: themeVar("labelTertiary"),
+              font: "inherit",
+              fontVariantNumeric: "tabular-nums",
+              lineHeight: "inherit",
+              whiteSpace: "nowrap",
+              background: isHovered ? themeVar("hoverBackground") : "transparent",
+              border: "none",
+              borderRadius: "24px",
               alignItems: "center",
               gap: "6px",
-              height: "26px",
-              padding: "0 8px",
-              fontSize: "12px",
-              fontFamily: "var(--dsw-font-mono, monospace)",
-              borderRadius: "6px",
-              background: "var(--dsw-surface-base, rgba(255, 255, 255, 0.05))",
-              border: "1px solid var(--dsw-border-subtle, rgba(255, 255, 255, 0.1))",
-              color: "var(--dsw-text-muted, #94a3b8)",
-              cursor: "pointer",
-              transition: "all 0.15s ease",
-              userSelect: "none"
+              padding: "1px 8px",
+              display: "inline-flex",
+              cursor: "pointer"
             },
             title: tooltipTitle,
             "aria-label": tooltipTitle,
@@ -1334,25 +1354,17 @@ function OpenVikingStatusChip({
                 "span",
                 {
                   "data-testid": "status-dot",
+                  "aria-hidden": "true",
                   style: {
-                    width: "7px",
-                    height: "7px",
+                    width: "6px",
+                    height: "6px",
                     borderRadius: "50%",
-                    backgroundColor: statusColor,
-                    boxShadow: statusGlow,
+                    background: statusColor,
                     flexShrink: 0
                   }
                 }
               ),
-              /* @__PURE__ */ jsx2(
-                "span",
-                {
-                  style: { fontWeight: 600, color: "var(--dsw-text-default, #e2e8f0)" },
-                  children: isOnline ? "OV:" : "OV"
-                }
-              ),
-              " ",
-              /* @__PURE__ */ jsx2("span", { children: isOnline ? `${recalledCount} rec \xB7 ${pendingTokensK}k pend` : "offline" })
+              /* @__PURE__ */ jsx2("span", { style: { textOverflow: "ellipsis", minWidth: 0 }, children: label })
             ]
           }
         ),
@@ -1362,6 +1374,7 @@ function OpenVikingStatusChip({
             sessionId,
             health,
             sessionData,
+            sessionRead,
             recalledResult,
             endpoint: apiClient.endpoint,
             isCommitting,
@@ -1381,10 +1394,10 @@ var inject = ["slots"];
 function apply(ctx) {
   ctx.effect(
     () => ctx.slots.inject(
-      "conversation.input.right",
+      "conversation.composer.dock",
       () => ctx.slots.register(
         {
-          name: "conversation.input.right",
+          name: "conversation.composer.dock",
           id: "openviking-status",
           order: 50,
           label: "OpenViking"
@@ -1392,7 +1405,7 @@ function apply(ctx) {
         OpenVikingStatusChip
       )
     ),
-    "openviking-status: composer chip"
+    "openviking-status: composer stats chip"
   );
 }
 export {
@@ -1401,11 +1414,14 @@ export {
   OpenVikingClient,
   OpenVikingStatusChip,
   OpenVikingStatusPopover,
+  THEME,
   apply,
+  chatNodesToText,
   checkHealth,
   commitSession,
   defaultOpenVikingClient,
   fetchSession,
+  formatDaemonVersion,
   formatEndpoint,
   formatMemoryLeafName,
   formatPendingTokens,
@@ -1413,11 +1429,9 @@ export {
   formatStatusLabel,
   formatTooltipTitle,
   getCategoryBadgeStyle,
-  getFallbackSessionMessages,
   getProgressBarColor,
   getProgressBarPercent,
   getSession,
-  getStatusGlow,
   getStatusIndicatorColor,
   handleEscapeKey,
   inferCategory,
@@ -1426,6 +1440,7 @@ export {
   parseRecalledMemories,
   resolveApiKey,
   resolveEndpoint,
+  themeVar,
   truncateSessionId
 };
 //# sourceMappingURL=client.js.map