@qredence/fleet 0.5.10 → 0.6.0

package/dist/web/server/{routes-CP_BBhD0-BAWQYGKY.js → routes-BBVirYfL-5WXMOT7M.js}

@@ -1,5 +1,10 @@
 import {
   ChatCommandsResponseSchema,
+  ChatMcpDeleteRequestSchema,
+  ChatMcpListResponseSchema,
+  ChatMcpOAuthLoginRequestSchema,
+  ChatMcpOAuthLoginResponseSchema,
+  ChatMcpUpsertRequestSchema,
   ChatModelsDiscoverRequestSchema,
   ChatModelsDiscoverResponseSchema,
   ChatModelsResponseSchema,
@@ -21,12 +26,12 @@ import {
   useMutation,
   useQuery,
   useQueryClient
-} from "./chunk-VHBFU4TG.js";
+} from "./chunk-EH4BZ6QM.js";
 import {
   Library,
   RIGHT_PANEL_LAUNCHER_DEFINITIONS,
   getRightPanelDefinition
-} from "./chunk-EOVMHQ2H.js";
+} from "./chunk-CNXJN5HN.js";
 import {
   AlertDialog,
   AlertDialogAction,
@@ -41,7 +46,6 @@ import {
   CHROME_PILL_CLASS,
   CHROME_PILL_INACTIVE_CLASS,
   PANEL_OVERLAY_CLASS,
-  Pencil,
   ProviderBrandIcon,
   Settings,
   Spinner,
@@ -51,7 +55,10 @@ import {
   useHoverFloatingInteraction,
   useHoverReferenceInteraction,
   usePopupHandleStore
-} from "./chunk-TCH3U26B.js";
+} from "./chunk-TWYHHG5N.js";
+import {
+  Pencil
+} from "./chunk-M5RSPNYN.js";
 import {
   RightPanelProvider,
   useChatPanelDataContext,
@@ -66,7 +73,7 @@ import {
   PromptInput,
   useHydrated,
   usePopoverPortalPosition
-} from "./chunk-GM32R7JW.js";
+} from "./chunk-YKVGQBZA.js";
 import "./chunk-7CNGNFFK.js";
 import {
   Plus
@@ -81,10 +88,11 @@ import {
   MessageContent,
   MessageScroller,
   UserMessage,
+  VirtualizedTurnList,
   buildAssistantElements,
   groupMessages,
   normalizeAssistantToolParts
-} from "./chunk-6AW2XFTZ.js";
+} from "./chunk-BBBS5AS7.js";
 import "./chunk-FJV6EQDW.js";
 import {
   RefreshCw
@@ -105,14 +113,14 @@ import {
   MessageCircleQuestionMark,
   PI_TOOL_RENDERERS,
   useHoverCapable
-} from "./chunk-2TRF62K5.js";
+} from "./chunk-N6NOTURM.js";
 import "./chunk-QPNUGF3V.js";
 import {
   field,
   floating,
   mono,
   paper
-} from "./chunk-ANL4B775.js";
+} from "./chunk-XLNCWZMZ.js";
 import "./chunk-BLSX7WHW.js";
 import {
   Sparkles
@@ -136,11 +144,20 @@ import {
   thinkingLevelLabel,
   toModelOption,
   toModelSelection
-} from "./chunk-FED63ZHU.js";
-import "./chunk-QK4CHLVV.js";
+} from "./chunk-WHBVQJ4K.js";
+import {
+  disambiguateSessionLabel,
+  fallbackSessionLabel,
+  sessionListTitle
+} from "./chunk-PTCKOR23.js";
 import {
   Folder
 } from "./chunk-GS2IZGRC.js";
+import {
+  readStoredValue,
+  removeStoredValue,
+  writeStoredValue
+} from "./chunk-SZJUXVWG.js";
 import {
   resolveWorkspacePanelTarget
 } from "./chunk-P66QQWUM.js";
@@ -224,7 +241,7 @@ import {
   Badge,
   UiErrorBoundary,
   decodeOpenPanelActionMessage
-} from "./chunk-KNJUSMBT.js";
+} from "./chunk-DZ2IC3FH.js";
 import {
   ChatOpenUIArtifactUpsertRequestSchema,
   ChatOpenUIArtifactUpsertResponseSchema,
@@ -248,7 +265,7 @@ import {
   UploadedAttachmentSchema,
   WorkspaceRelativePathSchema,
   external_exports
-} from "./chunk-NRDG2ISJ.js";
+} from "./chunk-YNUWKMNQ.js";
 import {
   CompositeList,
   Select,
@@ -409,7 +426,7 @@ import "./chunk-JDCCC7A7.js";
 import "./chunk-L547YHC4.js";
 import "./chunk-MLKGABMK.js";
 
-// web/app/dist/server/assets/routes-CP_BBhD0.js
+// web/app/dist/server/assets/routes-BBVirYfL.js
 import * as React$1 from "react";
 import { Suspense, createContext as createContext2, createElement, forwardRef as forwardRef2, isValidElement, lazy, memo, useCallback as useCallback2, useContext as useContext2, useEffect as useEffect2, useEffectEvent, useId, useLayoutEffect, useMemo as useMemo2, useReducer, useRef as useRef2, useState as useState2, useSyncExternalStore } from "react";
 import { Fragment as Fragment$1, jsx, jsxs } from "react/jsx-runtime";
@@ -1231,139 +1248,6 @@ function agentTabTriggerId(tabId) {
 function agentTabPanelId(tabId) {
   return `agent-tab-panel-${encodeURIComponent(tabId)}`;
 }
-function statusLabel(status) {
-  switch (status) {
-    case "queued":
-      return "queued";
-    case "running":
-    case "recovering":
-      return "streaming";
-    case "error":
-    case "failed":
-      return "error";
-    case "cancelled":
-      return "cancelled";
-    case "done":
-      return "complete";
-    default:
-      return "ready";
-  }
-}
-function statusDotClass(status) {
-  switch (status) {
-    case "running":
-    case "recovering":
-      return "bg-emerald-400 motion-safe:animate-pulse";
-    case "error":
-    case "failed":
-      return "bg-destructive";
-    case "queued":
-      return "bg-amber-300";
-    case "cancelled":
-      return "bg-foreground/35";
-    default:
-      return "bg-foreground/35";
-  }
-}
-function AgentTabBar({ tabs, value, onValueChange, onClose, onNewSession }) {
-  const tabRefs = useRef2(/* @__PURE__ */ new Map());
-  const setTabRef = useCallback2((tabId, node) => {
-    if (node) tabRefs.current.set(tabId, node);
-    else tabRefs.current.delete(tabId);
-  }, []);
-  useEffect2(() => {
-    for (const tabId of tabRefs.current.keys()) if (!tabs.some((tab) => tab.id === tabId)) tabRefs.current.delete(tabId);
-  }, [tabs]);
-  const focusTab = useCallback2((index) => {
-    const tab = tabs[index];
-    if (!tab) return;
-    tabRefs.current.get(tab.id)?.focus();
-    onValueChange(tab.id);
-  }, [onValueChange, tabs]);
-  const handleKeyDown = useCallback2((event, tabId) => {
-    const index = tabs.findIndex((tab) => tab.id === tabId);
-    if (index < 0) return;
-    let nextIndex;
-    if (event.key === "ArrowRight") nextIndex = (index + 1) % tabs.length;
-    if (event.key === "ArrowLeft") nextIndex = (index - 1 + tabs.length) % tabs.length;
-    if (event.key === "Home") nextIndex = 0;
-    if (event.key === "End") nextIndex = tabs.length - 1;
-    if (nextIndex === void 0) return;
-    event.preventDefault();
-    focusTab(nextIndex);
-  }, [focusTab, tabs]);
-  return /* @__PURE__ */ jsxs("div", {
-    className: "flex min-w-0 max-w-full items-center gap-1",
-    "data-testid": "agent-tab-bar",
-    children: [/* @__PURE__ */ jsx("div", {
-      "aria-label": "Agent conversations",
-      className: "flex min-w-0 flex-1 items-center gap-1 overflow-x-auto overscroll-contain [scrollbar-width:none] [&::-webkit-scrollbar]:hidden",
-      role: "tablist",
-      children: tabs.map((tab) => {
-        const active = tab.id === value;
-        const status = statusLabel(tab.status);
-        return /* @__PURE__ */ jsxs("div", {
-          className: "group/tab relative min-w-0 shrink-0 basis-[164px] sm:max-w-[164px]",
-          "data-tab-id": tab.id,
-          children: [/* @__PURE__ */ jsxs(Button, {
-            ref: (node) => setTabRef(tab.id, node),
-            "aria-controls": agentTabPanelId(tab.id),
-            "aria-selected": active,
-            "aria-label": `${tab.label}, ${status}`,
-            className: cn("h-7 w-full min-w-0 justify-start text-left gap-1.5 rounded-[7px] border border-transparent px-2 text-[12px] font-medium leading-none transition-colors motion-reduce:transition-none", active ? "bg-[#2c2c2c] text-foreground shadow-none" : "bg-transparent text-foreground/45 hover:bg-foreground/5 hover:text-foreground/75", tab.kind === "subagent" && onClose && "pr-7"),
-            "data-state": active ? "active" : "inactive",
-            id: agentTabTriggerId(tab.id),
-            onClick: () => onValueChange(tab.id),
-            onKeyDown: (event) => handleKeyDown(event, tab.id),
-            role: "tab",
-            size: "sm",
-            tabIndex: active ? 0 : -1,
-            type: "button",
-            variant: "ghost",
-            children: [tab.kind === "main" ? /* @__PURE__ */ jsx(Bot, {
-              "aria-hidden": "true",
-              className: "size-3.5 shrink-0"
-            }) : /* @__PURE__ */ jsx("span", {
-              "aria-hidden": "true",
-              className: cn("size-1.5 shrink-0 rounded-full", statusDotClass(tab.status))
-            }), /* @__PURE__ */ jsx("span", {
-              className: "min-w-0 flex-1 truncate text-left",
-              children: tab.label
-            })]
-          }), tab.kind === "subagent" && onClose ? /* @__PURE__ */ jsx(Button, {
-            "aria-label": `Close ${tab.label} tab`,
-            className: "absolute top-1/2 right-1 size-5 -translate-y-1/2 rounded-[5px] p-0 text-foreground/35 opacity-0 transition-opacity motion-reduce:transition-none hover:bg-foreground/10 hover:text-foreground/75 focus-visible:opacity-100 group-hover/tab:opacity-100",
-            onClick: (event) => {
-              event.stopPropagation();
-              onClose(tab.id);
-            },
-            size: "icon-xs",
-            title: `Close ${tab.label} tab`,
-            type: "button",
-            variant: "ghost",
-            children: /* @__PURE__ */ jsx(X, {
-              "aria-hidden": "true",
-              className: "size-3"
-            })
-          }) : null]
-        }, tab.id);
-      })
-    }), onNewSession ? /* @__PURE__ */ jsx(Button, {
-      "aria-label": "New chat",
-      className: "size-7 shrink-0 rounded-[7px] text-foreground/50 hover:bg-foreground/7 hover:text-foreground/85",
-      "data-testid": "new-chat-tab",
-      onClick: onNewSession,
-      size: "icon-sm",
-      title: "New chat",
-      type: "button",
-      variant: "ghost",
-      children: /* @__PURE__ */ jsx(Plus, {
-        "aria-hidden": "true",
-        className: "size-3.5"
-      })
-    }) : null]
-  });
-}
 function ResizableCanvas({ children, dataTestid, headerLeading, loading, onClose, onRefresh, onResizeStart, open, headerActions, title, titleIcon: TitleIcon, width }) {
   const reduceMotion = useReducedMotion();
   const panelRef = useRef2(null);
@@ -1418,7 +1302,7 @@ function ResizableCanvas({ children, dataTestid, headerLeading, loading, onClose
           children: [/* @__PURE__ */ jsx("div", {
             className: "min-w-0 flex-1",
             children: headerLeading ?? /* @__PURE__ */ jsxs("div", {
-              className: "flex min-w-0 items-center gap-2 text-[13px] font-medium text-foreground/80",
+              className: "flex min-w-0 items-center gap-2 text-[0.8125rem] font-medium text-foreground/80",
               children: [/* @__PURE__ */ jsx(TitleIcon, { className: "size-3.5 shrink-0" }), /* @__PURE__ */ jsx("span", { children: title })]
             })
           }), /* @__PURE__ */ jsxs("div", {
@@ -2426,7 +2310,7 @@ var TabsSubtleItem = forwardRef2(({ icon: Icon, label, index, badge, className,
   const tone = chromeTone(isPill, isActive);
   const ariaLabel = ariaLabelProp ?? (collapseLabel && !showLabel ? label : void 0);
   const labelContent = /* @__PURE__ */ jsxs("span", {
-    className: cn("inline-grid whitespace-nowrap", isPill ? "text-[12px] font-medium" : "text-[13px]"),
+    className: cn("inline-grid whitespace-nowrap", isPill ? "text-[0.75rem] font-medium" : "text-[0.8125rem]"),
     children: [/* @__PURE__ */ jsx("span", {
       className: "invisible col-start-1 row-start-1 [text-box:trim-both_cap_alphabetic]",
       style: { fontVariationSettings: fontWeights.semibold },
@@ -2465,7 +2349,7 @@ var TabsSubtleItem = forwardRef2(({ icon: Icon, label, index, badge, className,
           strokeWidth: isActive ? 2 : 1.5,
           className: cn("shrink-0 transition-[color,stroke-width] duration-80", tone)
         }), badge !== void 0 ? /* @__PURE__ */ jsx("span", {
-          className: cn("text-[11px] tabular-nums transition-colors duration-80", tone),
+          className: cn("text-[0.6875rem] tabular-nums transition-colors duration-80", tone),
           children: badge
         }) : null]
       }) : null,
@@ -2526,7 +2410,7 @@ function ChromePillButton({ active = false, ariaLabel, className, title, ...prop
     title: title ?? ariaLabel
   });
 }
-var COMPACT_TABS_CLASS = "[&_[data-proximity-index]]:!h-7 [&_[data-proximity-index]]:!px-2 [&_[data-proximity-index]]:!text-[11px]";
+var COMPACT_TABS_CLASS = "[&_[data-proximity-index]]:!h-7 [&_[data-proximity-index]]:!px-2 [&_[data-proximity-index]]:!text-[0.6875rem]";
 function RightPanelLauncherFromContext({ compact = false } = {}) {
   const { reopenRightPanel, rightPanel } = useChatPanelDataContext();
   return /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsx("div", {
@@ -2686,8 +2570,13 @@ function MobilePanel({ children, dataTestid, headerActions, icon: Icon, onClose,
   const panelTitleId = useId();
   const suppressCloseRef = useRef2(false);
   const onLightDismiss = useEffectEvent((event) => {
-    if (panelRef.current && event.target === panelRef.current) onClose?.();
+    if (panelRef.current && event.target === panelRef.current) panelRef.current.close();
   });
+  const handleHeaderClose = () => {
+    const dialog = panelRef.current;
+    if (dialog && dialog.open) dialog.close();
+    else onClose?.();
+  };
   useEffect2(() => {
     if (!open) return;
     const dialog = panelRef.current;
@@ -2749,7 +2638,7 @@ function MobilePanel({ children, dataTestid, headerActions, icon: Icon, onClose,
         title && /* @__PURE__ */ jsxs("div", {
           className: "flex h-10 shrink-0 items-center justify-between gap-2 border-b border-border/60 px-3",
           children: [/* @__PURE__ */ jsxs("div", {
-            className: "flex min-w-0 items-center gap-2 text-[13px] font-medium text-foreground/80",
+            className: "flex min-w-0 items-center gap-2 text-[0.8125rem] font-medium text-foreground/80",
             children: [Icon && /* @__PURE__ */ jsx(Icon, { className: "size-3.5 shrink-0" }), /* @__PURE__ */ jsx("span", {
               className: "truncate",
               children: title
@@ -2758,7 +2647,7 @@ function MobilePanel({ children, dataTestid, headerActions, icon: Icon, onClose,
             className: "flex shrink-0 items-center gap-1",
             children: [headerActions, onClose && /* @__PURE__ */ jsx(Button, {
               type: "button",
-              onClick: onClose,
+              onClick: handleHeaderClose,
               variant: "ghost",
               size: "icon-sm",
               className: `relative after:absolute after:top-1/2 after:left-1/2 after:size-10 after:-translate-x-1/2 after:-translate-y-1/2 text-foreground/40 hover:text-foreground/70`,
@@ -2779,23 +2668,33 @@ function MobilePanel({ children, dataTestid, headerActions, icon: Icon, onClose,
     })
   });
 }
+var DESKTOP_PANEL_QUERY = `(min-width: 960px)`;
+function subscribeToDesktopPanel(onChange) {
+  if (typeof window === "undefined" || typeof window.matchMedia !== "function") return () => void 0;
+  const media = window.matchMedia(DESKTOP_PANEL_QUERY);
+  media.addEventListener("change", onChange);
+  return () => media.removeEventListener("change", onChange);
+}
+function getDesktopPanelSnapshot() {
+  return typeof window !== "undefined" && typeof window.matchMedia === "function" ? window.matchMedia(DESKTOP_PANEL_QUERY).matches : false;
+}
+function getServerDesktopPanelSnapshot() {
+  return false;
+}
+function useIsDesktopPanel() {
+  return useSyncExternalStore(subscribeToDesktopPanel, getDesktopPanelSnapshot, getServerDesktopPanelSnapshot);
+}
 function RightPanelShell({ handleResourceCanvasResizeStart, onClose, resourceCanvasWidth }) {
   const chat = useChatPanelDataContext();
   const workspace = useWorkspaceTreeContext();
   const { rightPanel } = chat;
   const panelOpen = rightPanel !== null;
+  const isDesktop = useIsDesktopPanel();
   const definition = rightPanel ? getRightPanelDefinition(rightPanel) : null;
   const PanelContent = definition?.component;
   const loading = definition?.loadingSource === "resources" ? chat.resourcesLoading : definition?.loadingSource === "workspace" ? workspace.workspaceLoading : false;
   const onRefresh = definition?.refreshSource === "resources" ? chat.refreshResources : definition?.refreshSource === "workspace" ? workspace.refreshWorkspace : void 0;
-  return /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsx(MobilePanel, {
-    dataTestid: definition?.mobileDataTestid,
-    icon: definition?.icon,
-    onClose,
-    open: panelOpen,
-    title: definition?.title ?? "",
-    children: PanelContent ? /* @__PURE__ */ jsx(PanelContent, {}) : null
-  }), /* @__PURE__ */ jsx(ResizableCanvas, {
+  return /* @__PURE__ */ jsx(Fragment$1, { children: isDesktop ? /* @__PURE__ */ jsx(ResizableCanvas, {
     dataTestid: definition?.dataTestid,
     headerLeading: /* @__PURE__ */ jsx(RightPanelTabsFromContext, { idPrefix: "right-panel-desktop" }),
     loading,
@@ -2807,7 +2706,14 @@ function RightPanelShell({ handleResourceCanvasResizeStart, onClose, resourceCan
     titleIcon: definition?.icon ?? Library,
     width: resourceCanvasWidth,
     children: PanelContent ? /* @__PURE__ */ jsx(PanelContent, {}) : null
-  })] });
+  }) : /* @__PURE__ */ jsx(MobilePanel, {
+    dataTestid: definition?.mobileDataTestid,
+    icon: definition?.icon,
+    onClose,
+    open: panelOpen,
+    title: definition?.title ?? "",
+    children: PanelContent ? /* @__PURE__ */ jsx(PanelContent, {}) : null
+  }) });
 }
 var layoutStyle = {
   "--chat-chrome-top": `52px`,
@@ -2823,7 +2729,7 @@ function ChatWorkspaceLayout({ children, headerCenter, headerLeft, headerRight,
       className: "relative flex min-h-0 min-w-0 flex-1 flex-col overflow-hidden",
       "data-testid": "chat-column",
       children: [/* @__PURE__ */ jsxs("header", {
-        className: cn(CHAT_HEADER_LAYER_CLASS, "grid h-[var(--chat-header-height)] min-h-[var(--chat-header-height)] shrink-0 grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-1 border-b border-[#2e3033] px-2 py-2"),
+        className: cn(CHAT_HEADER_LAYER_CLASS, "grid h-[var(--chat-header-height)] min-h-[var(--chat-header-height)] shrink-0 grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-1 border-b border-border/70 px-2 py-2"),
         "data-testid": "chat-header",
         children: [
           /* @__PURE__ */ jsx("div", {
@@ -3277,7 +3183,7 @@ var AnimatedSidebarGroupLabel = forwardRef2(function AnimatedSidebarGroupLabel2(
     ref: forwardedRef,
     "aria-hidden": collapsed,
     "data-slot": "sidebar-group-label",
-    className: cn("mb-1 h-7 overflow-hidden px-2 text-[10px] font-medium uppercase tracking-[0.14em] text-muted-foreground transition-opacity", collapsed ? "opacity-0" : "opacity-100", className),
+    className: cn("mb-1 h-7 overflow-hidden px-2 text-[0.625rem] font-medium uppercase tracking-[0.14em] text-muted-foreground transition-opacity", collapsed ? "opacity-0" : "opacity-100", className),
     children
   });
 });
@@ -3370,8 +3276,19 @@ function newSessionResourceId(projectId) {
 function idValue(id, prefix) {
   return id.startsWith(prefix) ? id.slice(prefix.length) : null;
 }
-function sessionLabel(session) {
-  return normalizeSessionLabel(session.title || session.firstMessage || session.sessionId.slice(0, 8));
+function sessionBaseLabel(session) {
+  return normalizeSessionLabel(sessionListTitle({
+    sessionId: session.sessionId,
+    title: session.title,
+    firstMessage: session.firstMessage
+  })) || fallbackSessionLabel(session.sessionId);
+}
+function sessionLabel(session, siblings) {
+  const base = sessionBaseLabel(session);
+  if (!siblings) return base;
+  let collidingCount = 0;
+  for (const sibling of siblings) if (sessionBaseLabel(sibling) === base) collidingCount += 1;
+  return disambiguateSessionLabel(base, session.sessionId, collidingCount);
 }
 function sessionDiscoveryMeta(session, projectById) {
   return `${session.projectId ? projectById.get(session.projectId)?.name ?? "Unassigned" : "Unassigned"} \xB7 ${session.status === "idle" ? "Ready" : session.status} \xB7 ${`${String(session.messageCount)} ${session.messageCount === 1 ? "message" : "messages"}`}`;
@@ -3393,8 +3310,7 @@ function directoryErrorMessage(error, fallback) {
   return error instanceof Error && error.message.trim() ? error.message : fallback;
 }
 function readExpandedProjects(activeProjectId) {
-  if (typeof window === "undefined") return activeProjectId ? [projectResourceId(activeProjectId)] : [];
-  const stored = window.localStorage.getItem(EXPANDED_PROJECTS_STORAGE_KEY);
+  const stored = readStoredValue(EXPANDED_PROJECTS_STORAGE_KEY);
   if (!stored) return activeProjectId ? [projectResourceId(activeProjectId)] : [];
   try {
     const parsed = JSON.parse(stored);
@@ -3602,15 +3518,16 @@ function useFleetSessionSidebarViewModel({ sessions, projects = EMPTY_PROJECTS,
     setExpandedProjectIds((current) => current.includes(resourceId) ? current : [...current, resourceId]);
   }, [activeProjectId, setExpandedProjectIds]);
   useEffect2(() => {
-    window.localStorage.setItem(EXPANDED_PROJECTS_STORAGE_KEY, JSON.stringify(expandedProjectIds));
+    writeStoredValue(EXPANDED_PROJECTS_STORAGE_KEY, JSON.stringify(expandedProjectIds));
   }, [expandedProjectIds]);
   const sidebarItems = useMemo2(() => {
     const grouped = sortedProjects.map((project) => {
       const sessionsForProject = displayProjectSessions(projectSessions.filter((session) => session.projectId === project.projectId), activeSessionId);
       const revealed = revealedProjectIds.has(project.projectId);
-      const children = visibleProjectSessions(sessionsForProject, activeSessionId, revealed).map((session) => ({
+      const visible = visibleProjectSessions(sessionsForProject, activeSessionId, revealed);
+      const children = visible.map((session) => ({
         id: sessionResourceId(session.sessionId),
-        label: sessionLabel(session),
+        label: sessionLabel(session, visible),
         kind: "file",
         ...session.isSubagent ? { indent: 1 } : {}
       }));
@@ -3635,7 +3552,7 @@ function useFleetSessionSidebarViewModel({ sessions, projects = EMPTY_PROJECTS,
     if (unassigned.length > 0) {
       const unassignedChildren = visibleProjectSessions(unassigned, activeSessionId, revealedProjectIds.has("unassigned")).map((session) => ({
         id: sessionResourceId(session.sessionId),
-        label: sessionLabel(session),
+        label: sessionLabel(session, unassigned),
         kind: "file",
         ...session.isSubagent ? { indent: 1 } : {}
       }));
@@ -4458,7 +4375,7 @@ function ThreadSearch({ threads, query, activeId, onQueryChange, onSelect, class
     children: [/* @__PURE__ */ jsxs("span", {
       className: "flex items-center gap-1.5",
       children: [thread.pinned && /* @__PURE__ */ jsx(Pin, { className: "text-foreground/30 size-2.5 shrink-0" }), /* @__PURE__ */ jsx("span", {
-        className: "min-w-0 flex-1 truncate text-[13px]",
+        className: "min-w-0 flex-1 truncate text-[0.8125rem]",
         children: thread.title
       })]
     }), /* @__PURE__ */ jsx("span", {
@@ -4482,13 +4399,13 @@ function ThreadSearch({ threads, query, activeId, onQueryChange, onSelect, class
           onKeyDown,
           placeholder: "Search threads",
           "aria-label": "Search threads",
-          className: "text-foreground/85 placeholder:text-foreground/30 min-w-0 flex-1 bg-transparent text-base outline-none md:text-[13px]"
+          className: "text-foreground/85 placeholder:text-foreground/30 min-w-0 flex-1 bg-transparent text-base outline-none md:text-[0.8125rem]"
         })]
       }),
       pinned.length > 0 && /* @__PURE__ */ jsxs("div", {
         className: "flex flex-col",
         children: [/* @__PURE__ */ jsx("span", {
-          className: cn("font-mono text-[11px] tracking-tight", "text-foreground/25 px-2 pb-1"),
+          className: cn("font-mono text-[0.6875rem] tracking-tight", "text-foreground/25 px-2 pb-1"),
           children: "pinned"
         }), pinned.map(row)]
       }),
@@ -4512,7 +4429,7 @@ function ThreadSearch({ threads, query, activeId, onQueryChange, onSelect, class
 }
 function fleetVersion() {
   try {
-    return "0.5.10";
+    return "0.6.0";
   } catch {
     return "dev";
   }
@@ -4523,7 +4440,7 @@ function FleetVersionBadge() {
     variant: "secondary",
     title: `Fleet ${version}`,
     "aria-label": `Fleet version ${version}`,
-    className: "shrink-0 font-mono text-[10px] font-normal text-muted-foreground",
+    className: "shrink-0 font-mono text-[0.625rem] font-normal text-muted-foreground",
     children: ["v", version]
   });
 }
@@ -4751,7 +4668,7 @@ function ResourceActionMenu({ item, menuOpen, onMenuOpenChange, onRenameStart, r
   });
 }
 function getResourceRowClassName(acceptsChildren, active, containerActive, kind, disabled2) {
-  return cn("group/resource relative flex min-h-8 min-w-0 cursor-pointer items-center gap-2 rounded-lg pr-2 text-[13px] outline-none", "text-muted-foreground transition-colors hover:bg-muted hover:text-foreground", "focus-visible:bg-muted/70 focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-inset", "data-[menu-open=true]:bg-muted data-[menu-open=true]:text-foreground", "data-[dragging=true]:opacity-40", "data-[drop=inside]:bg-primary/10 data-[drop=inside]:ring-1 data-[drop=inside]:ring-primary/45", "data-[drop=before]:before:absolute data-[drop=before]:before:-top-0.5 data-[drop=before]:before:right-2 data-[drop=before]:before:left-2 data-[drop=before]:before:h-0.5 data-[drop=before]:before:rounded-full data-[drop=before]:before:bg-primary", "data-[drop=after]:after:absolute data-[drop=after]:after:-bottom-0.5 data-[drop=after]:after:right-2 data-[drop=after]:after:left-2 data-[drop=after]:after:h-0.5 data-[drop=after]:after:rounded-full data-[drop=after]:after:bg-primary", !acceptsChildren && active && "bg-muted text-foreground", acceptsChildren && containerActive && "bg-muted/55 text-foreground ring-1 ring-border/70", kind === "action" && "text-xs text-muted-foreground", disabled2 && "cursor-not-allowed opacity-45");
+  return cn("group/resource relative flex min-h-8 min-w-0 cursor-pointer items-center gap-2 rounded-lg pr-2 text-[0.8125rem] outline-none", "text-muted-foreground transition-colors hover:bg-muted hover:text-foreground", "focus-visible:bg-muted/70 focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-inset", "data-[menu-open=true]:bg-muted data-[menu-open=true]:text-foreground", "data-[dragging=true]:opacity-40", "data-[drop=inside]:bg-primary/10 data-[drop=inside]:ring-1 data-[drop=inside]:ring-primary/45", "data-[drop=before]:before:absolute data-[drop=before]:before:-top-0.5 data-[drop=before]:before:right-2 data-[drop=before]:before:left-2 data-[drop=before]:before:h-0.5 data-[drop=before]:before:rounded-full data-[drop=before]:before:bg-primary", "data-[drop=after]:after:absolute data-[drop=after]:after:-bottom-0.5 data-[drop=after]:after:right-2 data-[drop=after]:after:left-2 data-[drop=after]:after:h-0.5 data-[drop=after]:after:rounded-full data-[drop=after]:after:bg-primary", !acceptsChildren && active && "bg-muted text-foreground", acceptsChildren && containerActive && "bg-muted/55 text-foreground ring-1 ring-border/70", kind === "action" && "text-xs text-muted-foreground", disabled2 && "cursor-not-allowed opacity-45");
 }
 function useResourceRowEvents({ acceptsChildren, allowMove, disabled: disabled2, kind, onContainerSelect, onDragEnd, onDragOver, onDragStart, onDrop, onRenameStart, onSelect, renaming, row }) {
   const draggedRef = useRef2(false);
@@ -4934,7 +4851,7 @@ function ResourceList({ flat, selectedId, activeContainerId, expandedIds, focuse
     }), draggingId ? /* @__PURE__ */ jsx("div", {
       "aria-hidden": "true",
       "data-active": dropTarget?.id === null || void 0,
-      className: "absolute inset-x-1 bottom-0 flex h-8 items-center justify-center rounded-lg border border-dashed border-border text-[10px] text-muted-foreground data-[active=true]:border-primary/50 data-[active=true]:bg-primary/10 data-[active=true]:text-foreground",
+      className: "absolute inset-x-1 bottom-0 flex h-8 items-center justify-center rounded-lg border border-dashed border-border text-[0.625rem] text-muted-foreground data-[active=true]:border-primary/50 data-[active=true]:bg-primary/10 data-[active=true]:text-foreground",
       children: "Move to top level"
     }) : null]
   }), /* @__PURE__ */ jsx("span", {
@@ -5507,7 +5424,7 @@ function ProjectFolder({ title, description = "Updated recently", previews = [],
           "aria-hidden": "true",
           className: "pointer-events-none absolute inset-0",
           children: /* @__PURE__ */ jsx("span", {
-            className: "absolute left-1/2 top-0 block h-0 w-0",
+            className: "absolute left-1/2 top-0 block size-0",
             children: /* @__PURE__ */ jsx(AnimatePresence, {
               initial: false,
               children: !isExpanded ? previewItems.map((preview, index) => {
@@ -5718,14 +5635,14 @@ function SidebarMenuItem({ icon: Icon, label, onClick, href }) {
 }
 function KbdHint({ children }) {
   return /* @__PURE__ */ jsx("kbd", {
-    className: "rounded border border-border/60 bg-muted/60 px-1 font-mono text-[10px] leading-4 text-muted-foreground",
+    className: "rounded border border-border/60 bg-muted/60 px-1 font-mono text-[0.625rem] leading-4 text-muted-foreground",
     children
   });
 }
 function FleetSessionSidebarNavigation({ brandMenuOpen, setBrandMenuOpen, searchOpen, setSearchOpen, query, setQuery, projectActionsOpen, setProjectActionsOpen, expandedProjectIds, setExpandedProjectIds, setCreateOpen, projects, projectSessions, sidebarItems, sortedProjects, projectById, activeProjectId, activeSessionId, onNewSession, onNewSessionInProject, onProjectSelect, onRenameSession, onCreateProject, onOpenSettings, accountMenu, resumeResource, toggleProjectResource, selectSearchResult, renderMenu }) {
   const searchThreads = useMemo2(() => sortSessions(projectSessions).map((session) => ({
     id: session.sessionId,
-    title: sessionLabel(session),
+    title: sessionLabel(session, projectSessions),
     preview: sessionDiscoveryMeta(session, projectById),
     group: sessionSearchGroup(session.updatedAt),
     keywords: session.firstMessage ? [normalizeSessionLabel(session.firstMessage)] : []
@@ -5816,7 +5733,7 @@ function FleetSessionSidebarNavigation({ brandMenuOpen, setBrandMenuOpen, search
                   /* @__PURE__ */ jsxs("div", {
                     className: "border-t border-border/60 px-2 pb-2 pt-1.5",
                     children: [/* @__PURE__ */ jsx("span", {
-                      className: "px-2 pb-1 font-mono text-[10px] uppercase tracking-[0.14em] text-muted-foreground/60",
+                      className: "px-2 pb-1 font-mono text-[0.625rem] uppercase tracking-[0.14em] text-muted-foreground/60",
                       children: "Projects"
                     }), /* @__PURE__ */ jsxs("div", {
                       className: "mt-1 flex flex-col gap-0.5",
@@ -5831,12 +5748,12 @@ function FleetSessionSidebarNavigation({ brandMenuOpen, setBrandMenuOpen, search
                             children: project.name
                           }),
                           /* @__PURE__ */ jsx("span", {
-                            className: "max-w-24 truncate text-[10px] text-muted-foreground/55",
+                            className: "max-w-24 truncate text-[0.625rem] text-muted-foreground/55",
                             children: project.pathLabel
                           })
                         ]
                       }, project.projectId)), matchingProjects.length === 0 ? /* @__PURE__ */ jsxs("span", {
-                        className: "px-2 py-2 text-center text-[11px] text-muted-foreground/60",
+                        className: "p-2 text-center text-[0.6875rem] text-muted-foreground/60",
                         children: [
                           "No project matches \u201C",
                           query,
@@ -5846,7 +5763,7 @@ function FleetSessionSidebarNavigation({ brandMenuOpen, setBrandMenuOpen, search
                     })]
                   }),
                   /* @__PURE__ */ jsxs("div", {
-                    className: "flex items-center justify-end gap-3 border-t border-border/60 px-3 py-2 text-[10px] text-muted-foreground/70",
+                    className: "flex items-center justify-end gap-3 border-t border-border/60 px-3 py-2 text-[0.625rem] text-muted-foreground/70",
                     children: [
                       /* @__PURE__ */ jsxs("span", {
                         className: "flex items-center gap-1",
@@ -5872,7 +5789,7 @@ function FleetSessionSidebarNavigation({ brandMenuOpen, setBrandMenuOpen, search
           }), /* @__PURE__ */ jsxs("button", {
             type: "button",
             onClick: onNewSession,
-            className: "flex h-8 w-full items-center justify-start gap-2 rounded-lg px-2 text-[13px] font-normal text-sidebar-foreground outline-none transition-colors hover:bg-sidebar-accent focus-visible:bg-sidebar-accent focus-visible:ring-2 focus-visible:ring-sidebar-ring",
+            className: "flex h-8 w-full items-center justify-start gap-2 rounded-lg px-2 text-[0.8125rem] font-normal text-sidebar-foreground outline-none transition-colors hover:bg-sidebar-accent focus-visible:bg-sidebar-accent focus-visible:ring-2 focus-visible:ring-sidebar-ring",
             children: [/* @__PURE__ */ jsx(SquarePen, { className: "size-4 shrink-0 text-muted-foreground" }), "New chat"]
           })]
         }),
@@ -5902,7 +5819,7 @@ function FleetSessionSidebarNavigation({ brandMenuOpen, setBrandMenuOpen, search
             /* @__PURE__ */ jsx("div", {
               className: "min-w-0 flex-1",
               children: accountMenu ?? /* @__PURE__ */ jsx("span", {
-                className: "flex h-8 items-center px-2 text-[13px]",
+                className: "flex h-8 items-center px-2 text-[0.8125rem]",
                 children: "Qredence"
               })
             }),
@@ -6571,12 +6488,12 @@ function FleetSessionSidebarCreateDialog({ createOpen, setCreateOpen, directoryB
                     })]
                   }),
                   /* @__PURE__ */ jsx("span", {
-                    className: "shrink-0 rounded-full bg-primary/10 px-2 py-1 text-[11px] font-medium text-primary",
+                    className: "shrink-0 rounded-full bg-primary/10 px-2 py-1 text-[0.6875rem] font-medium text-primary",
                     children: "Selected"
                   })
                 ]
               }), /* @__PURE__ */ jsxs("div", {
-                className: "space-y-2 border-t px-3 py-3",
+                className: "space-y-2 border-t p-3",
                 children: [/* @__PURE__ */ jsxs("div", {
                   className: "flex items-center justify-between gap-2",
                   children: [/* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsx("p", {
@@ -6632,7 +6549,7 @@ function FleetSessionSidebarCreateDialog({ createOpen, setCreateOpen, directoryB
                               className: "block truncate font-medium text-foreground",
                               children: pathEntryLabel(entry)
                             }), /* @__PURE__ */ jsx("span", {
-                              className: "block truncate text-[11px] text-muted-foreground",
+                              className: "block truncate text-[0.6875rem] text-muted-foreground",
                               title: entry.pathLabel,
                               children: entry.pathLabel
                             })]
@@ -7814,7 +7731,7 @@ function ApprovalCard({ title = "Approval required", description, children, ques
                   questions.length
                 ]
               }) : /* @__PURE__ */ jsx("span", {
-                className: cn("shrink-0 rounded-full border px-2 py-0.5 text-[11px] font-medium transition-colors", getStatusBadgeClass(status)),
+                className: cn("shrink-0 rounded-full border px-2 py-0.5 text-[0.6875rem] font-medium transition-colors", getStatusBadgeClass(status)),
                 children: statusLabel2
               }),
               onDismiss ? /* @__PURE__ */ jsx("button", {
@@ -7980,7 +7897,7 @@ function InputQuestionBar({ questionBar, navigation, roundedTop, onDismiss }) {
         className: "flex h-7 items-center justify-between border-b border-border px-3 text-xs text-an-tool-color-muted",
         children: [/* @__PURE__ */ jsxs("div", {
           className: "inline-flex items-center gap-1.5",
-          children: [/* @__PURE__ */ jsx(MessageCircleQuestionMark, { className: "h-3.5 w-3.5" }), "Question"]
+          children: [/* @__PURE__ */ jsx(MessageCircleQuestionMark, { className: "size-3.5" }), "Question"]
         }), showQuestionNavigation && /* @__PURE__ */ jsxs("div", {
           className: "inline-flex items-center gap-1",
           children: [
@@ -7990,7 +7907,7 @@ function InputQuestionBar({ questionBar, navigation, roundedTop, onDismiss }) {
               disabled: !canGoPrev,
               className: "relative inline-flex size-5 items-center justify-center rounded-[4px] transition-[background-color,transform] duration-150 after:absolute after:inset-x-0 after:-top-2.5 after:-bottom-2.5 hover:bg-an-background-secondary active:scale-[0.96] disabled:opacity-40 disabled:active:scale-100",
               "aria-label": "Previous question",
-              children: /* @__PURE__ */ jsx(ChevronUp, { className: "h-3.5 w-3.5" })
+              children: /* @__PURE__ */ jsx(ChevronUp, { className: "size-3.5" })
             }),
             /* @__PURE__ */ jsxs("span", {
               className: "tabular-nums",
@@ -8006,7 +7923,7 @@ function InputQuestionBar({ questionBar, navigation, roundedTop, onDismiss }) {
               disabled: !canGoNext,
               className: "relative inline-flex size-5 items-center justify-center rounded-[4px] transition-[background-color,transform] duration-150 after:absolute after:inset-x-0 after:-top-2.5 after:-bottom-2.5 hover:bg-an-background-secondary active:scale-[0.96] disabled:opacity-40 disabled:active:scale-100",
               "aria-label": "Next question",
-              children: /* @__PURE__ */ jsx(ChevronDown, { className: "h-3.5 w-3.5" })
+              children: /* @__PURE__ */ jsx(ChevronDown, { className: "size-3.5" })
             })
           ]
         })]
@@ -8047,7 +7964,7 @@ var ModeSelector = memo(function ModeSelector2({ modes, value, defaultValue, onC
   const hasMultiple = modes.length > 1;
   const trigger = /* @__PURE__ */ jsxs("button", {
     type: "button",
-    className: cn("relative inline-flex h-7 cursor-pointer items-center gap-1.5 rounded-full px-2 text-[12px] leading-4 text-foreground/40 transition-[background-color,transform] duration-150 after:absolute after:inset-x-0 after:-top-1.5 after:-bottom-1.5 hover:bg-foreground/6 active:scale-[0.96]", !hasMultiple && "pointer-events-none", className),
+    className: cn("relative inline-flex h-7 cursor-pointer items-center gap-1.5 rounded-full px-2 text-[0.75rem] leading-4 text-foreground/40 transition-[background-color,transform] duration-150 after:absolute after:inset-x-0 after:-top-1.5 after:-bottom-1.5 hover:bg-foreground/6 active:scale-[0.96]", !hasMultiple && "pointer-events-none", className),
     "aria-label": "Select mode",
     children: [
       ActiveIcon && /* @__PURE__ */ jsx(ActiveIcon, { className: "size-3.5 shrink-0" }),
@@ -8071,7 +7988,7 @@ var ModeSelector = memo(function ModeSelector2({ modes, value, defaultValue, onC
       return /* @__PURE__ */ jsxs("button", {
         type: "button",
         onClick: () => handleSelect(mode.id),
-        className: cn("flex w-full cursor-pointer items-start gap-2 rounded-[6px] px-2 py-2 text-left text-[12px] leading-4 text-foreground transition-[background-color,transform] duration-150 hover:bg-foreground/6 active:scale-[0.96]", isActive && "bg-foreground/6"),
+        className: cn("flex w-full cursor-pointer items-start gap-2 rounded-[6px] px-2 py-2 text-left text-[0.75rem] leading-4 text-foreground transition-[background-color,transform] duration-150 hover:bg-foreground/6 active:scale-[0.96]", isActive && "bg-foreground/6"),
         children: [
           Icon && /* @__PURE__ */ jsx(Icon, { className: "mt-0.5 size-3.5 shrink-0" }),
           /* @__PURE__ */ jsxs("span", {
@@ -8127,7 +8044,7 @@ function ComposerMenuItem({ active = false, className, ...props }) {
     type: "button",
     "data-slot": "composer-menu-item",
     "data-active": active || void 0,
-    className: cn("flex w-full items-center gap-2.5 rounded-[10px] px-2.5 py-2 text-[13.5px] transition-colors", active ? field : "hover:bg-foreground/[0.04]", className),
+    className: cn("flex w-full items-center gap-2.5 rounded-[10px] px-2.5 py-2 text-[0.84375rem] transition-colors", active ? field : "hover:bg-foreground/[0.04]", className),
     ...props
   });
 }
@@ -8224,7 +8141,7 @@ var ComposerTriggerPopover = memo(function ComposerTriggerPopover2({ open, kind,
           children: title ?? (kind === "slash" ? "Commands" : "Workspace")
         }),
         query ? /* @__PURE__ */ jsx("span", {
-          className: "ml-auto max-w-[50%] truncate font-mono text-[11px]",
+          className: "ml-auto max-w-[50%] truncate font-mono text-[0.6875rem]",
           children: query
         }) : null,
         onClose ? /* @__PURE__ */ jsx("button", {
@@ -8250,7 +8167,7 @@ var ComposerTriggerPopover = memo(function ComposerTriggerPopover2({ open, kind,
           role: "group",
           "aria-label": group.label,
           children: [/* @__PURE__ */ jsx("div", {
-            className: "px-3 pb-1 pt-2 text-[10px] font-medium uppercase tracking-wide text-muted-foreground",
+            className: "px-3 pb-1 pt-2 text-[0.625rem] font-medium uppercase tracking-wide text-muted-foreground",
             children: group.label
           }), group.items.map((item, index) => renderItem(item, offset + index))]
         }, group.id);
@@ -8258,7 +8175,7 @@ var ComposerTriggerPopover = memo(function ComposerTriggerPopover2({ open, kind,
     })]
   }) : null;
 });
-var LazyModelSelectorList = lazy(() => import("./model-selector-list-cb2-ewoA-KIVU6LD3.js").then(({ ModelSelectorList: ModelSelectorList2 }) => ({ default: ModelSelectorList2 })));
+var LazyModelSelectorList = lazy(() => import("./model-selector-list-jBTZc2Mu-OXJOS5NA.js").then(({ ModelSelectorList: ModelSelectorList2 }) => ({ default: ModelSelectorList2 })));
 function ModelSelectorList(props) {
   return /* @__PURE__ */ jsx(Suspense, {
     fallback: /* @__PURE__ */ jsx("div", {
@@ -8378,6 +8295,8 @@ function slashCommandName(item) {
   return (item.value ?? item.id).trim().replace(/^\/+/, "").split(/\s+/, 1)[0] ?? item.id;
 }
 function slashArgumentHint(item) {
+  const fromMetadata = item.metadata?.argumentHint?.trim();
+  if (fromMetadata) return fromMetadata;
   return (item.value?.trim() ?? "").match(/^\/\S+\s+(.+)$/)?.[1];
 }
 function useFleetPiInputBarState({ models, status, thinkingLevel, onModelChange, onThinkingLevelChange, onSend, onSlashCommandSelect, onLocalSlashSubmit, modelPickerOpen, onModelPickerOpenChange, effortPickerOpen, onEffortPickerOpenChange, workspaceReferences = EMPTY_WORKSPACE_REFERENCES$1, workspaceSuggestions, onWorkspaceReferenceSelect, onRemoveWorkspaceReference, controlled, disabled: disabled2, questionBar, attachments, slashCommands }) {
@@ -8806,7 +8725,7 @@ function getChatErrorPresentation(error) {
     message: error.message.replace(/\s+(?:Socket|Daemon log):\s*[^\n]*(?:\s+(?:Socket|Daemon log):\s*[^\n]*)*/gi, "")
   };
 }
-var LazyFleetPiToolRenderer = lazy(() => import("./fleet-pi-tool-renderer-RIeVlM9J-D6MISCQC.js").then((n) => n.n).then(({ FleetPiToolRenderer: FleetPiToolRenderer2 }) => ({ default: FleetPiToolRenderer2 })));
+var LazyFleetPiToolRenderer = lazy(() => import("./fleet-pi-tool-renderer-umKunT3K-O4GBH35V.js").then((n) => n.n).then(({ FleetPiToolRenderer: FleetPiToolRenderer2 }) => ({ default: FleetPiToolRenderer2 })));
 function FleetPiToolRenderer(props) {
   return /* @__PURE__ */ jsx(Suspense, {
     fallback: /* @__PURE__ */ jsx("div", {
@@ -8816,17 +8735,20 @@ function FleetPiToolRenderer(props) {
     children: /* @__PURE__ */ jsx(LazyFleetPiToolRenderer, { ...props })
   });
 }
-var LazyAgentActivity = lazy(() => import("./agent-activity-B-JMvecd-SLE3GGY2.js").then(({ AgentActivity: AgentActivity2 }) => ({ default: AgentActivity2 })));
+var LazyAgentActivity = lazy(() => import("./agent-activity-CS2rbF_C-A3R26CYH.js").then(({ AgentActivity: AgentActivity2 }) => ({ default: AgentActivity2 })));
 function AgentActivity(props) {
-  return /* @__PURE__ */ jsx(Suspense, {
-    fallback: /* @__PURE__ */ jsx("div", {
-      className: "mt-2 h-8 animate-pulse rounded-md bg-muted/40",
-      "aria-label": "Loading activity"
-    }),
-    children: /* @__PURE__ */ jsx(LazyAgentActivity, { ...props })
+  return /* @__PURE__ */ jsx("div", {
+    className: "mt-2 min-h-8",
+    children: /* @__PURE__ */ jsx(Suspense, {
+      fallback: /* @__PURE__ */ jsx("div", {
+        className: "h-8 animate-pulse rounded-md bg-muted/40",
+        "aria-label": "Loading activity"
+      }),
+      children: /* @__PURE__ */ jsx(LazyAgentActivity, { ...props })
+    })
   });
 }
-var LazyFleetReasoningPanel = lazy(() => import("./fleet-reasoning-panel-D_K48UOT-GN2PA6KT.js").then(({ FleetReasoningPanel: FleetReasoningPanel2 }) => ({ default: FleetReasoningPanel2 })));
+var LazyFleetReasoningPanel = lazy(() => import("./fleet-reasoning-panel-BxC2COxi-GPLMQSTT.js").then(({ FleetReasoningPanel: FleetReasoningPanel2 }) => ({ default: FleetReasoningPanel2 })));
 function FleetReasoningPanel(props) {
   return /* @__PURE__ */ jsx(Suspense, {
     fallback: /* @__PURE__ */ jsx("div", {
@@ -8836,7 +8758,7 @@ function FleetReasoningPanel(props) {
     children: /* @__PURE__ */ jsx(LazyFleetReasoningPanel, { ...props })
   });
 }
-var LazyFleetToolTimeline = lazy(() => import("./fleet-tool-timeline-DwRqQgOj-HUFLGMDV.js").then((n) => n.n).then(({ FleetToolTimeline: FleetToolTimeline2 }) => ({ default: FleetToolTimeline2 })));
+var LazyFleetToolTimeline = lazy(() => import("./fleet-tool-timeline-IB36_PB2-XJENTO6I.js").then((n) => n.n).then(({ FleetToolTimeline: FleetToolTimeline2 }) => ({ default: FleetToolTimeline2 })));
 function FleetToolTimeline(props) {
   return /* @__PURE__ */ jsx(Suspense, {
     fallback: /* @__PURE__ */ jsx("div", {
@@ -8846,7 +8768,7 @@ function FleetToolTimeline(props) {
     children: /* @__PURE__ */ jsx(LazyFleetToolTimeline, { ...props })
   });
 }
-var LazyFleetSubagentList = lazy(() => import("./fleet-subagent-list-5luKtpds-3OTVFHJQ.js").then((n) => n.n).then(({ FleetSubagentList: FleetSubagentList2 }) => ({ default: FleetSubagentList2 })));
+var LazyFleetSubagentList = lazy(() => import("./fleet-subagent-list-CpSYzCIq-JDH2LHSS.js").then((n) => n.n).then(({ FleetSubagentList: FleetSubagentList2 }) => ({ default: FleetSubagentList2 })));
 function FleetSubagentList(props) {
   return /* @__PURE__ */ jsx(Suspense, {
     fallback: /* @__PURE__ */ jsx("div", {
@@ -8856,17 +8778,20 @@ function FleetSubagentList(props) {
     children: /* @__PURE__ */ jsx(LazyFleetSubagentList, { ...props })
   });
 }
-var LazyPromptSuggestions = lazy(() => import("./prompt-suggestions-BOmHi4-J-C563CHFU.js").then(({ PromptSuggestions: PromptSuggestions2 }) => ({ default: PromptSuggestions2 })));
+var LazyPromptSuggestions = lazy(() => import("./prompt-suggestions-D4AEEY7K-RZSP7PWV.js").then(({ PromptSuggestions: PromptSuggestions2 }) => ({ default: PromptSuggestions2 })));
 function PromptSuggestions(props) {
-  return /* @__PURE__ */ jsx(Suspense, {
-    fallback: /* @__PURE__ */ jsx("div", {
-      className: "h-8 animate-pulse rounded-full bg-muted/40",
-      "aria-label": "Loading suggestions"
-    }),
-    children: /* @__PURE__ */ jsx(LazyPromptSuggestions, { ...props })
+  return /* @__PURE__ */ jsx("div", {
+    className: "min-h-8",
+    children: /* @__PURE__ */ jsx(Suspense, {
+      fallback: /* @__PURE__ */ jsx("div", {
+        className: "h-8 animate-pulse rounded-full bg-muted/40",
+        "aria-label": "Loading suggestions"
+      }),
+      children: /* @__PURE__ */ jsx(LazyPromptSuggestions, { ...props })
+    })
   });
 }
-var LazyFleetMessageQueue = lazy(() => import("./fleet-message-queue-BxycG26e-2XLOTCLP.js").then(({ FleetMessageQueue: FleetMessageQueue2 }) => ({ default: FleetMessageQueue2 })));
+var LazyFleetMessageQueue = lazy(() => import("./fleet-message-queue-BS-cZ56r-GLZXUKDF.js").then(({ FleetMessageQueue: FleetMessageQueue2 }) => ({ default: FleetMessageQueue2 })));
 function FleetMessageQueue(props) {
   return /* @__PURE__ */ jsx(Suspense, {
     fallback: null,
@@ -9075,8 +9000,8 @@ function AssistantMessage({ messages, isLast, isStreaming, suppressQuestionTool,
           className: "mt-2 max-w-none"
         }) : null,
         isLast && presentation ? /* @__PURE__ */ jsx(FleetSubagentList, {
-          children: presentation.rlmChildren,
-          tree: presentation.rlmTree
+          tree: presentation.rlmTree,
+          children: presentation.rlmChildren
         }) : null
       ] })
     }) })
@@ -9139,8 +9064,12 @@ function ChatComposerHost({ inputBar, status, suggestions, onSend, onStop, isEmp
   });
 }
 var MemoChatComposerHost = memo(ChatComposerHost);
-function FleetPiAgentChat({ toolRenderers = PI_TOOL_RENDERERS, suggestions, status, onStop, onSend, inputBar, className, messages, error, suppressQuestionTool = false, onOpenUIAction, activityLabel, presentation, artifactRuns, onOpenArtifact, onOpenUIArtifactReady, queue, onDeleteQueuedMessage }) {
+function getConversationTurnKey(turn, turnIndex) {
+  return turn.user?.id ?? turn.assistants[0]?.id ?? `assistant-turn-${turnIndex}`;
+}
+function FleetPiAgentChat({ toolRenderers = PI_TOOL_RENDERERS, suggestions, status, onStop, onSend, inputBar, className, messages, error, suppressQuestionTool = false, onOpenUIAction, activityLabel, presentation, artifactRuns, onOpenArtifact, onOpenUIArtifactReady, queue, onDeleteQueuedMessage, onEditQueuedMessage }) {
   const draftSetterRef = useRef2(null);
+  const viewportRef = useRef2(null);
   const setDraft = useCallback2((value) => draftSetterRef.current?.(value), []);
   const turns = useMemo2(() => groupMessages(messages), [messages]);
   const suggestionItems2 = resolveSuggestions(suggestions);
@@ -9188,6 +9117,22 @@ function FleetPiAgentChat({ toolRenderers = PI_TOOL_RENDERERS, suggestions, stat
     presentation: void 0,
     artifactRuns: void 0
   }), []);
+  const renderTurn = useCallback2((turn, turnIndex) => {
+    const isLast = turnIndex === turns.length - 1;
+    return /* @__PURE__ */ jsx(ConversationTurnView, {
+      turn,
+      state: isLast ? stateForLast : stateForRest,
+      rendering,
+      activity: isLast ? activityForLast : activityForRest
+    });
+  }, [
+    activityForLast,
+    activityForRest,
+    rendering,
+    stateForLast,
+    stateForRest,
+    turns.length
+  ]);
   const isEmpty = turns.length === 0 && !error;
   const errorPresentation = error ? getChatErrorPresentation(error) : null;
   const composerNode = /* @__PURE__ */ jsx(MemoChatComposerHost, {
@@ -9206,6 +9151,7 @@ function FleetPiAgentChat({ toolRenderers = PI_TOOL_RENDERERS, suggestions, stat
         className: "flex-1",
         busy: isStreaming,
         followOutput: true,
+        viewportRef,
         smooth: !isStreaming,
         contentClassName: cn("mx-auto flex w-full max-w-an flex-col gap-5 px-4", isEmpty ? "min-h-full items-center justify-center py-8" : "py-6"),
         children: [
@@ -9214,15 +9160,13 @@ function FleetPiAgentChat({ toolRenderers = PI_TOOL_RENDERERS, suggestions, stat
             onSelect: (item) => setDraft(item.value ?? item.label),
             composer: composerNode
           }) : null,
-          turns.map((turn, turnIndex) => {
-            const key = turn.user?.id ?? `assistant-turn-${turnIndex}`;
-            const isLast = turnIndex === turns.length - 1;
-            return /* @__PURE__ */ jsx(ConversationTurnView, {
-              turn,
-              state: isLast ? stateForLast : stateForRest,
-              rendering,
-              activity: isLast ? activityForLast : activityForRest
-            }, key);
+          /* @__PURE__ */ jsx(VirtualizedTurnList, {
+            estimateSize: 400,
+            getItemKey: getConversationTurnKey,
+            itemGap: 20,
+            items: turns,
+            renderItem: renderTurn,
+            viewportRef
           }),
           errorPresentation ? /* @__PURE__ */ jsxs("div", {
             role: "alert",
@@ -9253,12 +9197,13 @@ function FleetPiAgentChat({ toolRenderers = PI_TOOL_RENDERERS, suggestions, stat
           steering: [],
           followUp: []
         },
-        onDelete: onDeleteQueuedMessage
+        onDelete: onDeleteQueuedMessage,
+        onEdit: onEditQueuedMessage
       })
     ]
   });
 }
-function ChatPanel({ messages, status, error, workspaceName, activityLabel, presentation, artifactRuns, queue, onDeleteQueuedMessage, onOpenArtifact, onOpenUIArtifactReady, inputSuggestionItems, suppressQuestionTool, inputBar, onSend, onOpenUIAction, onStop, onQuestionAnswer }) {
+function ChatPanel({ messages, status, error, workspaceName, activityLabel, presentation, artifactRuns, queue, onDeleteQueuedMessage, onEditQueuedMessage, onOpenArtifact, onOpenUIArtifactReady, inputSuggestionItems, suppressQuestionTool, inputBar, onSend, onOpenUIAction, onStop, onQuestionAnswer }) {
   const handleSend = useCallback2((msg) => {
     onSend(msg.content, msg.altKey);
   }, [onSend]);
@@ -9291,6 +9236,7 @@ function ChatPanel({ messages, status, error, workspaceName, activityLabel, pres
       artifactRuns,
       queue,
       onDeleteQueuedMessage,
+      onEditQueuedMessage,
       onOpenArtifact,
       onOpenUIArtifactReady,
       questionTool,
@@ -9361,175 +9307,26 @@ function buildChatInputBarProps(composer, activeSessionId) {
     onEffortPickerOpenChange: composer.setEffortPickerOpen
   };
 }
-var LazyChatCommandPalette = lazy(() => import("./chat-command-palette-CdYwoTMe-4LBAZF7K.js").then(({ ChatCommandPalette }) => ({ default: ChatCommandPalette })));
-var LazySettingsDialog = lazy(() => import("./settings-dialog-CxHe8nym-KKXDPTIW.js").then(({ SettingsDialog }) => ({ default: SettingsDialog })));
-var LazyForkPickerDialog = lazy(() => import("./fork-picker-dialog-B9yGc8Au-IL63F2DN.js").then(({ ForkPickerDialog }) => ({ default: ForkPickerDialog })));
-function ChatCommandPaletteOverlay({ chrome, conversation, dialogs, panels, session }) {
-  return /* @__PURE__ */ jsx(Fragment$1, { children: dialogs.commandPaletteOpen ? /* @__PURE__ */ jsx(Suspense, {
-    fallback: null,
-    children: /* @__PURE__ */ jsx(LazyChatCommandPalette, {
-      open: true,
-      onOpenChange: dialogs.setCommandPaletteOpen,
-      onNewSession: () => void session.startNewSession(),
-      onStop: conversation.stop,
-      onResumeSession: (sessionToResume) => void session.resumeSession({ sessionId: sessionToResume.sessionId }),
-      onSetRightPanel: panels.setRightPanel,
-      onThemeChange: chrome.handleThemePreferenceChange,
-      sessions: session.sessions,
-      isStreaming: conversation.status === "streaming",
-      themePreference: chrome.themePreference
-    })
-  }) : null });
+function getChatAuthBearerToken$1() {
+  return null;
 }
-function ChatWorkspaceOverlayDialogs({ dialogs }) {
-  const { forkFromEntry, forkPickerEntries, setForkPickerEntries, setSettingsDialogOpen, setSettingsInitialTab, settingsDialogOpen, settingsInitialTab } = dialogs;
-  const handleSettingsOpenChange = useCallback2((open) => {
-    setSettingsDialogOpen(open);
-    if (!open) setSettingsInitialTab(void 0);
-  }, [setSettingsDialogOpen, setSettingsInitialTab]);
-  return /* @__PURE__ */ jsxs(Fragment$1, { children: [settingsDialogOpen ? /* @__PURE__ */ jsx(Suspense, {
-    fallback: null,
-    children: /* @__PURE__ */ jsx(LazySettingsDialog, {
-      open: true,
-      onOpenChange: handleSettingsOpenChange,
-      initialTab: settingsInitialTab
-    })
-  }) : null, forkPickerEntries ? /* @__PURE__ */ jsx(Suspense, {
-    fallback: null,
-    children: /* @__PURE__ */ jsx(LazyForkPickerDialog, {
-      entries: forkPickerEntries,
-      onOpenChange: (open) => {
-        if (!open) setForkPickerEntries(null);
-      },
-      onPick: forkFromEntry
-    })
-  }) : null] });
-}
-var FLEET_PANEL_KEYBINDINGS_STORAGE_KEY = "fleet-prime:v1:panel-keybindings";
-var DEFAULT_FLEET_PANEL_KEYBINDINGS = {
-  toggleResources: {
-    code: "Digit1",
-    ctrlOrMeta: true,
-    shift: true
-  },
-  toggleWorkspace: {
-    code: "Digit2",
-    ctrlOrMeta: true,
-    shift: true
-  },
-  toggleArtifacts: {
-    code: "Digit3",
-    ctrlOrMeta: true,
-    shift: true
-  },
-  toggleRepl: {
-    code: "Digit4",
-    ctrlOrMeta: true,
-    shift: true
-  },
-  toggleSubagents: {
-    code: "Digit5",
-    ctrlOrMeta: true,
-    shift: true
-  },
-  toggleCommandPalette: {
-    code: "KeyK",
-    ctrlOrMeta: true
-  },
-  closePanel: { code: "Escape" },
-  focusPanel: {
-    code: "KeyP",
-    ctrlOrMeta: true,
-    shift: true
-  },
-  focusChat: {
-    code: "KeyC",
-    ctrlOrMeta: true,
-    shift: true
-  }
-};
-function readKeybindings() {
-  try {
-    const value = window.localStorage.getItem(FLEET_PANEL_KEYBINDINGS_STORAGE_KEY);
-    if (!value) return DEFAULT_FLEET_PANEL_KEYBINDINGS;
-    const overrides = JSON.parse(value);
-    return {
-      ...DEFAULT_FLEET_PANEL_KEYBINDINGS,
-      ...overrides
-    };
-  } catch {
-    return DEFAULT_FLEET_PANEL_KEYBINDINGS;
-  }
-}
-function matches(event, binding) {
-  return event.code === binding.code && (event.ctrlKey || event.metaKey) === Boolean(binding.ctrlOrMeta) && event.shiftKey === Boolean(binding.shift) && event.altKey === Boolean(binding.alt);
-}
-function focusChatComposer() {
-  document.querySelector("[data-fleet-chat-focus] textarea, [data-fleet-chat-focus] [contenteditable='true'], [data-fleet-chat-focus] input")?.focus({ preventScroll: true });
-}
-function usePanelKeybindings({ onCommandPaletteToggle, onClosePanel, rightPanel, setRightPanel }) {
-  useEffect2(() => {
-    const keybindings = readKeybindings();
-    const handleKeyDown = (event) => {
-      const match = (action) => matches(event, keybindings[action]);
-      let handled = true;
-      if (match("toggleResources")) setRightPanel(rightPanel === "resources" ? null : "resources");
-      else if (match("toggleWorkspace")) setRightPanel(rightPanel === "workspace" ? null : "workspace");
-      else if (match("toggleArtifacts")) setRightPanel(rightPanel === "artifacts" ? null : "artifacts");
-      else if (match("toggleRepl")) setRightPanel(rightPanel === "repl" ? null : "repl");
-      else if (match("toggleSubagents")) setRightPanel(rightPanel === "subagents" ? null : "subagents");
-      else if (onCommandPaletteToggle && match("toggleCommandPalette")) onCommandPaletteToggle();
-      else if (rightPanel && match("closePanel")) {
-        if (onClosePanel) onClosePanel();
-        else {
-          setRightPanel(null);
-          focusChatComposer();
-        }
-      } else if (rightPanel && match("focusPanel")) document.querySelector("[data-fleet-panel-focus]")?.focus({ preventScroll: true });
-      else if (match("focusChat")) focusChatComposer();
-      else handled = false;
-      if (handled) {
-        event.preventDefault();
-        event.stopPropagation();
-      }
-    };
-    document.addEventListener("keydown", handleKeyDown);
-    return () => document.removeEventListener("keydown", handleKeyDown);
-  }, [
-    onCommandPaletteToggle,
-    onClosePanel,
-    rightPanel,
-    setRightPanel
-  ]);
-}
-function useOptionalUser() {
-  return null;
-}
-function getChatAuthBearerToken$1() {
-  return null;
-}
-async function signOut() {
-}
-function getChatAuthBearerToken() {
-  return null;
-}
-var ChatRequestError = class extends Error {
-  status;
-  body;
-  code;
-  remediation;
-  constructor(status, body) {
-    super(formatChatRequestErrorMessage(status, body));
-    this.name = "ChatRequestError";
-    this.status = status;
-    this.body = body;
-    const envelope = parseErrorEnvelope(body);
-    this.code = envelope?.code;
-    this.remediation = envelope?.remediation;
-  }
-};
-function isFleetErrorRemediation(value) {
-  return typeof value === "object" && value !== null && typeof value.action === "string" && typeof value.label === "string";
+var ChatRequestError = class extends Error {
+  status;
+  body;
+  code;
+  remediation;
+  constructor(status, body) {
+    super(formatChatRequestErrorMessage(status, body));
+    this.name = "ChatRequestError";
+    this.status = status;
+    this.body = body;
+    const envelope = parseErrorEnvelope(body);
+    this.code = envelope?.code;
+    this.remediation = envelope?.remediation;
+  }
+};
+function isFleetErrorRemediation(value) {
+  return typeof value === "object" && value !== null && typeof value.action === "string" && typeof value.label === "string";
 }
 function parseErrorEnvelope(body) {
   const trimmed = body.trim();
@@ -9572,7 +9369,7 @@ function chatErrorFromStreamEvent(event) {
 }
 async function withChatRequestHeaders(init) {
   const headers = new Headers(init?.headers);
-  const bearer = await getChatAuthBearerToken();
+  const bearer = await getChatAuthBearerToken$1();
   if (bearer) headers.set("Authorization", `Bearer ${bearer}`);
   return headers;
 }
@@ -9672,6 +9469,167 @@ function labelForState(state) {
       return;
   }
 }
+function notifyChatError(error) {
+  if (isDaemonDisconnectError(error)) return;
+  notify.error(error instanceof Error ? error.message : String(error));
+}
+var LazyChatCommandPalette = lazy(() => import("./chat-command-palette-7gbqEnm9-6XICQZN7.js").then(({ ChatCommandPalette }) => ({ default: ChatCommandPalette })));
+var LazySettingsDialog = lazy(() => import("./settings-dialog-DndPbM-v-RFNXXEAN.js").then(({ SettingsDialog }) => ({ default: SettingsDialog })));
+var LazyForkPickerDialog = lazy(() => import("./fork-picker-dialog-DlINz9UQ-UWIXFDJX.js").then(({ ForkPickerDialog }) => ({ default: ForkPickerDialog })));
+function ChatCommandPaletteOverlay({ chrome, conversation, dialogs, panels, session }) {
+  return /* @__PURE__ */ jsx(Fragment$1, { children: dialogs.commandPaletteOpen ? /* @__PURE__ */ jsx(Suspense, {
+    fallback: null,
+    children: /* @__PURE__ */ jsx(LazyChatCommandPalette, {
+      open: true,
+      onOpenChange: dialogs.setCommandPaletteOpen,
+      onNewSession: () => void session.startNewSession(),
+      onStop: conversation.stop,
+      onResumeSession: (sessionToResume) => void session.resumeSession({ sessionId: sessionToResume.sessionId }),
+      onSetRightPanel: panels.setRightPanel,
+      onThemeChange: chrome.handleThemePreferenceChange,
+      sessions: session.sessions,
+      isStreaming: conversation.status === "streaming",
+      themePreference: chrome.themePreference
+    })
+  }) : null });
+}
+function ChatWorkspaceOverlayDialogs({ dialogs }) {
+  const { forkFromEntry, forkPickerEntries, setForkPickerEntries, setSettingsDialogOpen, setSettingsInitialTab, settingsDialogOpen, settingsInitialTab } = dialogs;
+  const [hasOpenedSettingsDialog, setHasOpenedSettingsDialog] = useState2(settingsDialogOpen);
+  const [hasOpenedForkPickerDialog, setHasOpenedForkPickerDialog] = useState2(forkPickerEntries !== null);
+  useEffect2(() => {
+    if (settingsDialogOpen) setHasOpenedSettingsDialog(true);
+  }, [settingsDialogOpen]);
+  useEffect2(() => {
+    if (forkPickerEntries !== null) setHasOpenedForkPickerDialog(true);
+  }, [forkPickerEntries]);
+  const handleSettingsOpenChange = useCallback2((open) => {
+    setSettingsDialogOpen(open);
+    if (!open) setSettingsInitialTab(void 0);
+  }, [setSettingsDialogOpen, setSettingsInitialTab]);
+  return /* @__PURE__ */ jsxs(Fragment$1, { children: [hasOpenedSettingsDialog ? /* @__PURE__ */ jsx(Suspense, {
+    fallback: null,
+    children: /* @__PURE__ */ jsx(LazySettingsDialog, {
+      open: settingsDialogOpen,
+      onOpenChange: handleSettingsOpenChange,
+      initialTab: settingsInitialTab
+    })
+  }) : null, hasOpenedForkPickerDialog ? /* @__PURE__ */ jsx(Suspense, {
+    fallback: null,
+    children: /* @__PURE__ */ jsx(LazyForkPickerDialog, {
+      entries: forkPickerEntries,
+      onOpenChange: (open) => {
+        if (!open) setForkPickerEntries(null);
+      },
+      onPick: forkFromEntry
+    })
+  }) : null] });
+}
+var FLEET_PANEL_KEYBINDINGS_STORAGE_KEY = "fleet-prime:v1:panel-keybindings";
+var DEFAULT_FLEET_PANEL_KEYBINDINGS = {
+  toggleResources: {
+    code: "Digit1",
+    ctrlOrMeta: true,
+    shift: true
+  },
+  toggleWorkspace: {
+    code: "Digit2",
+    ctrlOrMeta: true,
+    shift: true
+  },
+  toggleArtifacts: {
+    code: "Digit3",
+    ctrlOrMeta: true,
+    shift: true
+  },
+  toggleRepl: {
+    code: "Digit4",
+    ctrlOrMeta: true,
+    shift: true
+  },
+  toggleSubagents: {
+    code: "Digit5",
+    ctrlOrMeta: true,
+    shift: true
+  },
+  toggleCommandPalette: {
+    code: "KeyK",
+    ctrlOrMeta: true
+  },
+  closePanel: { code: "Escape" },
+  focusPanel: {
+    code: "KeyP",
+    ctrlOrMeta: true,
+    shift: true
+  },
+  focusChat: {
+    code: "KeyC",
+    ctrlOrMeta: true,
+    shift: true
+  }
+};
+function readKeybindings() {
+  try {
+    const value = readStoredValue(FLEET_PANEL_KEYBINDINGS_STORAGE_KEY);
+    if (!value) return DEFAULT_FLEET_PANEL_KEYBINDINGS;
+    const overrides = JSON.parse(value);
+    return {
+      ...DEFAULT_FLEET_PANEL_KEYBINDINGS,
+      ...overrides
+    };
+  } catch {
+    return DEFAULT_FLEET_PANEL_KEYBINDINGS;
+  }
+}
+function matches(event, binding) {
+  return event.code === binding.code && (event.ctrlKey || event.metaKey) === Boolean(binding.ctrlOrMeta) && event.shiftKey === Boolean(binding.shift) && event.altKey === Boolean(binding.alt);
+}
+function focusChatComposer() {
+  document.querySelector("[data-fleet-chat-focus] textarea, [data-fleet-chat-focus] [contenteditable='true'], [data-fleet-chat-focus] input")?.focus({ preventScroll: true });
+}
+function usePanelKeybindings({ onCommandPaletteToggle, onClosePanel, rightPanel, setRightPanel }) {
+  useEffect2(() => {
+    const keybindings = readKeybindings();
+    const handleKeyDown = (event) => {
+      const match = (action) => matches(event, keybindings[action]);
+      let handled = true;
+      if (match("toggleResources")) setRightPanel(rightPanel === "resources" ? null : "resources");
+      else if (match("toggleWorkspace")) setRightPanel(rightPanel === "workspace" ? null : "workspace");
+      else if (match("toggleArtifacts")) setRightPanel(rightPanel === "artifacts" ? null : "artifacts");
+      else if (match("toggleRepl")) setRightPanel(rightPanel === "repl" ? null : "repl");
+      else if (match("toggleSubagents")) setRightPanel(rightPanel === "subagents" ? null : "subagents");
+      else if (onCommandPaletteToggle && match("toggleCommandPalette")) onCommandPaletteToggle();
+      else if (rightPanel && match("closePanel")) {
+        if (onClosePanel) onClosePanel();
+        else {
+          setRightPanel(null);
+          focusChatComposer();
+        }
+      } else if (rightPanel && match("focusPanel")) document.querySelector("[data-fleet-panel-focus]")?.focus({ preventScroll: true });
+      else if (match("focusChat")) focusChatComposer();
+      else handled = false;
+      if (handled) {
+        event.preventDefault();
+        event.stopPropagation();
+      }
+    };
+    document.addEventListener("keydown", handleKeyDown);
+    return () => document.removeEventListener("keydown", handleKeyDown);
+  }, [
+    onCommandPaletteToggle,
+    onClosePanel,
+    rightPanel,
+    setRightPanel
+  ]);
+}
+function useOptionalUser() {
+  return null;
+}
+function getChatAuthBearerToken() {
+  return null;
+}
+async function signOut() {
+}
 var ProjectResponseSchema = external_exports.object({ project: ProjectSummarySchema });
 var chatClient = {
   async abortSession(metadata) {
@@ -9688,7 +9646,7 @@ var chatClient = {
       body: JSON.stringify(request)
     });
   },
-  async deleteQueuedMessage(request) {
+  async mutateQueuedMessage(request) {
     const body = ChatQueueMutationRequestSchema.parse(request);
     return fetchValidatedJson("/api/chat/session", ChatQueueMutationResponseSchema, {
       method: "PATCH",
@@ -9696,6 +9654,12 @@ var chatClient = {
       body: JSON.stringify(body)
     });
   },
+  async deleteQueuedMessage(request) {
+    return this.mutateQueuedMessage({
+      ...request,
+      mutation: request.mutation ?? { type: "delete" }
+    });
+  },
   async browseWorkspace(path, projectId) {
     const params = new URLSearchParams();
     if (projectId) params.set("projectId", projectId);
@@ -9874,7 +9838,7 @@ var chatClient = {
   async streamMessage(request, onEvent, signal) {
     const attempt = async (allowRetry) => {
       const headers = new Headers({ "Content-Type": "application/json" });
-      const bearer = await getChatAuthBearerToken$1();
+      const bearer = await getChatAuthBearerToken();
       if (bearer) headers.set("Authorization", `Bearer ${bearer}`);
       const response = await fetch(resolveChatApiUrl("/api/chat"), {
         method: "POST",
@@ -9891,6 +9855,33 @@ var chatClient = {
     };
     await attempt(true);
   },
+  async getMcpConnections() {
+    return fetchValidatedJson("/api/chat/mcp", ChatMcpListResponseSchema);
+  },
+  async upsertMcpConnection(request) {
+    const body = ChatMcpUpsertRequestSchema.parse(request);
+    return fetchValidatedJson("/api/chat/mcp", ChatMcpListResponseSchema, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(body)
+    });
+  },
+  async removeMcpConnection(request) {
+    const body = ChatMcpDeleteRequestSchema.parse(request);
+    return fetchValidatedJson("/api/chat/mcp", ChatMcpListResponseSchema, {
+      method: "DELETE",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(body)
+    });
+  },
+  async mcpOAuth(request) {
+    const body = ChatMcpOAuthLoginRequestSchema.parse(request);
+    return fetchValidatedJson("/api/chat/mcp/oauth", ChatMcpOAuthLoginResponseSchema, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(body)
+    });
+  },
   async getProviders() {
     return fetchValidatedJson("/api/chat/providers", ChatProvidersResponseSchema);
   },
@@ -9919,7 +9910,7 @@ var chatClient = {
     });
   }
 };
-var keys = {
+var chatQueryKeys = {
   models: (projectId) => [
     "chat",
     "models",
@@ -9932,6 +9923,7 @@ var keys = {
     projectId ?? "default"
   ],
   providers: ["chat", "providers"],
+  mcp: ["chat", "mcp"],
   resources: (projectId) => [
     "chat",
     "resources",
@@ -9954,10 +9946,12 @@ var keys = {
   ],
   projects: ["projects"]
 };
+var keys = chatQueryKeys;
 function useChatModels(projectId) {
   return useQuery({
     queryKey: keys.models(projectId),
-    queryFn: () => chatClient.getModels({ projectId })
+    queryFn: () => chatClient.getModels({ projectId }),
+    enabled: Boolean(projectId)
   });
 }
 function useChatProjects() {
@@ -9974,7 +9968,7 @@ function useChatModelCatalog(options) {
       scope: "all",
       projectId: options?.projectId
     }),
-    enabled: options?.enabled
+    enabled: Boolean(options?.projectId) && options?.enabled !== false
   });
 }
 function useDiscoverChatModels() {
@@ -9989,19 +9983,22 @@ function useDiscoverChatModels() {
 function useChatResources(projectId) {
   return useQuery({
     queryKey: keys.resources(projectId),
-    queryFn: () => chatClient.getResources(projectId)
+    queryFn: () => chatClient.getResources(projectId),
+    enabled: Boolean(projectId)
   });
 }
 function useChatCommands(projectId) {
   return useQuery({
     queryKey: keys.commands(projectId),
-    queryFn: () => chatClient.getCommands(projectId)
+    queryFn: () => chatClient.getCommands(projectId),
+    enabled: Boolean(projectId)
   });
 }
 function useChatSettings(projectId) {
   return useQuery({
     queryKey: keys.settings(projectId),
-    queryFn: () => chatClient.getSettings(projectId)
+    queryFn: () => chatClient.getSettings(projectId),
+    enabled: Boolean(projectId)
   });
 }
 function useUpdateChatSettings() {
@@ -10020,7 +10017,44 @@ function useWorkspaceTree(projectId, options) {
   return useQuery({
     queryKey: keys.workspace(projectId),
     queryFn: () => chatClient.getWorkspaceTree(projectId),
-    enabled: options?.enabled
+    enabled: Boolean(projectId) && options?.enabled !== false
+  });
+}
+function useChatMcpConnections() {
+  return useQuery({
+    queryKey: keys.mcp,
+    queryFn: () => chatClient.getMcpConnections()
+  });
+}
+function useUpdateMcpConnection() {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: (request) => chatClient.upsertMcpConnection(request),
+    onSuccess: (data) => {
+      queryClient.setQueryData(keys.mcp, data);
+      queryClient.invalidateQueries({ queryKey: ["chat", "resources"] });
+    }
+  });
+}
+function useRemoveMcpConnection() {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: (request) => chatClient.removeMcpConnection(request),
+    onSuccess: (data) => {
+      queryClient.setQueryData(keys.mcp, data);
+      queryClient.invalidateQueries({ queryKey: ["chat", "resources"] });
+    }
+  });
+}
+function useMcpOAuth() {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: (request) => chatClient.mcpOAuth(request),
+    onSuccess: (data) => {
+      if (data.status !== "success" || !data.connections) return;
+      queryClient.setQueryData(keys.mcp, { connections: data.connections });
+      queryClient.invalidateQueries({ queryKey: ["chat", "resources"] });
+    }
   });
 }
 function useChatProviders() {
@@ -10450,15 +10484,25 @@ function normalizeSlashCommandName(name) {
   const normalized = name.trim().replace(/\s+/g, "-");
   return /^[\w.-]+$/.test(normalized) ? normalized : "";
 }
+function slashSuggestionValue(name) {
+  return `/${name} `;
+}
 function toSlashSuggestion(command) {
+  const argumentHint = command.argumentHint?.trim();
   return {
     id: command.name,
     label: `/${command.name}`,
-    value: `/${command.name}${command.argumentHint ? ` ${command.argumentHint}` : ""} `,
+    value: slashSuggestionValue(command.name),
     description: command.description,
-    category: command.category ?? "builtin"
+    category: command.category ?? "builtin",
+    ...argumentHint ? { metadata: { argumentHint } } : {}
   };
 }
+function slashCommandInsertsPrefixOnSelect(item) {
+  if (item.metadata?.argumentHint?.trim()) return true;
+  const builtin = WEB_BUILTIN_SLASH_COMMANDS.find((command) => command.name === item.id);
+  return Boolean(builtin?.argumentHint?.trim());
+}
 function buildSlashCommands(resources, enabled, commandsData) {
   const byId = /* @__PURE__ */ new Map();
   for (const command of WEB_BUILTIN_SLASH_COMMANDS) byId.set(command.name, toSlashSuggestion(command));
@@ -10471,12 +10515,14 @@ function buildSlashCommands(resources, enabled, commandsData) {
     if (resource.activationStatus && resource.activationStatus !== "active") continue;
     const commandName = normalizeSlashCommandName(resource.name);
     if (!commandName || byId.has(commandName)) continue;
+    const argumentHint = resource.argumentHint?.trim();
     byId.set(commandName, {
       id: commandName,
       label: `/${commandName}`,
-      value: `/${commandName} `,
+      value: slashSuggestionValue(commandName),
       description: resource.description,
-      category
+      category,
+      ...argumentHint ? { metadata: { argumentHint } } : {}
     });
   }
   return Array.from(byId.values());
@@ -10742,6 +10788,8 @@ function applyChatStreamEvent(transition, event) {
   if (event.type === "rlm") {
     const presentation = transition.snapshot.presentation;
     if (!presentation) return transition;
+    const existingChild = presentation.rlmChildren.find((child) => child.id === event.child.id);
+    if (existingChild && existingChild.timestamp > event.child.timestamp) return transition;
     const rlmChildren = [...presentation.rlmChildren.filter((child) => child.id !== event.child.id), event.child];
     return {
       ...transition,
@@ -10909,13 +10957,12 @@ function isConnectedFrame(value) {
   return typeof value === "object" && value !== null && value.type === "connected" && typeof value.sessionId === "string";
 }
 function readStoredSubagentCursor(key) {
-  if (typeof window === "undefined") return void 0;
   try {
-    const raw = window.sessionStorage.getItem(key);
+    const raw = readStoredValue(key, "session");
     if (!raw) return void 0;
     const value = JSON.parse(raw);
     if (typeof value.generation !== "string" || value.generation.length === 0 || typeof value.lastEventId !== "number" || !Number.isInteger(value.lastEventId) || value.lastEventId < 0) {
-      window.sessionStorage.removeItem(key);
+      removeStoredValue(key, "session");
       return;
     }
     return {
@@ -10923,7 +10970,7 @@ function readStoredSubagentCursor(key) {
       lastEventId: value.lastEventId
     };
   } catch {
-    window.sessionStorage.removeItem(key);
+    removeStoredValue(key, "session");
     return;
   }
 }
@@ -11056,18 +11103,14 @@ function useSubagentChat({ client, enabled, child, loadSession, parentSessionId
       lastEventId = storedCursor.lastEventId;
     }
     const persistCursor = () => {
-      if (typeof window === "undefined") return;
-      try {
-        if (!streamGeneration) {
-          window.sessionStorage.removeItem(cursorKey);
-          return;
-        }
-        window.sessionStorage.setItem(cursorKey, JSON.stringify({
-          generation: streamGeneration,
-          lastEventId
-        }));
-      } catch {
+      if (!streamGeneration) {
+        removeStoredValue(cursorKey, "session");
+        return;
       }
+      writeStoredValue(cursorKey, JSON.stringify({
+        generation: streamGeneration,
+        lastEventId
+      }), "session");
     };
     const clearCursor = () => {
       lastEventId = 0;
@@ -11357,12 +11400,11 @@ function storeResourceCanvasWidth(width) {
 }
 function readStoredThemePreference() {
   if (typeof window === "undefined") return "system";
-  const value = window.localStorage.getItem(THEME_PREFERENCE_STORAGE_KEY);
+  const value = readStoredValue(THEME_PREFERENCE_STORAGE_KEY);
   return value === "light" || value === "dark" || value === "system" ? value : "system";
 }
 function storeThemePreference(preference) {
-  if (typeof window === "undefined") return;
-  window.localStorage.setItem(THEME_PREFERENCE_STORAGE_KEY, preference);
+  writeStoredValue(THEME_PREFERENCE_STORAGE_KEY, preference);
 }
 function applyThemePreference(preference) {
   if (typeof window === "undefined") return;
@@ -11544,18 +11586,16 @@ function useChatStorage() {
   };
 }
 function readStoredBrowserSessions() {
-  if (typeof window === "undefined" || !window.localStorage) return {};
+  const raw = readStoredValue(CHAT_SESSION_STORAGE_KEY);
+  if (!raw) return readLegacyScopeStorage();
   try {
-    const raw = window.localStorage.getItem(CHAT_SESSION_STORAGE_KEY);
-    if (!raw) return readLegacyScopeStorage();
     return parseSessionMetadata(JSON.parse(raw));
   } catch {
     return readLegacyScopeStorage();
   }
 }
 function readLegacyScopeStorage() {
-  if (typeof window === "undefined" || !window.localStorage) return {};
-  const raw = window.localStorage.getItem("fleet-prime:v1:chat-sessions");
+  const raw = readStoredValue("fleet-prime:v1:chat-sessions");
   if (!raw) return {};
   try {
     return parseSessionMetadata(JSON.parse(raw)?.normal);
@@ -11568,19 +11608,17 @@ function parseSessionMetadata(value) {
   return result.success ? result.data : {};
 }
 function clearBrowserChatSessions() {
-  if (typeof window === "undefined" || !window.localStorage) return;
-  window.localStorage.removeItem(CHAT_SESSION_STORAGE_KEY);
-  window.localStorage.removeItem("fleet-prime:v1:chat-sessions");
-  window.localStorage.removeItem("fleet-prime:v1:chat-mode");
+  removeStoredValue(CHAT_SESSION_STORAGE_KEY);
+  removeStoredValue("fleet-prime:v1:chat-sessions");
+  removeStoredValue("fleet-prime:v1:chat-mode");
 }
 function storeBrowserSessions(metadata) {
-  if (typeof window === "undefined" || !window.localStorage) return;
   if (!metadata.sessionId && !metadata.projectId) {
-    window.localStorage.removeItem(CHAT_SESSION_STORAGE_KEY);
-    window.localStorage.removeItem("fleet-prime:v1:chat-sessions");
+    removeStoredValue(CHAT_SESSION_STORAGE_KEY);
+    removeStoredValue("fleet-prime:v1:chat-sessions");
     return;
   }
-  window.localStorage.setItem(CHAT_SESSION_STORAGE_KEY, JSON.stringify(metadata));
+  writeStoredValue(CHAT_SESSION_STORAGE_KEY, JSON.stringify(metadata));
 }
 function useChatSuggestions({ messages, resources, workspaceTree }) {
   return useMemo2(() => buildContextSuggestions({
@@ -11725,7 +11763,7 @@ function AccountMenu({ user, onSignOut, onOpenSettings, compact = false, label =
         children: [
           /* @__PURE__ */ jsx(QredenceLogo, { className: "size-3.5 shrink-0" }),
           /* @__PURE__ */ jsx("span", {
-            className: compact ? "sr-only" : "text-[13px] font-medium tracking-[-0.01em] whitespace-nowrap",
+            className: compact ? "sr-only" : "text-[0.8125rem] font-medium tracking-[-0.01em] whitespace-nowrap",
             children: label
           }),
           /* @__PURE__ */ jsx(ChevronDown, { className: "size-3.5 shrink-0 text-foreground/35" })
@@ -11793,6 +11831,139 @@ function AccountMenu({ user, onSignOut, onOpenSettings, compact = false, label =
     })
   });
 }
+function statusLabel(status) {
+  switch (status) {
+    case "queued":
+      return "queued";
+    case "running":
+    case "recovering":
+      return "streaming";
+    case "error":
+    case "failed":
+      return "error";
+    case "cancelled":
+      return "cancelled";
+    case "done":
+      return "complete";
+    default:
+      return "ready";
+  }
+}
+function statusDotClass(status) {
+  switch (status) {
+    case "running":
+    case "recovering":
+      return "bg-emerald-400 motion-safe:animate-pulse";
+    case "error":
+    case "failed":
+      return "bg-destructive";
+    case "queued":
+      return "bg-amber-300";
+    case "cancelled":
+      return "bg-foreground/35";
+    default:
+      return "bg-foreground/35";
+  }
+}
+function AgentTabBar({ tabs, value, onValueChange, onClose, onNewSession }) {
+  const tabRefs = useRef2(/* @__PURE__ */ new Map());
+  const setTabRef = useCallback2((tabId, node) => {
+    if (node) tabRefs.current.set(tabId, node);
+    else tabRefs.current.delete(tabId);
+  }, []);
+  useEffect2(() => {
+    for (const tabId of tabRefs.current.keys()) if (!tabs.some((tab) => tab.id === tabId)) tabRefs.current.delete(tabId);
+  }, [tabs]);
+  const focusTab = useCallback2((index) => {
+    const tab = tabs[index];
+    if (!tab) return;
+    tabRefs.current.get(tab.id)?.focus();
+    onValueChange(tab.id);
+  }, [onValueChange, tabs]);
+  const handleKeyDown = useCallback2((event, tabId) => {
+    const index = tabs.findIndex((tab) => tab.id === tabId);
+    if (index < 0) return;
+    let nextIndex;
+    if (event.key === "ArrowRight") nextIndex = (index + 1) % tabs.length;
+    if (event.key === "ArrowLeft") nextIndex = (index - 1 + tabs.length) % tabs.length;
+    if (event.key === "Home") nextIndex = 0;
+    if (event.key === "End") nextIndex = tabs.length - 1;
+    if (nextIndex === void 0) return;
+    event.preventDefault();
+    focusTab(nextIndex);
+  }, [focusTab, tabs]);
+  return /* @__PURE__ */ jsxs("div", {
+    className: "flex min-w-0 max-w-full items-center gap-1",
+    "data-testid": "agent-tab-bar",
+    children: [/* @__PURE__ */ jsx("div", {
+      "aria-label": "Agent conversations",
+      className: "flex min-w-0 flex-1 items-center gap-1 overflow-x-auto overscroll-contain [scrollbar-width:none] [&::-webkit-scrollbar]:hidden",
+      role: "tablist",
+      children: tabs.map((tab) => {
+        const active = tab.id === value;
+        const status = statusLabel(tab.status);
+        return /* @__PURE__ */ jsxs("div", {
+          className: "group/tab relative min-w-0 shrink-0 basis-[164px] sm:max-w-[164px]",
+          "data-tab-id": tab.id,
+          children: [/* @__PURE__ */ jsxs(Button, {
+            ref: (node) => setTabRef(tab.id, node),
+            "aria-controls": agentTabPanelId(tab.id),
+            "aria-selected": active,
+            "aria-label": `${tab.label}, ${status}`,
+            className: cn("h-7 w-full min-w-0 justify-start text-left gap-1.5 rounded-[7px] border border-transparent px-2 text-[0.75rem] font-medium leading-none transition-colors motion-reduce:transition-none", active ? "bg-surface-4 text-foreground shadow-none" : "bg-transparent text-foreground/45 hover:bg-foreground/5 hover:text-foreground/75", tab.kind === "subagent" && onClose && "pr-7"),
+            "data-state": active ? "active" : "inactive",
+            id: agentTabTriggerId(tab.id),
+            onClick: () => onValueChange(tab.id),
+            onKeyDown: (event) => handleKeyDown(event, tab.id),
+            role: "tab",
+            size: "sm",
+            tabIndex: active ? 0 : -1,
+            type: "button",
+            variant: "ghost",
+            children: [tab.kind === "main" ? /* @__PURE__ */ jsx(Bot, {
+              "aria-hidden": "true",
+              className: "size-3.5 shrink-0"
+            }) : /* @__PURE__ */ jsx("span", {
+              "aria-hidden": "true",
+              className: cn("size-1.5 shrink-0 rounded-full", statusDotClass(tab.status))
+            }), /* @__PURE__ */ jsx("span", {
+              className: "min-w-0 flex-1 truncate text-left",
+              children: tab.label
+            })]
+          }), tab.kind === "subagent" && onClose ? /* @__PURE__ */ jsx(Button, {
+            "aria-label": `Close ${tab.label} tab`,
+            className: "absolute top-1/2 right-1 size-5 -translate-y-1/2 rounded-[5px] p-0 text-foreground/35 opacity-0 transition-opacity motion-reduce:transition-none hover:bg-foreground/10 hover:text-foreground/75 focus-visible:opacity-100 group-hover/tab:opacity-100",
+            onClick: (event) => {
+              event.stopPropagation();
+              onClose(tab.id);
+            },
+            size: "icon-xs",
+            title: `Close ${tab.label} tab`,
+            type: "button",
+            variant: "ghost",
+            children: /* @__PURE__ */ jsx(X, {
+              "aria-hidden": "true",
+              className: "size-3"
+            })
+          }) : null]
+        }, tab.id);
+      })
+    }), onNewSession ? /* @__PURE__ */ jsx(Button, {
+      "aria-label": "New chat",
+      className: "size-7 shrink-0 rounded-[7px] text-foreground/50 hover:bg-foreground/7 hover:text-foreground/85",
+      "data-testid": "new-chat-tab",
+      onClick: onNewSession,
+      size: "icon-sm",
+      title: "New chat",
+      type: "button",
+      variant: "ghost",
+      children: /* @__PURE__ */ jsx(Plus, {
+        "aria-hidden": "true",
+        className: "size-3.5"
+      })
+    }) : null]
+  });
+}
 function useChatWorkspaceHeader({ activeTabId, tabs, onCloseTab, onNewSession, onSelectTab, onOpenSettings }) {
   const navigate = useNavigate();
   const user = useOptionalUser();
@@ -11828,6 +11999,7 @@ function useChatWorkspaceHeader({ activeTabId, tabs, onCloseTab, onNewSession, o
   };
 }
 var CHAT_COMMAND_URL = "/api/chat/command";
+var MCP_USAGE = "MCP usage: /mcp, /mcp list, /mcp login <name>, /mcp logout <name>.";
 function liveSessionId(metadata) {
   const id = metadata.sessionId?.trim();
   return id ? id : void 0;
@@ -11905,6 +12077,7 @@ ${text}`;
   }).join("\n\n---\n\n");
 }
 function useLocalSlashActions({ appendLocalMessage, getMessages, getSessionMetadata, modelKey, models, onForkPicker, openSettings, onOpenUIRequest, resumeSession, sessions, setEffortPickerOpen, setModelKey, setModelPickerOpen, setThinkingLevel, startNewSession }) {
+  const queryClient = useQueryClient();
   const chatCommand = useCallback2(async (command, args = "") => {
     const sessionId = liveSessionId(getSessionMetadata());
     if (!sessionId) return {
@@ -12147,10 +12320,35 @@ ${sessions.map((session) => {
       case "open-logout":
         appendLocalMessage("Provider sign-out is managed by Fleet Prime CLI commands.");
         return true;
-      case "open-mcp":
-        openSettings("chat");
-        if (action.args) appendLocalMessage(`MCP: ${action.args}. Manage MCP connections with Fleet Prime CLI configuration.`);
+      case "open-mcp": {
+        openSettings("mcp");
+        const parts = action.args.trim().split(/\s+/).filter(Boolean);
+        const verb = parts[0];
+        const target = parts.slice(1).join(" ");
+        if (!verb || verb === "list" || (verb === "login" || verb === "reconnect") && !target) return true;
+        if ((verb === "login" || verb === "reconnect") && target) {
+          appendLocalMessage(`Open Settings \u2192 MCP and sign in to "${target}".`);
+          return true;
+        }
+        if (verb === "logout" && target) {
+          (async () => {
+            try {
+              const result = await chatClient.mcpOAuth({
+                name: target,
+                action: "logout"
+              });
+              if (result.connections) queryClient.setQueryData(chatQueryKeys.mcp, { connections: result.connections });
+              queryClient.invalidateQueries({ queryKey: ["chat", "resources"] });
+              appendLocalMessage(`Signed out of MCP connection "${target}".`);
+            } catch (error) {
+              appendLocalMessage(error instanceof Error ? error.message : `Could not sign out of "${target}".`);
+            }
+          })();
+          return true;
+        }
+        appendLocalMessage(MCP_USAGE);
         return true;
+      }
       case "fast-toggle":
         (async () => {
           appendLocalMessage("/fast toggles OpenAI Fast mode. The web port reads this from ~/.prime/agent/settings.json \u2014 flip `fastMode` there or in Settings.");
@@ -12211,6 +12409,7 @@ ${sessions.map((session) => {
     onForkPicker,
     openSettings,
     onOpenUIRequest,
+    queryClient,
     sessions,
     setEffortPickerOpen,
     setModelKey,
@@ -12219,7 +12418,7 @@ ${sessions.map((session) => {
     startNewSession
   ]);
   const handleSlashCommandSelect = useCallback2((item) => {
-    if (item.id === "openui") return false;
+    if (slashCommandInsertsPrefixOnSelect(item)) return false;
     const action = resolveLocalSlashAction(item.id);
     if (!action) return false;
     return applyLocalSlashAction(action);
@@ -12347,10 +12546,6 @@ function answerToRecordValue(answer) {
   if (answer.kind === "text") return typeof answer.text === "string" ? answer.text : "";
   return answer.selectedIds?.[0] ?? answer.text ?? "";
 }
-function notifyChatError(error) {
-  if (isDaemonDisconnectError(error)) return;
-  notify.error(error instanceof Error ? error.message : String(error));
-}
 function cleanStepText(text) {
   let cleaned = text.replace(/\*{1,2}([^*]+)\*{1,2}/g, "$1").replace(/`([^`]+)`/g, "$1").replace(/^(Use|Run|Execute|Create|Write|Read|Check|Verify|Update|Modify|Add|Remove|Delete|Install)\s+(the\s+)?/i, "").replace(/\s+/g, " ").trim();
   if (cleaned.length > 0) cleaned = `${cleaned.charAt(0).toUpperCase()}${cleaned.slice(1)}`;
@@ -12675,23 +12870,34 @@ function usePiChatSessionEvents({ client, presentationRef, sessionId, sessionMet
     if (!sessionId || typeof window === "undefined") return;
     const lastEventIdKey = `pi:sse:last-event-id:${sessionId}`;
     const sseCapabilitiesRef = { current: void 0 };
-    let lastEventId = Number.parseInt(window.sessionStorage.getItem(lastEventIdKey) ?? "0", 10);
+    let lastEventId = Number.parseInt(readStoredValue(lastEventIdKey, "session") ?? "0", 10);
     if (Number.isNaN(lastEventId)) lastEventId = 0;
     let source = null;
     let reconnectTimer = null;
+    let reconnectAttempt = 0;
+    let reconnectNoticeShown = false;
+    let lastAppliedRlmSeq = 0;
     let closedByEffect = false;
-    const handleEvent = (raw) => {
+    let activeAssistantId;
+    const handleEvent = (raw, seq) => {
       let frame2;
       try {
         frame2 = JSON.parse(raw.data);
       } catch {
         return;
       }
+      if (frame2.type === "start") activeAssistantId = frame2.id;
+      if (frame2.type === "done") activeAssistantId = void 0;
+      const statusAtFrame = statusRef.current;
       if (frame2.type === "presentation") {
         if (frame2.presentation.revision > (presentationRef.current?.revision ?? -1)) setPresentationSynced(frame2.presentation);
         return;
       }
       if (frame2.type === "rlm") {
+        if (!Number.isNaN(seq) && seq > 0) {
+          if (seq <= lastAppliedRlmSeq) return;
+          lastAppliedRlmSeq = seq;
+        }
         const current = presentationRef.current;
         const existing = current.rlmChildren.find((child) => child.id === frame2.child.id);
         if (existing && existing.timestamp > frame2.child.timestamp) return;
@@ -12702,45 +12908,78 @@ function usePiChatSessionEvents({ client, presentationRef, sessionId, sessionMet
         });
         return;
       }
-      if (statusRef.current === "streaming" || statusRef.current === "submitted") return;
-      const connected = frame2;
-      if (connected.type === "connected") {
-        sseCapabilitiesRef.current = connected.adapterCapabilities;
-        setAdapterCapabilities(connected.adapterCapabilities);
-        return;
-      }
-      if (frame2.type === "reasoning") {
-        const messageId = frame2.messageId;
-        if (!sseCapabilitiesRef.current?.features.includes("reasoning-summary-v1") || !messageId) return;
-        setMessagesSynced((current) => upsertAssistantReasoningPresentation(current, messageId, frame2.presentation));
-        return;
-      }
       if (frame2.type === "tool" && frame2.part?.type === "tool-Question") {
         setMessagesSynced((current) => {
           const toolCallId = frame2.part.toolCallId ?? "";
-          if (current.some((message) => message.parts.some((part) => part.type !== "text" && part.type !== "error" && "toolCallId" in part && part.toolCallId === toolCallId))) return current;
+          if (!toolCallId) return current;
+          const hasToolCall = (message) => message.parts.some((part) => part.type !== "text" && part.type !== "error" && "toolCallId" in part && part.toolCallId === toolCallId);
+          let targetIndex = frame2.messageId ? current.findIndex((message) => message.id === frame2.messageId && message.role === "assistant") : -1;
+          if (targetIndex < 0 && activeAssistantId) targetIndex = current.findIndex((message) => message.id === activeAssistantId && message.role === "assistant");
+          if (targetIndex < 0) {
+            let latestAssistantWithoutToolCall = -1;
+            let latestMatchingToolCall = -1;
+            for (let index = current.length - 1; index >= 0; index -= 1) {
+              const message = current[index];
+              if (message.role !== "assistant") continue;
+              if (hasToolCall(message) && latestMatchingToolCall < 0) latestMatchingToolCall = index;
+              else if (latestAssistantWithoutToolCall < 0) latestAssistantWithoutToolCall = index;
+            }
+            targetIndex = frame2.part.state === "input-streaming" ? latestAssistantWithoutToolCall >= 0 ? latestAssistantWithoutToolCall : latestMatchingToolCall : latestMatchingToolCall >= 0 ? latestMatchingToolCall : latestAssistantWithoutToolCall;
+          }
           const questionPart = {
             ...frame2.part,
             type: "tool-Question"
           };
-          return [...current, {
-            id: crypto.randomUUID(),
+          if (targetIndex < 0) return [...current, {
+            id: frame2.messageId ?? crypto.randomUUID(),
             role: "assistant",
             parts: [questionPart],
             createdAt: (/* @__PURE__ */ new Date()).toISOString()
           }];
+          return current.flatMap((message, index) => {
+            if (index === targetIndex) return [{
+              ...message,
+              parts: upsertToolPart(message.parts, questionPart)
+            }];
+            if (!hasToolCall(message)) return [message];
+            const parts = message.parts.filter((part) => !(part.type !== "text" && part.type !== "error" && "toolCallId" in part && part.toolCallId === toolCallId));
+            return parts.length > 0 ? [{
+              ...message,
+              parts
+            }] : [];
+          });
         });
         return;
       }
+      if (statusRef.current === "streaming" || statusRef.current === "submitted") return;
+      const connected = frame2;
+      if (connected.type === "connected") {
+        sseCapabilitiesRef.current = connected.adapterCapabilities;
+        setAdapterCapabilities(connected.adapterCapabilities);
+        if (connected.cursorReset) lastAppliedRlmSeq = 0;
+        return;
+      }
+      if (frame2.type === "reasoning") {
+        const messageId = frame2.messageId;
+        if (!sseCapabilitiesRef.current?.features.includes("reasoning-summary-v1") || !messageId) return;
+        setMessagesSynced((current) => upsertAssistantReasoningPresentation(current, messageId, frame2.presentation));
+        return;
+      }
       if (frame2.type === "state") {
         setActivityLabelSynced(typeof frame2.state?.message === "string" ? frame2.state.message : void 0);
-        if (frame2.state?.name === "agent_settled") client.loadSession({ sessionId }).then((result) => {
-          if (closedByEffect || sessionMetadataRef.current.sessionId !== sessionId) return;
-          setMessagesSynced(hydratePlanPresentationMessages(result.messages, result.planPresentations));
-          setPresentationSynced(result.presentation);
-          setSessionMetadataSynced(result.session);
-          setQueueSynced(EMPTY_QUEUE_STATE);
-        }).catch(() => void 0);
+        if (frame2.state?.name === "agent_settled") {
+          if (statusAtFrame === "streaming" || statusAtFrame === "submitted") return;
+          const metadataSessionIdAtFrame = sessionMetadataRef.current.sessionId;
+          client.loadSession({ sessionId }).then((result) => {
+            if (closedByEffect || sessionMetadataRef.current.sessionId !== sessionId) return;
+            if (sessionMetadataRef.current.sessionId !== metadataSessionIdAtFrame) return;
+            if (statusRef.current === "streaming" || statusRef.current === "submitted") return;
+            setMessagesSynced(hydratePlanPresentationMessages(result.messages, result.planPresentations));
+            setPresentationSynced(result.presentation);
+            setSessionMetadataSynced(result.session);
+            setQueueSynced(EMPTY_QUEUE_STATE);
+          }).catch(() => void 0);
+        }
         return;
       }
       if (frame2.type === "queue") setQueueSynced({
@@ -12759,15 +12998,27 @@ function usePiChatSessionEvents({ client, presentationRef, sessionId, sessionMet
         const seq = Number.parseInt(event.lastEventId ?? "", 10);
         if (!Number.isNaN(seq) && seq > 0) {
           lastEventId = seq;
-          window.sessionStorage.setItem(lastEventIdKey, String(seq));
+          writeStoredValue(lastEventIdKey, String(seq), "session");
+        }
+        if (reconnectAttempt > 0) {
+          reconnectAttempt = 0;
+          if (reconnectNoticeShown) {
+            reconnectNoticeShown = false;
+            if (statusRef.current !== "streaming" && statusRef.current !== "submitted") setActivityLabelSynced(void 0);
+          }
         }
-        handleEvent(event);
+        handleEvent(event, seq);
       };
       nextSource.onerror = () => {
         if (closedByEffect || source !== nextSource) return;
         nextSource.close();
+        reconnectAttempt += 1;
+        if (reconnectAttempt > 1 && statusRef.current !== "streaming" && statusRef.current !== "submitted") {
+          reconnectNoticeShown = true;
+          setActivityLabelSynced(reconnectAttempt > 2 ? `Reconnecting\u2026 (attempt ${reconnectAttempt})` : "Reconnecting\u2026");
+        }
         if (reconnectTimer) clearTimeout(reconnectTimer);
-        reconnectTimer = setTimeout(connect, 2e3);
+        reconnectTimer = setTimeout(connect, Math.min(2e3, 250 * 2 ** Math.min(reconnectAttempt, 3)));
       };
     };
     connect();
@@ -12819,6 +13070,10 @@ function usePiChatMessaging({ activityLabelRef, client, messagesRef, presentatio
   const streamAdmissionsRef = useRef2(/* @__PURE__ */ new Set());
   const queuedSubmissionTailRef = useRef2(RESOLVED_PROMISE);
   const adapterCapabilitiesRef = useRef2(void 0);
+  const projectIdRef = useRef2(projectId);
+  useEffect2(() => {
+    projectIdRef.current = projectId;
+  }, [projectId]);
   const findStreamAdmission = useCallback2((sessionId) => {
     for (const admission of streamAdmissionsRef.current) if (admission.sessionId === sessionId) return admission;
   }, []);
@@ -12863,7 +13118,7 @@ function usePiChatMessaging({ activityLabelRef, client, messagesRef, presentatio
     if (existing.sessionId) return existing;
     const inFlight = sessionCreatePromiseRef.current;
     if (inFlight) return inFlight;
-    const promise = client.createSession(projectId, signal).then((created) => {
+    const promise = client.createSession(projectIdRef.current, signal).then((created) => {
       if (signal?.aborted) throw new Error("Session creation was aborted");
       setSessionMetadataSynced(created.session);
       setPresentationSynced(created.presentation);
@@ -12877,7 +13132,6 @@ function usePiChatMessaging({ activityLabelRef, client, messagesRef, presentatio
     return promise;
   }, [
     client,
-    projectId,
     refreshSessions,
     sessionMetadataRef,
     setPresentationSynced,
@@ -13026,22 +13280,21 @@ function usePiChatMessaging({ activityLabelRef, client, messagesRef, presentatio
     resetStreamAdmission,
     sendMessage: useCallback2(async ({ text, attachments, openUI, openUIArtifact, planAction, mode, altKey }) => {
       const trimmed = text.trim();
-      if (!trimmed) return;
-      if (status === "submitted" || status === "streaming" || findStreamAdmission(sessionMetadataRef.current.sessionId) !== void 0) {
-        try {
-          await enqueueDuringStream(trimmed, altKey ? "followUp" : "steer", {
-            attachments,
-            mode,
-            openUI,
-            openUIArtifact,
-            planAction
-          });
-        } catch (err) {
-          const nextError = err instanceof Error ? err : new Error(String(err));
-          setError(nextError);
-          notifyChatError(nextError);
-        }
-        return;
+      if (!trimmed) return false;
+      if (status === "submitted" || status === "streaming" || findStreamAdmission(sessionMetadataRef.current.sessionId) !== void 0) try {
+        await enqueueDuringStream(trimmed, altKey ? "followUp" : "steer", {
+          attachments,
+          mode,
+          openUI,
+          openUIArtifact,
+          planAction
+        });
+        return true;
+      } catch (err) {
+        const nextError = err instanceof Error ? err : new Error(String(err));
+        setError(nextError);
+        notifyChatError(nextError);
+        return false;
       }
       setError(null);
       setActivityLabelSynced(void 0);
@@ -13059,7 +13312,7 @@ function usePiChatMessaging({ activityLabelRef, client, messagesRef, presentatio
       let terminalDoneSeen = false;
       try {
         const ensuredSession = await ensureSession(controller.signal);
-        if (controller.signal.aborted) return;
+        if (controller.signal.aborted) return false;
         const ensuredStreamSessionId = ensuredSession.sessionId;
         if (!ensuredStreamSessionId) throw new Error("Unable to start a session stream");
         streamSessionId = ensuredStreamSessionId;
@@ -13087,23 +13340,25 @@ function usePiChatMessaging({ activityLabelRef, client, messagesRef, presentatio
         }
         if (sessionMetadataRef.current.sessionId === ensuredStreamSessionId && (terminalDoneSeen || !sessionStillRunning)) setStatus("ready");
         messagesRef.current.length;
+        return true;
       } catch (err) {
         if (streamAdmissionsRef.current.delete(streamAdmission)) streamAdmission.reject(err);
         setMessagesSynced((current) => removeOptimisticUserMessage(current, userMessage.id));
-        if (controller.signal.aborted) return;
+        if (controller.signal.aborted) return false;
         if (streamSessionId && sessionMetadataRef.current.sessionId !== streamSessionId) {
           refreshSessions();
-          return;
+          return false;
         }
         const recoveryDeps = {
           setError,
           setStatus
         };
-        if (await tryRecoverForbiddenSession(err, recoverFromForbiddenSession, recoveryDeps) || await tryRecoverUnknownSession(err, recoverFromForbiddenSession, recoveryDeps)) return;
+        if (await tryRecoverForbiddenSession(err, recoverFromForbiddenSession, recoveryDeps) || await tryRecoverUnknownSession(err, recoverFromForbiddenSession, recoveryDeps)) return false;
         const nextError = err instanceof Error ? err : new Error(String(err));
         setError(nextError);
         setStatus("error");
         notifyChatError(nextError);
+        return false;
       } finally {
         if (streamAdmissionsRef.current.delete(streamAdmission)) streamAdmission.reject(/* @__PURE__ */ new Error("Chat stream ended before admission"));
         if (controller.signal.aborted) setMessagesSynced((current) => removeOptimisticUserMessage(current, userMessage.id));
@@ -13236,19 +13491,22 @@ function usePiChat(model, options) {
     artifactRuns: []
   }));
   const initialSessionMetadataRef = useRef2(initialSessionMetadata);
+  const projectIdRef = useRef2(projectId);
   const messagesRef = useRef2(messages);
   const sessionMetadataRef = useRef2(sessionMetadata);
   const activityLabelRef = useRef2(activityLabel);
   const planLabelRef = useRef2(planLabel);
   const queueRef = useRef2(queue);
   const queueRevisionRef = useRef2(0);
-  const queuedDeletionTailRef = useRef2(Promise.resolve());
+  const queuedMutationTailRef = useRef2(null);
   const presentationRef = useRef2(presentation);
   const pendingSendControllerRef = useRef2(null);
   const streamControllersRef = useRef2(/* @__PURE__ */ new Map());
+  const refreshSessionsPromiseRef = useRef2(null);
+  const resumeRequestRef = useRef2(0);
   const statusRef = useRef2(status);
   const initializedRef = useRef2(false);
-  const sendMessageRef = useRef2(() => Promise.resolve());
+  const sendMessageRef = useRef2(() => Promise.resolve(false));
   const setMessagesSynced = useCallback2((updater) => {
     const next = typeof updater === "function" ? updater(messagesRef.current) : updater;
     messagesRef.current = next;
@@ -13305,14 +13563,26 @@ function usePiChat(model, options) {
     if (sessionMetadataRef.current.sessionId === sessionId) setPresentationSynced(result.presentation);
     return result.artifact.id;
   }, [client, setPresentationSynced]);
+  useEffect2(() => {
+    projectIdRef.current = projectId;
+  }, [projectId]);
   const refreshSessions = useCallback2(async () => {
-    const nextSessions = await client.listSessions();
-    setSessions(nextSessions);
-    return nextSessions;
+    const pendingRefresh = refreshSessionsPromiseRef.current;
+    if (pendingRefresh) return pendingRefresh;
+    const refreshRequest = client.listSessions().then((nextSessions) => {
+      setSessions(nextSessions);
+      return nextSessions;
+    });
+    refreshSessionsPromiseRef.current = refreshRequest;
+    try {
+      return await refreshRequest;
+    } finally {
+      if (refreshSessionsPromiseRef.current === refreshRequest) refreshSessionsPromiseRef.current = null;
+    }
   }, [client]);
   const recoverFromForbiddenSession = useCallback2((projectIdOverride) => runForbiddenSessionRecovery({
     client,
-    projectId: projectIdOverride ?? projectId,
+    projectId: projectIdOverride ?? projectIdRef.current,
     refreshSessions,
     setActivityLabelSynced,
     setError,
@@ -13324,7 +13594,6 @@ function usePiChat(model, options) {
     setStatus
   }), [
     client,
-    projectId,
     refreshSessions,
     setActivityLabelSynced,
     setMessagesSynced,
@@ -13422,18 +13691,6 @@ function usePiChat(model, options) {
       controllers.clear();
     };
   }, []);
-  useEffect2(() => {
-    let cancelled = false;
-    refreshSessions().catch((err) => {
-      if (cancelled) return;
-      const nextError = err instanceof Error ? err : new Error(String(err));
-      setError(nextError);
-      notifyChatError(nextError);
-    });
-    return () => {
-      cancelled = true;
-    };
-  }, [refreshSessions]);
   usePiChatBootstrap({
     client,
     initialSessionMetadataRef,
@@ -13494,37 +13751,45 @@ function usePiChat(model, options) {
     setActivityLabelSynced,
     setQueueSynced
   ]);
-  const deleteQueuedMessage = useCallback2((lane, index, expectedText) => {
+  const mutateQueuedMessage = useCallback2((lane, index, expectedText, mutation, options2) => {
     const originatingSessionId = sessionMetadataRef.current.sessionId;
     const requestedRevision = queueRevisionRef.current;
     const requestedMatchCount = (lane === "steering" ? queueRef.current.steering : queueRef.current.followUp).filter((item) => item === expectedText).length;
-    const deletion = queuedDeletionTailRef.current.catch(() => void 0).then(async () => {
+    const queuedMutation = (queuedMutationTailRef.current ?? Promise.resolve()).catch(() => void 0).then(async () => {
       if (!originatingSessionId || sessionMetadataRef.current.sessionId !== originatingSessionId) return false;
+      const refuseStaleMutation = (expectedRace) => {
+        if (!expectedRace && options2?.staleMessage) notifyChatError(new Error(options2.staleMessage));
+        return false;
+      };
       const current = queueRef.current;
       const items = lane === "steering" ? current.steering : current.followUp;
       let resolvedIndex;
       if (queueRevisionRef.current === requestedRevision) resolvedIndex = items[index] === expectedText ? index : void 0;
       else {
-        if (requestedMatchCount !== 1) return false;
+        if (requestedMatchCount !== 1) return refuseStaleMutation(true);
         const currentMatches = items.reduce((matches2, item, itemIndex) => {
           if (item === expectedText) matches2.push(itemIndex);
           return matches2;
         }, []);
         resolvedIndex = currentMatches.length === 1 ? currentMatches[0] : void 0;
       }
-      if (resolvedIndex === void 0) return false;
-      const optimistic = {
+      if (resolvedIndex === void 0) return refuseStaleMutation(queueRevisionRef.current !== requestedRevision);
+      const optimistic = mutation.type === "delete" ? {
         ...current,
         [lane]: items.filter((_, itemIndex) => itemIndex !== resolvedIndex)
+      } : {
+        ...current,
+        [lane]: items.map((item, itemIndex) => itemIndex === resolvedIndex ? mutation.text : item)
       };
       setQueueSynced(optimistic);
       const requestRevision = queueRevisionRef.current;
       try {
-        const result = await client.deleteQueuedMessage({
+        const result = await client.mutateQueuedMessage({
           sessionId: originatingSessionId,
           lane,
           index: resolvedIndex,
-          expectedText
+          expectedText,
+          mutation
         });
         if (sessionMetadataRef.current.sessionId !== originatingSessionId || queueRevisionRef.current !== requestRevision) return result.status === "applied";
         setQueueSynced(result.queue);
@@ -13534,16 +13799,22 @@ function usePiChat(model, options) {
         throw queueError;
       }
     });
-    queuedDeletionTailRef.current = deletion.then(() => void 0, () => void 0);
-    return deletion;
+    queuedMutationTailRef.current = queuedMutation.then(() => void 0, () => void 0);
+    return queuedMutation;
   }, [client, setQueueSynced]);
+  const deleteQueuedMessage = useCallback2((lane, index, expectedText) => mutateQueuedMessage(lane, index, expectedText, { type: "delete" }, { staleMessage: "The queued message changed before it could be deleted." }), [mutateQueuedMessage]);
+  const editQueuedMessage = useCallback2((lane, index, expectedText, nextText) => mutateQueuedMessage(lane, index, expectedText, {
+    type: "replace",
+    text: nextText,
+    lane
+  }, { staleMessage: "The queued message changed before it could be updated." }), [mutateQueuedMessage]);
   const startNewSession = useCallback2(async (options2) => {
     if (options2?.preserveRunning === false) stop();
     else {
       invalidateQueueMutations();
       setStatus("ready");
     }
-    const result = await client.createSession(options2?.projectId ?? projectId);
+    const result = await client.createSession(options2?.projectId ?? projectIdRef.current ?? projectId);
     setSessionMetadataSynced(result.session);
     setMessagesSynced([]);
     setPresentationSynced(result.presentation);
@@ -13566,10 +13837,14 @@ function usePiChat(model, options) {
     projectId
   ]);
   const resumeSession = useCallback2(async (metadata, options2) => {
+    const requestId = resumeRequestRef.current + 1;
+    resumeRequestRef.current = requestId;
+    const isCurrent = () => resumeRequestRef.current === requestId;
     invalidateQueueMutations();
     try {
       if (options2?.preserveRunning === false) stop();
       const result = await client.resumeSession(metadata);
+      if (!isCurrent()) return false;
       setSessionMetadataSynced(result.session);
       setMessagesSynced(hydratePlanPresentationMessages(result.messages, result.planPresentations));
       setPresentationSynced(result.presentation);
@@ -13578,14 +13853,18 @@ function usePiChat(model, options) {
       setPlanLabelSynced(void 0);
       setStatus(streamControllersRef.current.has(result.session.sessionId ?? "") ? "streaming" : "ready");
       await refreshSessions();
+      if (!isCurrent()) return false;
       return true;
     } catch (err) {
+      if (!isCurrent()) return false;
       const recoveryDeps = {
         setError,
         setStatus
       };
       const recover = () => recoverFromForbiddenSession(metadata.projectId);
-      if (await tryRecoverForbiddenSession(err, recover, recoveryDeps) || await tryRecoverUnknownSession(err, recover, recoveryDeps)) return false;
+      const recovered = await tryRecoverForbiddenSession(err, recover, recoveryDeps) || await tryRecoverUnknownSession(err, recover, recoveryDeps);
+      if (!isCurrent()) return false;
+      if (recovered) return false;
       const nextError = err instanceof Error ? err : new Error(String(err));
       setError(nextError);
       setStatus("error");
@@ -13653,13 +13932,24 @@ function usePiChat(model, options) {
   });
   const enhancedMessages = useMemo2(() => enhanceMessages(messages), [messages, enhanceMessages]);
   const renameSession = useCallback2(async (sessionId, title) => {
-    await client.renameSession(sessionId, title);
-    await refreshSessions();
+    try {
+      await client.renameSession(sessionId, title);
+      await refreshSessions();
+      return true;
+    } catch (err) {
+      notifyChatError(err);
+      return false;
+    }
   }, [client, refreshSessions]);
   const deleteSession = useCallback2(async (sessionId) => {
     const deletingActive = sessionMetadataRef.current.sessionId === sessionId;
     if (deletingActive) stop();
-    await client.deleteSession(sessionId);
+    try {
+      await client.deleteSession(sessionId);
+    } catch (err) {
+      notifyChatError(err);
+      return false;
+    }
     if (deletingActive) {
       setSessionMetadataSynced({});
       setMessagesSynced([]);
@@ -13672,6 +13962,7 @@ function usePiChat(model, options) {
       });
     }
     await refreshSessions();
+    return true;
   }, [
     client,
     refreshSessions,
@@ -13687,6 +13978,7 @@ function usePiChat(model, options) {
     answerQuestion,
     appendLocalMessage,
     deleteQueuedMessage,
+    editQueuedMessage,
     deleteSession,
     error,
     getMessages: useCallback2(() => messagesRef.current, []),
@@ -13709,7 +14001,7 @@ function usePiChat(model, options) {
     switchProject
   };
 }
-function useRightPanelContextValue({ activityLabel, artifactRuns, chatMode, handleThemePreferenceChange, isLoadingProviders, isUpdatingProvider, loadSession, loadSubagentSession, loadWorkspaceFile: loadWorkspaceFile2, messages, onOpenSubagentTab, modelKey, models, modelCatalog, onDiscoverModels, onOAuthLogin, onRemoveProvider, onUpdateProvider, openWorkspacePath, planLabel, presentation, providers, queue, refreshResources, refreshWorkspace, resources, resourcesError, resourcesLoading, rightPanel, reopenRightPanel, saveSettings, selectedArtifactId, sessionId, selectedWorkspacePath, setRightPanel, setSelectedWorkspacePath, settings, settingsError, settingsLoading, status, thinkingLevel, themePreference, workspaceError, workspaceLoading, workspaceTree }) {
+function useRightPanelContextValue({ activityLabel, artifactRuns, chatMode, handleThemePreferenceChange, isLoadingMcp, isLoadingProviders, isUpdatingMcp, isUpdatingProvider, loadSession, loadSubagentSession, loadWorkspaceFile: loadWorkspaceFile2, messages, onOpenSubagentTab, modelKey, models, modelCatalog, onDiscoverModels, onMcpOAuth, onOAuthLogin, onRemoveMcp, onRemoveProvider, onUpdateMcp, onUpdateProvider, openWorkspacePath, planLabel, presentation, mcpConnections, providers, queue, refreshResources, refreshWorkspace, resources, resourcesError, resourcesLoading, rightPanel, reopenRightPanel, saveSettings, selectedArtifactId, sessionId, selectedWorkspacePath, setRightPanel, setSelectedWorkspacePath, settings, settingsError, settingsLoading, status, thinkingLevel, themePreference, workspaceError, workspaceLoading, workspaceTree }) {
   const chatPanelData = useMemo2(() => ({
     activityLabel,
     artifactRuns,
@@ -13781,13 +14073,19 @@ function useRightPanelContextValue({ activityLabel, artifactRuns, chatMode, hand
   return {
     chatPanelData,
     settingsActions: useMemo2(() => ({
+      isLoadingMcp,
       isLoadingProviders,
+      isUpdatingMcp,
       isUpdatingProvider,
+      mcpConnections,
       modelCatalog,
       onDiscoverModels,
+      onMcpOAuth,
       onOAuthLogin,
+      onRemoveMcp,
       onRemoveProvider,
       onThemePreferenceChange: handleThemePreferenceChange,
+      onUpdateMcp,
       onUpdateProvider,
       providers,
       saveSettings,
@@ -13797,12 +14095,18 @@ function useRightPanelContextValue({ activityLabel, artifactRuns, chatMode, hand
       themePreference
     }), [
       handleThemePreferenceChange,
+      isLoadingMcp,
       isLoadingProviders,
+      isUpdatingMcp,
       isUpdatingProvider,
+      mcpConnections,
       modelCatalog,
       onDiscoverModels,
+      onMcpOAuth,
       onOAuthLogin,
+      onRemoveMcp,
       onRemoveProvider,
+      onUpdateMcp,
       onUpdateProvider,
       providers,
       saveSettings,
@@ -13868,10 +14172,14 @@ function useChatWorkspaceData() {
     if (user) ;
   }, [user]);
   const { data: providersData, isLoading: isLoadingProviders } = useChatProviders();
+  const { data: mcpData, isLoading: isLoadingMcp } = useChatMcpConnections();
   const { data: projectsData, refetch: refetchProjects } = useChatProjects();
   const { mutateAsync: onUpdateProvider, isPending: isUpdatingProvider } = useUpdateChatProvider();
   const { mutateAsync: onOAuthLogin } = useOAuthLoginProvider();
   const { mutateAsync: onRemoveProvider, isPending: isRemovingProvider } = useRemoveChatProvider();
+  const { mutateAsync: onUpdateMcp, isPending: isUpdatingMcp } = useUpdateMcpConnection();
+  const { mutateAsync: onRemoveMcp, isPending: isRemovingMcp } = useRemoveMcpConnection();
+  const { mutateAsync: onMcpOAuth } = useMcpOAuth();
   const { data: modelsData } = useChatModels(activeProjectId);
   const { data: modelCatalogData } = useChatModelCatalog({
     enabled: settingsDialogOpen,
@@ -13898,7 +14206,7 @@ function useChatWorkspaceData() {
   const { data: commandsData } = useChatCommands(activeProjectId);
   const { data: settingsData, isLoading: settingsLoading, error: settingsError } = useChatSettings(activeProjectId);
   const updateSettings = useUpdateChatSettings();
-  const { data: workspaceData, isLoading: workspaceLoading, error: workspaceError, refetch: refetchWorkspace } = useWorkspaceTree(activeProjectId, { enabled: true });
+  const { data: workspaceData, isLoading: workspaceLoading, error: workspaceError, refetch: refetchWorkspace } = useWorkspaceTree(activeProjectId, { enabled: rightPanel === "workspace" || rightPanel === "resources" });
   const resources = resourcesData ?? null;
   const workspaceTree = workspaceData ?? null;
   const refreshResources = useCallback2(() => {
@@ -13921,7 +14229,7 @@ function useChatWorkspaceData() {
   const refreshWorkspace = useCallback2(() => {
     refetchWorkspace();
   }, [refetchWorkspace]);
-  const { activityLabel, answerQuestion, appendLocalMessage, deleteQueuedMessage, deleteSession, error, getMessages, getSessionMetadata, messages, planLabel, persistOpenUIArtifact, presentation, queue, renameSession, resumeSession, sendMessage, sessionMetadata, sessions, startNewSession, switchProject, status, stop } = usePiChat(modelSelection, {
+  const { activityLabel, answerQuestion, appendLocalMessage, deleteQueuedMessage, editQueuedMessage, deleteSession, error, getMessages, getSessionMetadata, messages, planLabel, persistOpenUIArtifact, presentation, queue, renameSession, resumeSession, sendMessage, sessionMetadata, sessions, startNewSession, switchProject, status, stop } = usePiChat(modelSelection, {
     initialSessionMetadata,
     projectId: activeProjectId,
     persistSession
@@ -13947,15 +14255,29 @@ function useChatWorkspaceData() {
     setUploadedAttachments([]);
     setWorkspaceAttachments([]);
   }, []);
+  const workspaceSessionCreatePromiseRef = useRef2(null);
   const startNewSessionForWorkspace = useCallback2(async (options) => {
-    const currentMetadata = getSessionMetadata();
-    const targetProjectId = options?.projectId ?? activeProjectId;
-    const shouldClear = shouldClearPendingAttachmentsForNewSession({
-      ...currentMetadata,
-      projectId: currentMetadata.projectId ?? activeProjectId
-    }, targetProjectId);
-    await startNewSession(options);
-    if (shouldClear) clearPendingAttachments();
+    const key = `${options?.projectId ?? ""}::${options?.preserveRunning ?? ""}`;
+    const inFlight = workspaceSessionCreatePromiseRef.current;
+    if (inFlight && inFlight.key === key) return inFlight.promise;
+    const promise = (async () => {
+      const currentMetadata = getSessionMetadata();
+      const targetProjectId = options?.projectId ?? activeProjectId;
+      const shouldClear = shouldClearPendingAttachmentsForNewSession({
+        ...currentMetadata,
+        projectId: currentMetadata.projectId ?? activeProjectId
+      }, targetProjectId);
+      await startNewSession(options);
+      if (shouldClear) clearPendingAttachments();
+      return getSessionMetadata();
+    })().finally(() => {
+      if (workspaceSessionCreatePromiseRef.current?.promise === promise) workspaceSessionCreatePromiseRef.current = null;
+    });
+    workspaceSessionCreatePromiseRef.current = {
+      key,
+      promise
+    };
+    return promise;
   }, [
     activeProjectId,
     clearPendingAttachments,
@@ -14010,8 +14332,7 @@ function useChatWorkspaceData() {
   ]);
   const deleteSessionForWorkspace = useCallback2(async (sessionId) => {
     const deletingActiveSession = getSessionMetadata().sessionId === sessionId;
-    await deleteSession(sessionId);
-    if (deletingActiveSession) clearPendingAttachments();
+    if (await deleteSession(sessionId) && deletingActiveSession) clearPendingAttachments();
   }, [
     clearPendingAttachments,
     deleteSession,
@@ -14065,8 +14386,7 @@ function useChatWorkspaceData() {
       (async () => {
         const files = Array.from(input.files ?? []);
         if (files.length === 0) return;
-        if (!getSessionMetadata().sessionId) await startNewSessionForWorkspace();
-        const sessionId = getSessionMetadata().sessionId;
+        const sessionId = getSessionMetadata().sessionId ?? (await startNewSessionForWorkspace()).sessionId;
         if (!sessionId) throw new Error("Unable to create a session for attachments");
         const uploaded = await chatClient.uploadAttachments(sessionId, files);
         setUploadedAttachments((current) => [...current, ...uploaded]);
@@ -14081,6 +14401,10 @@ function useChatWorkspaceData() {
   }, []);
   const clearUploadedAttachments = useCallback2(() => setUploadedAttachments([]), []);
   const clearWorkspaceAttachments = useCallback2(() => setWorkspaceAttachments([]), []);
+  const restoreAttachments = useCallback2((uploaded, workspace) => {
+    if (uploaded.length > 0) setUploadedAttachments((current) => [...uploaded, ...current]);
+    if (workspace.length > 0) setWorkspaceAttachments((current) => [...workspace, ...current]);
+  }, []);
   const addWorkspaceAttachment = useCallback2((item) => {
     const relativePath = workspacePathFromSuggestion(item);
     if (!relativePath) return;
@@ -14156,22 +14480,23 @@ function useChatWorkspaceData() {
     modelKey,
     models,
     onForkPicker: setForkPickerEntries,
-    onOpenUIRequest: useCallback2((request) => {
+    onOpenUIRequest: useCallback2(async (request) => {
       const attachments = [...workspaceAttachments, ...uploadedAttachments];
       clearUploadedAttachments();
       clearWorkspaceAttachments();
-      return sendMessage({
+      if (!await sendMessage({
         text: request,
         altKey: false,
         mode: chatMode,
         openUI: true,
         openUIArtifact: true,
         attachments
-      });
+      })) restoreAttachments(uploadedAttachments, workspaceAttachments);
     }, [
       chatMode,
       clearUploadedAttachments,
       clearWorkspaceAttachments,
+      restoreAttachments,
       sendMessage,
       uploadedAttachments,
       workspaceAttachments
@@ -14203,7 +14528,9 @@ function useChatWorkspaceData() {
     artifactRuns,
     chatMode,
     handleThemePreferenceChange,
+    isLoadingMcp,
     isLoadingProviders,
+    isUpdatingMcp: isUpdatingMcp || isRemovingMcp,
     isUpdatingProvider: isUpdatingProvider || isRemovingProvider,
     loadSession: loadChatSession,
     loadSubagentSession,
@@ -14214,12 +14541,16 @@ function useChatWorkspaceData() {
     models,
     modelCatalog,
     onDiscoverModels,
+    onMcpOAuth,
     onOAuthLogin,
+    onRemoveMcp,
     onRemoveProvider,
+    onUpdateMcp,
     onUpdateProvider,
     openWorkspacePath,
     planLabel,
     presentation,
+    mcpConnections: mcpData?.connections ?? [],
     providers: providersData?.providers ?? [],
     queue,
     refreshResources,
@@ -14277,6 +14608,7 @@ function useChatWorkspaceData() {
       activityLabel,
       artifactRuns,
       deleteQueuedMessage,
+      editQueuedMessage,
       error,
       messages,
       openArtifact,
@@ -14309,6 +14641,7 @@ function useChatWorkspaceData() {
       removeUploadedAttachment,
       removeWorkspaceAttachment,
       addWorkspaceAttachment,
+      restoreAttachments,
       setChatMode,
       setEffortPickerOpen,
       setModelKey,
@@ -14346,7 +14679,7 @@ function useChatWorkspaceData() {
     }
   };
 }
-var LazySubagentChatPanel = lazy(() => import("./subagent-chat-panel-DlSsM59d-DBW7DI3T.js").then(({ SubagentChatPanel }) => ({ default: SubagentChatPanel })));
+var LazySubagentChatPanel = lazy(() => import("./subagent-chat-panel-C0RpnXav-J7VYO7QY.js").then(({ SubagentChatPanel }) => ({ default: SubagentChatPanel })));
 function ChatWorkspaceShell() {
   const { session, conversation, composer, panels, dialogs, chrome, agentTabs } = useChatWorkspaceData();
   const toggleCommandPalette = useCallback2(() => {
@@ -14364,22 +14697,30 @@ function ChatWorkspaceShell() {
   });
   const activeProjectName = session.projects.find((project) => project.projectId === session.activeProjectId)?.name;
   const handleSend = useCallback2((text, altKey) => {
-    const attachments = [...composer.workspaceAttachments, ...composer.uploadedAttachments];
+    const uploaded = [...composer.uploadedAttachments];
+    const workspace = [...composer.workspaceAttachments];
+    const attachments = [...workspace, ...uploaded];
     composer.clearUploadedAttachments();
     composer.clearWorkspaceAttachments();
     (async () => {
-      await conversation.sendMessage({
-        text,
-        altKey,
-        mode: composer.chatMode,
-        openUI: true,
-        attachments
-      });
+      try {
+        if (!await conversation.sendMessage({
+          text,
+          altKey,
+          mode: composer.chatMode,
+          openUI: true,
+          attachments
+        })) composer.restoreAttachments(uploaded, workspace);
+      } catch (error) {
+        composer.restoreAttachments(uploaded, workspace);
+        notifyChatError(error);
+      }
     })();
   }, [
     composer.chatMode,
     composer.clearUploadedAttachments,
     composer.clearWorkspaceAttachments,
+    composer.restoreAttachments,
     composer.uploadedAttachments,
     composer.workspaceAttachments,
     conversation.sendMessage
@@ -14419,6 +14760,7 @@ function ChatWorkspaceShell() {
     artifactRuns: conversation.artifactRuns,
     queue: conversation.queue,
     onDeleteQueuedMessage: conversation.deleteQueuedMessage,
+    onEditQueuedMessage: conversation.editQueuedMessage,
     onOpenArtifact: conversation.openArtifact,
     onOpenUIArtifactReady: handleOpenUIArtifactReady,
     inputSuggestionItems: composer.inputSuggestionItems,