opencami 1.8.9 → 1.9.0

package/dist/server/assets/{_sessionKey-B6iYeyCS.js → _sessionKey-Bhksr7VP.js}

@@ -3,23 +3,23 @@ import { Link, useNavigate } from "@tanstack/react-router";
 import * as React from "react";
 import React__default, { useState, useCallback, memo, useDeferredValue, useMemo, Suspense, lazy, useRef, useEffect, useLayoutEffect, createContext, useContext } from "react";
 import { useQueryClient, useMutation, useQuery } from "@tanstack/react-query";
-import { T as TooltipProvider, a as TooltipRoot, b as TooltipTrigger, c as TooltipContent, s as setChatUiState, d as chatUiQueryKey, g as getChatUiState } from "./tooltip-DgsSPocE.js";
+import { T as TooltipProvider, a as TooltipRoot, b as TooltipTrigger, c as TooltipContent, s as setChatUiState, d as chatUiQueryKey, g as getChatUiState } from "./tooltip-DOvOrSSS.js";
 import { Tick01Icon, Cancel01Icon, MoreHorizontalIcon, Pen01Icon, Upload01Icon, Delete01Icon, BotIcon, Clock01Icon, Chat01Icon, ArrowRight01Icon, SidebarLeft01Icon, PencilEdit02Icon, Folder01Icon, AiBrain01Icon, PackageOpenIcon, SmartPhone01Icon, DashboardCircleIcon, Search01Icon, Settings01Icon, Menu01Icon, Tick02Icon, Copy01Icon, Loading02Icon, StopIcon, VolumeHighIcon, Loading03Icon, ArrowDown01Icon, File01Icon, CommandIcon, Attachment01Icon, Mic02Icon, ArrowUp02Icon } from "@hugeicons/core-free-icons";
 import { HugeiconsIcon } from "@hugeicons/react";
 import { motion, AnimatePresence } from "motion/react";
 import { AlertDialog } from "@base-ui/react/alert-dialog";
-import { c as cn, B as Button, b as buttonVariants } from "./button-CwY2OHFj.js";
-import { D as DialogRoot, a as DialogContent, b as DialogTitle, c as DialogDescription, d as DialogClose, u as useFileExplorerState } from "./use-file-explorer-state-s7CS50ho.js";
+import { c as cn, B as Button, b as buttonVariants } from "./button-kI8fEIZQ.js";
+import { D as DialogRoot, a as DialogContent, b as DialogTitle, c as DialogDescription, d as DialogClose, u as useFileExplorerState } from "./use-file-explorer-state-E6cUvMva.js";
 import { Collapsible as Collapsible$1 } from "@base-ui/react/collapsible";
 import { ScrollArea } from "@base-ui/react/scroll-area";
-import { M as MenuRoot, a as MenuTrigger, b as MenuContent, c as MenuItem } from "./menu-D90CDTi2.js";
+import { M as MenuRoot, a as MenuTrigger, b as MenuContent, c as MenuItem } from "./menu-D8cKTpmN.js";
 import { O as OpenCamiLogo, a as OpenCamiText } from "./opencami-logo-C-43FL3R.js";
-import { M as Markdown } from "./markdown-DoX5Q7qh.js";
-import { u as useChatSettings$1 } from "./index-BEWnDAH6.js";
+import { M as Markdown } from "./markdown-CFdYXCRQ.js";
+import { u as useChatSettings$1 } from "./index-B_F4DTUu.js";
 import { createPortal } from "react-dom";
 import { create } from "zustand";
 import { persist } from "zustand/middleware";
-import { a as Route } from "./router-BqLGFd4L.js";
+import { a as Route } from "./router-C9JRmWMm.js";
 function deriveFriendlyIdFromKey(key) {
   if (!key) return "main";
   const trimmed = key.trim();
@@ -31,9 +31,16 @@ function deriveFriendlyIdFromKey(key) {
 }
 const INBOUND_META_FENCED_REGEX = /^Conversation info \(untrusted metadata\):\s*```(?:json)?\s*[\s\S]*?```\s*/;
 const INBOUND_META_INLINE_REGEX = /^Conversation info \(untrusted metadata\):\s*\{[\s\S]*?\}\s*/;
-const INBOUND_META_TIMESTAMP_REGEX = /^\[(?:[A-Za-z]{3}\s+)?\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}\s+GMT[+-]?\d+\]\s*/;
+const INBOUND_SENDER_FENCED_REGEX = /^Sender \(untrusted metadata\):\s*```(?:[a-zA-Z0-9_-]+)?\s*[\s\S]*?```\s*/gm;
+const INBOUND_SENDER_INLINE_REGEX = /^Sender \(untrusted metadata\):\s*\{[^\n]*\}\s*$/gm;
+const SUPERMEMORY_CONTEXT_REGEX = /<supermemory-context\b[^>]*>[\s\S]*?<\/supermemory-context>/gi;
+const SUPERMEMORY_CONTAINERS_REGEX = /<supermemory-containers\b[^>]*>[\s\S]*?<\/supermemory-containers>/gi;
+const WORKSPACE_CRITICAL_RULES_REGEX = /<workspace-critical-rules\b[^>]*>[\s\S]*?<\/workspace-critical-rules>/gi;
+const INBOUND_META_TIMESTAMP_REGEX = /^\[(?:[A-Za-z]{3}\s+)?\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}\s+GMT[+-]?\d+\]\s*/gm;
+const MULTI_BLANK_LINES_REGEX = /\n{3,}/g;
 function stripInboundMeta(text) {
   let s = text;
+  s = s.replace(SUPERMEMORY_CONTEXT_REGEX, "").replace(SUPERMEMORY_CONTAINERS_REGEX, "").replace(WORKSPACE_CRITICAL_RULES_REGEX, "").replace(INBOUND_SENDER_FENCED_REGEX, "");
   const hasFenced = INBOUND_META_FENCED_REGEX.test(s);
   const hasInline = !hasFenced && INBOUND_META_INLINE_REGEX.test(s);
   if (hasFenced) {
@@ -41,9 +48,7 @@ function stripInboundMeta(text) {
   } else if (hasInline) {
     s = s.replace(INBOUND_META_INLINE_REGEX, "");
   }
-  if (hasFenced || hasInline) {
-    s = s.replace(INBOUND_META_TIMESTAMP_REGEX, "");
-  }
+  s = s.replace(SUPERMEMORY_CONTEXT_REGEX, "").replace(SUPERMEMORY_CONTAINERS_REGEX, "").replace(INBOUND_SENDER_FENCED_REGEX, "").replace(INBOUND_SENDER_INLINE_REGEX, "").replace(INBOUND_META_TIMESTAMP_REGEX, "").replace(MULTI_BLANK_LINES_REGEX, "\n\n");
   return s.trim();
 }
 function textFromMessage(msg) {
@@ -201,7 +206,7 @@ async function fetchHistory(payload) {
 }
 async function fetchGatewayStatus() {
   const controller = new AbortController();
-  const timeout = window.setTimeout(() => controller.abort(), 2500);
+  const timeout = window.setTimeout(() => controller.abort(), 8e3);
   try {
     const res = await fetch("/api/ping", { signal: controller.signal });
     if (!res.ok) throw new Error(await readError(res));
@@ -1681,10 +1686,10 @@ function areSidebarSessionsEqual(prev, next) {
   return true;
 }
 const SettingsDialog = lazy(
-  () => import("./settings-dialog-BZ67gr9N.js").then((m) => ({ default: m.SettingsDialog }))
+  () => import("./settings-dialog-B5yR2pBy.js").then((m) => ({ default: m.SettingsDialog }))
 );
 const SessionExportDialog = lazy(
-  () => import("./session-export-dialog-C53RRAah.js").then((m) => ({
+  () => import("./session-export-dialog-CgtlOnwf.js").then((m) => ({
     default: m.SessionExportDialog
   }))
 );
@@ -2444,17 +2449,17 @@ function ContextMeterComponent({
                 ),
                 children: [
                   /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 mb-1.5", children: [
-                    /* @__PURE__ */ jsx("span", { className: "text-primary-500 dark:text-primary-400", children: "Context window" }),
+                    /* @__PURE__ */ jsx("span", { className: "text-primary-500 dark:text-primary-500", children: "Context window" }),
                     /* @__PURE__ */ jsxs("span", { className: cn("font-semibold", colors.text), children: [
                       percentage,
                       "%"
                     ] })
                   ] }),
-                  /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-1.5 text-primary-700 dark:text-primary-300", children: [
+                  /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-1.5 text-primary-700 dark:text-primary-700", children: [
                     /* @__PURE__ */ jsx("span", { className: "font-medium", children: usedStr }),
-                    /* @__PURE__ */ jsx("span", { className: "text-primary-400", children: "/" }),
+                    /* @__PURE__ */ jsx("span", { className: "text-primary-400 dark:text-primary-500", children: "/" }),
                     /* @__PURE__ */ jsx("span", { children: maxStr }),
-                    /* @__PURE__ */ jsx("span", { className: "text-primary-400", children: "tokens" })
+                    /* @__PURE__ */ jsx("span", { className: "text-primary-400 dark:text-primary-500", children: "tokens" })
                   ] }),
                   /* @__PURE__ */ jsx("div", { className: "w-full h-1.5 rounded-full bg-primary-200 dark:bg-primary-700 overflow-hidden mt-1.5", children: /* @__PURE__ */ jsx(
                     "div",
@@ -2490,7 +2495,7 @@ function ChatHeaderComponent({
     {
       ref: wrapperRef,
       "data-tauri-drag-region": true,
-      className: "border-b border-primary-200 px-4 h-12 flex min-w-0 items-center overflow-x-hidden bg-surface tauri-drag-header",
+      className: "border-b border-primary-200 pr-4 h-12 flex shrink-0 min-w-0 items-center bg-surface tauri-drag-header",
       children: [
         showSidebarButton ? /* @__PURE__ */ jsx(
           Button,
@@ -2828,12 +2833,12 @@ function Tool({ toolPart, defaultOpen = false }) {
   ] }) });
 }
 const Thinking = lazy(
-  () => import("./thinking-CA8PSwKJ.js").then((m) => ({
+  () => import("./thinking-CHx4Oouj.js").then((m) => ({
     default: m.Thinking
   }))
 );
 const SearchSourcesBadge = lazy(
-  () => import("./search-sources-badge-B0rAEDs_.js").then((m) => ({
+  () => import("./search-sources-badge-B0t8Qffy.js").then((m) => ({
     default: m.SearchSourcesBadge
   }))
 );
@@ -3469,7 +3474,7 @@ function TypingIndicator({ className }) {
   ] });
 }
 const FollowUpSuggestions = lazy(
-  () => import("./follow-up-suggestions-mzRQIB0k.js").then((m) => ({
+  () => import("./follow-up-suggestions-B3hol2KT.js").then((m) => ({
     default: m.FollowUpSuggestions
   }))
 );
@@ -3886,8 +3891,8 @@ function SlashCommandMenuComponent({
               active ? "bg-neutral-800" : "hover:bg-neutral-800/80"
             ),
             children: /* @__PURE__ */ jsxs("div", { className: "flex items-start gap-3", children: [
-              /* @__PURE__ */ jsx("code", { className: "min-w-[90px] font-mono text-xs text-primary-300", children: item.command }),
-              /* @__PURE__ */ jsx("span", { className: "text-xs text-neutral-300", children: item.description })
+              /* @__PURE__ */ jsx("code", { className: "min-w-[90px] font-mono text-xs text-primary-700 dark:text-primary-700", children: item.command }),
+              /* @__PURE__ */ jsx("span", { className: "text-xs text-primary-600 dark:text-primary-600", children: item.description })
             ] })
           },
           item.command
@@ -3971,7 +3976,7 @@ function PromptInput({
         {
           onClick: handleClick,
           className: cn(
-            "bg-surface cursor-text rounded-[22px] outline outline-ink/10 shadow-[0px_12px_32px_0px_rgba(0,0,0,0.05)] py-3 gap-3 flex flex-col",
+            "bg-surface dark:bg-primary-200 cursor-text rounded-[22px] outline outline-ink/10 shadow-[0px_12px_32px_0px_rgba(0,0,0,0.05)] py-3 gap-3 flex flex-col",
             disabled && "cursor-not-allowed opacity-60",
             className
           ),
@@ -4323,7 +4328,7 @@ function CommandHelp({ className, onCommandSelect }) {
             onClick: () => handleCommandClick(cmd.command),
             className: "w-full flex items-start gap-3 px-3 py-2 rounded-lg hover:bg-primary-100 dark:hover:bg-neutral-800 transition-colors text-left",
             children: [
-              /* @__PURE__ */ jsx("code", { className: "text-sm font-mono font-medium text-primary-700 dark:text-primary-300 bg-primary-100 dark:bg-neutral-800 px-1.5 py-0.5 rounded min-w-[80px]", children: cmd.command }),
+              /* @__PURE__ */ jsx("code", { className: "text-sm font-mono font-medium text-primary-700 dark:text-primary-700 bg-primary-100 dark:bg-neutral-800 px-1.5 py-0.5 rounded min-w-[80px]", children: cmd.command }),
               /* @__PURE__ */ jsxs("div", { className: "flex-1 min-w-0", children: [
                 /* @__PURE__ */ jsx("div", { className: "text-sm text-primary-900 dark:text-neutral-100", children: cmd.description }),
                 cmd.usage && cmd.usage !== cmd.command && /* @__PURE__ */ jsx("div", { className: "text-xs text-primary-500 dark:text-neutral-500 font-mono mt-0.5", children: cmd.usage })
@@ -5901,61 +5906,32 @@ const INITIAL_STATE = {
   active: false,
   text: "",
   tools: [],
+  contentBlocks: [],
   sessionKey: null
 };
 function useStreaming(options) {
   const [state, setState] = useState(INITIAL_STATE);
   const eventSourceRef = useRef(null);
-  const pollingRef = useRef(null);
-  const pollingTimeoutRef = useRef(null);
-  const streamStartRef = useRef(null);
   const doneRef = useRef(false);
+  const finalStateRef = useRef(false);
+  const activeRunsRef = useRef(/* @__PURE__ */ new Set());
+  const lastSeqRef = useRef(-1);
+  const lastAgentFingerprintRef = useRef("");
+  const anyRunSeenRef = useRef(false);
+  const sessionKeyRef = useRef("");
   const onDoneRef = useRef(options.onDone);
   const onErrorRef = useRef(options.onError);
   const onAssistantDeltaRef = useRef(options.onAssistantDelta);
   onDoneRef.current = options.onDone;
   onErrorRef.current = options.onError;
   onAssistantDeltaRef.current = options.onAssistantDelta;
-  function clearPolling() {
-    if (pollingTimeoutRef.current) {
-      window.clearTimeout(pollingTimeoutRef.current);
-      pollingTimeoutRef.current = null;
-    }
-    if (pollingRef.current) {
-      window.clearInterval(pollingRef.current);
-      pollingRef.current = null;
-    }
-  }
-  function startPolling(sessionKey, startedAt) {
-    if (pollingRef.current) return;
-    pollingRef.current = window.setInterval(async () => {
-      try {
-        const res = await fetch(
-          `/api/history?sessionKey=${encodeURIComponent(sessionKey)}`
-        );
-        if (!res.ok) return;
-        const data = await res.json();
-        const messages = Array.isArray(data.messages) ? data.messages : [];
-        const hasNewAssistant = messages.some((message) => {
-          if (!message || message.role !== "assistant") return false;
-          if (typeof message.timestamp !== "number") return false;
-          return message.timestamp > startedAt - 3e3;
-        });
-        if (!hasNewAssistant) return;
-        if (eventSourceRef.current) {
-          eventSourceRef.current.close();
-          eventSourceRef.current = null;
-        }
-        clearPolling();
-        setState((prev) => ({ ...prev, active: false }));
-        onDoneRef.current(sessionKey);
-      } catch {
-      }
-    }, 2e3);
-  }
   const stop = useCallback((options2) => {
     doneRef.current = true;
-    clearPolling();
+    finalStateRef.current = false;
+    activeRunsRef.current.clear();
+    anyRunSeenRef.current = false;
+    lastSeqRef.current = -1;
+    lastAgentFingerprintRef.current = "";
     if (eventSourceRef.current) {
       eventSourceRef.current.close();
       eventSourceRef.current = null;
@@ -5966,80 +5942,177 @@ function useStreaming(options) {
     }
     setState(INITIAL_STATE);
   }, []);
-  const start = useCallback(
-    function start2(sessionKey) {
-      doneRef.current = false;
-      clearPolling();
-      streamStartRef.current = Date.now();
-      if (eventSourceRef.current) {
-        eventSourceRef.current.close();
-        eventSourceRef.current = null;
-      }
-      setState({
-        active: true,
-        text: "",
-        tools: [],
-        sessionKey
-      });
-      const es = new EventSource(`/api/stream?sessionKey=${encodeURIComponent(sessionKey)}`);
-      eventSourceRef.current = es;
-      es.addEventListener("delta", (e) => {
-        try {
-          const data = JSON.parse(e.data);
-          setState((prev) => ({
-            ...prev,
-            text: prev.text + data.text
-          }));
-          onAssistantDeltaRef.current?.({ text: data.text, sessionKey: data.sessionKey });
-        } catch {
+  const start = useCallback(function start2(sessionKey) {
+    sessionKeyRef.current = sessionKey;
+    if (eventSourceRef.current && !doneRef.current) {
+      setState((prev) => ({ ...prev, sessionKey, active: true }));
+      return;
+    }
+    doneRef.current = false;
+    finalStateRef.current = false;
+    activeRunsRef.current.clear();
+    anyRunSeenRef.current = false;
+    lastSeqRef.current = -1;
+    lastAgentFingerprintRef.current = "";
+    setState({
+      active: true,
+      text: "",
+      tools: [],
+      contentBlocks: [],
+      sessionKey
+    });
+    if (eventSourceRef.current) {
+      return;
+    }
+    const es = new EventSource(`/api/stream?sessionKey=${encodeURIComponent(sessionKey)}`);
+    eventSourceRef.current = es;
+    es.addEventListener("message", (e) => {
+      try {
+        const data = JSON.parse(e.data);
+        if (typeof data.seq === "number") {
+          if (data.seq <= lastSeqRef.current) return;
+          lastSeqRef.current = data.seq;
         }
-      });
-      es.addEventListener("tool", (e) => {
-        try {
-          const data = JSON.parse(e.data);
-          setState((prev) => {
-            const existingIdx = prev.tools.findIndex((t) => t.id === data.id);
-            const tools = [...prev.tools];
-            if (existingIdx >= 0) {
-              tools[existingIdx] = { name: data.name, status: data.status, id: data.id };
-            } else {
-              tools.push({ name: data.name, status: data.status, id: data.id });
-            }
-            return { ...prev, tools };
+        const currentKey = sessionKeyRef.current;
+        if (data.event === "agent") {
+          const fp = JSON.stringify(data.payload);
+          if (fp === lastAgentFingerprintRef.current) return;
+          lastAgentFingerprintRef.current = fp;
+          handleAgentEvent(data.payload, currentKey, {
+            setState,
+            onAssistantDelta: onAssistantDeltaRef.current,
+            activeRuns: activeRunsRef.current,
+            anyRunSeen: anyRunSeenRef
           });
-        } catch {
+          return;
         }
-      });
-      es.addEventListener("done", (e) => {
-        try {
-          const data = JSON.parse(e.data);
-          doneRef.current = true;
-          clearPolling();
-          es.close();
-          eventSourceRef.current = null;
-          setState((prev) => ({ ...prev, active: false }));
-          onDoneRef.current(data.sessionKey);
-        } catch {
+        if (data.event === "chat") {
+          const chatPayload = asRecord(data.payload);
+          const eventSessionKey = normalizeString(chatPayload?.sessionKey) || currentKey;
+          const chatState = normalizeString(chatPayload?.state);
+          if (chatState === "final") {
+            finalStateRef.current = true;
+          }
+          if (!doneRef.current && finalStateRef.current && (chatState === "final" || anyRunSeenRef.current && activeRunsRef.current.size === 0)) {
+            doneRef.current = true;
+            setState((prev) => ({ ...prev, active: false }));
+            onDoneRef.current(eventSessionKey);
+          }
+          return;
         }
-      });
-      es.onerror = () => {
-        if (es.readyState === EventSource.CLOSED) {
-          es.close();
-          eventSourceRef.current = null;
-          setState(INITIAL_STATE);
-          onErrorRef.current?.("Stream connection lost");
+        if (data.event === "error") {
+          const message = typeof data.payload === "string" ? data.payload : "Stream connection lost";
+          onErrorRef.current?.(message);
         }
-      };
-      pollingTimeoutRef.current = window.setTimeout(() => {
-        if (doneRef.current) return;
-        const startedAt = streamStartRef.current ?? Date.now();
-        startPolling(sessionKey, startedAt);
-      }, 3e3);
-    },
-    []
-  );
+      } catch {
+      }
+    });
+    es.onerror = () => {
+      if (doneRef.current) return;
+      if (es.readyState === EventSource.CLOSED) {
+        eventSourceRef.current = null;
+        setState((prev) => ({ ...prev, active: false }));
+        onErrorRef.current?.("Stream connection lost");
+      }
+    };
+  }, []);
   return { streaming: state, startStream: start, stopStream: stop };
 }
+function handleAgentEvent(payload, fallbackSessionKey, options) {
+  const agentPayload = asRecord(payload);
+  const stream = normalizeString(agentPayload?.stream);
+  const runId = normalizeString(agentPayload?.runId);
+  const sessionKey = normalizeString(agentPayload?.sessionKey) || fallbackSessionKey;
+  const streamData = asRecord(agentPayload?.data);
+  if (runId) {
+    options.anyRunSeen.current = true;
+    if (stream === "lifecycle") {
+      const phase = normalizeString(streamData?.phase);
+      if (phase === "end" || phase === "error" || phase === "abort") {
+        options.activeRuns.delete(runId);
+      } else if (phase) {
+        options.activeRuns.add(runId);
+      }
+    } else {
+      options.activeRuns.add(runId);
+    }
+  }
+  if (stream === "assistant") {
+    const text = normalizeString(streamData?.delta) || normalizeString(streamData?.text);
+    if (!text) return;
+    options.setState((prev) => {
+      const blocks = [...prev.contentBlocks];
+      const lastBlock = blocks[blocks.length - 1];
+      if (lastBlock?.kind === "text") {
+        blocks[blocks.length - 1] = { ...lastBlock, text: lastBlock.text + text };
+      } else {
+        blocks.push({ kind: "text", text });
+      }
+      return {
+        ...prev,
+        sessionKey,
+        text: prev.text + text,
+        contentBlocks: blocks
+      };
+    });
+    options.onAssistantDelta?.({ text, sessionKey });
+    return;
+  }
+  if (!stream.includes("tool")) return;
+  const toolId = normalizeString(streamData?.toolCallId) || normalizeString(streamData?.id) || normalizeString(streamData?.callId) || `${runId || "tool"}:${normalizeString(streamData?.toolName) || normalizeString(streamData?.name) || "unknown"}`;
+  const toolName = normalizeString(streamData?.toolName) || normalizeString(streamData?.name) || "Tool";
+  const toolStatus = deriveToolStatus(stream, streamData);
+  const toolArgs = asRecord(streamData?.arguments) || asRecord(streamData?.input) || asRecord(streamData?.params) || null;
+  const toolOutput = normalizeString(streamData?.result) || normalizeString(streamData?.output) || (stream.includes("result") ? normalizeString(streamData?.text) : "");
+  options.setState((prev) => {
+    const tools = [...prev.tools];
+    const toolIndex = tools.findIndex((tool) => tool.id === toolId);
+    const nextTool = { id: toolId, name: toolName, status: toolStatus };
+    if (toolIndex >= 0) {
+      tools[toolIndex] = nextTool;
+    } else {
+      tools.push(nextTool);
+    }
+    const blocks = [...prev.contentBlocks];
+    const blockIndex = blocks.findIndex(
+      (b) => b.kind === "tool" && b.id === toolId
+    );
+    const existingBlock = blockIndex >= 0 ? blocks[blockIndex] : null;
+    const nextBlock = {
+      kind: "tool",
+      name: toolName,
+      id: toolId,
+      status: toolStatus,
+      // Merge: keep existing arguments/output if new event doesn't carry them
+      arguments: toolArgs ?? existingBlock?.arguments,
+      output: toolOutput || existingBlock?.output || void 0
+    };
+    if (blockIndex >= 0) {
+      blocks[blockIndex] = nextBlock;
+    } else {
+      blocks.push(nextBlock);
+    }
+    return {
+      ...prev,
+      sessionKey,
+      tools,
+      contentBlocks: blocks
+    };
+  });
+}
+function deriveToolStatus(stream, data) {
+  const explicitStatus = normalizeString(data?.phase) || normalizeString(data?.status) || normalizeString(data?.state);
+  if (explicitStatus) return explicitStatus;
+  if (stream.includes("result") || stream.includes("output")) return "done";
+  if (stream.includes("call")) return "running";
+  return "running";
+}
+function asRecord(value) {
+  return value && typeof value === "object" ? value : null;
+}
+function normalizeString(value) {
+  return typeof value === "string" ? value.trim() : "";
+}
 function useKeyboardShortcuts(handlers) {
   const handleKeyDown = useCallback(
     (event) => {
@@ -6246,12 +6319,12 @@ function useNotifications() {
   };
 }
 const KeyboardShortcutsDialog = lazy(
-  () => import("./keyboard-shortcuts-dialog-Cr6fOqHz.js").then((m) => ({
+  () => import("./keyboard-shortcuts-dialog-Cp3ECNNi.js").then((m) => ({
     default: m.KeyboardShortcutsDialog
   }))
 );
 const SearchDialog = lazy(
-  () => import("./search-dialog-CmI7naPN.js").then((m) => ({
+  () => import("./search-dialog-CTJULPB8.js").then((m) => ({
     default: m.SearchDialog
   }))
 );
@@ -6333,9 +6406,10 @@ function ChatScreen({
   const gatewayStatusQuery = useQuery({
     queryKey: ["gateway", "status"],
     queryFn: fetchGatewayStatus,
-    retry: false,
+    retry: 2,
+    retryDelay: (attempt) => Math.min(2e3 * 2 ** attempt, 8e3),
     refetchOnWindowFocus: false,
-    refetchOnReconnect: false,
+    refetchOnReconnect: true,
     refetchOnMount: "always"
   });
   const gatewayStatusMountRef = useRef(Date.now());
@@ -6345,6 +6419,11 @@ function ChatScreen({
     void gatewayStatusQuery.refetch();
   }, [gatewayStatusQuery]);
   const isSidebarCollapsed = uiQuery.data?.isSidebarCollapsed ?? false;
+  useEffect(() => {
+    if (sessionsQuery.isSuccess && gatewayStatusQuery.isError) {
+      void gatewayStatusQuery.refetch();
+    }
+  }, [sessionsQuery.isSuccess, gatewayStatusQuery.isError]);
   const sidebarSwipeHandlers = useSwipeGesture({
     enabled: isMobile && isSidebarCollapsed,
     edgeWidth: 40,
@@ -6420,26 +6499,30 @@ function ChatScreen({
   handleStreamDoneRef.current = useCallback(
     async (_sk) => {
       await historyQuery.refetch();
-      stopStream({ preserveState: true });
       streamFinish();
       void queryClient.invalidateQueries({ queryKey: chatQueryKeys.sessions });
     },
-    [historyQuery, queryClient, stopStream, streamFinish]
+    [historyQuery, queryClient, streamFinish]
   );
   handleStreamErrorRef.current = useCallback((_err) => {
     console.warn("[stream] SSE error, falling back to polling");
   }, []);
   const streamingMessage = useMemo(() => {
-    if (!streaming.text) return null;
+    if (streaming.contentBlocks.length === 0) return null;
     const content = [];
-    for (const tool of streaming.tools) {
-      content.push({
-        type: "toolCall",
-        name: tool.name,
-        id: tool.id
-      });
+    for (const block of streaming.contentBlocks) {
+      if (block.kind === "text" && block.text) {
+        content.push({ type: "text", text: block.text });
+      } else if (block.kind === "tool") {
+        content.push({
+          type: "toolCall",
+          name: block.name,
+          id: block.id,
+          arguments: block.arguments
+        });
+      }
     }
-    content.push({ type: "text", text: streaming.text });
+    if (content.length === 0) return null;
     return {
       role: "assistant",
       content,
@@ -6447,22 +6530,46 @@ function ChatScreen({
       __streaming: true,
       timestamp: Date.now()
     };
-  }, [streaming.text, streaming.tools]);
+  }, [streaming.contentBlocks]);
+  const streamingToolResults = useMemo(() => {
+    const results = [];
+    for (const block of streaming.contentBlocks) {
+      if (block.kind === "tool" && block.status === "done") {
+        results.push({
+          role: "toolResult",
+          toolCallId: block.id,
+          toolName: block.name,
+          content: block.output ? [{ type: "text", text: block.output }] : []
+        });
+      }
+    }
+    return results;
+  }, [streaming.contentBlocks]);
   const messagesWithStreaming = useMemo(() => {
     if (!streamingMessage) return displayMessages;
     const lastAssistantIndex = [...displayMessages].map((message, index) => ({ message, index })).filter(({ message }) => message.role === "assistant").map(({ index }) => index).pop();
     const lastUserIndex = [...displayMessages].map((message, index) => ({ message, index })).filter(({ message }) => message.role === "user").map(({ index }) => index).pop();
     const assistantIsLatestTurn = typeof lastAssistantIndex === "number" && (typeof lastUserIndex !== "number" || lastAssistantIndex > lastUserIndex);
+    if (!streaming.active && assistantIsLatestTurn) {
+      return displayMessages;
+    }
+    let merged;
     if (assistantIsLatestTurn && typeof lastAssistantIndex === "number") {
       const historyAssistant = displayMessages[lastAssistantIndex];
       const historyText = textFromMessage(historyAssistant);
-      if (historyText.length >= streaming.text.length) return displayMessages;
-      const msgs = [...displayMessages];
-      msgs[lastAssistantIndex] = streamingMessage;
-      return msgs;
+      if (historyText.length >= streaming.text.length && streaming.tools.length === 0) {
+        return displayMessages;
+      }
+      merged = [...displayMessages];
+      merged[lastAssistantIndex] = streamingMessage;
+    } else {
+      merged = [...displayMessages, streamingMessage];
     }
-    return [...displayMessages, streamingMessage];
-  }, [displayMessages, streamingMessage, streaming.text]);
+    if (streamingToolResults.length > 0) {
+      merged = [...merged, ...streamingToolResults];
+    }
+    return merged;
+  }, [displayMessages, streamingMessage, streamingToolResults, streaming.active, streaming.text, streaming.tools]);
   const stableContentStyle = useMemo(() => ({}), []);
   refreshHistoryRef.current = function refreshHistory() {
     void historyQuery.refetch();
@@ -6733,6 +6840,10 @@ function ChatScreen({
     }));
     streamingNotificationTextRef.current = "";
     streamStart();
+    const preStreamKey = sessionKey || friendlyId;
+    if (preStreamKey) {
+      startStream(preStreamKey);
+    }
     fetch("/api/send", {
       method: "POST",
       headers: { "content-type": "application/json" },
@@ -6956,7 +7067,7 @@ function ChatScreen({
   });
   const historyLoading = historyQuery.isLoading && !historyQuery.data || isRedirecting;
   const showGatewayDown = Boolean(gatewayStatusError);
-  const showGatewayNotice = showGatewayDown && gatewayStatusQuery.errorUpdatedAt > gatewayStatusMountRef.current;
+  const showGatewayNotice = showGatewayDown && !sessionsQuery.isSuccess && gatewayStatusQuery.errorUpdatedAt > gatewayStatusMountRef.current;
   const historyEmpty = !historyLoading && displayMessages.length === 0;
   const gatewayNotice = useMemo(() => {
     if (!showGatewayNotice) return null;