@schlessera/brain-ui-react 0.35.0 → 0.37.0

package/src/components/quick-actions/streaming-modal.tsx

@@ -1,10 +1,14 @@
+import { useBrainUiRoot } from "../../root-context.js";
 import { useState, useEffect, useRef } from "react";
-import { Loader2, CheckCircle2, XCircle } from "lucide-react";
 import { SlidePanel } from "../layout/slide-panel.js";
 import { linkifyPaths } from "../chat/brain-markdown.js";
+import { StreamingOutput, type StreamState } from "./streaming-output.js";
 
-type StreamState = "idle" | "running" | "success" | "error" | "cancelled";
-
+/**
+ * The container (S6) for a streamed backend job: the request, the SSE reader
+ * loop, the abort controller and the "still my stream" checks live here;
+ * `StreamingOutput` draws from props.
+ */
 export function StreamingPanel({
   open,
   onClose,
@@ -15,9 +19,11 @@ export function StreamingPanel({
   open: boolean;
   onClose: () => void;
   title: string;
+  /** Backend-relative path, resolved against the current root. */
   endpoint: string;
   method?: string;
 }) {
+  const root = useBrainUiRoot();
   const [state, setState] = useState<StreamState>("idle");
   const [lines, setLines] = useState<string[]>([]);
   const scrollRef = useRef<HTMLDivElement>(null);
@@ -29,30 +35,42 @@ export function StreamingPanel({
     setState("running");
     setLines([]);
 
+    let disposed = false;
+    let reader: ReadableStreamDefaultReader<Uint8Array> | undefined;
     const controller = new AbortController();
+    const cancelReader = () => { void reader?.cancel().catch(() => {}); };
+    controller.signal.addEventListener("abort", cancelReader);
     controllerRef.current = controller;
 
     (async () => {
       try {
-        const res = await fetch(endpoint, {
+        const res = await root.request(root.backendUrl(endpoint), {
           method,
           signal: controller.signal,
         });
 
+        if (disposed || controller.signal.aborted) {
+          await res.body?.cancel();
+          return;
+        }
+
         if (!res.ok || !res.body) {
-          setState("error");
           const body = await res.json().catch(() => null);
+          if (disposed || controller.signal.aborted) return;
+          setState("error");
           const message = typeof body?.error === "string" ? body.error : `HTTP ${res.status}: ${res.statusText}`;
           if (!controller.signal.aborted) setLines((l) => [...l, message]);
           return;
         }
 
-        const reader = res.body.getReader();
+        reader = res.body.getReader();
         const decoder = new TextDecoder();
         let buffer = "";
+        let finished = false;
 
         while (true) {
           const { done, value } = await reader.read();
+          if (disposed || controller.signal.aborted) return;
           if (done) break;
 
           buffer += decoder.decode(value, { stream: true });
@@ -71,12 +89,22 @@ export function StreamingPanel({
                 setLines((l) => [...l, data.text]);
               }
               if (data.type === "done") {
+                finished = true;
                 setState(data.success ? "success" : "error");
               }
             } catch {}
           }
         }
+
+        // EOF without a `done` frame — a dropped connection, or a route that
+        // unwound past its last send. Running is not terminal, so staying in
+        // it would strand the panel on a Cancel for a stream that is gone.
+        if (!finished) {
+          setLines((l) => [...l, "The connection closed before the job reported a result."]);
+          setState("error");
+        }
       } catch (err: any) {
+        if (disposed || controller.signal.aborted) return;
         if (err.name === "AbortError") {
           setLines((l) => [...l, "Cancelled."]);
           setState("cancelled");
@@ -85,86 +113,43 @@ export function StreamingPanel({
           setLines((l) => [...l, `Error: ${err.message}`]);
         }
       } finally {
-        controllerRef.current = null;
+        controller.signal.removeEventListener("abort", cancelReader);
+        reader?.releaseLock();
+        if (controllerRef.current === controller) controllerRef.current = null;
       }
     })();
 
     return () => {
+      disposed = true;
       controller.abort();
-      controllerRef.current = null;
+      if (controllerRef.current === controller) controllerRef.current = null;
     };
-  }, [open, endpoint, method]);
+  }, [open, endpoint, method, root]);
 
   // Auto-scroll
   useEffect(() => {
     scrollRef.current?.scrollIntoView({ behavior: "smooth" });
   }, [lines]);
 
-  const isRunning = state === "running";
+  // Closing unmounts the panel, and the unmount aborts the stream, so a stray
+  // click on the backdrop must not close it: mid-run it would cancel the job,
+  // and afterwards it would discard a log nobody has read. Escape is refused
+  // only while the job runs; the header's X is always the way out.
+  const closedBy = state === "running" ? "none" : "closerequest";
 
   return (
-    <SlidePanel
-      open={open}
-      onClose={isRunning ? () => {} : onClose}
-      title={title}
-    >
-      <div className="flex h-full flex-col">
-        {/* Status bar */}
-        <div className="flex items-center gap-2 border-b border-border px-5 py-2">
-          {isRunning && (
-            <Loader2 className="h-3.5 w-3.5 animate-spin text-primary" />
-          )}
-          {state === "success" && (
-            <CheckCircle2 className="h-3.5 w-3.5 text-green-500" />
-          )}
-          {(state === "error" || state === "cancelled") && (
-            <XCircle className="h-3.5 w-3.5 text-destructive" />
-          )}
-          <span className="text-xs text-muted-foreground">
-            {isRunning
-              ? "Running..."
-              : state === "success"
-                ? "Complete"
-                : state === "error"
-                  ? "Failed"
-                  : state === "cancelled"
-                    ? "Cancelled"
-                    : "Ready"}
-          </span>
-        </div>
-
-        {/* Log output */}
-        <div className="flex-1 overflow-y-auto p-4 font-[family-name:var(--font-mono)] text-xs leading-relaxed text-muted-foreground">
-          {lines.map((line, i) => (
-            <div key={i} className="whitespace-pre-wrap">
-              {linkifyPaths(line)}
-            </div>
-          ))}
-          {isRunning && lines.length === 0 && (
-            <div className="text-muted-foreground/50">Starting...</div>
-          )}
-          <div ref={scrollRef} />
-        </div>
-
-        {/* Footer */}
-        <div className="border-t border-border px-5 py-3 flex justify-end">
-          {isRunning ? (
-            <button
-              onClick={() => controllerRef.current?.abort()}
-              className="rounded-lg border border-destructive/30 px-4 py-1.5 text-xs font-medium text-destructive transition-colors hover:bg-destructive/10"
-            >
-              Cancel
-            </button>
-          ) : (
-            <button
-              onClick={onClose}
-              className="rounded-lg bg-surface-raised px-4 py-1.5 text-xs font-medium text-foreground transition-colors hover:bg-surface-overlay"
-            >
-              Close
-            </button>
-          )}
-        </div>
-      </div>
+    <SlidePanel open={open} onClose={onClose} title={title} closedBy={closedBy}>
+      <StreamingOutput
+        state={state}
+        lines={lines.map((line) => linkifyPaths(line))}
+        anchor={<div ref={scrollRef} />}
+        onCancel={() => {
+          controllerRef.current?.abort();
+          setState("cancelled");
+          setLines((lines) => [...lines, "Cancelled."]);
+        }}
+        onClose={onClose}
+      />
     </SlidePanel>
   );
 }

package/src/components/quick-actions/streaming-output.tsx

@@ -0,0 +1,112 @@
+import { Button, Placeholder, StatusDot } from "@schlessera/brain-ui-kit";
+import type { ReactNode } from "react";
+import type { Tone } from "@schlessera/brain-ui-kit";
+
+/**
+ * What a streamed backend job looks like while it runs and once it has
+ * finished — rendered from props (S6). `StreamingPanel` and `WhatsupPanel`
+ * are the containers: they own the request, the reader loop, the abort
+ * controller and the "is this still my stream" checks; the two views here
+ * own the status row, the output area and the one button in the footer.
+ *
+ * `state` is the job's, in the container's vocabulary: `running` is the only
+ * state with a Cancel; every other state offers Close. The status dot is the
+ * kit's — amber breathing while running, teal when it completed, red for a
+ * failure or a cancellation — and the row is a polite live region so a
+ * screen reader hears "Complete" once, not every line.
+ */
+export type StreamState = "idle" | "running" | "success" | "error" | "cancelled";
+
+const STATUS: Record<StreamState, { tone: Tone; pulse: boolean; text: string }> = {
+  idle: { tone: "neutral", pulse: false, text: "Ready" },
+  running: { tone: "amber", pulse: true, text: "Running..." },
+  success: { tone: "teal", pulse: false, text: "Complete" },
+  error: { tone: "red", pulse: false, text: "Failed" },
+  cancelled: { tone: "red", pulse: false, text: "Cancelled" },
+};
+
+export interface StreamingOutputProps {
+  state: StreamState;
+  /** The job's lines so far, already turned into nodes by the container (paths linkified). */
+  lines: ReactNode[];
+  onCancel: () => void;
+  onClose: () => void;
+  /** Wire to the scroll anchor the container keeps in view. */
+  anchor?: ReactNode;
+}
+
+export function StreamingOutput(p: StreamingOutputProps) {
+  const running = p.state === "running";
+  const s = STATUS[p.state];
+  return (
+    <div className="flex h-full flex-col">
+      <div className="flex items-center gap-2 border-b border-border px-5 py-2" aria-live="polite">
+        <StatusDot tone={s.tone} pulse={s.pulse} size={7} />
+        <span className="text-xs text-muted-foreground">{s.text}</span>
+      </div>
+
+      <div className="flex-1 overflow-y-auto p-4 font-[family-name:var(--font-mono)] text-xs leading-relaxed text-muted-foreground">
+        {p.lines.map((line, i) => (
+          <div key={i} className="whitespace-pre-wrap">
+            {line}
+          </div>
+        ))}
+        {running && p.lines.length === 0 && <div className="text-muted-foreground/50">Starting...</div>}
+        {p.anchor}
+      </div>
+
+      <StreamFooter running={running} onCancel={p.onCancel} onClose={p.onClose} />
+    </div>
+  );
+}
+
+/**
+ * The briefing: one document rather than a log, so it loads behind a skeleton
+ * and renders as prose once it has all arrived. `content` is the container's
+ * rendered markdown node; the view does not know what it is made of.
+ */
+export interface BriefingOutputProps {
+  state: "loading" | "done" | "error" | "cancelled";
+  content: ReactNode;
+  onCancel: () => void;
+  onClose: () => void;
+}
+
+export function BriefingOutput(p: BriefingOutputProps) {
+  const loading = p.state === "loading";
+  return (
+    <div className="flex h-full flex-col">
+      {(p.state === "error" || p.state === "cancelled") && (
+        <div className="flex items-center gap-2 border-b border-border px-5 py-2" aria-live="polite">
+          <StatusDot tone="red" pulse={false} size={7} />
+          <span className="text-xs text-muted-foreground">Failed</span>
+        </div>
+      )}
+
+      <div className="flex-1 overflow-y-auto p-5">
+        {loading ? (
+          <div className="flex flex-col gap-3">
+            <Placeholder variant="loading" lines={4} bordered={false} pad={0} />
+            <p className="text-sm text-muted-foreground">Generating briefing...</p>
+          </div>
+        ) : (
+          p.content
+        )}
+      </div>
+
+      <StreamFooter running={loading} onCancel={p.onCancel} onClose={p.onClose} />
+    </div>
+  );
+}
+
+function StreamFooter({ running, onCancel, onClose }: { running: boolean; onCancel: () => void; onClose: () => void }) {
+  return (
+    <div className="flex justify-end border-t border-border px-5 py-3">
+      {running ? (
+        <Button label="Cancel" icon="cancel" tone="danger" size="sm" block={false} onClick={onCancel} />
+      ) : (
+        <Button label="Close" tone="quiet" size="sm" block={false} onClick={onClose} />
+      )}
+    </div>
+  );
+}

package/src/components/quick-actions/whatsup-modal.tsx

@@ -1,11 +1,16 @@
+import { useBrainUiRoot } from "../../root-context.js";
 import { useState, useEffect, useRef } from "react";
-import { Loader2, XCircle } from "lucide-react";
 import { SlidePanel } from "../layout/slide-panel.js";
 import { BrainMarkdown } from "../chat/brain-markdown.js";
-import { getBackendUrl } from "../../lib/backend.js";
+import { BriefingOutput } from "./streaming-output.js";
 
 type State = "loading" | "done" | "error" | "cancelled";
 
+/**
+ * The container (S6) for the briefing: the request, the SSE reader loop, the
+ * abort controller and the "still my stream" checks live here;
+ * `BriefingOutput` draws from props.
+ */
 export function WhatsupPanel({
   open,
   onClose,
@@ -13,6 +18,7 @@ export function WhatsupPanel({
   open: boolean;
   onClose: () => void;
 }) {
+  const root = useBrainUiRoot();
   const [state, setState] = useState<State>("loading");
   const [content, setContent] = useState("");
   const controllerRef = useRef<AbortController | null>(null);
@@ -23,29 +29,40 @@ export function WhatsupPanel({
     setState("loading");
     setContent("");
 
+    let disposed = false;
+    let reader: ReadableStreamDefaultReader<Uint8Array> | undefined;
     const controller = new AbortController();
+    const cancelReader = () => { void reader?.cancel().catch(() => {}); };
+    controller.signal.addEventListener("abort", cancelReader);
     controllerRef.current = controller;
 
     (async () => {
       try {
-        const res = await fetch(getBackendUrl("/api/brain/whatsup"), {
+        const res = await root.request(root.backendUrl("/api/brain/whatsup"), {
           method: "POST",
           signal: controller.signal,
         });
 
+        if (disposed || controller.signal.aborted) {
+          await res.body?.cancel();
+          return;
+        }
+
         if (!res.ok || !res.body) {
           setState("error");
           setContent(`HTTP ${res.status}: ${res.statusText}`);
           return;
         }
 
-        const reader = res.body.getReader();
+        reader = res.body.getReader();
         const decoder = new TextDecoder();
         let buffer = "";
         const lines: string[] = [];
+        let finished = false;
 
         while (true) {
           const { done, value } = await reader.read();
+          if (disposed || controller.signal.aborted) return;
           if (done) break;
 
           buffer += decoder.decode(value, { stream: true });
@@ -64,14 +81,23 @@ export function WhatsupPanel({
                 lines.push(data.text);
               }
               if (data.type === "done") {
+                finished = true;
                 setState(data.success ? "done" : "error");
               }
             } catch {}
           }
         }
 
+        // EOF without a `done` frame — a dropped connection, or a route that
+        // unwound past its last send. Loading is not terminal, so staying in
+        // it would strand the panel behind the skeleton and a Cancel.
+        if (!finished) {
+          lines.push("", "_The connection closed before the job reported a result._");
+          setState("error");
+        }
         setContent(lines.join("\n"));
       } catch (err: any) {
+        if (disposed || controller.signal.aborted) return;
         if (err.name === "AbortError") {
           setState("cancelled");
           setContent("Cancelled.");
@@ -80,70 +106,38 @@ export function WhatsupPanel({
           setContent(`Error: ${err.message}`);
         }
       } finally {
-        controllerRef.current = null;
+        controller.signal.removeEventListener("abort", cancelReader);
+        reader?.releaseLock();
+        if (controllerRef.current === controller) controllerRef.current = null;
       }
     })();
 
     return () => {
+      disposed = true;
       controller.abort();
-      controllerRef.current = null;
+      if (controllerRef.current === controller) controllerRef.current = null;
     };
-  }, [open]);
+  }, [open, root]);
 
-  const isLoading = state === "loading";
+  // Closing unmounts the panel, and the unmount aborts the briefing, so a stray
+  // click on the backdrop must not close it: while it loads the click cancels a
+  // model call, and afterwards it discards a briefing that call paid for.
+  // Escape is refused only while the briefing loads; the header's X is always
+  // the way out.
+  const closedBy = state === "loading" ? "none" : "closerequest";
 
   return (
-    <SlidePanel
-      open={open}
-      onClose={onClose}
-      title="Whatsup"
-      wide
-    >
-      <div className="flex h-full flex-col">
-        {/* Status bar (errors only — loading uses centered indicator) */}
-        {(state === "error" || state === "cancelled") && (
-          <div className="flex items-center gap-2 border-b border-border px-5 py-2">
-            <XCircle className="h-3.5 w-3.5 text-destructive" />
-            <span className="text-xs text-muted-foreground">Failed</span>
-          </div>
-        )}
-
-        {/* Content */}
-        <div className="flex-1 overflow-y-auto p-5">
-          {isLoading ? (
-            <div className="flex items-center justify-center h-32 text-muted-foreground text-sm">
-              <Loader2 className="h-5 w-5 animate-spin mr-2 text-primary" />
-              Generating briefing...
-            </div>
-          ) : (
-            <BrainMarkdown
-              content={content}
-              className="whatsup-briefing brain-prose"
-              entityTags
-              fileLinks
-            />
-          )}
-        </div>
-
-        {/* Footer */}
-        <div className="border-t border-border px-5 py-3 flex justify-end">
-          {isLoading ? (
-            <button
-              onClick={() => controllerRef.current?.abort()}
-              className="rounded-lg border border-destructive/30 px-4 py-1.5 text-xs font-medium text-destructive transition-colors hover:bg-destructive/10"
-            >
-              Cancel
-            </button>
-          ) : (
-            <button
-              onClick={onClose}
-              className="rounded-lg bg-surface-raised px-4 py-1.5 text-xs font-medium text-foreground transition-colors hover:bg-surface-overlay"
-            >
-              Close
-            </button>
-          )}
-        </div>
-      </div>
+    <SlidePanel open={open} onClose={onClose} title="Whatsup" wide closedBy={closedBy}>
+      <BriefingOutput
+        state={state}
+        content={<BrainMarkdown content={content} className="whatsup-briefing brain-prose" entityTags fileLinks />}
+        onCancel={() => {
+          controllerRef.current?.abort();
+          setState("cancelled");
+          setContent("Cancelled.");
+        }}
+        onClose={onClose}
+      />
     </SlidePanel>
   );
 }