uilint-react 0.1.45 → 0.1.47

package/dist/{chunk-EQKEHJI4.js → chunk-OSYIUF52.js}

@@ -1,16 +1,18 @@
 "use client";
 import {
   BADGE_COLORS,
-  Badge
-} from "./chunk-W42PI2OF.js";
+  Badge,
+  fetchSource,
+  getCachedSource
+} from "./chunk-S4IWHBOQ.js";
 import {
   groupBySourceFile,
   useUILintContext,
   useUILintStore
-} from "./chunk-BJD2V2LF.js";
+} from "./chunk-RAPUZC5J.js";
 
 // src/components/ui-lint/UILintToolbar.tsx
-import { useState as useState2, useRef as useRef2, useEffect as useEffect2, useCallback as useCallback2 } from "react";
+import React3, { useState as useState2, useRef as useRef2, useEffect as useEffect3, useCallback as useCallback2 } from "react";
 import { createPortal } from "react-dom";
 
 // src/components/ui-lint/toolbar-styles.ts
@@ -228,10 +230,10 @@ function SettingsPopover({ settings }) {
 }
 
 // src/components/ui-lint/ScanPanelStack.tsx
-import { useRef, useEffect } from "react";
+import { useRef, useEffect as useEffect2 } from "react";
 
 // src/components/ui-lint/ScanResultsPopover.tsx
-import { useState, useCallback, useMemo } from "react";
+import { useState, useCallback, useMemo, useEffect } from "react";
 
 // src/components/ui-lint/toolbar-icons.tsx
 import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
@@ -860,12 +862,65 @@ function ElementRow({ item, onHover, onClick }) {
     }
   );
 }
+function extractTagName(line, column) {
+  if (!line) return null;
+  if (column !== void 0) {
+    const searchStart = Math.max(0, column - 50);
+    const searchEnd = Math.min(line.length, column + 20);
+    const searchSlice = line.substring(searchStart, searchEnd);
+    const tagMatches = [
+      ...searchSlice.matchAll(/<([a-zA-Z][a-zA-Z0-9.-]*|Fragment)\b/g)
+    ];
+    for (const match of tagMatches) {
+      const tagStart = searchStart + match.index;
+      const tagEnd = tagStart + match[0].length;
+      if (column >= tagStart && column <= tagEnd + 30) {
+        return match[1];
+      }
+    }
+  }
+  const trimmed = line.trim();
+  const jsxTagMatch = trimmed.match(/^<([a-zA-Z][a-zA-Z0-9.-]*|Fragment)\b/);
+  if (jsxTagMatch) {
+    return jsxTagMatch[1];
+  }
+  return null;
+}
 function FileLevelIssueRow({
   filePath,
   issue,
   onClick
 }) {
   const fileName = filePath.split("/").pop() || filePath;
+  const [tagName, setTagName] = useState(null);
+  useEffect(() => {
+    const cached = getCachedSource(filePath);
+    if (cached) {
+      const lines = cached.content.split("\n");
+      const lineIndex = issue.line - 1;
+      if (lineIndex >= 0 && lineIndex < lines.length) {
+        const line = lines[lineIndex];
+        const tag = extractTagName(line, issue.column);
+        if (tag) {
+          setTagName(tag);
+          return;
+        }
+      }
+    }
+    fetchSource(filePath).then((result) => {
+      if (result) {
+        const lines = result.content.split("\n");
+        const lineIndex = issue.line - 1;
+        if (lineIndex >= 0 && lineIndex < lines.length) {
+          const line = lines[lineIndex];
+          const tag = extractTagName(line, issue.column);
+          if (tag) {
+            setTagName(tag);
+          }
+        }
+      }
+    });
+  }, [filePath, issue.line, issue.column]);
   return /* @__PURE__ */ jsxs3(
     "div",
     {
@@ -896,7 +951,22 @@ function FileLevelIssueRow({
               marginRight: "12px"
             },
             children: [
-              /* @__PURE__ */ jsx3(
+              tagName && /* @__PURE__ */ jsxs3(
+                "span",
+                {
+                  style: {
+                    fontSize: "11px",
+                    fontFamily: STYLES.fontMono,
+                    color: STYLES.accent
+                  },
+                  children: [
+                    "<",
+                    tagName,
+                    ">"
+                  ]
+                }
+              ),
+              !tagName && /* @__PURE__ */ jsx3(
                 "span",
                 {
                   style: {
@@ -992,26 +1062,26 @@ function CloseIcon() {
 import { jsx as jsx4 } from "react/jsx-runtime";
 function ScanPanelStack({ show, onClose }) {
   const containerRef = useRef(null);
-  useEffect(() => {
+  useEffect2(() => {
     if (!show) return;
     const handleClickOutside = (e) => {
       const target = e.target;
+      if (target?.closest?.("[data-ui-lint]")) {
+        return;
+      }
       if (containerRef.current && !containerRef.current.contains(target)) {
-        const isUILintElement = target.closest?.("[data-ui-lint]");
-        if (!isUILintElement) {
-          onClose();
-        }
+        onClose();
       }
     };
     const timeoutId = setTimeout(() => {
-      document.addEventListener("mousedown", handleClickOutside);
+      document.addEventListener("mousedown", handleClickOutside, true);
     }, 100);
     return () => {
       clearTimeout(timeoutId);
-      document.removeEventListener("mousedown", handleClickOutside);
+      document.removeEventListener("mousedown", handleClickOutside, true);
     };
   }, [show, onClose]);
-  useEffect(() => {
+  useEffect2(() => {
     if (!show) return;
     const handleKeyDown = (e) => {
       if (e.key === "Escape") {
@@ -1021,16 +1091,25 @@ function ScanPanelStack({ show, onClose }) {
     window.addEventListener("keydown", handleKeyDown);
     return () => window.removeEventListener("keydown", handleKeyDown);
   }, [show, onClose]);
+  const handleUILintInteraction = (e) => {
+    e.stopPropagation();
+  };
   if (!show) return null;
   return /* @__PURE__ */ jsx4(
     "div",
     {
       ref: containerRef,
+      "data-ui-lint": true,
+      onMouseDown: handleUILintInteraction,
+      onClick: handleUILintInteraction,
+      onKeyDown: handleUILintInteraction,
       style: {
         position: "absolute",
         bottom: "100%",
         left: 0,
-        marginBottom: "8px"
+        marginBottom: "8px",
+        pointerEvents: "auto"
+        // Ensure panel is interactive
       },
       children: /* @__PURE__ */ jsx4(ScanResultsPopover, { onClose })
     }
@@ -1038,10 +1117,10 @@ function ScanPanelStack({ show, onClose }) {
 }
 
 // src/components/ui-lint/UILintToolbar.tsx
-import { jsx as jsx5, jsxs as jsxs4 } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx5, jsxs as jsxs4 } from "react/jsx-runtime";
 var TOKENS = {
   // Colors
-  bgBase: "rgba(15, 15, 15, 0.85)",
+  bgBase: "rgba(15, 15, 15, 0.92)",
   bgElevated: "rgba(25, 25, 25, 0.95)",
   bgHover: "rgba(255, 255, 255, 0.08)",
   bgActive: "rgba(255, 255, 255, 0.12)",
@@ -1052,26 +1131,17 @@ var TOKENS = {
   textMuted: "rgba(255, 255, 255, 0.4)",
   textDisabled: "rgba(255, 255, 255, 0.25)",
   accent: "#63b3ed",
-  // Calm blue
   success: BADGE_COLORS.success,
-  // Soft green (shared with Badge)
   warning: BADGE_COLORS.warning,
-  // Warm orange (shared with Badge)
-  // Typography
+  error: "#f56565",
   fontFamily: `-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif`,
   fontMono: `"SF Mono", Monaco, "Cascadia Code", monospace`,
-  // Sizing
-  pillHeight: "44px",
-  // Touch-friendly
-  pillRadius: "22px",
-  buttonMinWidth: "44px",
-  // Touch target minimum
-  // Effects
-  blur: "blur(20px)",
-  shadowSm: "0 2px 8px rgba(0, 0, 0, 0.3)",
+  pillHeight: "40px",
+  pillRadius: "20px",
+  buttonMinWidth: "40px",
+  blur: "blur(16px)",
   shadowMd: "0 4px 20px rgba(0, 0, 0, 0.4)",
-  shadowGlow: (color) => `0 0 20px ${color}`,
-  // Animation
+  shadowGlow: (color) => `0 0 16px ${color}`,
   transitionFast: "150ms cubic-bezier(0.4, 0, 0.2, 1)",
   transitionBase: "200ms cubic-bezier(0.4, 0, 0.2, 1)",
   transitionSlow: "300ms cubic-bezier(0.4, 0, 0.2, 1)"
@@ -1080,8 +1150,8 @@ var Icons = {
   Eye: () => /* @__PURE__ */ jsxs4(
     "svg",
     {
-      width: "18",
-      height: "18",
+      width: "16",
+      height: "16",
       viewBox: "0 0 24 24",
       fill: "none",
       stroke: "currentColor",
@@ -1094,11 +1164,11 @@ var Icons = {
       ]
     }
   ),
-  EyeOff: () => /* @__PURE__ */ jsxs4(
+  Settings: () => /* @__PURE__ */ jsxs4(
     "svg",
     {
-      width: "18",
-      height: "18",
+      width: "15",
+      height: "15",
       viewBox: "0 0 24 24",
       fill: "none",
       stroke: "currentColor",
@@ -1106,16 +1176,30 @@ var Icons = {
       strokeLinecap: "round",
       strokeLinejoin: "round",
       children: [
-        /* @__PURE__ */ jsx5("path", { d: "M17.94 17.94A10.07 10.07 0 0 1 12 20c-7 0-11-8-11-8a18.45 18.45 0 0 1 5.06-5.94M9.9 4.24A9.12 9.12 0 0 1 12 4c7 0 11 8 11 8a18.5 18.5 0 0 1-2.16 3.19m-6.72-1.07a3 3 0 1 1-4.24-4.24" }),
-        /* @__PURE__ */ jsx5("line", { x1: "1", y1: "1", x2: "23", y2: "23" })
+        /* @__PURE__ */ jsx5("circle", { cx: "12", cy: "12", r: "3" }),
+        /* @__PURE__ */ jsx5("path", { d: "M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z" })
       ]
     }
   ),
-  Scan: () => /* @__PURE__ */ jsxs4(
+  Check: () => /* @__PURE__ */ jsx5(
     "svg",
     {
-      width: "16",
-      height: "16",
+      width: "12",
+      height: "12",
+      viewBox: "0 0 24 24",
+      fill: "none",
+      stroke: "currentColor",
+      strokeWidth: "2.5",
+      strokeLinecap: "round",
+      strokeLinejoin: "round",
+      children: /* @__PURE__ */ jsx5("polyline", { points: "20 6 9 17 4 12" })
+    }
+  ),
+  AlertTriangle: () => /* @__PURE__ */ jsxs4(
+    "svg",
+    {
+      width: "12",
+      height: "12",
       viewBox: "0 0 24 24",
       fill: "none",
       stroke: "currentColor",
@@ -1123,29 +1207,27 @@ var Icons = {
       strokeLinecap: "round",
       strokeLinejoin: "round",
       children: [
-        /* @__PURE__ */ jsx5("path", { d: "M3 7V5a2 2 0 0 1 2-2h2" }),
-        /* @__PURE__ */ jsx5("path", { d: "M17 3h2a2 2 0 0 1 2 2v2" }),
-        /* @__PURE__ */ jsx5("path", { d: "M21 17v2a2 2 0 0 1-2 2h-2" }),
-        /* @__PURE__ */ jsx5("path", { d: "M7 21H5a2 2 0 0 1-2-2v-2" }),
-        /* @__PURE__ */ jsx5("line", { x1: "7", y1: "12", x2: "17", y2: "12" })
+        /* @__PURE__ */ jsx5("path", { d: "M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z" }),
+        /* @__PURE__ */ jsx5("line", { x1: "12", y1: "9", x2: "12", y2: "13" }),
+        /* @__PURE__ */ jsx5("line", { x1: "12", y1: "17", x2: "12.01", y2: "17" })
       ]
     }
   ),
-  Check: () => /* @__PURE__ */ jsx5(
+  ChevronDown: () => /* @__PURE__ */ jsx5(
     "svg",
     {
-      width: "14",
-      height: "14",
+      width: "12",
+      height: "12",
       viewBox: "0 0 24 24",
       fill: "none",
       stroke: "currentColor",
-      strokeWidth: "2.5",
+      strokeWidth: "2",
       strokeLinecap: "round",
       strokeLinejoin: "round",
-      children: /* @__PURE__ */ jsx5("polyline", { points: "20 6 9 17 4 12" })
+      children: /* @__PURE__ */ jsx5("polyline", { points: "6 9 12 15 18 9" })
     }
   ),
-  AlertTriangle: () => /* @__PURE__ */ jsxs4(
+  X: () => /* @__PURE__ */ jsxs4(
     "svg",
     {
       width: "14",
@@ -1157,17 +1239,16 @@ var Icons = {
       strokeLinecap: "round",
       strokeLinejoin: "round",
       children: [
-        /* @__PURE__ */ jsx5("path", { d: "M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z" }),
-        /* @__PURE__ */ jsx5("line", { x1: "12", y1: "9", x2: "12", y2: "13" }),
-        /* @__PURE__ */ jsx5("line", { x1: "12", y1: "17", x2: "12.01", y2: "17" })
+        /* @__PURE__ */ jsx5("line", { x1: "18", y1: "6", x2: "6", y2: "18" }),
+        /* @__PURE__ */ jsx5("line", { x1: "6", y1: "6", x2: "18", y2: "18" })
       ]
     }
   ),
-  Settings: () => /* @__PURE__ */ jsxs4(
+  Unplug: () => /* @__PURE__ */ jsxs4(
     "svg",
     {
-      width: "16",
-      height: "16",
+      width: "14",
+      height: "14",
       viewBox: "0 0 24 24",
       fill: "none",
       stroke: "currentColor",
@@ -1175,12 +1256,15 @@ var Icons = {
       strokeLinecap: "round",
       strokeLinejoin: "round",
       children: [
-        /* @__PURE__ */ jsx5("circle", { cx: "12", cy: "12", r: "3" }),
-        /* @__PURE__ */ jsx5("path", { d: "M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z" })
+        /* @__PURE__ */ jsx5("path", { d: "M19 5l3-3" }),
+        /* @__PURE__ */ jsx5("path", { d: "M2 22l3-3" }),
+        /* @__PURE__ */ jsx5("path", { d: "M6.3 6.3a10 10 0 0 1 13.4 1.3" }),
+        /* @__PURE__ */ jsx5("path", { d: "M17.7 17.7a10 10 0 0 1-13.4-1.3" }),
+        /* @__PURE__ */ jsx5("path", { d: "m8 15 8-8" })
       ]
     }
   ),
-  ChevronRight: () => /* @__PURE__ */ jsx5(
+  Scan: () => /* @__PURE__ */ jsxs4(
     "svg",
     {
       width: "14",
@@ -1191,7 +1275,13 @@ var Icons = {
       strokeWidth: "2",
       strokeLinecap: "round",
       strokeLinejoin: "round",
-      children: /* @__PURE__ */ jsx5("polyline", { points: "9 18 15 12 9 6" })
+      children: [
+        /* @__PURE__ */ jsx5("path", { d: "M3 7V5a2 2 0 0 1 2-2h2" }),
+        /* @__PURE__ */ jsx5("path", { d: "M17 3h2a2 2 0 0 1 2 2v2" }),
+        /* @__PURE__ */ jsx5("path", { d: "M21 17v2a2 2 0 0 1-2 2h-2" }),
+        /* @__PURE__ */ jsx5("path", { d: "M7 21H5a2 2 0 0 1-2-2v-2" }),
+        /* @__PURE__ */ jsx5("line", { x1: "7", y1: "12", x2: "17", y2: "12" })
+      ]
     }
   )
 };
@@ -1208,101 +1298,72 @@ var globalStyles = `
   
   @keyframes uilint-pulse {
     0%, 100% { opacity: 1; }
-    50% { opacity: 0.5; }
-  }
-  
-  @keyframes uilint-scan-line {
-    0% { transform: translateX(-100%); }
-    100% { transform: translateX(100%); }
+    50% { opacity: 0.6; }
   }
   
-  @keyframes uilint-spin {
-    from { transform: rotate(0deg); }
-    to { transform: rotate(360deg); }
+  @keyframes uilint-slide-up {
+    from { opacity: 0; transform: translateY(12px); }
+    to { opacity: 1; transform: translateY(0); }
   }
   
-  .uilint-toolbar-btn {
+  .uilint-btn {
     display: flex;
     align-items: center;
     justify-content: center;
+    gap: 6px;
     height: 100%;
+    padding: 0 14px;
     border: none;
     background: transparent;
     color: ${TOKENS.textSecondary};
+    font-family: ${TOKENS.fontFamily};
+    font-size: 13px;
+    font-weight: 500;
     cursor: pointer;
     transition: 
       background-color ${TOKENS.transitionFast},
-      color ${TOKENS.transitionFast},
-      transform ${TOKENS.transitionFast};
+      color ${TOKENS.transitionFast};
     outline: none;
-    position: relative;
+    white-space: nowrap;
   }
   
-  .uilint-toolbar-btn:hover:not(:disabled) {
+  .uilint-btn:hover:not(:disabled) {
     background: ${TOKENS.bgHover};
     color: ${TOKENS.textPrimary};
   }
   
-  .uilint-toolbar-btn:active:not(:disabled) {
+  .uilint-btn:active:not(:disabled) {
     background: ${TOKENS.bgActive};
-    transform: scale(0.97);
   }
   
-  .uilint-toolbar-btn:focus-visible {
+  .uilint-btn:focus-visible {
     box-shadow: inset 0 0 0 2px ${TOKENS.borderFocus};
   }
   
-  .uilint-toolbar-btn:disabled {
+  .uilint-btn:disabled {
     cursor: not-allowed;
     color: ${TOKENS.textDisabled};
   }
   
-  .uilint-toolbar-btn--active {
-    background: ${TOKENS.bgActive} !important;
-    color: ${TOKENS.accent} !important;
-  }
-  
-  .uilint-toolbar-btn--warning {
-    color: ${TOKENS.warning} !important;
+  .uilint-btn--icon {
+    padding: 0;
+    min-width: ${TOKENS.buttonMinWidth};
   }
   
-  .uilint-toolbar-btn--success {
-    color: ${TOKENS.success} !important;
-  }
-  
-  .uilint-hint {
-    opacity: 0;
-    transform: translateY(4px);
-    transition: 
-      opacity ${TOKENS.transitionBase},
-      transform ${TOKENS.transitionBase};
-    pointer-events: none;
+  .uilint-btn--primary {
+    color: ${TOKENS.textPrimary};
   }
   
-  .uilint-hint--visible {
-    opacity: 1;
-    transform: translateY(0);
+  .uilint-btn--accent {
+    color: ${TOKENS.accent};
   }
   
-  .uilint-scanning-indicator {
-    position: relative;
-    overflow: hidden;
+  .uilint-btn--warning {
+    color: ${TOKENS.warning};
   }
   
-  .uilint-scanning-indicator::after {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: linear-gradient(
-      90deg,
-      transparent,
-      rgba(99, 179, 237, 0.3),
-      transparent
-    );
-    animation: uilint-scan-line 1.5s ease-in-out infinite;
+  .uilint-btn--success {
+    color: ${TOKENS.success};
   }
   
   .uilint-popover {
@@ -1313,80 +1374,65 @@ var globalStyles = `
     animation: uilint-fade-out ${TOKENS.transitionBase} forwards;
   }
   
-  /* Custom scrollbar styling for dark mode - scoped to uilint components */
-  [data-ui-lint] *,
-  [data-ui-lint] {
-    /* Firefox */
+  .uilint-scanning-bar {
+    animation: uilint-slide-up ${TOKENS.transitionSlow} forwards;
+  }
+  
+  .uilint-scanning-dot {
+    width: 6px;
+    height: 6px;
+    border-radius: 50%;
+    background: ${TOKENS.accent};
+    animation: uilint-pulse 1.5s ease-in-out infinite;
+  }
+
+  /* Scrollbar styling */
+  [data-ui-lint] * {
     scrollbar-width: thin;
     scrollbar-color: rgba(255, 255, 255, 0.15) rgba(15, 15, 15, 0.3);
   }
   
-  /* WebKit browsers (Chrome, Safari, Edge) */
-  [data-ui-lint] *::-webkit-scrollbar,
-  [data-ui-lint]::-webkit-scrollbar {
+  [data-ui-lint] *::-webkit-scrollbar {
     width: 8px;
     height: 8px;
   }
   
-  [data-ui-lint] *::-webkit-scrollbar-track,
-  [data-ui-lint]::-webkit-scrollbar-track {
+  [data-ui-lint] *::-webkit-scrollbar-track {
     background: rgba(15, 15, 15, 0.3);
     border-radius: 4px;
   }
   
-  [data-ui-lint] *::-webkit-scrollbar-thumb,
-  [data-ui-lint]::-webkit-scrollbar-thumb {
+  [data-ui-lint] *::-webkit-scrollbar-thumb {
     background: rgba(255, 255, 255, 0.15);
     border-radius: 4px;
-    border: 1px solid rgba(15, 15, 15, 0.2);
-    transition: background ${TOKENS.transitionFast};
   }
   
-  [data-ui-lint] *::-webkit-scrollbar-thumb:hover,
-  [data-ui-lint]::-webkit-scrollbar-thumb:hover {
+  [data-ui-lint] *::-webkit-scrollbar-thumb:hover {
     background: rgba(255, 255, 255, 0.25);
   }
-  
-  [data-ui-lint] *::-webkit-scrollbar-thumb:active,
-  [data-ui-lint]::-webkit-scrollbar-thumb:active {
-    background: rgba(255, 255, 255, 0.35);
-  }
-  
-  [data-ui-lint] *::-webkit-scrollbar-corner,
-  [data-ui-lint]::-webkit-scrollbar-corner {
-    background: rgba(15, 15, 15, 0.3);
-  }
 `;
-function ToolbarButton({
-  onClick,
-  disabled,
-  active,
-  variant = "default",
-  title,
-  ariaLabel,
-  width = TOKENS.buttonMinWidth,
-  children
-}) {
-  const classes = [
-    "uilint-toolbar-btn",
-    active && "uilint-toolbar-btn--active",
-    variant === "warning" && "uilint-toolbar-btn--warning",
-    variant === "success" && "uilint-toolbar-btn--success"
-  ].filter(Boolean).join(" ");
-  return /* @__PURE__ */ jsx5(
-    "button",
-    {
-      className: classes,
-      onClick,
-      disabled,
-      title,
-      "aria-label": ariaLabel,
-      "aria-pressed": active,
-      style: { minWidth: width },
-      children
-    }
-  );
-}
+var PillContainer = React3.forwardRef(({ children, glow, style }, ref) => /* @__PURE__ */ jsx5(
+  "div",
+  {
+    ref,
+    style: {
+      display: "inline-flex",
+      alignItems: "center",
+      height: TOKENS.pillHeight,
+      borderRadius: TOKENS.pillRadius,
+      border: `1px solid ${TOKENS.border}`,
+      backgroundColor: TOKENS.bgBase,
+      backdropFilter: TOKENS.blur,
+      WebkitBackdropFilter: TOKENS.blur,
+      boxShadow: glow ? `${TOKENS.shadowMd}, ${TOKENS.shadowGlow(glow)}` : TOKENS.shadowMd,
+      overflow: "hidden",
+      transition: `box-shadow ${TOKENS.transitionBase}`,
+      ...style
+    },
+    children
+  }
+));
+PillContainer.displayName = "PillContainer";
 function Divider() {
   return /* @__PURE__ */ jsx5(
     "div",
@@ -1401,98 +1447,112 @@ function Divider() {
     }
   );
 }
-function ScanStatus({ status, issueCount, enabled }) {
-  if (!enabled) {
-    return /* @__PURE__ */ jsx5(
-      "span",
-      {
-        style: {
-          fontSize: "12px",
-          color: TOKENS.textDisabled,
-          fontStyle: "italic"
-        },
-        children: "Off"
-      }
-    );
-  }
-  if (status === "scanning" || status === "paused") {
-    return /* @__PURE__ */ jsxs4(
-      "span",
+function Kbd({ children }) {
+  return /* @__PURE__ */ jsx5(
+    "kbd",
+    {
+      style: {
+        display: "inline-flex",
+        alignItems: "center",
+        padding: "2px 6px",
+        borderRadius: "4px",
+        backgroundColor: TOKENS.bgElevated,
+        border: `1px solid ${TOKENS.border}`,
+        fontSize: "11px",
+        fontFamily: TOKENS.fontMono,
+        color: TOKENS.textSecondary,
+        boxShadow: "0 1px 2px rgba(0, 0, 0, 0.4)"
+      },
+      children
+    }
+  );
+}
+function DisconnectedToolbar({
+  onSettingsClick,
+  showSettings
+}) {
+  return /* @__PURE__ */ jsxs4(PillContainer, { children: [
+    /* @__PURE__ */ jsxs4(
+      "div",
       {
-        className: "uilint-scanning-indicator",
         style: {
           display: "flex",
           alignItems: "center",
           gap: "6px",
-          padding: "0 4px"
+          padding: "0 12px",
+          color: TOKENS.textMuted,
+          fontSize: "12px"
         },
         children: [
-          /* @__PURE__ */ jsx5(Icons.Scan, {}),
-          /* @__PURE__ */ jsx5(
-            "span",
-            {
-              style: {
-                fontSize: "12px",
-                fontFamily: TOKENS.fontMono,
-                animation: `uilint-pulse 1s ease-in-out infinite`
-              },
-              children: "Scanning"
-            }
-          )
+          /* @__PURE__ */ jsx5(Icons.Unplug, {}),
+          /* @__PURE__ */ jsx5("span", { children: "Not connected" })
         ]
       }
-    );
-  }
-  if (issueCount === 0) {
-    return /* @__PURE__ */ jsxs4(
-      "span",
+    ),
+    /* @__PURE__ */ jsx5(Divider, {}),
+    /* @__PURE__ */ jsx5(
+      "button",
       {
-        style: {
-          display: "flex",
-          alignItems: "center",
-          gap: "5px"
-        },
+        className: `uilint-btn uilint-btn--icon ${showSettings ? "uilint-btn--accent" : ""}`,
+        onClick: onSettingsClick,
+        title: "Settings",
+        "aria-label": "Open settings",
+        "aria-pressed": showSettings,
+        children: /* @__PURE__ */ jsx5(Icons.Settings, {})
+      }
+    )
+  ] });
+}
+function IdleToolbar({
+  onStartScan,
+  onSettingsClick,
+  showSettings
+}) {
+  return /* @__PURE__ */ jsxs4(PillContainer, { children: [
+    /* @__PURE__ */ jsxs4(
+      "button",
+      {
+        className: "uilint-btn uilint-btn--primary",
+        onClick: onStartScan,
+        title: "Start scanning (\u2325S)",
+        "aria-label": "Start live scanning",
         children: [
-          /* @__PURE__ */ jsx5(
-            "span",
-            {
-              style: {
-                display: "flex",
-                alignItems: "center",
-                justifyContent: "center",
-                width: "18px",
-                height: "18px",
-                borderRadius: "50%",
-                backgroundColor: `${TOKENS.success}20`,
-                color: TOKENS.success
-              },
-              children: /* @__PURE__ */ jsx5(Icons.Check, {})
-            }
-          ),
-          /* @__PURE__ */ jsx5(
-            "span",
-            {
-              style: {
-                fontSize: "12px",
-                fontWeight: 500,
-                color: TOKENS.success
-              },
-              children: "Clear"
-            }
-          )
+          /* @__PURE__ */ jsx5(Icons.Eye, {}),
+          /* @__PURE__ */ jsx5("span", { children: "Start Scanning" })
         ]
       }
-    );
-  }
-  return /* @__PURE__ */ jsxs4(
-    "span",
-    {
-      style: {
-        display: "flex",
-        alignItems: "center",
-        gap: "5px"
-      },
-      children: [
+    ),
+    /* @__PURE__ */ jsx5(Divider, {}),
+    /* @__PURE__ */ jsx5(
+      "button",
+      {
+        className: `uilint-btn uilint-btn--icon ${showSettings ? "uilint-btn--accent" : ""}`,
+        onClick: onSettingsClick,
+        title: "Settings",
+        "aria-label": "Open settings",
+        "aria-pressed": showSettings,
+        children: /* @__PURE__ */ jsx5(Icons.Settings, {})
+      }
+    )
+  ] });
+}
+function ScanningToolbar({
+  issueCount,
+  isScanning,
+  showResults,
+  onToggleResults,
+  onStopScan
+}) {
+  const hasIssues = issueCount > 0;
+  const getStatusContent = () => {
+    if (isScanning) {
+      return /* @__PURE__ */ jsxs4(Fragment2, { children: [
+        /* @__PURE__ */ jsx5("div", { className: "uilint-scanning-dot" }),
+        /* @__PURE__ */ jsx5("span", { style: { fontFamily: TOKENS.fontMono, fontSize: "12px" }, children: "Scanning..." })
+      ] });
+    }
+    if (hasIssues) {
+      return /* @__PURE__ */ jsxs4(Fragment2, { children: [
         /* @__PURE__ */ jsx5(
           "span",
           {
@@ -1500,8 +1560,8 @@ function ScanStatus({ status, issueCount, enabled }) {
               display: "flex",
               alignItems: "center",
               justifyContent: "center",
-              width: "18px",
-              height: "18px",
+              width: "16px",
+              height: "16px",
               borderRadius: "50%",
               backgroundColor: `${TOKENS.warning}20`,
               color: TOKENS.warning
@@ -1510,6 +1570,72 @@ function ScanStatus({ status, issueCount, enabled }) {
           }
         ),
         /* @__PURE__ */ jsx5(Badge, { count: issueCount })
+      ] });
+    }
+    return /* @__PURE__ */ jsxs4(Fragment2, { children: [
+      /* @__PURE__ */ jsx5(
+        "span",
+        {
+          style: {
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center",
+            width: "16px",
+            height: "16px",
+            borderRadius: "50%",
+            backgroundColor: `${TOKENS.success}20`,
+            color: TOKENS.success
+          },
+          children: /* @__PURE__ */ jsx5(Icons.Check, {})
+        }
+      ),
+      /* @__PURE__ */ jsx5(
+        "span",
+        {
+          style: { fontSize: "12px", fontWeight: 500, color: TOKENS.success },
+          children: "All clear"
+        }
+      )
+    ] });
+  };
+  const statusVariant = hasIssues ? "warning" : isScanning ? "accent" : "success";
+  const glowColor = hasIssues ? `${TOKENS.warning}25` : void 0;
+  return /* @__PURE__ */ jsxs4(
+    "div",
+    {
+      className: "uilint-scanning-bar",
+      style: { display: "flex", alignItems: "center", gap: "10px" },
+      children: [
+        /* @__PURE__ */ jsxs4(PillContainer, { glow: glowColor, children: [
+          /* @__PURE__ */ jsxs4(
+            "button",
+            {
+              className: `uilint-btn uilint-btn--${statusVariant}`,
+              onClick: onToggleResults,
+              title: hasIssues ? `${issueCount} issue${issueCount !== 1 ? "s" : ""} found` : "View scan results",
+              "aria-label": "Toggle scan results",
+              "aria-expanded": showResults,
+              style: { paddingRight: "10px" },
+              children: [
+                getStatusContent(),
+                /* @__PURE__ */ jsx5(Icons.ChevronDown, {})
+              ]
+            }
+          ),
+          /* @__PURE__ */ jsx5(Divider, {}),
+          /* @__PURE__ */ jsx5(
+            "button",
+            {
+              className: "uilint-btn uilint-btn--icon",
+              onClick: onStopScan,
+              title: "Stop scanning (\u2325S)",
+              "aria-label": "Stop scanning",
+              children: /* @__PURE__ */ jsx5(Icons.X, {})
+            }
+          )
+        ] }),
+        /* @__PURE__ */ jsx5(Kbd, { children: "\u2325 + Click" }),
+        /* @__PURE__ */ jsx5("span", { style: { fontSize: "12px", color: TOKENS.textMuted }, children: "to inspect" })
       ]
     }
   );
@@ -1526,6 +1652,7 @@ function UILintToolbar() {
     (s) => s.elementIssuesCache
   );
   const fileIssuesCache = useUILintStore((s) => s.fileIssuesCache);
+  const wsConnected = useUILintStore((s) => s.wsConnected);
   const [showSettings, setShowSettings] = useState2(false);
   const [showResults, setShowResults] = useState2(false);
   const [mounted, setMounted] = useState2(false);
@@ -1533,7 +1660,17 @@ function UILintToolbar() {
   const [nextjsOverlayVisible, setNextjsOverlayVisible] = useState2(false);
   const toolbarRef = useRef2(null);
   const settingsRef = useRef2(null);
-  useEffect2(() => {
+  const isScanning = autoScanState.status === "scanning" || autoScanState.status === "paused";
+  let elementIssues = 0;
+  elementIssuesCache.forEach((el) => {
+    elementIssues += el.issues.length;
+  });
+  let fileLevelIssues = 0;
+  fileIssuesCache.forEach((issues) => {
+    fileLevelIssues += issues.length;
+  });
+  const totalIssues = elementIssues + fileLevelIssues;
+  useEffect3(() => {
     const checkForNextOverlay = () => {
       const overlaySelectors = [
         "nextjs-portal",
@@ -1560,29 +1697,21 @@ function UILintToolbar() {
     });
     return () => observer.disconnect();
   }, []);
-  const isScanning = autoScanState.status === "scanning";
-  const isComplete = autoScanState.status === "complete";
-  let elementIssues = 0;
-  elementIssuesCache.forEach((el) => {
-    elementIssues += el.issues.length;
-  });
-  let fileLevelIssues = 0;
-  fileIssuesCache.forEach((issues) => {
-    fileLevelIssues += issues.length;
-  });
-  const totalIssues = elementIssues + fileLevelIssues;
-  const hasIssues = totalIssues > 0;
-  useEffect2(() => {
+  useEffect3(() => {
     setMounted(true);
   }, []);
-  useEffect2(() => {
+  useEffect3(() => {
     const handleClickOutside = (e) => {
       const target = e.target;
+      if (target?.closest?.("[data-ui-lint]")) return;
       if (showSettings && settingsRef.current && toolbarRef.current) {
         if (!settingsRef.current.contains(target) && !toolbarRef.current.contains(target)) {
           handleCloseSettings();
         }
       }
+      if (showResults) {
+        setShowResults(false);
+      }
     };
     const handleEscape = (e) => {
       if (e.key === "Escape") {
@@ -1590,35 +1719,26 @@ function UILintToolbar() {
         if (showResults) setShowResults(false);
       }
     };
-    document.addEventListener("mousedown", handleClickOutside);
+    document.addEventListener("mousedown", handleClickOutside, true);
     document.addEventListener("keydown", handleEscape);
     return () => {
-      document.removeEventListener("mousedown", handleClickOutside);
+      document.removeEventListener("mousedown", handleClickOutside, true);
       document.removeEventListener("keydown", handleEscape);
     };
   }, [showSettings, showResults]);
-  const handleToggleClick = useCallback2(() => {
-    if (liveScanEnabled) {
-      disableLiveScan();
-      setShowResults(false);
-    } else {
-      enableLiveScan();
-    }
-    if (showSettings) handleCloseSettings();
-  }, [liveScanEnabled, enableLiveScan, disableLiveScan, showSettings]);
-  const handleIssuesClick = useCallback2(() => {
-    if (!liveScanEnabled) {
-      enableLiveScan();
-      return;
-    }
-    setShowResults((prev) => !prev);
-  }, [liveScanEnabled, enableLiveScan]);
+  const handleStartScan = useCallback2(() => {
+    enableLiveScan();
+    setShowSettings(false);
+  }, [enableLiveScan]);
+  const handleStopScan = useCallback2(() => {
+    disableLiveScan();
+    setShowResults(false);
+  }, [disableLiveScan]);
   const handleSettingsClick = useCallback2(() => {
     if (showSettings) {
       handleCloseSettings();
     } else {
       setShowSettings(true);
-      setShowResults(false);
     }
   }, [showSettings]);
   const handleCloseSettings = useCallback2(() => {
@@ -1628,125 +1748,77 @@ function UILintToolbar() {
       setSettingsClosing(false);
     }, 150);
   }, []);
+  const handleToggleResults = useCallback2(() => {
+    setShowResults((prev) => !prev);
+  }, []);
+  const handleUILintInteraction = useCallback2(
+    (e) => {
+      e.stopPropagation();
+    },
+    []
+  );
   if (!mounted) return null;
-  const issueVariant = !liveScanEnabled ? "default" : hasIssues ? "warning" : isComplete ? "success" : "default";
   const bottomPosition = nextjsOverlayVisible ? "80px" : "20px";
+  const renderToolbar = () => {
+    if (!wsConnected) {
+      return /* @__PURE__ */ jsx5(
+        DisconnectedToolbar,
+        {
+          onSettingsClick: handleSettingsClick,
+          showSettings
+        }
+      );
+    }
+    if (!liveScanEnabled) {
+      return /* @__PURE__ */ jsx5(
+        IdleToolbar,
+        {
+          onStartScan: handleStartScan,
+          onSettingsClick: handleSettingsClick,
+          showSettings
+        }
+      );
+    }
+    return /* @__PURE__ */ jsx5(
+      ScanningToolbar,
+      {
+        issueCount: totalIssues,
+        isScanning,
+        showResults,
+        onToggleResults: handleToggleResults,
+        onStopScan: handleStopScan
+      }
+    );
+  };
   const content = /* @__PURE__ */ jsxs4(
     "div",
     {
       "data-ui-lint": true,
+      onMouseDown: handleUILintInteraction,
+      onClick: handleUILintInteraction,
+      onKeyDown: handleUILintInteraction,
       style: {
         position: "fixed",
         bottom: bottomPosition,
         left: "20px",
         zIndex: 99999,
         fontFamily: TOKENS.fontFamily,
-        transition: `bottom ${TOKENS.transitionSlow}`
+        transition: `bottom ${TOKENS.transitionSlow}`,
+        pointerEvents: "none"
       },
       children: [
         /* @__PURE__ */ jsx5("style", { children: globalStyles }),
         /* @__PURE__ */ jsx5(
-          "div",
-          {
-            className: `uilint-hint ${liveScanEnabled ? "uilint-hint--visible" : ""}`,
-            style: {
-              textAlign: "center",
-              marginBottom: "10px",
-              fontSize: "11px",
-              color: TOKENS.textMuted,
-              letterSpacing: "0.02em"
-            },
-            "aria-hidden": !liveScanEnabled,
-            children: /* @__PURE__ */ jsx5(
-              "kbd",
-              {
-                style: {
-                  display: "inline-block",
-                  padding: "2px 5px",
-                  marginRight: "4px",
-                  borderRadius: "4px",
-                  backgroundColor: TOKENS.bgElevated,
-                  border: `1px solid ${TOKENS.border}`,
-                  fontSize: "10px",
-                  fontFamily: TOKENS.fontMono,
-                  color: TOKENS.textSecondary,
-                  boxShadow: `0 1px 3px rgba(0, 0, 0, 0.5)`
-                },
-                children: "\u2325 + Click to inspect element"
-              }
-            )
-          }
-        ),
-        /* @__PURE__ */ jsxs4(
           "div",
           {
             ref: toolbarRef,
             role: "toolbar",
             "aria-label": "UI Lint toolbar",
-            style: {
-              position: "relative",
-              display: "inline-flex",
-              alignItems: "center",
-              height: TOKENS.pillHeight,
-              borderRadius: TOKENS.pillRadius,
-              border: `1px solid ${TOKENS.border}`,
-              backgroundColor: TOKENS.bgBase,
-              backdropFilter: TOKENS.blur,
-              WebkitBackdropFilter: TOKENS.blur,
-              boxShadow: liveScanEnabled && hasIssues ? `${TOKENS.shadowMd}, ${TOKENS.shadowGlow(
-                `${TOKENS.warning}30`
-              )}` : TOKENS.shadowMd,
-              overflow: "hidden",
-              transition: `box-shadow ${TOKENS.transitionBase}`
-            },
-            children: [
-              /* @__PURE__ */ jsx5(
-                ToolbarButton,
-                {
-                  onClick: handleToggleClick,
-                  active: liveScanEnabled,
-                  title: liveScanEnabled ? "Stop scanning (\u2325S)" : "Start scanning (\u2325S)",
-                  ariaLabel: liveScanEnabled ? "Stop live scanning" : "Start live scanning",
-                  width: "48px",
-                  children: liveScanEnabled ? /* @__PURE__ */ jsx5(Icons.Eye, {}) : /* @__PURE__ */ jsx5(Icons.EyeOff, {})
-                }
-              ),
-              /* @__PURE__ */ jsx5(Divider, {}),
-              /* @__PURE__ */ jsx5(
-                ToolbarButton,
-                {
-                  onClick: handleIssuesClick,
-                  active: showResults && liveScanEnabled,
-                  variant: issueVariant,
-                  title: !liveScanEnabled ? "Click to enable scanning" : `${totalIssues} issue${totalIssues !== 1 ? "s" : ""} found`,
-                  ariaLabel: !liveScanEnabled ? "Enable scanning to see issues" : `View ${totalIssues} issues`,
-                  width: "auto",
-                  children: /* @__PURE__ */ jsx5("span", { style: { padding: "0 12px" }, children: /* @__PURE__ */ jsx5(
-                    ScanStatus,
-                    {
-                      status: autoScanState.status,
-                      issueCount: totalIssues,
-                      enabled: liveScanEnabled
-                    }
-                  ) })
-                }
-              ),
-              /* @__PURE__ */ jsx5(Divider, {}),
-              /* @__PURE__ */ jsx5(
-                ToolbarButton,
-                {
-                  onClick: handleSettingsClick,
-                  active: showSettings,
-                  title: "Settings",
-                  ariaLabel: "Open settings",
-                  width: "44px",
-                  children: /* @__PURE__ */ jsx5(Icons.Settings, {})
-                }
-              )
-            ]
+            style: { pointerEvents: "auto" },
+            children: renderToolbar()
           }
         ),
-        showSettings && /* @__PURE__ */ jsx5(
+        showSettings && !liveScanEnabled && /* @__PURE__ */ jsx5(
           "div",
           {
             ref: settingsRef,
@@ -1755,7 +1827,8 @@ function UILintToolbar() {
               position: "absolute",
               bottom: "100%",
               left: 0,
-              marginBottom: "8px"
+              marginBottom: "8px",
+              pointerEvents: "auto"
             },
             children: /* @__PURE__ */ jsx5(SettingsPopover, { settings })
           }