From 14c72bdfb29c7bc5206ed33c807582a7d1d18d0a Mon Sep 17 00:00:00 2001
From: ComputelessComputer <john@hyprnote.com>
Date: Fri, 27 Mar 2026 17:15:35 -0700
Subject: [PATCH] fix: keep the session chat toggle selected while open

- keep the header chat button visible while the right panel is docked
- treat floating and docked chat as an active toggle state and let the active button close chat
---
 apps/desktop/src/shared/main/index.tsx | 35 ++++++++++++++++++++------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/apps/desktop/src/shared/main/index.tsx b/apps/desktop/src/shared/main/index.tsx
index 6eaa5d601f..1e36d269a1 100644
--- a/apps/desktop/src/shared/main/index.tsx
+++ b/apps/desktop/src/shared/main/index.tsx
@@ -641,6 +641,10 @@ function TabChatButton({
 }) {
   const { chat } = useShell();
   const currentTab = useTabs((state) => state.currentTab);
+  const isChatOpen =
+    chat.mode === "FloatingOpen" || chat.mode === "RightPanelOpen";
+  const isRightPanelOpen = chat.mode === "RightPanelOpen";
+  const isTabbarSelected = placement === "tabbar" && isChatOpen;
 
   const { data: isChatEnabled } = useQuery({
     refetchInterval: 10_000,
@@ -658,7 +662,11 @@ function TabChatButton({
     return null;
   }
 
-  if (chat.mode === "RightPanelOpen" || chat.mode === "FullTab") {
+  if (chat.mode === "FullTab") {
+    return null;
+  }
+
+  if (placement !== "tabbar" && isRightPanelOpen) {
     return null;
   }
 
@@ -671,29 +679,40 @@ function TabChatButton({
     return null;
   }
 
-  const handleOpen = () => chat.sendEvent({ type: "OPEN" });
+  const buttonTitle = isTabbarSelected ? "Close chat" : "Chat with notes";
+
+  const handleClick = () =>
+    chat.sendEvent(isTabbarSelected ? { type: "TOGGLE" } : { type: "OPEN" });
 
   if (placement === "tabbar") {
     return (
       <Tooltip>
         <TooltipTrigger asChild>
           <Button
-            onClick={handleOpen}
+            onClick={handleClick}
             variant="ghost"
             size="icon"
-            className="text-neutral-600"
-            aria-label="Chat with notes"
-            title="Chat with notes"
+            className={cn([
+              "text-neutral-600",
+              isTabbarSelected &&
+                "bg-neutral-200 text-neutral-900 hover:bg-neutral-200",
+            ])}
+            aria-label={buttonTitle}
+            aria-pressed={isTabbarSelected}
+            title={buttonTitle}
           >
             <img
               src="/assets/char-logo-icon-black.svg"
               alt="Char"
-              className="size-[13px] shrink-0 object-contain"
+              className={cn([
+                "size-[13px] shrink-0 object-contain opacity-65",
+                isTabbarSelected && "opacity-100",
+              ])}
             />
           </Button>
         </TooltipTrigger>
         <TooltipContent side="bottom" className="flex items-center gap-2">
-          <span>Chat with notes</span>
+          <span>{buttonTitle}</span>
           {shortcutLabel && (
             <Kbd className="animate-kbd-press">{shortcutLabel}</Kbd>
           )}