fix: make opening tabs switch to existing ones if possible (#3687)

Author: goranmoomin

apps/desktop/src/components/main/body/sessions/index.tsx

@@ -18,11 +18,7 @@ import { useStartListening } from "../../../../hooks/useStartListening";
 import { useSTTConnection } from "../../../../hooks/useSTTConnection";
 import { useTitleGeneration } from "../../../../hooks/useTitleGeneration";
 import * as main from "../../../../store/tinybase/store/main";
-import {
-  rowIdfromTab,
-  type Tab,
-  useTabs,
-} from "../../../../store/zustand/tabs";
+import { type Tab, useTabs } from "../../../../store/zustand/tabs";
 import { StandardTabWrapper } from "../index";
 import { type TabItem, TabItemBase } from "../shared";
 import { CaretPositionProvider } from "./caret-position-context";
@@ -52,12 +48,7 @@ export const TabItemNote: TabItem<Extract<Tab, { type: "sessions" }>> = ({
   pendingCloseConfirmationTab,
   setPendingCloseConfirmationTab,
 }) => {
-  const title = main.UI.useCell(
-    "sessions",
-    rowIdfromTab(tab),
-    "title",
-    main.STORE_ID,
-  );
+  const title = main.UI.useCell("sessions", tab.id, "title", main.STORE_ID);
   const sessionMode = useListener((state) => state.getSessionMode(tab.id));
   const stop = useListener((state) => state.stop);
   const isEnhancing = useIsSessionEnhancing(tab.id);

apps/desktop/src/store/zustand/tabs/basic.test.ts

@@ -41,7 +41,7 @@ describe("Basic Tab Actions", () => {
     });
   });
 
-  test("openCurrent replaces active tab and closes all duplicates", () => {
+  test("openCurrent switches to existing tab instead of replacing active", () => {
     const session1 = createSessionTab({ active: false });
     const session2 = createSessionTab({ active: false });
     const session3 = createSessionTab({ active: false });
@@ -56,13 +56,13 @@ describe("Basic Tab Actions", () => {
     useTabs.getState().openCurrent(duplicateOfSession1);
 
     expect(useTabs.getState()).toMatchTabsInOrder([
-      { id: session2.id, active: false },
       { id: session1.id, active: true },
+      { id: session2.id, active: false },
+      { id: session3.id, active: false },
     ]);
-    expect(useTabs.getState()).toHaveLastHistoryEntry({ id: session1.id });
-    expect(useTabs.getState()).toHaveHistoryLength(2);
+    expect(useTabs.getState()).toHaveHistoryLength(1);
     expect(useTabs.getState()).toHaveNavigationState({
-      canGoBack: true,
+      canGoBack: false,
       canGoNext: false,
     });
   });

apps/desktop/src/store/zustand/tabs/basic.ts

@@ -55,9 +55,9 @@ export const createBasicSlice = <
         listenerStore.getState().live.status === "finalizing");
 
     if (currentActiveTab?.pinned || isCurrentTabListening) {
-      set(openTab(tabs, tab, history, false));
-    } else {
       set(openTab(tabs, tab, history, true));
+    } else {
+      set(openTab(tabs, tab, history, false));
     }
 
     if (tab.type === "sessions") {
@@ -71,7 +71,7 @@ export const createBasicSlice = <
   },
   openNew: (tab) => {
     const { tabs, history, addRecentlyOpened } = get();
-    set(openTab(tabs, tab, history, false));
+    set(openTab(tabs, tab, history, true));
 
     if (tab.type === "sessions") {
       addRecentlyOpened(tab.id);
@@ -229,10 +229,6 @@ export const createBasicSlice = <
   },
 });
 
-const removeDuplicates = (tabs: Tab[], newTab: Tab): Tab[] => {
-  return tabs.filter((t) => !isSameTab(t, newTab));
-};
-
 const setActiveFlags = (tabs: Tab[], activeTab: Tab): Tab[] => {
   return tabs.map((t) => ({ ...t, active: isSameTab(t, activeTab) }));
 };
@@ -258,7 +254,7 @@ const openTab = <T extends BasicState & NavigationState>(
   tabs: Tab[],
   newTab: TabInput,
   history: Map<string, TabHistory>,
-  replaceActive: boolean,
+  forceNewTab: boolean,
 ): Partial<T> => {
   const tabWithDefaults: Tab = {
     ...getDefaultState(newTab),
@@ -272,7 +268,13 @@ const openTab = <T extends BasicState & NavigationState>(
   const existingTab = tabs.find((t) => isSameTab(t, tabWithDefaults));
   const isNewTab = !existingTab;
 
-  if (replaceActive) {
+  if (!isNewTab) {
+    nextTabs = setActiveFlags(tabs, existingTab!);
+    const currentTab = { ...existingTab!, active: true };
+    return { tabs: nextTabs, currentTab, history } as Partial<T>;
+  }
+
+  if (!forceNewTab) {
     const existingActiveIdx = tabs.findIndex((t) => t.active);
     const currentActiveTab = tabs[existingActiveIdx];
 
@@ -283,32 +285,20 @@ const openTab = <T extends BasicState & NavigationState>(
         slotId: currentActiveTab.slotId,
       };
 
-      nextTabs = tabs
-        .map((t, idx) => {
-          if (idx === existingActiveIdx) {
-            return activeTab;
-          }
-          if (isSameTab(t, tabWithDefaults)) {
-            return null;
-          }
-          return { ...t, active: false };
-        })
-        .filter((t): t is Tab => t !== null);
+      nextTabs = tabs.map((t, idx) => {
+        if (idx === existingActiveIdx) {
+          return activeTab;
+        }
+        return { ...t, active: false };
+      });
     } else {
       activeTab = { ...tabWithDefaults, active: true, slotId: id() };
-      const withoutDuplicates = removeDuplicates(tabs, tabWithDefaults);
-      const deactivated = deactivateAll(withoutDuplicates);
+      const deactivated = deactivateAll(tabs);
       nextTabs = [...deactivated, activeTab];
     }
 
     return updateWithHistory(nextTabs, activeTab, history);
   } else {
-    if (!isNewTab) {
-      nextTabs = setActiveFlags(tabs, existingTab!);
-      const currentTab = { ...existingTab!, active: true };
-      return { tabs: nextTabs, currentTab, history } as Partial<T>;
-    }
-
     activeTab = { ...tabWithDefaults, active: true, slotId: id() };
     const deactivated = deactivateAll(tabs);
     nextTabs = [...deactivated, activeTab];

apps/desktop/src/store/zustand/tabs/index.ts

@@ -34,7 +34,7 @@ import {
 import { createStateUpdaterSlice, type StateBasicActions } from "./state";
 
 export type { SettingsState, SettingsTab, Tab, TabInput } from "./schema";
-export { isSameTab, rowIdfromTab, uniqueIdfromTab } from "./schema";
+export { isSameTab, uniqueIdfromTab } from "./schema";
 export { restorePinnedTabsToStore, restoreRecentlyOpenedToStore };
 
 type State = BasicState &

apps/desktop/src/store/zustand/tabs/schema.ts

@@ -195,34 +195,6 @@ export const getDefaultState = (tab: TabInput): Tab => {
   }
 };
 
-export const rowIdfromTab = (tab: Tab): string => {
-  switch (tab.type) {
-    case "sessions":
-      return tab.id;
-    case "humans":
-      return tab.id;
-    case "organizations":
-      return tab.id;
-    case "contacts":
-    case "templates":
-    case "prompts":
-    case "chat_shortcuts":
-    case "extensions":
-    case "empty":
-    case "extension":
-    case "calendar":
-    case "changelog":
-    case "settings":
-    case "ai":
-      throw new Error("invalid_resource");
-    case "folders":
-      if (!tab.id) {
-        throw new Error("invalid_resource");
-      }
-      return tab.id;
-  }
-};
-
 export const uniqueIdfromTab = (tab: Tab): string => {
   switch (tab.type) {
     case "sessions":