@zythum02/fello-server 0.1.53 → 0.1.54

package/out/renderer/assets/{session-Bn5k9ScR.js → session-C_1BpGhU.js}

@@ -1,36 +1,21 @@
-const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./code-editor-CEXlC4aV.js","./index-LmYTNvdF.js","./index-aGJ_yZib.css","./mermaid-GHXKKRXX-CZqkhGx7.js","./code-editor-BwxubRqT.css"])))=>i.map(i=>d[i]);
-import { h as createLucideIcon, r as reactExports, am as formatErrorMessage, bq as ReactStore, br as popupStoreSelectors, bs as triggerHover, al as triggerPress, bt as escapeKey, bu as attachPreventUnmountOnClose, bv as closePress, bw as PATIENT_CLICK_THRESHOLD, ae as reactDomExports, bx as focusOut, by as setPopupOpenState, bz as createInitialPopupStoreState, bA as createPopupFloatingRootContext, bB as Timeout, bC as PopupTriggerMap, j as jsxRuntimeExports, bD as FloatingTree, bE as usePopupRootSync, bF as useImplicitActiveTrigger, bG as useOpenStateTransitions, ak as createChangeEventDetails, bH as imperativeAction, bI as PopupHandleAttachment, bJ as usePopupRootStore, bK as useDismiss, bL as usePopupInteractionProps, bM as usePopupHandleStore, ai as useBaseUiId, bN as useTriggerDataForwarding, bO as useHoverReferenceInteraction, bP as safePolygon, bQ as useClick, bR as useOpenMethodTriggerProps, aq as useButton, bS as useTriggerFocusGuards, ap as useRenderElement, bT as CLICK_TRIGGER_IDENTIFIER, bU as FocusGuard, bV as pressableTriggerOpenStateMapping, bW as triggerOpenStateMapping, bX as FloatingPortal, bY as POPUP_COLLISION_AVOIDANCE, bZ as useFloatingNodeId, at as useAnimationsFinished, b_ as useAnchorPositioning, au as useIsoLayoutEffect, b$ as useAnchoredPopupScrollLock, c0 as usePositioner, c1 as InternalBackdrop, c2 as inertValue, c3 as FloatingNode, aj as useStableCallback, c4 as useToolbarRootContext, av as useOpenChangeComplete, c5 as useHoverFloatingInteraction, c6 as createDefaultInitialFocus, c7 as FOCUSABLE_POPUP_PROPS, ba as COMPOSITE_KEYS, c8 as getDisabledMountTransitionStyles, c9 as FloatingFocusManager, ca as isHTMLElement, cb as popupTransitionStateMapping, u as useTranslation, b as useMessage, X as useNavigate, a as useAppStore, _ as Badge, cc as formatUpdatedTime, e as request, V as electron, ab as ALL_FEATURES, ac as FEATURE_I18N_KEYS, M as cn$1, c as Switch, B as Button, R as LoaderCircle, cd as buttonVariants, i as isWebUI, U as FolderOpen, C as Check, d as Copy, f as extractErrorMessage, aG as reduceFlushStreaming, aF as reduceSessionNotification, g as copyText, ad as React, ce as Tooltip, cf as TooltipTrigger, cg as TooltipContent, S as ScrollArea, a5 as Bot, ch as formatDuration, af as getDefaultExportFromCjs, ci as ReactDOM, Y as subscribe, cj as clientId, A as DropdownMenu, E as DropdownMenuTrigger, ck as ChevronDown, F as DropdownMenuContent, G as DropdownMenuItem, cl as v$2, J as generateUUID, cm as HoverCard, cn as HoverCardTrigger, co as HoverCardContent, cp as X$1, aI as Folder, L as Library, cq as DropdownMenuSub, cr as DropdownMenuSubTrigger, cs as DropdownMenuSubContent, ct as CircleQuestionMark, cu as ChevronUp, aH as Clock, aB as Tabs, aC as TabsList, aD as TabsTrigger, cv as z$1, a0 as CircleCheck, cw as __vitePreload, I as Input, m as ContextMenuContent, n as ContextMenuItem, o as ContextMenuSeparator, cx as Code, bk as EDITOR_LABELS, k as ContextMenu, l as ContextMenuTrigger, aE as webUIBaseUrl, aa as ChevronRight, cy as MessageSquare, cz as FolderPlus, P as Pencil, T as Trash2, cA as useProjectState, cB as TabsContent } from "./index-LmYTNvdF.js";
-import { S as Settings2 } from "./settings-2-DRhoXOO8.js";
-import { i as isValidMessageToDisplay, M as MessageBubble, A as ArrowUpToLine, S as Square, j as jsonToPrettyYamlExports, p as parseFileReference, c as CodeCompareView, r as resolveFileUrl, I as ImageView, P as PdfView, D as DocxView, a as PptxView, X as XlsxView, R as RotateCcw, F as Folders } from "./xlsx-view-Bv0YhA5m.js";
-import { M as Mic, C as Clipboard } from "./mic-BgSvicCB.js";
-import { I as Image, W as Wrench } from "./wrench-7r-g9MUq.js";
-import { F as FileText } from "./file-text-nGCW6zu1.js";
-import { A as ArrowLeft } from "./arrow-left-CxS1t3f7.js";
-import { aQ as CodeView, S as StreamMarkdown, aR as FileIcon } from "./mermaid-GHXKKRXX-CZqkhGx7.js";
-import { S as Search } from "./search-BEY9yGF_.js";
-import { E as ExternalLink } from "./link-2-DHUPzNSt.js";
-import { R as RefreshCw } from "./refresh-cw-Bvm578nW.js";
-import { P as Plus } from "./plus-YNCXW-GD.js";
-import { R as ResizablePanelGroup, a as ResizablePanel, b as ResizableHandle } from "./resizable-cStzNJ8V.js";
-import "./collapsible-CMuCJUWG.js";
-import "./item-BHEUMM9H.js";
+const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./code-editor-tm0AYOLz.js","./index-BUwXrbHW.js","./index-DOIzYXAl.css","./mermaid-GHXKKRXX-CqMNodCp.js","./code-editor-BwxubRqT.css"])))=>i.map(i=>d[i]);
+import { c as createLucideIcon, r as reactExports, av as formatErrorMessage, bz as ReactStore, bA as popupStoreSelectors, bB as triggerHover, au as triggerPress, bC as escapeKey, bD as attachPreventUnmountOnClose, bE as closePress, bF as PATIENT_CLICK_THRESHOLD, an as reactDomExports, bG as focusOut, bH as setPopupOpenState, bI as createInitialPopupStoreState, bJ as createPopupFloatingRootContext, bK as Timeout, bL as PopupTriggerMap, j as jsxRuntimeExports, bM as FloatingTree, bN as usePopupRootSync, bO as useImplicitActiveTrigger, bP as useOpenStateTransitions, at as createChangeEventDetails, bQ as imperativeAction, bR as PopupHandleAttachment, bS as usePopupRootStore, bT as useDismiss, bU as usePopupInteractionProps, bV as usePopupHandleStore, ar as useBaseUiId, bW as useTriggerDataForwarding, bX as useHoverReferenceInteraction, bY as safePolygon, bZ as useClick, b_ as useOpenMethodTriggerProps, az as useButton, b$ as useTriggerFocusGuards, ay as useRenderElement, c0 as CLICK_TRIGGER_IDENTIFIER, c1 as FocusGuard, c2 as pressableTriggerOpenStateMapping, c3 as triggerOpenStateMapping, c4 as FloatingPortal, c5 as POPUP_COLLISION_AVOIDANCE, c6 as useFloatingNodeId, aC as useAnimationsFinished, c7 as useAnchorPositioning, aD as useIsoLayoutEffect, c8 as useAnchoredPopupScrollLock, c9 as usePositioner, ca as InternalBackdrop, cb as inertValue, cc as FloatingNode, as as useStableCallback, cd as useToolbarRootContext, aE as useOpenChangeComplete, ce as useHoverFloatingInteraction, cf as createDefaultInitialFocus, cg as FOCUSABLE_POPUP_PROPS, bj as COMPOSITE_KEYS, ch as getDisabledMountTransitionStyles, ci as FloatingFocusManager, cj as isHTMLElement, ck as popupTransitionStateMapping, u as useTranslation, b as useMessage, X as useNavigate, a as useAppStore, f as request, g as extractErrorMessage, _ as Badge, cl as formatUpdatedTime, V as electron, aK as Tabs, aL as TabsList, aM as TabsTrigger, af as ALL_FEATURES, ag as FEATURE_I18N_KEYS, M as cn$1, d as Switch, B as Button, R as LoaderCircle, cm as buttonVariants, C as Check, e as Copy, i as isWebUI, U as FolderOpen, cn as restartSession, co as SessionLifecycleBusyError, cp as closeSession, h as copyText, cq as RestartSessionError, am as React, cr as Tooltip, cs as TooltipTrigger, ct as TooltipContent, cu as useFocusTarget, S as ScrollArea, a1 as Bot, cv as formatDuration, ao as getDefaultExportFromCjs, cw as ReactDOM, Y as subscribe, cx as clientId, A as DropdownMenu, E as DropdownMenuTrigger, cy as ChevronDown, F as DropdownMenuContent, G as DropdownMenuItem, cz as v$2, J as generateUUID, aP as reduceFlushStreaming, cA as HoverCard, cB as HoverCardTrigger, cC as HoverCardContent, cD as X$1, aR as Folder, L as Library, cE as DropdownMenuSub, cF as DropdownMenuSubTrigger, cG as DropdownMenuSubContent, cH as CircleQuestionMark, cI as ChevronUp, aQ as Clock, cJ as z$1, a0 as CircleCheck, cK as __vitePreload, I as Input, m as ContextMenuContent, n as ContextMenuItem, o as ContextMenuSeparator, cL as Code, bt as EDITOR_LABELS, k as ContextMenu, l as ContextMenuTrigger, aN as webUIBaseUrl, a6 as RefreshCw, a7 as ChevronRight, cM as MessageSquare, cN as FolderPlus, cO as Eye, P as Pencil, T as Trash2, cP as useProjectState, cQ as useFocusTargetRegistry, cR as TabsContent, cS as loadSession } from "./index-BUwXrbHW.js";
+import { S as Settings2 } from "./settings-2-BwfZrIw6.js";
+import { i as isValidMessageToDisplay, M as MessageBubble, A as ArrowUpToLine, S as Square, j as jsonToPrettyYamlExports, p as parseFileReference, c as CodeCompareView, r as resolveFileUrl, I as ImageView, P as PdfView, D as DocxView, a as PptxView, X as XlsxView, R as RotateCcw, F as Folders } from "./xlsx-view-CQd4jbk-.js";
+import { a as ArrowDown, A as ArrowUp, b as ArrowRight } from "./arrow-up-1eI4tva4.js";
+import { M as Mic, C as Clipboard } from "./mic-CT1bYBEV.js";
+import { I as Image, W as Wrench } from "./wrench-BsjH8RPm.js";
+import { F as FileText } from "./file-text-ITbWr8iW.js";
+import { A as ArrowLeft } from "./arrow-left-CQqe9rrj.js";
+import { aQ as CodeView, S as StreamMarkdown, aR as FileIcon } from "./mermaid-GHXKKRXX-CqMNodCp.js";
+import { S as Search } from "./search-TCnuQyCi.js";
+import { E as ExternalLink } from "./link-2-DpdZfD3m.js";
+import { P as Plus } from "./plus-C5XdFVFm.js";
+import { R as ResizablePanelGroup, a as ResizablePanel, b as ResizableHandle } from "./resizable-ObbINbIB.js";
+import "./collapsible-DD6NlDid.js";
+import "./item-Dph2aCdz.js";
 import "./schemas-c0X-G5_P.js";
-import "./ellipsis-D1agTYu1.js";
-const __iconNode$k = [
-  ["path", { d: "M12 5v14", key: "s699le" }],
-  ["path", { d: "m19 12-7 7-7-7", key: "1idqje" }]
-];
-const ArrowDown = createLucideIcon("arrow-down", __iconNode$k);
-const __iconNode$j = [
-  ["path", { d: "M5 12h14", key: "1ays0h" }],
-  ["path", { d: "m12 5 7 7-7 7", key: "xquz4c" }]
-];
-const ArrowRight = createLucideIcon("arrow-right", __iconNode$j);
-const __iconNode$i = [
-  ["path", { d: "m5 12 7-7 7 7", key: "hav0vg" }],
-  ["path", { d: "M12 19V5", key: "x0mq9r" }]
-];
-const ArrowUp = createLucideIcon("arrow-up", __iconNode$i);
+import "./ellipsis-92s4sSUO.js";
 const __iconNode$h = [
   [
     "path",
@@ -815,76 +800,71 @@ function ChatHeader({ session }) {
   const currentProjectInfo = projects.find((project) => project.id === currentProjectId);
   const [localMcpServers, setLocalMcpServers] = reactExports.useState([]);
   const [localFeatures, setLocalFeatures] = reactExports.useState([]);
+  const [isRestarting, setIsRestarting] = reactExports.useState(false);
   const [isClosing, setIsClosing] = reactExports.useState(false);
   const handleToggle = reactExports.useCallback((mcpId) => {
     setLocalMcpServers(
       (prev) => prev.includes(mcpId) ? prev.filter((id) => id !== mcpId) : [...prev, mcpId]
     );
   }, []);
+  const handlePermissionChange = reactExports.useCallback(
+    async (permissionMode) => {
+      try {
+        await request.updateSession({ sessionId: session.id, permissionMode });
+      } catch (err) {
+        console.error("Failed to update session permission:", err);
+        toast.error(
+          extractErrorMessage(err) || t("chatHeader.failedToUpdatePermission", "Failed to update permission.")
+        );
+      }
+    },
+    [session.id, t, toast]
+  );
   const handleSyncAndRefresh = async () => {
-    if (!session) return;
+    if (!session || isClosing || isRestarting) return;
+    setIsRestarting(true);
     try {
-      await request.updateSession({
-        sessionId: session.id,
+      await restartSession({
+        session,
         mcpServers: localMcpServers,
         features: localFeatures
       });
     } catch (err) {
-      console.error("Failed to update MCP servers:", err);
-      toast.error(
-        extractErrorMessage(err) || t("chat.failedToUpdateMcpServers", "Failed to update MCP servers")
-      );
-      return;
-    }
-    const { resetSessionState, updateSessionState, updateSession } = useAppStore.getState();
-    try {
-      updateSession({ ...session, isStreaming: false });
-      updateSessionState(session.id, (prev) => reduceFlushStreaming(prev));
-      resetSessionState(session.id);
-      updateSessionState(session.id, () => ({ isLoading: true }));
-      const result = await request.getSessionHistory({ sessionId: session.id });
-      if (!result) return;
-      let state = useAppStore.getState().getSessionState(session.id);
-      state = { ...state, messages: [], activeToolCalls: /* @__PURE__ */ new Map(), activeSubagents: /* @__PURE__ */ new Map() };
-      for (const notification of result.messages) {
-        state = reduceSessionNotification(session.id, state, notification);
-      }
-      const displayIds = new Set(
-        result.messages.map((m) => m?.update?._meta?.fello?.displayId).filter(Boolean)
-      );
-      for (const notification of state.pendingNotifications) {
-        const did = notification.update._meta?.fello?.displayId;
-        if (did && displayIds.has(did)) continue;
-        state = reduceSessionNotification(session.id, state, notification);
-      }
-      state = {
-        ...state,
-        pendingNotifications: [],
-        isLoading: false
-      };
-      updateSessionState(session.id, () => state);
-      request.loadSession({ sessionId: session.id, force: true }).catch((err) => {
-        console.error("Failed to load session:", err);
+      console.error("Failed to restart session:", err);
+      if (err instanceof SessionLifecycleBusyError) {
         toast.error(
-          extractErrorMessage(err) || t("chat.failedToLoadSession", "Failed to load session.")
+          t(
+            "chatHeader.sessionOperationInProgress",
+            "Another session operation is already in progress."
+          )
         );
-      });
-    } catch (err) {
-      console.error("Failed to load session:", err);
-      const message = extractErrorMessage(err) || t("chat.failedToLoadSession", "Failed to load session.");
-      toast.error(message);
+        return;
+      }
+      const lifecycleError = err instanceof RestartSessionError ? err : null;
+      const cause = lifecycleError?.cause ?? err;
+      const fallback = lifecycleError?.stage === "update" ? t("chat.failedToUpdateMcpServers", "Failed to update MCP servers") : t("chat.failedToLoadSession", "Failed to load session.");
+      toast.error(extractErrorMessage(cause) || fallback);
     } finally {
-      useAppStore.getState().updateSessionState(session.id, () => ({ isLoading: false }));
+      setIsRestarting(false);
     }
   };
   const handleCloseSession = async () => {
-    if (isClosing) return;
+    if (isClosing || isRestarting) return;
     setIsClosing(true);
     try {
-      await request.closeSession({ sessionId: session.id });
+      await closeSession(session.id);
       navigate("/");
     } catch (err) {
       console.error("Failed to close session:", err);
+      if (err instanceof SessionLifecycleBusyError) {
+        toast.error(
+          t(
+            "chatHeader.sessionOperationInProgress",
+            "Another session operation is already in progress."
+          )
+        );
+        return;
+      }
       toast.error(
         extractErrorMessage(err) || t("chatHeader.failedToCloseSession", "Failed to close session.")
       );
@@ -903,7 +883,7 @@ function ChatHeader({ session }) {
       children: [
         /* @__PURE__ */ jsxRuntimeExports.jsx(Badge, { variant: "outline", className: "px-1 text-[10px] uppercase select-none", children: session.agentId }),
         /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-1 min-w-0 items-baseline gap-2", children: [
-          /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "truncate text-[13px] font-normal text-sidebar-foreground/85", children: session.title || t("sidebar.newChat", "New Chat") }),
+          /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "truncate text-[13px] font-normal text-sidebar-foreground/85", children: session.title || t("sidebar.newSession", "New Session") }),
           /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "flex-1 text-[10px] text-muted-foreground truncate", children: currentProjectInfo?.cwd }),
           /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "shrink-0 text-xs text-sidebar-foreground/70 whitespace-nowrap", children: formatUpdatedTime(session.updatedAt) })
         ] }),
@@ -920,8 +900,8 @@ function ChatHeader({ session }) {
               },
               children: [
                 /* @__PURE__ */ jsxRuntimeExports.jsx(PopoverTrigger, { className: "flex size-7 items-center justify-center rounded-md text-sidebar-foreground/45 hover:bg-sidebar-accent/30 hover:text-sidebar-foreground/70 outline-none transition-colors data-pressed:bg-sidebar-accent/40", children: /* @__PURE__ */ jsxRuntimeExports.jsx(Settings2, { className: "size-4" }) }),
-                /* @__PURE__ */ jsxRuntimeExports.jsx(PopoverPortal, { children: /* @__PURE__ */ jsxRuntimeExports.jsx(PopoverPositioner, { side: "bottom", align: "end", sideOffset: 4, children: /* @__PURE__ */ jsxRuntimeExports.jsxs(PopoverPopup, { className: "z-10 min-w-96 rounded-lg border border-border bg-popover text-popover-foreground shadow-lg outline-none p-1.5 origin-(--transform-origin) data-ending-style:scale-90 data-starting-style:scale-90 data-ending-style:opacity-0 data-starting-style:opacity-0 transition-[transform,opacity] duration-100", children: [
-                  /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "space-y-1 py-1", children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsx(PopoverPortal, { children: /* @__PURE__ */ jsxRuntimeExports.jsx(PopoverPositioner, { side: "bottom", align: "end", sideOffset: 4, children: /* @__PURE__ */ jsxRuntimeExports.jsxs(PopoverPopup, { className: "z-10 w-110 rounded-lg border border-border bg-popover text-popover-foreground shadow-lg outline-none p-1.5 origin-(--transform-origin) data-ending-style:scale-90 data-starting-style:scale-90 data-ending-style:opacity-0 data-starting-style:opacity-0 transition-[transform,opacity] duration-100", children: [
+                  /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "space-y-px py-1", children: [
                     /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "px-2", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
                       CopyableRow,
                       {
@@ -950,6 +930,24 @@ function ChatHeader({ session }) {
                     ) })
                   ] }),
                   /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "border-t border-border/50 my-1" }),
+                  /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "px-2 py-1 text-xs font-semibold text-foreground/80", children: t("sidebar.newSessionDialog.permission", "Permission") }),
+                  /* @__PURE__ */ jsxRuntimeExports.jsx(
+                    Tabs,
+                    {
+                      value: session.permissionMode,
+                      onValueChange: (value) => {
+                        if (value === "ask" || value === "allow-all") {
+                          void handlePermissionChange(value);
+                        }
+                      },
+                      className: "w-full px-2 my-2",
+                      children: /* @__PURE__ */ jsxRuntimeExports.jsxs(TabsList, { className: "w-full", children: [
+                        /* @__PURE__ */ jsxRuntimeExports.jsx(TabsTrigger, { value: "ask", className: "text-xs", children: t("sidebar.newSessionDialog.permissionAsk", "Ask") }),
+                        /* @__PURE__ */ jsxRuntimeExports.jsx(TabsTrigger, { value: "allow-all", className: "text-xs", children: t("sidebar.newSessionDialog.permissionAllowAll", "Allow all") })
+                      ] })
+                    }
+                  ),
+                  /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "border-t border-border/50 my-1" }),
                   /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "px-2 py-1 text-xs font-semibold text-foreground/80", children: t("constant.feature.title", "Features") }),
                   /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: ALL_FEATURES.length >= 2 ? "grid grid-cols-2 gap-0.5" : "", children: ALL_FEATURES.map((feature) => /* @__PURE__ */ jsxRuntimeExports.jsxs(
                     "div",
@@ -1024,14 +1022,17 @@ function ChatHeader({ session }) {
                     )
                   ] }),
                   /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "mt-1 flex gap-1", children: [
-                    /* @__PURE__ */ jsxRuntimeExports.jsx(
+                    /* @__PURE__ */ jsxRuntimeExports.jsxs(
                       Button,
                       {
                         size: "xs",
                         className: "flex flex-3 items-center gap-2 h-7 text-xs font-normal",
                         onClick: handleSyncAndRefresh,
-                        disabled: isClosing,
-                        children: /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: t("chatHeader.refresh", "Restart Session") })
+                        disabled: isClosing || isRestarting,
+                        children: [
+                          isRestarting && /* @__PURE__ */ jsxRuntimeExports.jsx(LoaderCircle, { className: "size-3 animate-spin" }),
+                          /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: t("chatHeader.refresh", "Restart Session") })
+                        ]
                       }
                     ),
                     /* @__PURE__ */ jsxRuntimeExports.jsxs(
@@ -1041,7 +1042,7 @@ function ChatHeader({ session }) {
                         variant: "destructive",
                         className: "flex flex-1 items-center gap-1.5 h-7 text-xs font-normal",
                         onClick: handleCloseSession,
-                        disabled: isClosing,
+                        disabled: isClosing || isRestarting,
                         children: [
                           isClosing && /* @__PURE__ */ jsxRuntimeExports.jsx(LoaderCircle, { className: "size-3 animate-spin" }),
                           /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: isClosing ? t("chatHeader.closingSession", "Closing…") : t("chatHeader.closeSession", "Close Session") })
@@ -1175,23 +1176,23 @@ function CopyableRow({
       ":"
     ] }),
     /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "flex-1 min-w-0 truncate font-mono text-muted-foreground/70 select-all", children: value }),
-    !isWebUI && onOpenFolder && /* @__PURE__ */ jsxRuntimeExports.jsx(
+    /* @__PURE__ */ jsxRuntimeExports.jsx(
       "button",
       {
         type: "button",
         className: "shrink-0 flex items-center justify-center size-5 rounded hover:bg-accent/50 text-muted-foreground/50 hover:text-muted-foreground transition-colors -mr-1",
-        onClick: onOpenFolder,
-        title: openFolderTitle,
-        children: /* @__PURE__ */ jsxRuntimeExports.jsx(FolderOpen, { className: "size-3" })
+        onClick: handleCopy,
+        children: copied ? /* @__PURE__ */ jsxRuntimeExports.jsx(Check, { className: "size-3" }) : /* @__PURE__ */ jsxRuntimeExports.jsx(Copy, { className: "size-3" })
       }
     ),
-    /* @__PURE__ */ jsxRuntimeExports.jsx(
+    !isWebUI && onOpenFolder && /* @__PURE__ */ jsxRuntimeExports.jsx(
       "button",
       {
         type: "button",
         className: "shrink-0 flex items-center justify-center size-5 rounded hover:bg-accent/50 text-muted-foreground/50 hover:text-muted-foreground transition-colors -mr-1",
-        onClick: handleCopy,
-        children: copied ? /* @__PURE__ */ jsxRuntimeExports.jsx(Check, { className: "size-3" }) : /* @__PURE__ */ jsxRuntimeExports.jsx(Copy, { className: "size-3" })
+        onClick: onOpenFolder,
+        title: openFolderTitle,
+        children: /* @__PURE__ */ jsxRuntimeExports.jsx(FolderOpen, { className: "size-3" })
       }
     )
   ] });
@@ -1372,14 +1373,14 @@ function ChatTimeline({ items, activeDisplayId, onSelect: onSelect2 }) {
             {
               type: "button",
               onClick: () => handleSelect(item.displayId),
-              className: "p-1 group pointer-events-auto",
+              className: "p-1 group/timeline pointer-events-auto outline-0",
               "aria-label": ariaLabel,
               children: /* @__PURE__ */ jsxRuntimeExports.jsx(
                 "div",
                 {
                   className: cn$1(
-                    "size-2 rounded-full transition-colors outline-none focus-visible:ring-[3px] focus-visible:ring-ring/50",
-                    isActive ? "bg-foreground/40" : "bg-muted-foreground/15 group-hover:bg-muted-foreground/40"
+                    "size-2 rounded-full transition-colors outline-none group-focus-visible/timeline:ring-1 group-focus-visible/timeline:ring-ring",
+                    isActive ? "bg-foreground/40" : "bg-muted-foreground/15 group-hover/timeline:bg-muted-foreground/40"
                   )
                 }
               )
@@ -1438,6 +1439,12 @@ function ChatArea({ session }) {
   const getViewport = reactExports.useCallback(() => {
     return scrollAreaRef.current?.querySelector('[data-slot="scroll-area-viewport"]');
   }, []);
+  const focusChatArea = reactExports.useCallback(() => {
+    const viewport = getViewport();
+    if (!viewport) return;
+    viewport.focus({ preventScroll: true });
+  }, [getViewport]);
+  useFocusTarget("chat-area", focusChatArea);
   const scrollToBottom = reactExports.useCallback((behavior) => {
     if (scrollTimeoutRef.current) {
       clearTimeout(scrollTimeoutRef.current);
@@ -1708,7 +1715,7 @@ function ChatArea({ session }) {
   const copyText$1 = reactExports.useCallback(async (text) => {
     return copyText(text);
   }, []);
-  return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "w-full relative min-h-0 flex flex-1 overflow-hidden", children: [
+  return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "w-full relative min-h-0 flex flex-1 group/chat-area", children: [
     /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "shrink-0 w-6 -mr-6 relative z-1 pointer-events-none", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
       ChatTimeline,
       {
@@ -1722,7 +1729,7 @@ function ChatArea({ session }) {
       {
         ref: scrollAreaRef,
         className: "flex-1 w-full transform-gpu",
-        viewportClassName: "animate-in fade-in",
+        viewportClassName: "animate-in fade-in chat-area",
         children: [
           hasMore && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-3 px-10 py-3 max-w-5xl mx-auto", children: [
             /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex-1 border-b border-dashed border-muted-foreground/30" }),
@@ -1892,7 +1899,8 @@ function ChatArea({ session }) {
         "aria-label": t("chatArea.scrollToBottom", "Scroll to bottom"),
         children: /* @__PURE__ */ jsxRuntimeExports.jsx(ArrowDown, { className: "size-4" })
       }
-    )
+    ),
+    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "pointer-events-none absolute -top-px left-0 right-0 h-px bg-linear-to-r from-ring/30 from-10% via-ring/80 via-30% to-ring/30 animate-out fill-mode-both fade-out ease-out duration-1500 hidden group-has-[.chat-area:focus-visible]/chat-area:block" })
   ] });
 }
 function _arrayWithoutHoles$1(arr) {
@@ -4586,7 +4594,10 @@ function useRealtimeAsr(options) {
 }
 const ASR_WAVEFORM_BARS = [0.35, 0.65, 0.95, 0.55, 0.8, 0.45, 0.9, 0.6, 0.38];
 const DEFAULT_MAX_DURATION = 5 * 60 * 1e3;
+const ALT_DOUBLE_PRESS_WINDOW = 350;
 const VOICE_INPUT_DEVICE_STORAGE_KEY = "fello.voice-input.device-id";
+let activeVoiceRecording = null;
+let voiceRecordingStartChain = Promise.resolve();
 function getInputCursor(input) {
   return input.selectionStart ?? input.value.length;
 }
@@ -4599,11 +4610,16 @@ function VoiceInputButton({
 }) {
   const { t } = useTranslation();
   const { toast } = useMessage();
+  const altDoublePressEnabled = useAppStore((state) => state.voiceInput.altDoublePress);
+  const [instanceId] = reactExports.useState(() => /* @__PURE__ */ Symbol("VoiceInputButton"));
+  const stopAsrRef = reactExports.useRef(() => Promise.resolve());
   const asrApplyingRef = reactExports.useRef(false);
   const asrSegmentsRef = reactExports.useRef(/* @__PURE__ */ new Map());
   const asrTailRef = reactExports.useRef(0);
   const asrCurrentKeyRef = reactExports.useRef(null);
   const asrSequenceRef = reactExports.useRef(0);
+  const lastAltTapAtRef = reactExports.useRef(null);
+  const suppressAltUntilRef = reactExports.useRef(0);
   const freezeAsrSegments = reactExports.useCallback(() => {
     asrSegmentsRef.current.clear();
     asrCurrentKeyRef.current = null;
@@ -4639,17 +4655,32 @@ function VoiceInputButton({
     },
     [inputRef]
   );
+  const handleRecordingChange = reactExports.useCallback(
+    (recording) => {
+      if (recording) {
+        activeVoiceRecording = {
+          owner: instanceId,
+          stop: () => stopAsrRef.current()
+        };
+      } else {
+        freezeAsrSegments();
+        if (activeVoiceRecording?.owner === instanceId) {
+          activeVoiceRecording = null;
+        }
+      }
+    },
+    [freezeAsrSegments, instanceId]
+  );
   const asr = useRealtimeAsr({
     onTranscript: applyAsrTranscript,
     onError: (message) => toast.error(message),
-    onRecordingChange: (recording) => {
-      if (!recording) freezeAsrSegments();
-    }
+    onRecordingChange: handleRecordingChange
   });
   const { start: startAsr, stop: stopAsr, refreshInputDevices } = asr;
   const handleStop = reactExports.useCallback(async () => {
     await stopAsr();
   }, [stopAsr]);
+  stopAsrRef.current = handleStop;
   reactExports.useImperativeHandle(
     ref,
     () => ({
@@ -4659,23 +4690,28 @@ function VoiceInputButton({
   );
   const handleStart = reactExports.useCallback(
     async (deviceId) => {
-      const textarea = inputRef.current;
-      if (!textarea) return;
-      textarea.focus();
-      const cursorPosition = getInputCursor(textarea);
-      const before = textarea.value.slice(0, cursorPosition);
-      if (before.length > 0 && !/\s$/.test(before)) {
-        asrApplyingRef.current = true;
-        try {
-          document.execCommand("insertText", false, " ");
-        } finally {
-          asrApplyingRef.current = false;
+      const startOperation = voiceRecordingStartChain.then(async () => {
+        await activeVoiceRecording?.stop();
+        const textarea = inputRef.current;
+        if (!textarea) return;
+        textarea.focus();
+        const cursorPosition = getInputCursor(textarea);
+        const before = textarea.value.slice(0, cursorPosition);
+        if (before.length > 0 && !/\s$/.test(before)) {
+          asrApplyingRef.current = true;
+          try {
+            document.execCommand("insertText", false, " ");
+          } finally {
+            asrApplyingRef.current = false;
+          }
         }
-      }
-      asrSegmentsRef.current.clear();
-      asrCurrentKeyRef.current = null;
-      asrTailRef.current = getInputCursor(textarea);
-      await startAsr(deviceId);
+        asrSegmentsRef.current.clear();
+        asrCurrentKeyRef.current = null;
+        asrTailRef.current = getInputCursor(textarea);
+        await startAsr(deviceId);
+      });
+      voiceRecordingStartChain = startOperation.catch(() => void 0);
+      await startOperation;
     },
     [startAsr, inputRef]
   );
@@ -4687,6 +4723,7 @@ function VoiceInputButton({
     }
   });
   const [deviceMenuOpen, setDeviceMenuOpen] = reactExports.useState(false);
+  const [starting, setStarting] = reactExports.useState(false);
   const rememberDevice = reactExports.useCallback((deviceId) => {
     setSavedDeviceId(deviceId);
     try {
@@ -4702,14 +4739,44 @@ function VoiceInputButton({
     [rememberDevice]
   );
   const handleMicClick = reactExports.useCallback(async () => {
-    const devices = await refreshInputDevices();
-    const hasSavedDevice = savedDeviceId != null && devices.some((device) => device.deviceId === savedDeviceId);
-    if (hasSavedDevice) {
-      await handleStart(savedDeviceId);
-    } else {
-      setDeviceMenuOpen(true);
+    if (disabled || !asr.configured || starting) return;
+    setStarting(true);
+    try {
+      const devices = await refreshInputDevices();
+      const hasSavedDevice = savedDeviceId != null && devices.some((device) => device.deviceId === savedDeviceId);
+      if (hasSavedDevice) {
+        await handleStart(savedDeviceId);
+      } else {
+        setDeviceMenuOpen(true);
+      }
+    } finally {
+      setStarting(false);
+    }
+  }, [asr.configured, disabled, handleStart, refreshInputDevices, savedDeviceId, starting]);
+  const handleShortcutToggle = reactExports.useCallback(async () => {
+    if (disabled || !asr.configured || starting) return;
+    if (asr.recording) {
+      await handleStop();
+      return;
+    }
+    setStarting(true);
+    try {
+      const devices = await refreshInputDevices();
+      const hasSavedDevice = savedDeviceId != null && devices.some((device) => device.deviceId === savedDeviceId);
+      await handleStart(hasSavedDevice ? savedDeviceId : void 0);
+    } finally {
+      setStarting(false);
     }
-  }, [refreshInputDevices, handleStart, savedDeviceId]);
+  }, [
+    asr.configured,
+    asr.recording,
+    disabled,
+    handleStart,
+    handleStop,
+    refreshInputDevices,
+    savedDeviceId,
+    starting
+  ]);
   const handleDeviceMenuChange = reactExports.useCallback(
     (open) => {
       setDeviceMenuOpen(open);
@@ -4717,6 +4784,76 @@ function VoiceInputButton({
     },
     [refreshInputDevices]
   );
+  reactExports.useEffect(() => {
+    lastAltTapAtRef.current = null;
+    const handleKeyDown = (event) => {
+      const input = inputRef.current;
+      if (!input || document.activeElement !== input) {
+        lastAltTapAtRef.current = null;
+        return;
+      }
+      if (event.key === "Escape") {
+        lastAltTapAtRef.current = null;
+        suppressAltUntilRef.current = 0;
+        if (!event.repeat && !event.ctrlKey && !event.metaKey && !event.shiftKey && asr.recording) {
+          event.preventDefault();
+          void handleStop();
+        }
+        return;
+      }
+      if (event.key !== "Alt") {
+        lastAltTapAtRef.current = null;
+        return;
+      }
+      if (!altDoublePressEnabled || event.repeat || event.ctrlKey || event.metaKey || event.shiftKey) {
+        lastAltTapAtRef.current = null;
+        return;
+      }
+      const now = Date.now();
+      if (now < suppressAltUntilRef.current) {
+        lastAltTapAtRef.current = null;
+        return;
+      }
+      if (asr.recording) {
+        lastAltTapAtRef.current = null;
+        suppressAltUntilRef.current = now + ALT_DOUBLE_PRESS_WINDOW;
+        event.preventDefault();
+        void handleStop();
+        return;
+      }
+      const lastTapAt = lastAltTapAtRef.current;
+      if (lastTapAt !== null && now - lastTapAt <= ALT_DOUBLE_PRESS_WINDOW) {
+        lastAltTapAtRef.current = null;
+        event.preventDefault();
+        void handleShortcutToggle();
+      }
+    };
+    const handleKeyUp = (event) => {
+      if (event.key !== "Alt") return;
+      const input = inputRef.current;
+      if (!input || document.activeElement !== input) {
+        lastAltTapAtRef.current = null;
+        return;
+      }
+      if (Date.now() < suppressAltUntilRef.current) {
+        lastAltTapAtRef.current = null;
+        return;
+      }
+      lastAltTapAtRef.current = Date.now();
+    };
+    const resetAltTap = () => {
+      lastAltTapAtRef.current = null;
+      suppressAltUntilRef.current = 0;
+    };
+    window.addEventListener("keydown", handleKeyDown);
+    window.addEventListener("keyup", handleKeyUp);
+    window.addEventListener("blur", resetAltTap);
+    return () => {
+      window.removeEventListener("keydown", handleKeyDown);
+      window.removeEventListener("keyup", handleKeyUp);
+      window.removeEventListener("blur", resetAltTap);
+    };
+  }, [altDoublePressEnabled, asr.recording, handleShortcutToggle, handleStop, inputRef]);
   reactExports.useEffect(() => {
     const textarea = inputRef.current;
     if (!textarea) return;
@@ -4739,7 +4876,7 @@ function VoiceInputButton({
     "div",
     {
       className: cn$1(
-        "relative inline-flex h-7 transition-[width] duration-300 ease-out",
+        "relative inline-flex h-7 transition-[width] duration-300 ease-out flex-none",
         asr.recording ? "w-18" : "w-12.5",
         className
       ),
@@ -4802,10 +4939,11 @@ function VoiceInputButton({
                     size: "sm",
                     className: "h-full w-8 rounded-r-none border-r-0 bg-muted hover:bg-input border border-input text-amber-300/50 hover:text-amber-200",
                     onClick: () => void handleMicClick(),
-                    disabled: disabled || !asr.configured,
-                    "aria-label": t("chatInput.voiceInput", "Voice input"),
-                    title: asr.configured ? t("chatInput.voiceInput", "Voice input") : t("chatInput.voiceInputNotConfigured", "Configure voice input in Settings"),
-                    children: /* @__PURE__ */ jsxRuntimeExports.jsx(Mic, { className: "size-3.5" })
+                    disabled: disabled || !asr.configured || starting,
+                    "aria-busy": starting,
+                    "aria-label": starting ? t("chatInput.startingVoiceInput", "Starting voice input") : t("chatInput.voiceInput", "Voice input"),
+                    title: starting ? t("chatInput.startingVoiceInput", "Starting voice input") : asr.configured ? t("chatInput.voiceInput", "Voice input") : t("chatInput.voiceInputNotConfigured", "Configure voice input in Settings"),
+                    children: starting ? /* @__PURE__ */ jsxRuntimeExports.jsx(LoaderCircle, { className: "size-3.5 animate-spin" }) : /* @__PURE__ */ jsxRuntimeExports.jsx(Mic, { className: "size-3.5" })
                   }
                 ),
                 /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -4816,7 +4954,7 @@ function VoiceInputButton({
                       {
                         size: "icon",
                         className: "h-full w-4.5 rounded-l-none bg-muted hover:bg-input border border-input border-l-0 px-0 text-amber-300/50 hover:text-amber-200",
-                        disabled: disabled || !asr.configured,
+                        disabled: disabled || !asr.configured || starting,
                         "aria-label": t("chatInput.selectVoiceInputDevice", "Select microphone"),
                         title: t("chatInput.selectVoiceInputDevice", "Select microphone")
                       }
@@ -4996,6 +5134,13 @@ function ChatInput({ session }) {
   const textareaRef = reactExports.useRef(null);
   const voiceInputRef = reactExports.useRef(null);
   const getTextarea = reactExports.useCallback(() => textareaRef.current, []);
+  const focusInput = reactExports.useCallback(() => {
+    const textarea = getTextarea();
+    if (!textarea || textarea.disabled) return false;
+    textarea.focus({ preventScroll: true });
+    return document.activeElement === textarea;
+  }, [getTextarea]);
+  useFocusTarget("chat-input", focusInput);
   const insertTriggerChar = reactExports.useCallback(
     (char) => {
       const textarea = getTextarea();
@@ -5554,14 +5699,14 @@ function ChatInput({ session }) {
             /* @__PURE__ */ jsxRuntimeExports.jsxs(
               "div",
               {
-                className: "flex cursor-text items-center justify-between gap-2 px-2 pb-2 overflow-hidden",
+                className: "flex cursor-text items-center justify-between gap-2 -mt-3 overflow-hidden",
                 onClick: (e) => {
                   const target = e.target;
                   if (target.closest("button, select, [role='combobox']")) return;
                   getTextarea()?.focus();
                 },
                 children: [
-                  /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-2 overflow-hidden", children: [
+                  /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-2 p-2 overflow-hidden -mr-4", children: [
                     availableModes.length > 0 && /* @__PURE__ */ jsxRuntimeExports.jsxs(DropdownMenu, { children: [
                       /* @__PURE__ */ jsxRuntimeExports.jsxs(
                         DropdownMenuTrigger,
@@ -5571,7 +5716,7 @@ function ChatInput({ session }) {
                             {
                               variant: "outline",
                               size: "sm",
-                              className: "h-7 text-xs text-muted-foreground hover:text-foreground gap-2 max-w-48 shrink overflow-hidden"
+                              className: "h-7 min-w-16 text-xs text-muted-foreground hover:text-foreground gap-2 max-w-48 shrink overflow-hidden"
                             }
                           ),
                           children: [
@@ -5693,7 +5838,7 @@ function ChatInput({ session }) {
                       ] })
                     ] })
                   ] }),
-                  /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-2 overflow-hidden", children: [
+                  /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-2 p-2 overflow-hidden", children: [
                     availableModels.length > 0 ? /* @__PURE__ */ jsxRuntimeExports.jsxs(DropdownMenu, { children: [
                       /* @__PURE__ */ jsxRuntimeExports.jsxs(
                         DropdownMenuTrigger,
@@ -5703,7 +5848,7 @@ function ChatInput({ session }) {
                             {
                               variant: "outline",
                               size: "sm",
-                              className: "h-7 text-xs text-muted-foreground hover:text-foreground gap-2 max-w-48 shrink overflow-hidden"
+                              className: "h-7 min-w-16 text-xs text-muted-foreground hover:text-foreground gap-2 max-w-48 shrink overflow-hidden"
                             }
                           ),
                           children: [
@@ -5839,14 +5984,7 @@ function ChatInput({ session }) {
                         }
                       )
                     ] }),
-                    /* @__PURE__ */ jsxRuntimeExports.jsx(
-                      VoiceInputButton,
-                      {
-                        ref: voiceInputRef,
-                        inputRef: textareaRef,
-                        disabled
-                      }
-                    ),
+                    /* @__PURE__ */ jsxRuntimeExports.jsx(VoiceInputButton, { ref: voiceInputRef, inputRef: textareaRef, disabled }),
                     isStreaming ? /* @__PURE__ */ jsxRuntimeExports.jsx(
                       Button,
                       {
@@ -5890,14 +6028,14 @@ const mentionsInputStyle = {
     highlighter: {
       padding: "12px 16px 8px",
       border: "none",
-      maxHeight: 200
+      maxHeight: "80vh"
     },
     input: {
       padding: "12px 16px 8px",
       border: "none",
       outline: "none",
       overflow: "auto",
-      maxHeight: 200,
+      maxHeight: "80vh",
       color: "var(--foreground)",
       fontSize: 13,
       lineHeight: "1.5",
@@ -5990,12 +6128,15 @@ function AskUserDialog({ sessionId }) {
         "div",
         {
           ref: cardRef,
+          role: "dialog",
+          "aria-labelledby": "ask-user-dialog-title",
+          "aria-describedby": currentRequest.description ? "ask-user-dialog-description" : void 0,
           onClick: () => setCollapsed(false),
           className: "grid grid-rows-[auto_1fr_auto] rounded-xl border border-border bg-card p-4 shadow-lg shadow-primary/5 max-h-[90vh]",
           children: [
             /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-2 mb-3 min-h-0", children: [
               /* @__PURE__ */ jsxRuntimeExports.jsx(CircleQuestionMark, { className: "size-4.5 shrink-0 text-sky-500" }),
-              /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-sm font-medium leading-snug truncate", children: currentRequest.title || t("askUser.title", "Request") }),
+              /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { id: "ask-user-dialog-title", className: "text-sm font-medium leading-snug truncate", children: currentRequest.title || t("askUser.title", "Request") }),
               /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center ml-auto gap-1", children: [
                 currentRequest.timeoutAt != null && /* @__PURE__ */ jsxRuntimeExports.jsx(AskUserCountdown, { timeoutAt: currentRequest.timeoutAt }),
                 /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -6009,13 +6150,14 @@ function AskUserDialog({ sessionId }) {
                       setCollapsed((c) => !c);
                     },
                     "aria-label": collapsed ? t("askUser.expand", "Expand") : t("askUser.collapse", "Collapse"),
+                    "aria-expanded": !collapsed,
                     title: collapsed ? t("askUser.expand", "Expand") : t("askUser.collapse", "Collapse"),
                     children: collapsed ? /* @__PURE__ */ jsxRuntimeExports.jsx(ChevronUp, { className: "size-4" }) : /* @__PURE__ */ jsxRuntimeExports.jsx(ChevronDown, { className: "size-4" })
                   }
                 )
               ] })
             ] }),
-            currentRequest.description && /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "min-h-0 overflow-hidden", children: /* @__PURE__ */ jsxRuntimeExports.jsx(ScrollArea, { className: "h-full rounded-md bg-muted/40", children: /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "py-3 px-2", children: /* @__PURE__ */ jsxRuntimeExports.jsx("pre", { className: "text-xs text-muted-foreground leading-relaxed whitespace-pre-wrap", children: /* @__PURE__ */ jsxRuntimeExports.jsx("code", { children: formatDescription(currentRequest.description) }) }) }) }) }),
+            currentRequest.description && /* @__PURE__ */ jsxRuntimeExports.jsx("div", { id: "ask-user-dialog-description", className: "min-h-0 overflow-hidden", children: /* @__PURE__ */ jsxRuntimeExports.jsx(ScrollArea, { className: "h-full rounded-md bg-muted/40", children: /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "py-3 px-2", children: /* @__PURE__ */ jsxRuntimeExports.jsx("pre", { className: "text-xs text-muted-foreground leading-relaxed whitespace-pre-wrap", children: /* @__PURE__ */ jsxRuntimeExports.jsx("code", { children: formatDescription(currentRequest.description) }) }) }) }) }),
             /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: cn$1("pt-3 min-h-0", collapsed ? "pointer-events-none" : ""), children: /* @__PURE__ */ jsxRuntimeExports.jsx(
               AskUserOptions,
               {
@@ -6079,12 +6221,21 @@ function AskUserOptions({
   const [highlightedIndex, setHighlightedIndex] = reactExports.useState(null);
   const [isDragOver, setIsDragOver] = reactExports.useState(false);
   const inputContainerRef = reactExports.useRef(null);
+  const optionRefs = reactExports.useRef([]);
+  const otherButtonRef = reactExports.useRef(null);
   const textareaRef = reactExports.useRef(null);
   const voiceInputRef = reactExports.useRef(null);
   const navigate = useNavigate();
   const snippets = useAppStore((s15) => s15.snippets);
   const fileInputRef = reactExports.useRef(null);
   const getTextarea = reactExports.useCallback(() => textareaRef.current, []);
+  const focusAskUser = reactExports.useCallback(() => {
+    const target = mode === "input" ? textareaRef.current : optionRefs.current[0];
+    if (!target || target.disabled) return false;
+    target.focus({ preventScroll: true });
+    return document.activeElement === target;
+  }, [mode]);
+  useFocusTarget("ask-user-dialog", focusAskUser);
   const insertTriggerChar = reactExports.useCallback(
     (char) => {
       const textarea = getTextarea();
@@ -6254,31 +6405,53 @@ function AskUserOptions({
     }
   };
   reactExports.useEffect(() => {
-    if (mode === "input") {
-      textareaRef.current?.focus();
-    }
+    if (mode !== "input") return;
+    textareaRef.current?.focus();
   }, [mode]);
+  reactExports.useEffect(() => {
+    if (mode !== "options" || !hasOptions) return;
+    const frame = window.requestAnimationFrame(() => optionRefs.current[0]?.focus());
+    return () => window.cancelAnimationFrame(frame);
+  }, [hasOptions, mode]);
+  const handleOptionKeyDown = (event, index) => {
+    const { key } = event;
+    if (key === "ArrowDown" || key === "ArrowUp" || key === "Home" || key === "End") {
+      event.preventDefault();
+      event.stopPropagation();
+      if (key === "Home") {
+        optionRefs.current[0]?.focus();
+      } else if (key === "End") {
+        if (showOther) otherButtonRef.current?.focus();
+        else optionRefs.current[request$1.options.length - 1]?.focus();
+      } else if (key === "ArrowDown") {
+        if (index < request$1.options.length - 1) {
+          optionRefs.current[index + 1]?.focus();
+        } else if (showOther) {
+          otherButtonRef.current?.focus();
+        }
+      } else if (index > 0) {
+        optionRefs.current[index - 1]?.focus();
+      }
+    }
+  };
   return /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
     mode === "options" && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-col gap-2", children: [
       request$1.options.map((option, index) => /* @__PURE__ */ jsxRuntimeExports.jsxs(
-        "div",
+        "button",
         {
-          role: "button",
-          tabIndex: 0,
-          className: `relative flex w-full min-h-8 py-2 px-2 text-xs text-left rounded-lg border transition-all select-none focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 active:translate-y-px ${highlightedIndex === index ? "ring-1 ring-sky-500 bg-sky-500/10 border-sky-500/30" : option.danger ? "bg-destructive/10 text-destructive hover:bg-destructive/20 border-destructive/20" : "bg-secondary/50 hover:bg-secondary hover:text-foreground"}`,
-          onClick: () => handleSelectOption(option.value),
-          onKeyDown: (e) => {
-            if (e.key === "Enter" || e.key === " ") {
-              e.preventDefault();
-              handleSelectOption(option.value);
-            }
+          ref: (element) => {
+            optionRefs.current[index] = element;
           },
+          type: "button",
+          className: `relative flex w-full min-h-8 py-2 px-2 text-xs text-left rounded-lg border transition-all select-none focus-visible:border-ring focus-visible:ring-1 focus-visible:ring-ring/50 active:translate-y-px ${highlightedIndex === index ? "ring-1 ring-sky-500 bg-sky-500/10 border-sky-500/30" : option.danger ? "bg-destructive/10 text-destructive hover:bg-destructive/20 border-destructive/20" : "bg-secondary/50 hover:bg-secondary hover:text-foreground"}`,
+          onClick: () => handleSelectOption(option.value),
+          onKeyDown: (event) => handleOptionKeyDown(event, index),
           children: [
             /* @__PURE__ */ jsxRuntimeExports.jsxs("span", { className: "inline-flex items-start gap-1.5 w-full", children: [
               /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "inline-flex size-5 items-center justify-center rounded bg-muted-foreground/10 text-[10px] font-mono shrink-0 self-start mt-0.5", children: index + 1 }),
               /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "min-w-0 flex-1 whitespace-normal self-start py-1", children: option.label })
             ] }),
-            /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "absolute top-0.5 right-1 text-[9px] leading-none text-muted-foreground/30 shrink-0 self-start font-mono", children: option.priority })
+            /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "absolute top-0.5 right-1 text-[9px] leading-none text-muted-foreground/30 shrink-0 self-start font-mono", children: option.priority })
           ]
         },
         option.value
@@ -6286,10 +6459,22 @@ function AskUserOptions({
       showOther && /* @__PURE__ */ jsxRuntimeExports.jsxs(
         Button,
         {
+          ref: otherButtonRef,
           variant: "ghost",
           size: "sm",
           className: "justify-start h-8 px-2 text-xs text-muted-foreground",
           onClick: () => setMode("input"),
+          onKeyDown: (event) => {
+            if (event.key === "ArrowUp") {
+              event.preventDefault();
+              event.stopPropagation();
+              optionRefs.current[request$1.options.length - 1]?.focus();
+            } else if (event.key === "Home") {
+              event.preventDefault();
+              event.stopPropagation();
+              optionRefs.current[0]?.focus();
+            }
+          },
           children: [
             /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: t("askUser.other", "Custom reply") }),
             /* @__PURE__ */ jsxRuntimeExports.jsx(ArrowRight, { className: "size-3" })
@@ -6689,7 +6874,7 @@ function useFile(projectId, file, options = {}) {
   };
 }
 const CodeEditor = reactExports.lazy(
-  () => __vitePreload(() => import("./code-editor-CEXlC4aV.js"), true ? __vite__mapDeps([0,1,2,3,4]) : void 0, import.meta.url).then((m) => ({ default: m.CodeEditor }))
+  () => __vitePreload(() => import("./code-editor-tm0AYOLz.js"), true ? __vite__mapDeps([0,1,2,3,4]) : void 0, import.meta.url).then((m) => ({ default: m.CodeEditor }))
 );
 const MAX_EDIT_SIZE = 1024 * 1024;
 const EditPanel = reactExports.forwardRef(function EditPanel2({ projectId, filePath, content, loading = false, onCancel, onSaved }, ref) {
@@ -17260,6 +17445,9 @@ const GIT_SUMMARY_BADGES = [
   { key: "C", color: "text-yellow-500" },
   { key: "D", color: "text-red-500" }
 ];
+function fileNavigationItemKey(item) {
+  return item.type === "action" ? `action:${item.action}` : `tree:${item.id}`;
+}
 function TreeItem({
   node,
   depth,
@@ -17273,7 +17461,10 @@ function TreeItem({
   onEditChange,
   onEditSubmit,
   onEditCancel,
-  actions
+  actions,
+  onKeyDown: onKeyDown2,
+  registerRef,
+  onFocus
 }) {
   const { t } = useTranslation();
   const isOpen = openFolders.has(node.id);
@@ -17284,6 +17475,15 @@ function TreeItem({
   reactExports.useEffect(() => {
     if (isEditing) setTimeout(() => inputRef.current?.focus(), 0);
   }, [isEditing]);
+  const handleView = (e) => {
+    if (node.isFolder) {
+      actions.toggle(node);
+      actions.select(node.id, e);
+    } else {
+      actions.previewFile(node.id);
+      actions.select(node.id, e);
+    }
+  };
   const childProps = {
     selectedIds,
     openFolders,
@@ -17294,7 +17494,10 @@ function TreeItem({
     onEditChange,
     onEditSubmit,
     onEditCancel,
-    actions
+    actions,
+    onKeyDown: onKeyDown2,
+    registerRef,
+    onFocus
   };
   const status = gitStatusMap.get(node.id);
   let statusText = "";
@@ -17331,7 +17534,22 @@ function TreeItem({
       /* @__PURE__ */ jsxRuntimeExports.jsxs(
         ContextMenuTrigger,
         {
-          render: /* @__PURE__ */ jsxRuntimeExports.jsx("div", {}),
+          render: /* @__PURE__ */ jsxRuntimeExports.jsx(
+            "div",
+            {
+              ref: (element) => registerRef(node.id, element),
+              tabIndex: -1,
+              role: "treeitem",
+              "aria-level": depth + 1,
+              "aria-expanded": node.isFolder ? isOpen : void 0,
+              "aria-selected": isSelected,
+              className: "outline-0 focus-visible:inset-ring-1 focus-visible:inset-ring-ring/80 rounded-md",
+              onKeyDown: (e) => {
+                if (e.target === e.currentTarget) onKeyDown2(e, node);
+              },
+              onFocus: () => onFocus(node.id)
+            }
+          ),
           draggable: !isEditing,
           onDragStart: (e) => {
             e.stopPropagation();
@@ -17349,7 +17567,6 @@ function TreeItem({
           },
           className: cn$1(
             "flex h-6 cursor-default select-none items-center gap-1.5 px-1.5 text-sx leading-none text-foreground/60",
-            node.ignored && "opacity-50",
             node.id === previewId ? "bg-primary/8 hover:bg-primary/10" : "hover:bg-primary/5 hover:text-foreground",
             isSelected ? "text-foreground bg-primary/6" : "",
             isDragOver && "relative ring-1 ring-primary bg-primary/5"
@@ -17361,13 +17578,7 @@ function TreeItem({
               actions.select(node.id, e);
               return;
             }
-            if (node.isFolder) {
-              actions.toggle(node);
-              actions.select(node.id, e);
-            } else {
-              actions.previewFile(node.id);
-              actions.select(node.id, e);
-            }
+            handleView(e);
           },
           children: [
             node.isFolder ? /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -17375,10 +17586,11 @@ function TreeItem({
               {
                 className: cn$1(
                   "size-3.5 shrink-0 text-muted-foreground scale-110 transition-transform",
-                  isOpen && "rotate-90"
+                  isOpen && "rotate-90",
+                  node.ignored && "opacity-50"
                 )
               }
-            ) : /* @__PURE__ */ jsxRuntimeExports.jsx(FileIcon, { name: node.name, className: "size-3.5 shrink-0 text-muted-foreground/90" }),
+            ) : /* @__PURE__ */ jsxRuntimeExports.jsx(FileIcon, { name: node.name, className: cn$1("size-3.5 shrink-0 text-muted-foreground/90", node.ignored && "opacity-50") }),
             isEditing ? /* @__PURE__ */ jsxRuntimeExports.jsx(
               "input",
               {
@@ -17399,7 +17611,8 @@ function TreeItem({
                 {
                   className: cn$1(
                     "flex-1 truncate leading-normal",
-                    statusText && !node.isFolder && statusColor
+                    statusText && !node.isFolder && statusColor,
+                    node.ignored && "opacity-50"
                   ),
                   children: node.name
                 }
@@ -17419,6 +17632,11 @@ function TreeItem({
         }
       ),
       /* @__PURE__ */ jsxRuntimeExports.jsxs(ContextMenuContent, { children: [
+        /* @__PURE__ */ jsxRuntimeExports.jsxs(ContextMenuItem, { onClick: handleView, children: [
+          /* @__PURE__ */ jsxRuntimeExports.jsx(Eye, {}),
+          t("filePanel.view")
+        ] }),
+        /* @__PURE__ */ jsxRuntimeExports.jsx(ContextMenuSeparator, {}),
         node.isFolder ? /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
           /* @__PURE__ */ jsxRuntimeExports.jsxs(ContextMenuItem, { onClick: () => actions.createIn(node.id, false), children: [
             /* @__PURE__ */ jsxRuntimeExports.jsx(FilePlus, {}),
@@ -17558,7 +17776,13 @@ const FilePanel = reactExports.memo(function FilePanel2({
   onPreviewFile
 }) {
   const { t } = useTranslation();
-  const containerRef = reactExports.useRef(null);
+  const treeRef = reactExports.useRef(null);
+  const treeItemRefs = reactExports.useRef(/* @__PURE__ */ new Map());
+  const navigationActionRefs = reactExports.useRef(/* @__PURE__ */ new Map());
+  const lastFocusedActionRef = reactExports.useRef(null);
+  const focusedTreeItemIdRef = reactExports.useRef(null);
+  const pendingFocusIdRef = reactExports.useRef(null);
+  const pendingFocusRestoreRef = reactExports.useRef(false);
   const [data, setData] = reactExports.useState([]);
   const [loading, setLoading] = reactExports.useState(false);
   const [showLoading, setShowLoading] = reactExports.useState(false);
@@ -17769,6 +17993,144 @@ const FilePanel = reactExports.memo(function FilePanel2({
     },
     [openFolders]
   );
+  const registerTreeItemRef = reactExports.useCallback((id, element) => {
+    if (element) {
+      treeItemRefs.current.set(id, element);
+    } else {
+      treeItemRefs.current.delete(id);
+    }
+  }, []);
+  const registerNavigationActionRef = reactExports.useCallback(
+    (action, element) => {
+      if (element) {
+        navigationActionRefs.current.set(action, element);
+      } else {
+        navigationActionRefs.current.delete(action);
+      }
+    },
+    []
+  );
+  const handleTreeItemFocus = reactExports.useCallback((id) => {
+    focusedTreeItemIdRef.current = id;
+  }, []);
+  const focusTreeItem = reactExports.useCallback(
+    (id) => {
+      let element = treeItemRefs.current.get(id);
+      if (!element) {
+        const visibleIds = flattenTree(data);
+        const itemIndex = visibleIds.indexOf(id);
+        if (itemIndex !== -1) {
+          element = treeRef.current?.querySelectorAll('[role="treeitem"]')[itemIndex];
+        }
+      }
+      if (!element) return;
+      element.focus({ preventScroll: true });
+      element.scrollIntoView({ block: "nearest" });
+    },
+    [data, flattenTree]
+  );
+  const fileNavigationItems = reactExports.useMemo(() => {
+    const items = [];
+    if (!isWebUI && cwd) {
+      items.push({ type: "action", action: "reveal" });
+      items.push({ type: "action", action: "editor" });
+    }
+    if (!loading) {
+      items.push(
+        { type: "action", action: "new-file" },
+        { type: "action", action: "new-folder" },
+        { type: "action", action: "refresh" },
+        { type: "action", action: "collapse" }
+      );
+    }
+    items.push(...flattenTree(data).map((id) => ({ type: "tree", id })));
+    return items;
+  }, [cwd, data, flattenTree, loading]);
+  const fileActionItems = reactExports.useMemo(
+    () => fileNavigationItems.filter(
+      (item) => item.type === "action"
+    ),
+    [fileNavigationItems]
+  );
+  const treeNavigationItems = reactExports.useMemo(
+    () => fileNavigationItems.filter(
+      (item) => item.type === "tree"
+    ),
+    [fileNavigationItems]
+  );
+  const focusFileNavigationItem = reactExports.useCallback(
+    (item) => {
+      if (item.type === "action") {
+        const element = navigationActionRefs.current.get(item.action);
+        if (!element) return;
+        element.focus({ preventScroll: true });
+        return;
+      }
+      focusTreeItem(item.id);
+    },
+    [focusTreeItem]
+  );
+  const handleFileNavigationKeyDown = reactExports.useCallback(
+    (event, items, item) => {
+      event.preventDefault();
+      event.stopPropagation();
+      if (items.length === 0) return;
+      const currentIndex = items.findIndex(
+        (navigationItem) => fileNavigationItemKey(navigationItem) === fileNavigationItemKey(item)
+      );
+      const nextIndex = event.key === "Home" ? 0 : event.key === "End" ? items.length - 1 : Math.max(
+        0,
+        Math.min(
+          items.length - 1,
+          currentIndex + (event.key === "ArrowRight" || event.key === "ArrowDown" ? 1 : -1)
+        )
+      );
+      const nextItem = items[nextIndex];
+      if (nextItem) focusFileNavigationItem(nextItem);
+    },
+    [focusFileNavigationItem]
+  );
+  const focusFileTree = reactExports.useCallback(() => {
+    const visibleIds = flattenTree(data);
+    const targetId = lastSelectedId && visibleIds.includes(lastSelectedId) && lastSelectedId || visibleIds.find((id) => selectedIds.has(id)) || visibleIds[0];
+    if (targetId) {
+      focusTreeItem(targetId);
+    } else if (fileActionItems[0]) {
+      focusFileNavigationItem(fileActionItems[0]);
+    }
+  }, [
+    data,
+    fileActionItems,
+    flattenTree,
+    focusFileNavigationItem,
+    focusTreeItem,
+    lastSelectedId,
+    selectedIds
+  ]);
+  useFocusTarget("file-tree-content", focusFileTree);
+  reactExports.useEffect(() => {
+    if (!pendingFocusRestoreRef.current || loading) return;
+    const visibleIds = flattenTree(data);
+    const pendingId = pendingFocusIdRef.current;
+    const targetId = pendingId && visibleIds.includes(pendingId) ? pendingId : visibleIds[0];
+    const fallbackAction = fileActionItems[0];
+    pendingFocusRestoreRef.current = false;
+    pendingFocusIdRef.current = null;
+    window.requestAnimationFrame(() => {
+      if (targetId) {
+        focusTreeItem(targetId);
+      } else if (fallbackAction) {
+        focusFileNavigationItem(fallbackAction);
+      }
+    });
+  }, [
+    data,
+    fileActionItems,
+    flattenTree,
+    focusFileNavigationItem,
+    focusTreeItem,
+    loading
+  ]);
   reactExports.useEffect(() => {
     useAppStore.getState().updateProjectState(projectId, () => ({
       openFolders: Array.from(openFolders)
@@ -17820,6 +18182,86 @@ const FilePanel = reactExports.memo(function FilePanel2({
     },
     [activeProjectId]
   );
+  const handleTreeKeyDown = reactExports.useCallback(
+    (event, node) => {
+      const { key } = event;
+      const isVerticalNavigationKey = key === "ArrowUp" || key === "ArrowDown" || key === "Home" || key === "End";
+      if (isVerticalNavigationKey) {
+        const treeItem = { type: "tree", id: node.id };
+        const currentIndex = treeNavigationItems.findIndex((item) => item.id === node.id);
+        if (key === "ArrowUp" && currentIndex === 0) {
+          const actionItem = fileActionItems.find((item) => item.action === lastFocusedActionRef.current) ?? fileActionItems[0];
+          if (actionItem) {
+            event.preventDefault();
+            event.stopPropagation();
+            focusFileNavigationItem(actionItem);
+            return;
+          }
+        }
+        handleFileNavigationKeyDown(event, treeNavigationItems, treeItem);
+        return;
+      }
+      if (key === "/") {
+        event.preventDefault();
+        event.stopPropagation();
+        const target = event.currentTarget;
+        const rect = target.getBoundingClientRect();
+        target.dispatchEvent(
+          new MouseEvent("contextmenu", {
+            bubbles: true,
+            cancelable: true,
+            view: window,
+            button: 2,
+            buttons: 2,
+            clientX: rect.left + rect.width / 2,
+            clientY: rect.top + rect.height / 2
+          })
+        );
+        return;
+      }
+      if (key === "ArrowLeft" || key === "ArrowRight") {
+        event.preventDefault();
+        event.stopPropagation();
+        if (key === "ArrowRight" && node.isFolder) {
+          if (!openFolders.has(node.id)) {
+            toggle(node);
+          } else {
+            const firstChild = node.children?.[0];
+            if (firstChild) focusTreeItem(firstChild.id);
+          }
+        } else if (key === "ArrowLeft") {
+          if (node.isFolder && openFolders.has(node.id)) {
+            toggle(node);
+          } else {
+            const parentId = node.id.slice(0, node.id.lastIndexOf("/"));
+            if (parentId) focusTreeItem(parentId);
+          }
+        }
+        return;
+      }
+      if (key === "Enter" || key === " " || key === "Spacebar") {
+        event.preventDefault();
+        event.stopPropagation();
+        setSelectedIds(/* @__PURE__ */ new Set([node.id]));
+        setLastSelectedId(node.id);
+        if (node.isFolder) {
+          toggle(node);
+        } else {
+          onPreviewFile(node.id);
+        }
+      }
+    },
+    [
+      fileActionItems,
+      focusFileNavigationItem,
+      focusTreeItem,
+      handleFileNavigationKeyDown,
+      onPreviewFile,
+      openFolders,
+      toggle,
+      treeNavigationItems
+    ]
+  );
   const collapseAll = reactExports.useCallback(() => {
     setOpenFolders(/* @__PURE__ */ new Set());
     openFoldersRef.current = /* @__PURE__ */ new Set();
@@ -17958,6 +18400,16 @@ const FilePanel = reactExports.memo(function FilePanel2({
     request.getPlatform().then((p) => setOsPlatform(p));
   }, []);
   const trashLabel = osPlatform === "darwin" ? t("filePanel.moveToTrash") : osPlatform === "win32" ? t("filePanel.moveToRecycleBin") : t("filePanel.moveToTrash");
+  const prepareFocusAfterDelete = (ids) => {
+    const isDeletedId = (id) => ids.some((deletedId) => id === deletedId || id.startsWith(`${deletedId}/`));
+    const referenceId = (focusedTreeItemIdRef.current && isDeletedId(focusedTreeItemIdRef.current) ? focusedTreeItemIdRef.current : null) ?? (lastSelectedId && isDeletedId(lastSelectedId) ? lastSelectedId : null) ?? ids.find(isDeletedId);
+    if (!referenceId) return;
+    const visibleIds = flattenTree(data);
+    const referenceIndex = visibleIds.indexOf(referenceId);
+    const targetId = (referenceIndex !== -1 ? visibleIds.slice(referenceIndex + 1).find((id) => !isDeletedId(id)) : void 0) ?? (referenceIndex !== -1 ? [...visibleIds.slice(0, referenceIndex)].reverse().find((id) => !isDeletedId(id)) : void 0) ?? visibleIds.find((id) => !isDeletedId(id));
+    pendingFocusIdRef.current = targetId ?? null;
+    pendingFocusRestoreRef.current = true;
+  };
   const deleteNode = async (ids) => {
     if (ids.length === 0 || !activeProjectId) return;
     await confirm2({
@@ -17986,7 +18438,9 @@ const FilePanel = reactExports.memo(function FilePanel2({
             } catch (err) {
               console.error("Delete failed:", extractErrorMessage(err));
             }
+            prepareFocusAfterDelete(ids);
             setSelectedIds(/* @__PURE__ */ new Set());
+            setLastSelectedId(null);
             refresh();
             return "trashed";
           }
@@ -18004,7 +18458,9 @@ const FilePanel = reactExports.memo(function FilePanel2({
             } catch (err) {
               console.error("Delete failed:", extractErrorMessage(err));
             }
+            prepareFocusAfterDelete(ids);
             setSelectedIds(/* @__PURE__ */ new Set());
+            setLastSelectedId(null);
             refresh();
             return "deleted";
           }
@@ -18445,6 +18901,47 @@ const FilePanel = reactExports.memo(function FilePanel2({
     }
     return null;
   };
+  const handleFileActionKeyDown = (event, action) => {
+    if (event.key === "ArrowLeft" || event.key === "ArrowRight" || event.key === "Home" || event.key === "End") {
+      handleFileNavigationKeyDown(event, fileActionItems, { type: "action", action });
+      return;
+    }
+    if (event.key === "ArrowDown") {
+      event.preventDefault();
+      event.stopPropagation();
+      const firstTreeItem = treeNavigationItems[0];
+      if (firstTreeItem) focusFileNavigationItem(firstTreeItem);
+      return;
+    }
+    if (event.key !== "Enter" && event.key !== " " && event.key !== "Spacebar") return;
+    event.preventDefault();
+    event.stopPropagation();
+    switch (action) {
+      case "reveal":
+        if (cwd) void revealInFinder(cwd);
+        break;
+      case "editor":
+        if (cwd) {
+          const editorName = useAppStore.getState().editor.name;
+          void electron.openInEditor(cwd, editorName).catch((err) => {
+            console.error("openInEditor failed:", extractErrorMessage(err));
+          });
+        }
+        break;
+      case "new-file":
+        createIn(getSelectedFolder(), false);
+        break;
+      case "new-folder":
+        createIn(getSelectedFolder(), true);
+        break;
+      case "refresh":
+        refresh();
+        break;
+      case "collapse":
+        collapseAll();
+        break;
+    }
+  };
   if (!projectId) {
     return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex h-full items-center justify-center text-xs text-muted-foreground", children: t("filePanel.noProject", "No project selected") });
   }
@@ -18464,9 +18961,12 @@ const FilePanel = reactExports.memo(function FilePanel2({
     onEditChange: setEditingValue,
     onEditSubmit: submitEdit,
     onEditCancel: () => setEditingId(null),
-    actions
+    actions,
+    onKeyDown: handleTreeKeyDown,
+    registerRef: registerTreeItemRef,
+    onFocus: handleTreeItemFocus
   };
-  return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { ref: containerRef, className: "flex h-full min-h-0 flex-col text-xs w-full", children: [
+  return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex h-full min-h-0 flex-col text-xs w-full", children: [
     /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex h-10 items-center gap-0.5 border-b border-border", children: [
       /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex text-muted-foreground items-center gap-1 px-3", children: [
         /* @__PURE__ */ jsxRuntimeExports.jsx(Folders, { className: "size-3.5" }),
@@ -18477,10 +18977,16 @@ const FilePanel = reactExports.memo(function FilePanel2({
           /* @__PURE__ */ jsxRuntimeExports.jsx(
             Button,
             {
+              ref: (element) => registerNavigationActionRef("reveal", element),
               variant: "ghost",
               size: "icon",
+              tabIndex: -1,
               className: "size-6 text-muted-foreground hover:text-foreground",
               disabled: !cwd,
+              onKeyDown: (event) => handleFileActionKeyDown(event, "reveal"),
+              onFocus: () => {
+                lastFocusedActionRef.current = "reveal";
+              },
               onClick: () => revealInFinder(cwd),
               title: t("filePanel.revealInFinder"),
               children: /* @__PURE__ */ jsxRuntimeExports.jsx(FolderOpen, { className: "size-3.5" })
@@ -18489,10 +18995,16 @@ const FilePanel = reactExports.memo(function FilePanel2({
           /* @__PURE__ */ jsxRuntimeExports.jsx(
             Button,
             {
+              ref: (element) => registerNavigationActionRef("editor", element),
               variant: "ghost",
               size: "icon",
+              tabIndex: -1,
               className: "size-6 text-muted-foreground hover:text-foreground",
               disabled: !cwd,
+              onKeyDown: (event) => handleFileActionKeyDown(event, "editor"),
+              onFocus: () => {
+                lastFocusedActionRef.current = "editor";
+              },
               onClick: () => {
                 if (!cwd) return;
                 const editorName = useAppStore.getState().editor.name;
@@ -18510,10 +19022,16 @@ const FilePanel = reactExports.memo(function FilePanel2({
         /* @__PURE__ */ jsxRuntimeExports.jsx(
           Button,
           {
+            ref: (element) => registerNavigationActionRef("new-file", element),
             variant: "ghost",
             size: "icon",
+            tabIndex: -1,
             className: "size-6 text-muted-foreground hover:text-foreground",
             disabled: loading,
+            onKeyDown: (event) => handleFileActionKeyDown(event, "new-file"),
+            onFocus: () => {
+              lastFocusedActionRef.current = "new-file";
+            },
             onClick: () => createIn(getSelectedFolder(), false),
             title: t("filePanel.newFile"),
             children: /* @__PURE__ */ jsxRuntimeExports.jsx(FilePlus, { className: "size-3.5" })
@@ -18522,10 +19040,16 @@ const FilePanel = reactExports.memo(function FilePanel2({
         /* @__PURE__ */ jsxRuntimeExports.jsx(
           Button,
           {
+            ref: (element) => registerNavigationActionRef("new-folder", element),
             variant: "ghost",
             size: "icon",
+            tabIndex: -1,
             className: "size-6 text-muted-foreground hover:text-foreground",
             disabled: loading,
+            onKeyDown: (event) => handleFileActionKeyDown(event, "new-folder"),
+            onFocus: () => {
+              lastFocusedActionRef.current = "new-folder";
+            },
             onClick: () => createIn(getSelectedFolder(), true),
             title: t("filePanel.newFolder"),
             children: /* @__PURE__ */ jsxRuntimeExports.jsx(FolderPlus, { className: "size-3.5" })
@@ -18534,10 +19058,16 @@ const FilePanel = reactExports.memo(function FilePanel2({
         /* @__PURE__ */ jsxRuntimeExports.jsx(
           Button,
           {
+            ref: (element) => registerNavigationActionRef("refresh", element),
             variant: "ghost",
             size: "icon",
+            tabIndex: -1,
             className: "size-6 text-muted-foreground hover:text-foreground",
             disabled: loading,
+            onKeyDown: (event) => handleFileActionKeyDown(event, "refresh"),
+            onFocus: () => {
+              lastFocusedActionRef.current = "refresh";
+            },
             onClick: refresh,
             title: t("filePanel.refresh", "Refresh"),
             children: /* @__PURE__ */ jsxRuntimeExports.jsx(RefreshCw, { className: "size-3.5" })
@@ -18546,10 +19076,16 @@ const FilePanel = reactExports.memo(function FilePanel2({
         /* @__PURE__ */ jsxRuntimeExports.jsx(
           Button,
           {
+            ref: (element) => registerNavigationActionRef("collapse", element),
             variant: "ghost",
             size: "icon",
+            tabIndex: -1,
             className: "size-6 text-muted-foreground hover:text-foreground",
             disabled: loading,
+            onKeyDown: (event) => handleFileActionKeyDown(event, "collapse"),
+            onFocus: () => {
+              lastFocusedActionRef.current = "collapse";
+            },
             onClick: collapseAll,
             title: t("filePanel.collapseFolders"),
             children: /* @__PURE__ */ jsxRuntimeExports.jsx(ListChevronsDownUp, { className: "size-3.5" })
@@ -18571,11 +19107,18 @@ const FilePanel = reactExports.memo(function FilePanel2({
           /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-xs text-muted-foreground/70", children: t("filePanel.emptyDirectory") })
         ]
       }
-    ) : /* @__PURE__ */ jsxRuntimeExports.jsx(ScrollArea, { className: "min-h-0 flex-1 pl-1", children: /* @__PURE__ */ jsxRuntimeExports.jsxs(ContextMenu, { children: [
+    ) : /* @__PURE__ */ jsxRuntimeExports.jsx(ScrollArea, { className: "min-h-0 flex-1 px-1", children: /* @__PURE__ */ jsxRuntimeExports.jsxs(ContextMenu, { children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx(
         ContextMenuTrigger,
         {
-          render: /* @__PURE__ */ jsxRuntimeExports.jsx("div", {}),
+          render: /* @__PURE__ */ jsxRuntimeExports.jsx(
+            "div",
+            {
+              ref: treeRef,
+              role: "tree",
+              "aria-label": t("filePanel.title", "Files")
+            }
+          ),
           className: "min-h-full py-1",
           onClick: (e) => {
             if (e.target === e.currentTarget) clearSelection();
@@ -18703,6 +19246,10 @@ function findNode(node, id) {
   }
   return null;
 }
+const ADD_TERMINAL_NAVIGATION_ID = "__add_terminal__";
+function terminalNavigationItemKey(item) {
+  return item.type === "add" ? ADD_TERMINAL_NAVIGATION_ID : item.id;
+}
 function TerminalPanel({
   projectId,
   activeTerminalId,
@@ -18712,7 +19259,51 @@ function TerminalPanel({
   const projectState = useProjectState(projectId);
   const terminals = projectState.terminals;
   const updateProjectState = useAppStore((s15) => s15.updateProjectState);
-  async function createTerminal() {
+  const navigationItemRefs = reactExports.useRef(/* @__PURE__ */ new Map());
+  const focusedNavigationItemIdRef = reactExports.useRef(null);
+  const navigationItems = reactExports.useMemo(() => {
+    const items = [{ type: "add" }];
+    items.push(
+      ...terminals.map(
+        (terminal) => ({ type: "terminal", id: terminal.id })
+      )
+    );
+    return items;
+  }, [terminals]);
+  const terminalItems = reactExports.useMemo(
+    () => navigationItems.filter(
+      (item) => item.type === "terminal"
+    ),
+    [navigationItems]
+  );
+  const registerNavigationItemRef = reactExports.useCallback((id, element) => {
+    if (element) {
+      navigationItemRefs.current.set(id, element);
+    } else {
+      navigationItemRefs.current.delete(id);
+    }
+  }, []);
+  const focusNavigationItem = reactExports.useCallback((item) => {
+    const element = navigationItemRefs.current.get(terminalNavigationItemKey(item));
+    if (!element) return;
+    element.focus({ preventScroll: true });
+    element.scrollIntoView({ block: "nearest" });
+  }, []);
+  const focusTerminalList = reactExports.useCallback(() => {
+    const activeItem = activeTerminalId ? navigationItems.find(
+      (item) => item.type === "terminal" && item.id === activeTerminalId
+    ) : void 0;
+    focusNavigationItem(activeItem ?? navigationItems[0]);
+  }, [activeTerminalId, focusNavigationItem, navigationItems]);
+  useFocusTarget("terminal-list-content", focusTerminalList);
+  const selectTerminal = reactExports.useCallback(
+    (terminalId) => {
+      updateProjectState(projectId, () => ({ activeTerminalId: terminalId }));
+      onSelectTerminal(terminalId);
+    },
+    [onSelectTerminal, projectId, updateProjectState]
+  );
+  const createTerminal = reactExports.useCallback(async () => {
     if (!projectId) return;
     const { terminalId } = await request.createTerminal({ projectId, cwd: "", clientId });
     updateProjectState(projectId, (prev) => ({
@@ -18720,9 +19311,14 @@ function TerminalPanel({
       activeTerminalId: terminalId
     }));
     onSelectTerminal(terminalId);
-  }
+  }, [onSelectTerminal, projectId, updateProjectState]);
   async function deleteTerminal(terminalId, e) {
-    e.stopPropagation();
+    e?.stopPropagation();
+    const shouldRestoreFocus = focusedNavigationItemIdRef.current === terminalId;
+    const deletedIndex = navigationItems.findIndex(
+      (item) => item.type === "terminal" && item.id === terminalId
+    );
+    const focusTarget = deletedIndex === -1 ? void 0 : navigationItems[deletedIndex + 1] ?? navigationItems[deletedIndex - 1] ?? navigationItems[0];
     destroyTerminalInstance(terminalId);
     await request.killTerminal({ terminalId });
     updateProjectState(projectId, (prev) => {
@@ -18732,7 +19328,81 @@ function TerminalPanel({
         activeTerminalId: prev.activeTerminalId === terminalId ? nextList[nextList.length - 1]?.id ?? null : prev.activeTerminalId
       };
     });
+    if (shouldRestoreFocus && focusTarget) {
+      window.requestAnimationFrame(() => focusNavigationItem(focusTarget));
+    }
   }
+  const handleNavigationKeyDown = reactExports.useCallback(
+    (event, item) => {
+      const { key } = event;
+      if (item.type === "add") {
+        if (key === "ArrowLeft" || key === "ArrowRight" || key === "Home" || key === "End") {
+          event.preventDefault();
+          event.stopPropagation();
+          focusNavigationItem(item);
+          return;
+        }
+        if (key === "ArrowDown") {
+          event.preventDefault();
+          event.stopPropagation();
+          const firstTerminal = terminalItems[0];
+          if (firstTerminal) focusNavigationItem(firstTerminal);
+          return;
+        }
+        if (key === "Enter" || key === " " || key === "Spacebar") {
+          event.preventDefault();
+          event.stopPropagation();
+          void createTerminal();
+        }
+        return;
+      }
+      const isVerticalNavigationKey = key === "ArrowUp" || key === "ArrowDown" || key === "Home" || key === "End";
+      if (isVerticalNavigationKey) {
+        event.preventDefault();
+        event.stopPropagation();
+        const currentIndex = terminalItems.findIndex((terminal) => terminal.id === item.id);
+        if (key === "ArrowUp" && currentIndex === 0) {
+          focusNavigationItem({ type: "add" });
+          return;
+        }
+        if (terminalItems.length === 0) return;
+        const nextIndex = key === "Home" ? 0 : key === "End" ? terminalItems.length - 1 : Math.max(
+          0,
+          Math.min(
+            terminalItems.length - 1,
+            currentIndex + (key === "ArrowDown" ? 1 : -1)
+          )
+        );
+        const nextTerminal = terminalItems[nextIndex];
+        if (nextTerminal) focusNavigationItem(nextTerminal);
+        return;
+      }
+      if (key === "/") {
+        event.preventDefault();
+        event.stopPropagation();
+        const target = event.currentTarget;
+        const rect = target.getBoundingClientRect();
+        target.dispatchEvent(
+          new MouseEvent("contextmenu", {
+            bubbles: true,
+            cancelable: true,
+            view: window,
+            button: 2,
+            buttons: 2,
+            clientX: rect.left + rect.width / 2,
+            clientY: rect.top + rect.height / 2
+          })
+        );
+        return;
+      }
+      if (key === "Enter" || key === " " || key === "Spacebar") {
+        event.preventDefault();
+        event.stopPropagation();
+        selectTerminal(item.id);
+      }
+    },
+    [createTerminal, focusNavigationItem, selectTerminal, terminalItems]
+  );
   return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex h-full flex-col", children: [
     /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex h-10 items-center gap-0.5 border-b border-border", children: [
       /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex text-muted-foreground items-center gap-1 px-3", children: [
@@ -18742,10 +19412,16 @@ function TerminalPanel({
       /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "ml-auto mr-2 flex items-center", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
         Button,
         {
+          ref: (element) => registerNavigationItemRef(ADD_TERMINAL_NAVIGATION_ID, element),
           variant: "ghost",
           size: "icon",
+          tabIndex: -1,
           className: "size-6 text-muted-foreground hover:text-foreground",
           onClick: () => void createTerminal(),
+          onKeyDown: (event) => handleNavigationKeyDown(event, { type: "add" }),
+          onFocus: () => {
+            focusedNavigationItemIdRef.current = ADD_TERMINAL_NAVIGATION_ID;
+          },
           "aria-label": t("terminalPanel.addTerminal", "Add terminal"),
           children: /* @__PURE__ */ jsxRuntimeExports.jsx(Plus, { className: "size-3.5" })
         }
@@ -18754,41 +19430,70 @@ function TerminalPanel({
     terminals.length === 0 ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex-1 flex flex-col items-center justify-center text-muted-foreground", children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "size-10 rounded-full bg-muted flex items-center justify-center mb-3 -mt-10", children: /* @__PURE__ */ jsxRuntimeExports.jsx(SquareTerminal, { className: "size-5 text-muted-foreground/60" }) }),
       /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-xs text-muted-foreground/70", children: t("terminalPanel.noTerminalSelected", "No terminals") })
-    ] }) : /* @__PURE__ */ jsxRuntimeExports.jsx(ScrollArea, { className: "min-h-0 flex-1", children: /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex flex-col gap-0.5 py-1 px-1", children: terminals.map((terminal) => /* @__PURE__ */ jsxRuntimeExports.jsxs(
-      "button",
-      {
-        type: "button",
-        onClick: () => {
-          updateProjectState(projectId, () => ({ activeTerminalId: terminal.id }));
-          onSelectTerminal(terminal.id);
-        },
-        className: cn$1(
-          "flex h-8 items-center gap-2 rounded-md pl-2 pr-1.5 text-xs w-full transition-colors",
-          terminal.id === activeTerminalId ? "bg-accent text-accent-foreground" : "text-foreground/70 hover:bg-accent/50 hover:text-foreground"
-        ),
-        children: [
-          /* @__PURE__ */ jsxRuntimeExports.jsx(
-            Circle,
+    ] }) : /* @__PURE__ */ jsxRuntimeExports.jsx(ScrollArea, { className: "min-h-0 flex-1", children: /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex flex-col gap-0.5 py-1 px-1", children: terminals.map((terminal) => /* @__PURE__ */ jsxRuntimeExports.jsxs(ContextMenu, { children: [
+      /* @__PURE__ */ jsxRuntimeExports.jsxs(
+        ContextMenuTrigger,
+        {
+          render: /* @__PURE__ */ jsxRuntimeExports.jsx(
+            "button",
             {
-              className: cn$1(
-                "size-2 shrink-0",
-                terminal.running ? "fill-emerald-400 text-emerald-400" : "text-muted-foreground"
-              )
+              ref: (element) => registerNavigationItemRef(terminal.id, element),
+              type: "button",
+              tabIndex: -1,
+              className: "outline-0 focus-visible:inset-ring-1 focus-visible:inset-ring-ring/80 rounded-md",
+              "aria-current": terminal.id === activeTerminalId ? "true" : void 0,
+              onKeyDown: (event) => handleNavigationKeyDown(event, { type: "terminal", id: terminal.id }),
+              onFocus: () => {
+                focusedNavigationItemIdRef.current = terminal.id;
+              }
             }
           ),
-          /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "flex-1 truncate text-left", children: terminal.id.slice(0, 8) }),
-          /* @__PURE__ */ jsxRuntimeExports.jsx(
-            "span",
-            {
-              className: "flex size-5 shrink-0 items-center justify-center rounded hover:bg-background/70",
-              onClick: (e) => void deleteTerminal(terminal.id, e),
-              children: /* @__PURE__ */ jsxRuntimeExports.jsx(X$1, { className: "size-3 text-muted-foreground" })
-            }
-          )
-        ]
-      },
-      terminal.id
-    )) }) })
+          onClick: () => selectTerminal(terminal.id),
+          className: cn$1(
+            "flex h-8 items-center gap-2 rounded-md pl-2 pr-1.5 text-xs w-full transition-colors",
+            terminal.id === activeTerminalId ? "bg-accent text-accent-foreground" : "text-foreground/70 hover:bg-accent/50 hover:text-foreground"
+          ),
+          children: [
+            /* @__PURE__ */ jsxRuntimeExports.jsx(
+              Circle,
+              {
+                className: cn$1(
+                  "size-2 shrink-0",
+                  terminal.running ? "fill-emerald-400 text-emerald-400" : "text-muted-foreground"
+                )
+              }
+            ),
+            /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "flex-1 truncate text-left", children: terminal.id.slice(0, 8) }),
+            /* @__PURE__ */ jsxRuntimeExports.jsx(
+              "span",
+              {
+                className: "flex size-5 shrink-0 items-center justify-center rounded hover:bg-background/70",
+                onClick: (e) => void deleteTerminal(terminal.id, e),
+                children: /* @__PURE__ */ jsxRuntimeExports.jsx(X$1, { className: "size-3 text-muted-foreground" })
+              }
+            )
+          ]
+        }
+      ),
+      /* @__PURE__ */ jsxRuntimeExports.jsxs(ContextMenuContent, { children: [
+        /* @__PURE__ */ jsxRuntimeExports.jsxs(ContextMenuItem, { onClick: () => selectTerminal(terminal.id), children: [
+          /* @__PURE__ */ jsxRuntimeExports.jsx(Eye, {}),
+          t("terminalPanel.view", "View")
+        ] }),
+        /* @__PURE__ */ jsxRuntimeExports.jsx(ContextMenuSeparator, {}),
+        /* @__PURE__ */ jsxRuntimeExports.jsxs(
+          ContextMenuItem,
+          {
+            variant: "destructive",
+            onClick: () => void deleteTerminal(terminal.id),
+            children: [
+              /* @__PURE__ */ jsxRuntimeExports.jsx(Trash2, {}),
+              t("terminalPanel.delete", "Delete")
+            ]
+          }
+        )
+      ] })
+    ] }, terminal.id)) }) })
   ] });
 }
 function Panel({
@@ -18801,6 +19506,27 @@ function Panel({
   onSelectTerminal
 }) {
   const { t } = useTranslation();
+  const { focus } = useFocusTargetRegistry();
+  const focusFileTree = reactExports.useCallback(() => {
+    const focusFileTreeContent = () => focus("file-tree-content");
+    if (tab === "files") {
+      focusFileTreeContent();
+      return;
+    }
+    onTabChange("files");
+    window.requestAnimationFrame(focusFileTreeContent);
+  }, [focus, onTabChange, tab]);
+  useFocusTarget("file-tree", focusFileTree, Boolean(projectId));
+  const focusTerminalList = reactExports.useCallback(() => {
+    const focusTerminalListContent = () => focus("terminal-list-content");
+    if (tab === "terminal") {
+      focusTerminalListContent();
+      return;
+    }
+    onTabChange("terminal");
+    window.requestAnimationFrame(focusTerminalListContent);
+  }, [focus, onTabChange, tab]);
+  useFocusTarget("terminal-list", focusTerminalList, Boolean(projectId));
   if (!projectId) {
     return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex h-full items-center justify-center text-xs text-muted-foreground border-l border-border bg-background", children: /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: t("panel.noProjectSelected", "No project selected") }) });
   }
@@ -18821,7 +19547,7 @@ function Panel({
             t("panel.terminal", "Terminal")
           ] })
         ] }) }),
-        /* @__PURE__ */ jsxRuntimeExports.jsx(TabsContent, { value: "files", className: "flex-1 min-h-0", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+        /* @__PURE__ */ jsxRuntimeExports.jsx(TabsContent, { value: "files", keepMounted: true, className: "flex-1 min-h-0", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
           FilePanel,
           {
             projectId,
@@ -18829,7 +19555,7 @@ function Panel({
             onPreviewFile
           }
         ) }),
-        /* @__PURE__ */ jsxRuntimeExports.jsx(TabsContent, { value: "terminal", className: "flex-1 min-h-0", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+        /* @__PURE__ */ jsxRuntimeExports.jsx(TabsContent, { value: "terminal", keepMounted: true, className: "flex-1 min-h-0", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
           TerminalPanel,
           {
             projectId,
@@ -18911,61 +19637,21 @@ function Session({ session }) {
   const [connectionError, setConnectionError] = reactExports.useState(false);
   reactExports.useEffect(() => {
     setConnectionError(false);
-    request.loadSession({ sessionId }).catch((err) => {
+    const sessionState = useAppStore.getState().getSessionState(sessionId);
+    const shouldLoadHistory = sessionState.messages.length === 0 && !isCreatingSession && sessionState.loadedAt === null;
+    if (shouldLoadHistory && fetchingRef.current === sessionId) return;
+    if (shouldLoadHistory) fetchingRef.current = sessionId;
+    void loadSession(sessionId, { loadHistory: shouldLoadHistory }).catch((err) => {
+      if (err instanceof SessionLifecycleBusyError) return;
       setConnectionError(true);
       toast.error(err instanceof Error ? err.message : String(err));
+    }).finally(() => {
+      if (fetchingRef.current === sessionId) fetchingRef.current = null;
     });
-    const sessionState = useAppStore.getState().getSessionState(sessionId);
-    if (sessionState.messages.length > 0 || isCreatingSession || sessionState.loadedAt !== null) {
-      return;
-    }
-    if (fetchingRef.current === sessionId) return;
-    fetchingRef.current = sessionId;
-    async function fetchHistory() {
-      useAppStore.getState().updateSessionState(sessionId, (prev) => ({
-        ...reduceFlushStreaming(prev),
-        isLoading: true
-      }));
-      try {
-        const result = await request.getSessionHistory({ sessionId });
-        let state = useAppStore.getState().getSessionState(sessionId);
-        state = { ...state, messages: [], activeToolCalls: /* @__PURE__ */ new Map(), activeSubagents: /* @__PURE__ */ new Map() };
-        const displayIds = /* @__PURE__ */ new Set();
-        for (const notification of result.messages) {
-          const displayId = notification?.update?._meta?.fello?.displayId;
-          if (displayId) {
-            displayIds.add(displayId);
-          }
-          if (!notification?.update) continue;
-          state = reduceSessionNotification(sessionId, state, notification);
-        }
-        for (const notification of state.pendingNotifications) {
-          const did = notification.update._meta?.fello?.displayId;
-          if (did && displayIds.has(did)) {
-            continue;
-          }
-          state = reduceSessionNotification(sessionId, state, notification);
-        }
-        state = reduceFlushStreaming(state);
-        state = {
-          ...state,
-          isLoading: false,
-          pendingNotifications: [],
-          loadedAt: Date.now()
-        };
-        useAppStore.getState().updateSessionState(sessionId, () => state);
-      } catch (err) {
-        console.error("Failed to fetch session history", err);
-        useAppStore.getState().updateSessionState(sessionId, (prev) => ({ ...prev, isLoading: false }));
-      } finally {
-        fetchingRef.current = null;
-      }
-    }
-    void fetchHistory();
   }, [sessionId, isCreatingSession, toast]);
   return /* @__PURE__ */ jsxRuntimeExports.jsx("main", { ref: setMainEl, className: "flex min-w-0 flex-1 flex-col relative overflow-hidden", children: isLoading || sessionConnected !== "connected" || isCreatingSession ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-1 flex-col items-center justify-center gap-4 relative", children: [
     /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "absolute left-0 top-0 right-0 h-12", style: { WebkitAppRegion: "drag" } }),
-    connectionError && sessionConnected !== "connected" && !isCreatingSession ? /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
+    connectionError && !isCreatingSession ? /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-sm font-normal text-muted-foreground", children: t("session.connectionFailed") }),
       /* @__PURE__ */ jsxRuntimeExports.jsxs(
         Button,
@@ -18974,7 +19660,8 @@ function Session({ session }) {
           size: "sm",
           onClick: () => {
             setConnectionError(false);
-            request.loadSession({ sessionId, force: true }).catch((err) => {
+            void loadSession(sessionId, { force: true, loadHistory: true }).catch((err) => {
+              if (err instanceof SessionLifecycleBusyError) return;
               setConnectionError(true);
               toast.error(err instanceof Error ? err.message : String(err));
             });