@schlessera/brain-ui-react 0.34.1 → 0.36.0

package/src/connection.ts

@@ -0,0 +1,443 @@
+import { BrainUiClient, type WebSocketClose } from "@schlessera/brain-ui-sdk/client";
+import type { ServerMessage, ClientMessage, ServerLocationRequest } from "@schlessera/brain-ui-sdk/protocol";
+import type { BrainUiServices } from "./root.js";
+import { activeChat, type ChatState, type ChatKey } from "./stores/chat-state.js";
+import { dispatchServerMessage } from "./hooks/websocket-handlers/index.js";
+import { runStateForFrame } from "./hooks/websocket-handlers/chat.js";
+import { REFUSAL_ATTEMPTS } from "./components/connectivity/connection-state.js";
+
+/** Every callback and mutable queue belongs to the root supplied here. */
+export function createWebSocketClient(root: BrainUiServices) {
+  let disposed = false;
+  let generation = 0;
+  let owners = 0;
+  let removeListeners: (() => void) | undefined;
+
+  /**
+   * Does this frame announce the identity of the conversation THIS client just
+   * started?
+   *
+   * The old test was `session_info || result` for any unknown session, which
+   * adopted whichever arrived first — an older background turn finishing, or
+   * another client's new session, would capture the user's draft and bind it to
+   * a transcript they never wrote. `draftId` is minted per draft turn and echoed
+   * on `session_info`, so a match is proof.
+   *
+   * A server too old to echo it sends no `draftId`, and the pre-existing
+   * behaviour applies rather than the draft never binding at all: correctness
+   * where the information exists, compatibility where it does not.
+   */
+  function isOurDraftAnnouncement(
+    state: ChatState,
+    msg: ServerMessage
+  ): boolean {
+    // A terminal result has no draft correlation. Another client's turn may
+    // finish before our session_info arrives, so it can never claim our draft.
+    if (msg.type !== "session_info") return false;
+    const pending = state.pendingDraftId;
+    if (msg.draftId) return msg.draftId === pending;
+    // No echo to compare against.
+    return true;
+  }
+
+  /**
+   * Lazily open a session-scoped activity subscription (live subagent rows,
+   * server-stamped tool timing). Idempotent per connection; the subscribed set
+   * resets when a new socket's server_hello arrives.
+   */
+  function ensureActivitySubscription(sessionId: string | null | undefined): void {
+    if (!sessionId) return;
+    const activity = root.stores.activity.getState();
+    if (!activity.supported || activity.subscribed[sessionId]) return;
+    activity.markSubscribed(sessionId);
+    wsClient?.send({ type: "activity_subscribe", view: "session", sessionId });
+    // The subscription snapshot carries OPEN runs; finished runs (history
+    // timing, past fan-outs) come from the REST side.
+    void root.stores.activity.loadSessionActivityHistory(sessionId);
+  }
+
+  /**
+   * Text and thinking deltas waiting to be applied, per buffer.
+   *
+   * A model streams tokens far faster than the display refreshes, and each socket
+   * frame arrives in its own macrotask, so React cannot batch them: one token was
+   * one store write, one render and one markdown re-parse of the growing message.
+   * Coalescing a frame's worth of tokens into a single write costs nothing
+   * visually — the screen could not have shown the intermediate states anyway.
+   *
+   * Consecutive same-kind chunks merge, so a burst of text becomes ONE appendText
+   * rather than one per token. Kind changes start a new chunk, which is what keeps
+   * interleaved thinking and text in their true chronological order.
+   */
+  type PendingDelta = { kind: "text" | "thinking"; text: string };
+  const pendingDeltas = new Map<ChatKey, PendingDelta[]>();
+  let flushScheduled = false;
+  let frameId: number | undefined;
+
+  /**
+   * Apply every buffered delta, in arrival order, and clear the buffer.
+   *
+   * Exported so tests can force the frame rather than wait for one; production
+   * code never needs to call it, because every path that reads the transcript
+   * flushes first.
+   */
+  function flushChatDeltas(): void {
+    flushDeltas();
+  }
+
+  function flushDeltas(): void {
+    if (frameId !== undefined && typeof cancelAnimationFrame === "function") cancelAnimationFrame(frameId);
+    frameId = undefined;
+    flushScheduled = false;
+    if (pendingDeltas.size === 0) return;
+    const batches = [...pendingDeltas.entries()];
+    pendingDeltas.clear();
+    const state = root.stores.chat.getState();
+    for (const [key, chunks] of batches) {
+      for (const chunk of chunks) {
+        if (chunk.kind === "text") state.appendText(key, chunk.text);
+        else state.appendThinking(key, chunk.text);
+      }
+    }
+  }
+
+  function enqueueDelta(key: ChatKey, kind: PendingDelta["kind"], text: string): void {
+    const chunks = pendingDeltas.get(key);
+    if (!chunks) {
+      pendingDeltas.set(key, [{ kind, text }]);
+    } else {
+      const last = chunks[chunks.length - 1];
+      if (last.kind === kind) last.text += text;
+      else chunks.push({ kind, text });
+    }
+    // Outside a browser (unit tests, SSR) there is no frame to wait for, so apply
+    // straight away and keep the handler's behaviour synchronous.
+    if (typeof requestAnimationFrame !== "function") {
+      flushDeltas();
+      return;
+    }
+    if (!flushScheduled) {
+      flushScheduled = true;
+      frameId = requestAnimationFrame(flushDeltas);
+    }
+  }
+
+  function handleServerMessage(msg: ServerMessage) {
+    if (disposed) return;
+    // Every frame that is not itself a delta must see the transcript fully
+    // applied: the demux below reads buffer state, and the store records parts in
+    // arrival order, so a tool call landing ahead of buffered text would reorder
+    // the message.
+    if (msg.type !== "text_delta" && msg.type !== "thinking_delta") flushDeltas();
+
+    const state = root.stores.chat.getState();
+
+    // Activity stream frames feed their own store and never touch chat state.
+    if (
+      msg.type === "server_hello" ||
+      msg.type === "activity_snapshot" ||
+      msg.type === "activity_delta"
+    ) {
+      const key = state.activeSessionId;
+      dispatchServerMessage(msg, {
+        stores: root.stores,
+        state,
+        frameSessionId: undefined,
+        frameTurnId: undefined,
+        key,
+        buffer: () => (key === null ? state.draft : state.buffers[key]),
+        enqueueDelta,
+        ensureActivitySubscription,
+        requestBrowserLocation,
+        resyncIfNeeded,
+        coldResumeIfNeeded,
+        markHistoryReplaced,
+      });
+      return;
+    }
+
+    // Parallel-session demux (per-session buffers). Every frame is scoped by
+    // sessionId; a scoped frame lands in ITS session's buffer, so a background
+    // session's transcript keeps accumulating while another one is in view.
+    // Frames without a sessionId (legacy single-session servers, or a new
+    // session's pre-binding frames) apply to the buffer in view.
+    const frameSessionId = (msg as { sessionId?: string }).sessionId;
+    if (frameSessionId) {
+      // `detail` on a queued status is the host's queue-pressure note; it rides
+      // along so the session's badge can show WHY it is queued deep.
+      const queueNote =
+        msg.type === "status" && msg.status === "queued" ? msg.detail : undefined;
+      // `message_blocks` arrives AFTER the turn's result (D42); it must not
+      // reopen a finished session, and it must not touch a queued follow-up
+      // that may already be running, so it takes no part in run state.
+      if (msg.type !== "message_blocks") {
+        state.setRunState(frameSessionId, runStateForFrame(msg), queueNote);
+      }
+    }
+
+    // Resolve the target buffer key for this frame.
+    let key: ChatKey;
+    if (!frameSessionId) {
+      key = state.activeSessionId; // null = the draft view
+    } else if (state.buffers[frameSessionId]) {
+      key = frameSessionId;
+    } else if (state.draft && isOurDraftAnnouncement(state, msg)) {
+      // A draft run just got its server identity: adopt the draft buffer.
+      state.bindDraftSession(frameSessionId);
+      key = frameSessionId;
+    } else if (msg.type === "session_info" && frameSessionId === state.activeSessionId) {
+      // The ACTIVE session announced itself but has no buffer yet — the cold
+      // reattach case (PWA relaunch mid-turn; the server may skip the history
+      // frame when a first turn has no history yet). Materialize the buffer so
+      // this session_info and every following delta land instead of vanishing.
+      state.setActiveSession(frameSessionId);
+      key = frameSessionId;
+    } else if (msg.type === "session_history") {
+      // History replay may create a buffer (cold resume / reattach).
+      key = frameSessionId;
+    } else {
+      // Scoped frame for a session with no buffer (never opened, or evicted):
+      // the badge above is all we track. The transcript heals via
+      // session_resume when the user opens it.
+      return;
+    }
+
+    const buffer = () => {
+      const s = root.stores.chat.getState();
+      return key === null ? s.draft : s.buffers[key];
+    };
+
+    dispatchServerMessage(msg, {
+      stores: root.stores,
+      state,
+      frameSessionId,
+      frameTurnId: (msg as { turnId?: string }).turnId,
+      key,
+      buffer,
+      enqueueDelta,
+      ensureActivitySubscription,
+      requestBrowserLocation,
+      resyncIfNeeded,
+      coldResumeIfNeeded,
+      markHistoryReplaced,
+    });
+  }
+
+  /**
+   * The server asked the browser for its location (the agent called
+   * `get_current_location`). Read `navigator.geolocation` and reply over the same
+   * requestId. The browser shows its own permission prompt on first use; a denial,
+   * timeout, or unavailable position comes back as a `location_error` that the
+   * server turns into a tool error for the agent.
+   */
+  function requestBrowserLocation(msg: ServerLocationRequest) {
+    const client = wsClient;
+    const requestedGeneration = generation;
+    const requestedSocket = root.stores.connection.getState().socketOpens;
+    const reply = (message: ClientMessage) => {
+      if (!disposed && requestedGeneration === generation && requestedSocket === root.stores.connection.getState().socketOpens && client === wsClient) client?.send(message);
+    };
+    const { requestId } = msg;
+    if (typeof navigator === "undefined" || !navigator.geolocation) {
+      reply({
+        type: "location_error",
+        requestId,
+        code: 0,
+        message: "Geolocation is not available in this browser.",
+      });
+      return;
+    }
+    const opts = msg.options ?? {};
+    navigator.geolocation.getCurrentPosition(
+      (pos) => {
+        reply({
+          type: "location_response",
+          requestId,
+          coords: {
+            latitude: pos.coords.latitude,
+            longitude: pos.coords.longitude,
+            accuracy: pos.coords.accuracy,
+            altitude: pos.coords.altitude,
+            altitudeAccuracy: pos.coords.altitudeAccuracy,
+            heading: pos.coords.heading,
+            speed: pos.coords.speed,
+          },
+          timestamp: pos.timestamp,
+        });
+      },
+      (err) => {
+        reply({
+          type: "location_error",
+          requestId,
+          code: err.code,
+          message: err.message || "Failed to retrieve location.",
+        });
+      },
+      {
+        enableHighAccuracy: opts.enableHighAccuracy ?? false,
+        timeout: opts.timeoutMs ?? 15000,
+        maximumAge: opts.maximumAgeMs ?? 60000,
+      }
+    );
+  }
+
+  // Reconnection bookkeeping: after a WS drop, the rendered transcript may have
+  // gaps (deltas streamed while offline are lost). We heal by replaying the
+  // authoritative session history — immediately if nothing is streaming, or
+  // once the in-flight turn settles (result / idle status). The pending resync
+  // is keyed to the session that needs healing (the one that was active at the
+  // reconnect), so a background session settling first cannot consume it.
+  let wasDisconnected = false;
+  let resyncSessionId: string | null = null;
+
+  function handleSocketClose(close: WebSocketClose): void {
+    const connection = root.stores.connection.getState();
+    connection.recordWsClose(close.opened, close.code);
+    if (
+      !close.opened &&
+      root.stores.connection.getState().handshakeFailures >= REFUSAL_ATTEMPTS
+    ) {
+      root.recheckVpn?.();
+    }
+  }
+
+  function resyncIfNeeded(sessionId: string | null) {
+    if (!resyncSessionId || !sessionId || sessionId !== resyncSessionId) return;
+    resyncSessionId = null;
+    wsClient?.send({ type: "session_resume", sessionId });
+  }
+
+  // A cold page / PWA relaunch restores only the stored session id, not the
+  // transcript. The server pushes a snapshot on connect only while a session is
+  // actively running; when it's idle (the common "agent finished while the phone
+  // slept" case) nothing arrives, so the client must fetch the finished
+  // session's history itself. Guarded to fire at most once per session id per
+  // connection — an empty session would otherwise re-trigger on every idle
+  // status and loop.
+  let coldResumedSessionId: string | null = null;
+
+  function markHistoryReplaced(key: ChatKey): void {
+    if (key !== null && key === resyncSessionId) resyncSessionId = null;
+    coldResumedSessionId = key;
+  }
+
+  function coldResumeIfNeeded(sessionId: string | null, messageCount: number) {
+    if (!sessionId || messageCount > 0) return;
+    if (coldResumedSessionId === sessionId) return;
+    coldResumedSessionId = sessionId;
+    wsClient?.send({ type: "session_resume", sessionId });
+  }
+
+  function handleStatusChange(status: "connecting" | "connected" | "disconnected") {
+    root.stores.connection.getState().setWsStatus(status);
+
+    if (status === "connected") {
+      root.stores.connection.getState().noteSocketOpen();
+    }
+
+    // A status change can be followed by a history replay that rewrites the
+    // buffer, so land whatever is still buffered before anything reads it. In a
+    // hidden tab requestAnimationFrame does not run at all, which is exactly the
+    // case where deltas could otherwise sit unapplied across a reconnect.
+    flushDeltas();
+
+    if (status === "disconnected") {
+      wasDisconnected = true;
+      // Allow a fresh cold-resume attempt after we reconnect.
+      coldResumedSessionId = null;
+    } else if (status === "connected" && wasDisconnected) {
+      wasDisconnected = false;
+      const chat = root.stores.chat.getState();
+      const active = activeChat(chat);
+      if (chat.activeSessionId && active.messages.length > 0) {
+        resyncSessionId = chat.activeSessionId;
+        // Not mid-stream: replay right away. Mid-stream: the flag holds until
+        // the running turn finishes (result or idle status).
+        if (!active.isStreaming) {
+          resyncIfNeeded(chat.activeSessionId);
+        }
+      }
+    }
+  }
+
+  let wsClient: BrainUiClient | null = null;
+
+  function sendClientMessage(msg: ClientMessage): boolean {
+    if (!wsClient) return false;
+    if (root.stores.connection.getState().wsStatus !== "connected") return false;
+    return wsClient.send(msg);
+  }
+
+  /** Retry this root's socket, skipping any remaining backoff. */
+  function reconnectWebSocketNow(): void {
+    wsClient?.reconnectNow();
+  }
+
+
+  /** Acquire a connection lease. Several consumers may share one root safely. */
+  function connect(): () => void {
+    if (disposed) throw new Error("Cannot connect a disposed UI root");
+    owners++;
+    if (!wsClient) {
+      const connectedGeneration = ++generation;
+      const current = () => !disposed && connectedGeneration === generation;
+      root.stores.connection.getState().noteSocketOpen();
+      const client = new BrainUiClient({
+        url: root.wsUrl(),
+        handlers: { onAny: (message) => { if (current()) handleServerMessage(message); } },
+        onStatusChange: (status) => { if (current()) handleStatusChange(status); },
+        onClose: (close) => { if (current()) handleSocketClose(close); },
+        onProtocolError: (err) => {
+          if (!current()) return;
+          root.stores.connection.getState().reportError(
+            "PROTOCOL_ERROR",
+            err.frameType ? `Dropped a ${err.frameType} frame: ${err.detail}` : `Dropped an unreadable frame: ${err.detail}`,
+          );
+        },
+      });
+      wsClient = client;
+      client.connect();
+      const reconnectNow = () => { if (current()) client.reconnectNow(); };
+      const onVisible = () => { if (document.visibilityState === "visible") reconnectNow(); };
+      if (typeof window !== "undefined") window.addEventListener("online", reconnectNow);
+      if (typeof document !== "undefined") document.addEventListener("visibilitychange", onVisible);
+      removeListeners = () => {
+        if (typeof window !== "undefined") window.removeEventListener("online", reconnectNow);
+        if (typeof document !== "undefined") document.removeEventListener("visibilitychange", onVisible);
+      };
+    }
+    let released = false;
+    return () => {
+      if (released) return;
+      released = true;
+      if (--owners === 0) disconnect();
+    };
+  }
+
+  function disconnect() {
+    generation++;
+    removeListeners?.();
+    removeListeners = undefined;
+    const client = wsClient;
+    wsClient = null;
+    client?.close();
+    handleStatusChange("disconnected");
+    root.stores.activity.getState().setSupported(false);
+    root.stores.activity.getState().resetSubscriptions();
+  }
+
+  return {
+    connect,
+    send: sendClientMessage,
+    reconnectNow: reconnectWebSocketNow,
+    handleServerMessage,
+    flushChatDeltas,
+    dispose() {
+      if (disposed) return;
+      disposed = true;
+      disconnect();
+      resyncSessionId = null;
+      coldResumedSessionId = null;
+    },
+  };
+}

package/src/default-root.ts

@@ -0,0 +1,16 @@
+import { defaultToolRendererRegistry, defaultAsrClientRegistry } from "@schlessera/brain-ui-sdk/client";
+import { uiConfig, registerDevHandle } from "./config.js";
+import { api } from "./lib/api-client.js";
+import { createRoot } from "./root.js";
+
+/** The single application root used by existing shells without a provider. */
+export const defaultRoot = createRoot({ storagePrefix: "", api }, uiConfig, defaultToolRendererRegistry, defaultAsrClientRegistry);
+
+registerDevHandle(() => {
+  if (typeof window === "undefined") return;
+  Object.assign(window, {
+    __chatStore: defaultRoot.stores.chat,
+    __graphStore: defaultRoot.stores.graph,
+    __activityStore: defaultRoot.stores.activity,
+  });
+});

package/src/hooks/use-color-scheme.ts

@@ -0,0 +1,36 @@
+import { useEffect, useState } from "react";
+import { useUIStore } from "../stores/ui-store.js";
+import { useMediaQuery } from "./use-media-query.js";
+import { documentColorScheme, type ColorScheme } from "../lib/light-dark.js";
+
+/**
+ * The scheme the page is drawing in — `light` or `dark` — for the parts of
+ * the app that read a token as a value rather than referencing it (the graph
+ * canvas, the diagram theme). Everything else lets `light-dark()` decide.
+ *
+ * Follows the store's preference and, under `system`, the OS: both are
+ * subscribed, and the answer is re-read from the root's computed
+ * `color-scheme` after `useApplyTheme` has written the attribute, so a host
+ * that sets `data-theme` itself is honoured too. The initial value is read
+ * synchronously, so the first paint after a stored preference is right.
+ */
+export function useColorScheme(): ColorScheme {
+  const preference = useUIStore((s) => s.theme);
+  const osDark = useMediaQuery("(prefers-color-scheme: dark)");
+  const [scheme, setScheme] = useState<ColorScheme>(() => expected(preference, osDark));
+  useEffect(() => {
+    // `useApplyTheme` writes `data-theme` in the app root's effect, which runs
+    // after this one; the store says what it will write, and the document is
+    // re-read on the next frame in case a host wrote something else.
+    setScheme(expected(preference, osDark));
+    if (typeof requestAnimationFrame !== "function") return;
+    const frame = requestAnimationFrame(() => setScheme(documentColorScheme()));
+    return () => cancelAnimationFrame(frame);
+  }, [preference, osDark]);
+  return scheme;
+}
+
+function expected(preference: "system" | "light" | "dark", osDark: boolean): ColorScheme {
+  if (preference === "system") return osDark ? "dark" : "light";
+  return preference;
+}

package/src/hooks/use-hash-routes.ts

@@ -1,3 +1,4 @@
+import { useBrainUiRoot } from "../root-context.js";
 import { useEffect, useRef, useState } from "react";
 import { useFileStore } from "../stores/file-store.js";
 import { useUIStore, type ActiveView } from "../stores/ui-store.js";
@@ -31,6 +32,7 @@ function viewForHash(hash: string): Exclude<ActiveView, "chat"> | null {
  * stores.
  */
 export function useHashRoutes(): void {
+  const root = useBrainUiRoot();
   const [hash, setHash] = useState(() => window.location.hash);
   const syncingFromHash = useRef(false);
   const activeView = useUIStore((state) => state.activeView);
@@ -74,10 +76,10 @@ export function useHashRoutes(): void {
     // below never runs and never clears the flag. It would then swallow the
     // NEXT store-driven change, leaving the URL pointing at Activity while the
     // app shows Chat, and a refresh would jump back.
-    if (useUIStore.getState().activeView === view) return;
+    if (root.stores.ui.getState().activeView === view) return;
     syncingFromHash.current = true;
     setActiveView(view);
-  }, [hash, setActiveView]);
+  }, [hash, setActiveView, root]);
 
   useEffect(() => {
     // A hash-driven store write and this effect are flushed together. Skip

package/src/hooks/use-media-query.ts

@@ -0,0 +1,32 @@
+import { useEffect, useState } from "react";
+
+/**
+ * Whether a media query matches, kept current as the window changes. Reads
+ * `false` where there is no `matchMedia` — the server, and the test DOM —
+ * so a component that branches on it renders its mobile shape there.
+ */
+export function useMediaQuery(query: string): boolean {
+  const [matches, setMatches] = useState(() => read(query));
+  useEffect(() => {
+    if (typeof window === "undefined" || typeof window.matchMedia !== "function") return;
+    let list: MediaQueryList;
+    try {
+      list = window.matchMedia(query);
+    } catch {
+      return;
+    }
+    const update = () => setMatches(list.matches);
+    update();
+    list.addEventListener?.("change", update);
+    return () => list.removeEventListener?.("change", update);
+  }, [query]);
+  return matches;
+}
+
+function read(query: string): boolean {
+  try {
+    return typeof window !== "undefined" && typeof window.matchMedia === "function" && window.matchMedia(query).matches;
+  } catch {
+    return false;
+  }
+}

package/src/hooks/use-share-intake.ts

@@ -1,4 +1,5 @@
-import { useCallback, useEffect } from "react";
+import { useBrainUiRoot } from "../root-context.js";
+import { useCallback, useEffect, useRef } from "react";
 import {
   SHARE_STASH_TTL_MS,
   type ShareIntakeResult,
@@ -9,8 +10,6 @@ import {
   readShareLaunchParams,
   type StoredShare,
 } from "@schlessera/brain-ui-sdk/share-target";
-import { useChatStore } from "../stores/chat-store.js";
-import { useConnectionStore } from "../stores/connection-store.js";
 import { useShareStore } from "../stores/share-store.js";
 import { detectClientEnvironment } from "../lib/client-environment.js";
 import {
@@ -23,7 +22,6 @@ import {
   shareImagesToAttachments,
   uploadShare,
 } from "../lib/share-intake.js";
-import { sendClientMessage } from "./use-websocket.js";
 
 /**
  * Pick up shares the service worker stashed, and file them once confirmed.
@@ -66,6 +64,13 @@ export function useShareIntake(): {
   confirm: (record: StoredShare) => Promise<void>;
   dismiss: (record: StoredShare) => void;
 } {
+  const root = useBrainUiRoot();
+  const lifetime = useRef(new AbortController());
+  useEffect(() => {
+    const controller = new AbortController();
+    lifetime.current = controller;
+    return () => controller.abort();
+  }, [root]);
   const enqueue = useShareStore((s) => s.enqueue);
   const remove = useShareStore((s) => s.remove);
   const setBusy = useShareStore((s) => s.setBusy);
@@ -82,8 +87,12 @@ export function useShareIntake(): {
       try {
         for (const id of claimed) {
           const record = await store.take(id);
+          if (disposed) {
+            if (record) await store.put(record);
+            return;
+          }
           dropShareClaim(id);
-          if (record && !disposed) enqueue(record);
+          if (record) enqueue(record);
         }
 
         // Orphans: a share whose landing page never ran (the app opened
@@ -91,8 +100,13 @@ export function useShareIntake(): {
         // parameter was read) leaves a record nobody holds the id for. The
         // stash is the only place it still exists.
         for (const record of await store.list()) {
+          if (disposed) return;
           const taken = await store.take(record.id);
-          if (taken && !disposed) enqueue(taken);
+          if (disposed) {
+            if (taken) await store.put(taken);
+            return;
+          }
+          if (taken) enqueue(taken);
         }
 
         // The service worker's own prune runs after a stash, so it can never
@@ -112,9 +126,10 @@ export function useShareIntake(): {
 
   const confirm = useCallback(
     async (record: StoredShare) => {
-      const share = useShareStore.getState();
+      const signal = lifetime.current.signal;
+      const share = root.stores.share.getState();
       if (share.busy) return;
-      if (useConnectionStore.getState().wsStatus !== "connected") {
+      if (root.stores.connection.getState().wsStatus !== "connected") {
         setError("Not connected yet — this will work as soon as the app reconnects.");
         return;
       }
@@ -123,17 +138,22 @@ export function useShareIntake(): {
       setError(null);
       setNotes([]);
       try {
-        const outcome = await uploadShare(record);
+        const outcome = await uploadShare(record, root.request, root.apiBase(), signal);
+        if (signal.aborted) return;
         if (!outcome.ok) {
           setError(describeUploadError(outcome));
           return;
         }
 
         const { attachments, errors } = await shareImagesToAttachments(record.files);
+        if (signal.aborted) {
+          for (const attachment of attachments) URL.revokeObjectURL(attachment.previewUrl);
+          return;
+        }
         if (errors.length) setNotes(errors);
 
         const prompt = buildSharePrompt(outcome.result as ShareIntakeResult);
-        const chat = useChatStore.getState();
+        const chat = root.stores.chat.getState();
         // Always start from a fresh draft: `activeSessionId` is restored from
         // localStorage at store creation, so on a cold boot it already points
         // at whatever session was last open.
@@ -153,7 +173,7 @@ export function useShareIntake(): {
         );
         chat.startAssistantMessage(null);
 
-        const sent = sendClientMessage({
+        const sent = root.connection.send({
           type: "chat_message",
           text: prompt,
           ...(attachments.length
@@ -172,7 +192,7 @@ export function useShareIntake(): {
         setBusy(false);
       }
     },
-    [remove, setBusy, setError, setNotes]
+    [remove, setBusy, setError, setNotes, root]
   );
 
   const dismiss = useCallback(