From 65806a990dcb91b85df398aa291710927b7ee52e Mon Sep 17 00:00:00 2001
From: Yujong Lee <yujonglee.dev@gmail.com>
Date: Thu, 30 Oct 2025 08:55:27 +0900
Subject: [PATCH 1/5] rename persisted to main

---
 apps/desktop/src/components/chat/header.tsx   | 12 ++---
 .../components/chat/message/tool/search.tsx   |  4 +-
 apps/desktop/src/components/chat/session.tsx  | 20 +++----
 apps/desktop/src/components/chat/view.tsx     | 10 ++--
 .../body/calendars/calendar-checkbox-row.tsx  |  4 +-
 .../main/body/calendars/calendar-day.tsx      | 16 +++---
 .../main/body/calendars/day-events.tsx        | 12 ++---
 .../main/body/calendars/day-sessions.tsx      |  6 +--
 .../components/main/body/calendars/index.tsx  |  4 +-
 .../components/main/body/contacts/details.tsx | 54 +++++++++----------
 .../components/main/body/contacts/index.tsx   | 10 ++--
 .../body/contacts/organization-details.tsx    | 18 +++----
 .../main/body/contacts/organizations.tsx      | 34 ++++++------
 .../components/main/body/contacts/people.tsx  | 36 ++++++-------
 .../src/components/main/body/events.tsx       |  6 +--
 .../components/main/body/folders/index.tsx    | 38 ++++++-------
 .../src/components/main/body/humans.tsx       |  4 +-
 .../main/body/sessions/floating/generate.tsx  |  8 +--
 .../main/body/sessions/floating/listen.tsx    |  6 +--
 .../components/main/body/sessions/index.tsx   |  4 +-
 .../sessions/note-input/enhanced/editor.tsx   |  8 +--
 .../main/body/sessions/note-input/raw.tsx     |  8 +--
 .../note-input/transcript/viewer/segment.ts   | 22 ++++----
 .../transcript/viewer/test-utils.ts           |  4 +-
 .../body/sessions/outer-header/folder.tsx     | 10 ++--
 .../outer-header/metadata/participants.tsx    | 14 ++---
 .../sessions/outer-header/metadata/shared.ts  | 18 +++----
 .../body/sessions/outer-header/overflow.tsx   |  6 +--
 .../sessions/outer-header/shared/folder.tsx   | 14 ++---
 .../components/main/body/sessions/shared.tsx  |  8 +--
 .../main/body/sessions/title-input.tsx        |  8 +--
 .../main/body/shared/folder-breadcrumb.tsx    |  8 +--
 .../components/main/sidebar/search/item.tsx   |  8 +--
 .../main/sidebar/timeline/index.tsx           | 14 ++---
 .../components/main/sidebar/timeline/item.tsx |  4 +-
 .../settings/memory/custom-vocabulary.tsx     |  2 +-
 .../components/settings/template/editor.tsx   | 14 ++---
 .../components/settings/template/index.tsx    | 10 ++--
 .../settings/template/sections-list.tsx       |  4 +-
 .../template/use-template-navigation.ts       |  8 +--
 .../src/contexts/search/engine/index.tsx      |  2 +-
 .../src/contexts/search/engine/indexing.ts    |  2 +-
 .../src/contexts/search/engine/listeners.ts   |  4 +-
 apps/desktop/src/devtool/index.tsx            |  2 +-
 apps/desktop/src/devtool/seed/data/loader.ts  |  2 +-
 .../src/devtool/seed/shared/builders.ts       |  2 +-
 .../src/devtool/seed/shared/calendar.ts       |  2 +-
 apps/desktop/src/devtool/seed/shared/chat.ts  |  2 +-
 apps/desktop/src/devtool/seed/shared/event.ts |  2 +-
 .../desktop/src/devtool/seed/shared/folder.ts |  2 +-
 apps/desktop/src/devtool/seed/shared/human.ts |  2 +-
 apps/desktop/src/devtool/seed/shared/index.ts |  2 +-
 .../src/devtool/seed/shared/mapping.ts        |  2 +-
 .../desktop/src/devtool/seed/shared/memory.ts |  2 +-
 .../src/devtool/seed/shared/organization.ts   |  2 +-
 .../src/devtool/seed/shared/session.ts        |  2 +-
 apps/desktop/src/devtool/seed/shared/tag.ts   |  2 +-
 .../src/devtool/seed/shared/template.ts       |  2 +-
 .../src/devtool/seed/shared/transcript.ts     |  2 +-
 .../src/devtool/seed/versions/curated.ts      |  2 +-
 .../src/devtool/seed/versions/empty.ts        |  2 +-
 .../src/devtool/seed/versions/random.ts       |  4 +-
 apps/desktop/src/hooks/useAutoEnhance.ts      | 12 ++---
 .../desktop/src/hooks/useAutoGenerateTitle.ts | 10 ++--
 apps/desktop/src/hooks/useStartListening.ts   |  6 +--
 apps/desktop/src/main.tsx                     |  2 +-
 .../src/routes/app/settings/_layout.tsx       |  8 +--
 .../src/store/tinybase/cloudPersister.ts      | 16 +++---
 .../store/tinybase/{persisted.ts => main.ts}  |  0
 .../src/store/zustand/ai-task/index.ts        |  2 +-
 .../zustand/ai-task/task-configs/enhance.ts   |  2 +-
 .../zustand/ai-task/task-configs/index.ts     |  2 +-
 .../zustand/ai-task/task-configs/title.ts     |  2 +-
 .../src/store/zustand/ai-task/tasks.ts        |  2 +-
 .../src/store/zustand/listener/transcript.ts  |  4 +-
 apps/desktop/src/store/zustand/tabs/schema.ts |  2 +-
 apps/desktop/src/types/index.ts               |  2 +-
 apps/desktop/src/utils/segments.ts            |  8 +--
 apps/desktop/src/utils/timeline.ts            | 10 ++--
 apps/desktop/src/utils/transcript.ts          |  2 +-
 80 files changed, 319 insertions(+), 319 deletions(-)
 rename apps/desktop/src/store/tinybase/{persisted.ts => main.ts} (100%)

diff --git a/apps/desktop/src/components/chat/header.tsx b/apps/desktop/src/components/chat/header.tsx
index 43b22b710..42b041a04 100644
--- a/apps/desktop/src/components/chat/header.tsx
+++ b/apps/desktop/src/components/chat/header.tsx
@@ -6,7 +6,7 @@ import { Button } from "@hypr/ui/components/ui/button";
 import { DropdownMenu, DropdownMenuContent, DropdownMenuTrigger } from "@hypr/ui/components/ui/dropdown-menu";
 import { cn } from "@hypr/utils";
 import { useShell } from "../../contexts/shell";
-import * as persisted from "../../store/tinybase/persisted";
+import * as main from "../../store/tinybase/main";
 
 export function ChatHeader({
   currentChatGroupId,
@@ -86,19 +86,19 @@ function ChatGroups({
 }) {
   const [isDropdownOpen, setIsDropdownOpen] = useState(false);
 
-  const currentChatTitle = persisted.UI.useCell(
+  const currentChatTitle = main.UI.useCell(
     "chat_groups",
     currentChatGroupId || "",
     "title",
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
-  const recentChatGroupIds = persisted.UI.useSortedRowIds(
+  const recentChatGroupIds = main.UI.useSortedRowIds(
     "chat_groups",
     "created_at",
     true,
     0,
     5,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   return (
@@ -162,7 +162,7 @@ function ChatGroupItem({
   isActive: boolean;
   onSelect: (groupId: string) => void;
 }) {
-  const chatGroup = persisted.UI.useRow("chat_groups", groupId, persisted.STORE_ID);
+  const chatGroup = main.UI.useRow("chat_groups", groupId, main.STORE_ID);
 
   if (!chatGroup) {
     return null;
diff --git a/apps/desktop/src/components/chat/message/tool/search.tsx b/apps/desktop/src/components/chat/message/tool/search.tsx
index 236080f18..8baab9a32 100644
--- a/apps/desktop/src/components/chat/message/tool/search.tsx
+++ b/apps/desktop/src/components/chat/message/tool/search.tsx
@@ -9,7 +9,7 @@ import {
   CarouselNext,
   CarouselPrevious,
 } from "@hypr/ui/components/ui/carousel";
-import * as persisted from "../../../../store/tinybase/persisted";
+import * as main from "../../../../store/tinybase/main";
 import { useTabs } from "../../../../store/zustand/tabs";
 import { Disclosure } from "../shared";
 import { ToolRenderer } from "../types";
@@ -91,7 +91,7 @@ function RenderContent({ part }: { part: Part }) {
 }
 
 function RenderSession({ sessionId }: { sessionId: string }) {
-  const session = persisted.UI.useRow("sessions", sessionId, persisted.STORE_ID);
+  const session = main.UI.useRow("sessions", sessionId, main.STORE_ID);
   const { openNew } = useTabs();
 
   const handleClick = useCallback(() => {
diff --git a/apps/desktop/src/components/chat/session.tsx b/apps/desktop/src/components/chat/session.tsx
index c8273fc32..78f64eb42 100644
--- a/apps/desktop/src/components/chat/session.tsx
+++ b/apps/desktop/src/components/chat/session.tsx
@@ -7,7 +7,7 @@ import type { HyprUIMessage } from "../../chat/types";
 import { useToolRegistry } from "../../contexts/tool";
 import { useLanguageModel } from "../../hooks/useLLMConnection";
 import * as internal from "../../store/tinybase/internal";
-import * as persisted from "../../store/tinybase/persisted";
+import * as main from "../../store/tinybase/main";
 import { id } from "../../utils";
 
 interface ChatSessionProps {
@@ -29,14 +29,14 @@ export function ChatSession({
   children,
 }: ChatSessionProps) {
   const transport = useTransport();
-  const store = persisted.UI.useStore(persisted.STORE_ID);
+  const store = main.UI.useStore(main.STORE_ID);
 
   const { user_id } = internal.UI.useValues(internal.STORE_ID);
 
-  const createChatMessage = persisted.UI.useSetRowCallback(
+  const createChatMessage = main.UI.useSetRowCallback(
     "chat_messages",
-    (p: Omit<persisted.ChatMessage, "user_id" | "created_at"> & { id: string }) => p.id,
-    (p: Omit<persisted.ChatMessage, "user_id" | "created_at"> & { id: string }) => ({
+    (p: Omit<main.ChatMessage, "user_id" | "created_at"> & { id: string }) => p.id,
+    (p: Omit<main.ChatMessage, "user_id" | "created_at"> & { id: string }) => ({
       user_id,
       chat_group_id: p.chat_group_id,
       content: p.content,
@@ -44,15 +44,15 @@ export function ChatSession({
       role: p.role,
       metadata: JSON.stringify(p.metadata),
       parts: JSON.stringify(p.parts),
-    } satisfies persisted.ChatMessageStorage),
+    } satisfies main.ChatMessageStorage),
     [user_id],
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
-  const messageIds = persisted.UI.useSliceRowIds(
-    persisted.INDEXES.chatMessagesByGroup,
+  const messageIds = main.UI.useSliceRowIds(
+    main.INDEXES.chatMessagesByGroup,
     chatGroupId ?? "",
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   const initialMessages = useMemo((): HyprUIMessage[] => {
diff --git a/apps/desktop/src/components/chat/view.tsx b/apps/desktop/src/components/chat/view.tsx
index ebe76218a..252072d9c 100644
--- a/apps/desktop/src/components/chat/view.tsx
+++ b/apps/desktop/src/components/chat/view.tsx
@@ -3,7 +3,7 @@ import { useCallback, useRef } from "react";
 import type { HyprUIMessage } from "../../chat/types";
 import { useShell } from "../../contexts/shell";
 import * as internal from "../../store/tinybase/internal";
-import * as persisted from "../../store/tinybase/persisted";
+import * as main from "../../store/tinybase/main";
 import { id } from "../../utils";
 
 import { useLanguageModel } from "../../hooks/useLLMConnection";
@@ -21,7 +21,7 @@ export function ChatView() {
 
   const { user_id } = internal.UI.useValues(internal.STORE_ID);
 
-  const createChatGroup = persisted.UI.useSetRowCallback(
+  const createChatGroup = main.UI.useSetRowCallback(
     "chat_groups",
     (p: { groupId: string; title: string }) => p.groupId,
     (p: { groupId: string; title: string }) => ({
@@ -30,10 +30,10 @@ export function ChatView() {
       title: p.title,
     }),
     [user_id],
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
-  const createChatMessage = persisted.UI.useSetRowCallback(
+  const createChatMessage = main.UI.useSetRowCallback(
     "chat_messages",
     (p: { id: string; chat_group_id: string; content: string; role: string; parts: any; metadata: any }) => p.id,
     (p: { id: string; chat_group_id: string; content: string; role: string; parts: any; metadata: any }) => ({
@@ -46,7 +46,7 @@ export function ChatView() {
       parts: JSON.stringify(p.parts),
     }),
     [user_id],
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   const handleSendMessage = useCallback(
diff --git a/apps/desktop/src/components/main/body/calendars/calendar-checkbox-row.tsx b/apps/desktop/src/components/main/body/calendars/calendar-checkbox-row.tsx
index 24efa6b78..d64d14e2d 100644
--- a/apps/desktop/src/components/main/body/calendars/calendar-checkbox-row.tsx
+++ b/apps/desktop/src/components/main/body/calendars/calendar-checkbox-row.tsx
@@ -1,11 +1,11 @@
 import { Checkbox } from "@hypr/ui/components/ui/checkbox";
 
-import * as persisted from "../../../../store/tinybase/persisted";
+import * as main from "../../../../store/tinybase/main";
 
 export function CalendarCheckboxRow(
   { id, checked, onToggle }: { id: string; checked: boolean; onToggle: (checked: boolean) => void },
 ) {
-  const calendar = persisted.UI.useRow("calendars", id, persisted.STORE_ID);
+  const calendar = main.UI.useRow("calendars", id, main.STORE_ID);
   return (
     <div className="flex items-center space-x-2">
       <Checkbox
diff --git a/apps/desktop/src/components/main/body/calendars/calendar-day.tsx b/apps/desktop/src/components/main/body/calendars/calendar-day.tsx
index fe2a7ba6f..f96ccc80a 100644
--- a/apps/desktop/src/components/main/body/calendars/calendar-day.tsx
+++ b/apps/desktop/src/components/main/body/calendars/calendar-day.tsx
@@ -2,7 +2,7 @@ import { cn, format, getDay } from "@hypr/utils";
 
 import { useEffect, useRef, useState } from "react";
 
-import * as persisted from "../../../../store/tinybase/persisted";
+import * as main from "../../../../store/tinybase/main";
 import { TabContentCalendarDayEvents } from "./day-events";
 import { TabContentCalendarDayMore } from "./day-more";
 import { TabContentCalendarDaySessions } from "./day-sessions";
@@ -24,23 +24,23 @@ export function TabContentCalendarDay({
   const contentRef = useRef<HTMLDivElement>(null);
   const [maxVisibleItems, setMaxVisibleItems] = useState(5);
 
-  const allEventIds = persisted.UI.useSliceRowIds(
-    persisted.INDEXES.eventsByDate,
+  const allEventIds = main.UI.useSliceRowIds(
+    main.INDEXES.eventsByDate,
     day,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
-  const store = persisted.UI.useStore(persisted.STORE_ID);
+  const store = main.UI.useStore(main.STORE_ID);
 
   const eventIds = allEventIds.filter((eventId) => {
     const event = store?.getRow("events", eventId);
     return event?.calendar_id && selectedCalendars.has(event.calendar_id as string);
   });
 
-  const sessionIds = persisted.UI.useSliceRowIds(
-    persisted.INDEXES.sessionByDateWithoutEvent,
+  const sessionIds = main.UI.useSliceRowIds(
+    main.INDEXES.sessionByDateWithoutEvent,
     day,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   const dayNumber = format(new Date(day), "d");
diff --git a/apps/desktop/src/components/main/body/calendars/day-events.tsx b/apps/desktop/src/components/main/body/calendars/day-events.tsx
index a3452e3e9..bead9340e 100644
--- a/apps/desktop/src/components/main/body/calendars/day-events.tsx
+++ b/apps/desktop/src/components/main/body/calendars/day-events.tsx
@@ -5,23 +5,23 @@ import { cn, format, isSameDay } from "@hypr/utils";
 import { Calendar, Pen, StickyNote } from "lucide-react";
 import { useState } from "react";
 
-import * as persisted from "../../../../store/tinybase/persisted";
+import * as main from "../../../../store/tinybase/main";
 import { useTabs } from "../../../../store/zustand/tabs";
 
 export function TabContentCalendarDayEvents({ eventId }: { eventId: string }) {
-  const event = persisted.UI.useRow("events", eventId, persisted.STORE_ID);
+  const event = main.UI.useRow("events", eventId, main.STORE_ID);
   const [open, setOpen] = useState(false);
   const { openNew } = useTabs();
 
   const title = event?.title || "Untitled Event";
 
-  const sessionIds = persisted.UI.useSliceRowIds(
-    persisted.INDEXES.sessionsByEvent,
+  const sessionIds = main.UI.useSliceRowIds(
+    main.INDEXES.sessionsByEvent,
     eventId,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
   const linkedSessionId = sessionIds[0];
-  const linkedSession = persisted.UI.useRow("sessions", linkedSessionId || "dummy", persisted.STORE_ID);
+  const linkedSession = main.UI.useRow("sessions", linkedSessionId || "dummy", main.STORE_ID);
 
   const handleOpenNote = () => {
     setOpen(false);
diff --git a/apps/desktop/src/components/main/body/calendars/day-sessions.tsx b/apps/desktop/src/components/main/body/calendars/day-sessions.tsx
index e83f86d9d..9a9028057 100644
--- a/apps/desktop/src/components/main/body/calendars/day-sessions.tsx
+++ b/apps/desktop/src/components/main/body/calendars/day-sessions.tsx
@@ -2,15 +2,15 @@ import { Button } from "@hypr/ui/components/ui/button";
 
 import { StickyNote } from "lucide-react";
 
-import * as persisted from "../../../../store/tinybase/persisted";
+import * as main from "../../../../store/tinybase/main";
 import { useTabs } from "../../../../store/zustand/tabs";
 
 export function TabContentCalendarDaySessions({ sessionId }: { sessionId: string }) {
-  const session = persisted.UI.useRow("sessions", sessionId, persisted.STORE_ID);
+  const session = main.UI.useRow("sessions", sessionId, main.STORE_ID);
   const { openNew } = useTabs();
 
   const eventId = session?.event_id ?? "";
-  const event = persisted.UI.useRow("events", eventId, persisted.STORE_ID);
+  const event = main.UI.useRow("events", eventId, main.STORE_ID);
 
   const handleClick = () => {
     openNew({ type: "sessions", id: sessionId });
diff --git a/apps/desktop/src/components/main/body/calendars/index.tsx b/apps/desktop/src/components/main/body/calendars/index.tsx
index 544bafefc..9cc8c8814 100644
--- a/apps/desktop/src/components/main/body/calendars/index.tsx
+++ b/apps/desktop/src/components/main/body/calendars/index.tsx
@@ -15,7 +15,7 @@ import {
 import { Calendar, CalendarDays, ChevronLeft, ChevronRight } from "lucide-react";
 import { useState } from "react";
 
-import * as persisted from "../../../../store/tinybase/persisted";
+import * as main from "../../../../store/tinybase/main";
 import { type Tab, useTabs } from "../../../../store/zustand/tabs";
 import { StandardTabWrapper } from "../index";
 import { type TabItem, TabItemBase } from "../shared";
@@ -58,7 +58,7 @@ function TabContentCalendarInner({ tab }: { tab: Extract<Tab, { type: "calendars
 
   const { openCurrent } = useTabs();
 
-  const calendarIds = persisted.UI.useRowIds("calendars", persisted.STORE_ID);
+  const calendarIds = main.UI.useRowIds("calendars", main.STORE_ID);
 
   const [selectedCalendars, setSelectedCalendars] = useState<Set<string>>(() => new Set(calendarIds));
 
diff --git a/apps/desktop/src/components/main/body/contacts/details.tsx b/apps/desktop/src/components/main/body/contacts/details.tsx
index 681cf5ceb..42b24ecd6 100644
--- a/apps/desktop/src/components/main/body/contacts/details.tsx
+++ b/apps/desktop/src/components/main/body/contacts/details.tsx
@@ -5,7 +5,7 @@ import { Button } from "@hypr/ui/components/ui/button";
 import { Input } from "@hypr/ui/components/ui/input";
 import { Popover, PopoverContent, PopoverTrigger } from "@hypr/ui/components/ui/popover";
 import { Textarea } from "@hypr/ui/components/ui/textarea";
-import * as persisted from "../../../../store/tinybase/persisted";
+import * as main from "../../../../store/tinybase/main";
 import { getInitials } from "./shared";
 
 export function DetailsColumn({
@@ -17,16 +17,16 @@ export function DetailsColumn({
   handleDeletePerson: (id: string) => void;
   handleSessionClick: (id: string) => void;
 }) {
-  const selectedPersonData = persisted.UI.useRow("humans", selectedHumanId ?? "", persisted.STORE_ID);
+  const selectedPersonData = main.UI.useRow("humans", selectedHumanId ?? "", main.STORE_ID);
 
-  const mappingIdsByHuman = persisted.UI.useSliceRowIds(
-    persisted.INDEXES.sessionsByHuman,
+  const mappingIdsByHuman = main.UI.useSliceRowIds(
+    main.INDEXES.sessionsByHuman,
     selectedHumanId ?? "",
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
-  const allMappings = persisted.UI.useTable("mapping_session_participant", persisted.STORE_ID);
-  const allSessions = persisted.UI.useTable("sessions", persisted.STORE_ID);
+  const allMappings = main.UI.useTable("mapping_session_participant", main.STORE_ID);
+  const allSessions = main.UI.useTable("sessions", main.STORE_ID);
 
   const personSessions = React.useMemo(() => {
     if (!mappingIdsByHuman || mappingIdsByHuman.length === 0) {
@@ -185,15 +185,15 @@ export function DetailsColumn({
 }
 
 function EditablePersonNameField({ personId }: { personId: string }) {
-  const value = persisted.UI.useCell("humans", personId, "name", persisted.STORE_ID);
+  const value = main.UI.useCell("humans", personId, "name", main.STORE_ID);
 
-  const handleChange = persisted.UI.useSetCellCallback(
+  const handleChange = main.UI.useSetCellCallback(
     "humans",
     personId,
     "name",
     (e: React.ChangeEvent<HTMLInputElement>) => e.target.value,
     [],
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   return (
@@ -207,15 +207,15 @@ function EditablePersonNameField({ personId }: { personId: string }) {
 }
 
 function EditablePersonJobTitleField({ personId }: { personId: string }) {
-  const value = persisted.UI.useCell("humans", personId, "job_title", persisted.STORE_ID);
+  const value = main.UI.useCell("humans", personId, "job_title", main.STORE_ID);
 
-  const handleChange = persisted.UI.useSetCellCallback(
+  const handleChange = main.UI.useSetCellCallback(
     "humans",
     personId,
     "job_title",
     (e: React.ChangeEvent<HTMLInputElement>) => e.target.value,
     [],
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   return (
@@ -234,15 +234,15 @@ function EditablePersonJobTitleField({ personId }: { personId: string }) {
 }
 
 function EditablePersonEmailField({ personId }: { personId: string }) {
-  const value = persisted.UI.useCell("humans", personId, "email", persisted.STORE_ID);
+  const value = main.UI.useCell("humans", personId, "email", main.STORE_ID);
 
-  const handleChange = persisted.UI.useSetCellCallback(
+  const handleChange = main.UI.useSetCellCallback(
     "humans",
     personId,
     "email",
     (e: React.ChangeEvent<HTMLInputElement>) => e.target.value,
     [],
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   return (
@@ -262,15 +262,15 @@ function EditablePersonEmailField({ personId }: { personId: string }) {
 }
 
 function EditablePersonLinkedInField({ personId }: { personId: string }) {
-  const value = persisted.UI.useCell("humans", personId, "linkedin_username", persisted.STORE_ID);
+  const value = main.UI.useCell("humans", personId, "linkedin_username", main.STORE_ID);
 
-  const handleChange = persisted.UI.useSetCellCallback(
+  const handleChange = main.UI.useSetCellCallback(
     "humans",
     personId,
     "linkedin_username",
     (e: React.ChangeEvent<HTMLInputElement>) => e.target.value,
     [],
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   return (
@@ -289,15 +289,15 @@ function EditablePersonLinkedInField({ personId }: { personId: string }) {
 }
 
 function EditablePersonMemoField({ personId }: { personId: string }) {
-  const value = persisted.UI.useCell("humans", personId, "memo", persisted.STORE_ID);
+  const value = main.UI.useCell("humans", personId, "memo", main.STORE_ID);
 
-  const handleChange = persisted.UI.useSetCellCallback(
+  const handleChange = main.UI.useSetCellCallback(
     "humans",
     personId,
     "memo",
     (e: React.ChangeEvent<HTMLTextAreaElement>) => e.target.value,
     [],
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   return (
@@ -318,16 +318,16 @@ function EditablePersonMemoField({ personId }: { personId: string }) {
 
 function EditPersonOrganizationSelector({ personId }: { personId: string }) {
   const [open, setOpen] = useState(false);
-  const orgId = persisted.UI.useCell("humans", personId, "org_id", persisted.STORE_ID) as string | null;
-  const organization = persisted.UI.useRow("organizations", orgId ?? "", persisted.STORE_ID);
+  const orgId = main.UI.useCell("humans", personId, "org_id", main.STORE_ID) as string | null;
+  const organization = main.UI.useRow("organizations", orgId ?? "", main.STORE_ID);
 
-  const handleChange = persisted.UI.useSetCellCallback(
+  const handleChange = main.UI.useSetCellCallback(
     "humans",
     personId,
     "org_id",
     (newOrgId: string | null) => newOrgId ?? "",
     [],
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   const handleRemoveOrganization = () => {
@@ -373,7 +373,7 @@ function OrganizationControl({
 }) {
   const [searchTerm, setSearchTerm] = useState("");
 
-  const organizationsData = persisted.UI.useResultTable(persisted.QUERIES.visibleOrganizations, persisted.STORE_ID);
+  const organizationsData = main.UI.useResultTable(main.QUERIES.visibleOrganizations, main.STORE_ID);
 
   const allOrganizations = Object.entries(organizationsData).map(([id, data]) => ({
     id,
diff --git a/apps/desktop/src/components/main/body/contacts/index.tsx b/apps/desktop/src/components/main/body/contacts/index.tsx
index 3a6596868..a33e231c8 100644
--- a/apps/desktop/src/components/main/body/contacts/index.tsx
+++ b/apps/desktop/src/components/main/body/contacts/index.tsx
@@ -3,7 +3,7 @@ import { ResizableHandle, ResizablePanel, ResizablePanelGroup } from "@hypr/ui/c
 import { Contact2Icon } from "lucide-react";
 import { useCallback, useEffect } from "react";
 
-import * as persisted from "../../../../store/tinybase/persisted";
+import * as main from "../../../../store/tinybase/main";
 import { type Tab, useTabs } from "../../../../store/zustand/tabs";
 import { StandardTabWrapper } from "../index";
 import { type TabItem, TabItemBase } from "../shared";
@@ -70,10 +70,10 @@ function ContactView({ tab }: { tab: Extract<Tab, { type: "contacts" }> }) {
     openCurrent({ type: "sessions", id });
   }, [openCurrent]);
 
-  const deletePersonFromStore = persisted.UI.useDelRowCallback(
+  const deletePersonFromStore = main.UI.useDelRowCallback(
     "humans",
     (human_id: string) => human_id,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   const handleDeletePerson = useCallback((id: string) => {
@@ -81,10 +81,10 @@ function ContactView({ tab }: { tab: Extract<Tab, { type: "contacts" }> }) {
     deletePersonFromStore(id);
   }, [invalidateResource, deletePersonFromStore]);
 
-  const deleteOrganizationFromStore = persisted.UI.useDelRowCallback(
+  const deleteOrganizationFromStore = main.UI.useDelRowCallback(
     "organizations",
     (org_id: string) => org_id,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   const handleDeleteOrganization = useCallback((id: string) => {
diff --git a/apps/desktop/src/components/main/body/contacts/organization-details.tsx b/apps/desktop/src/components/main/body/contacts/organization-details.tsx
index 37a5a5e4c..9f7081bc8 100644
--- a/apps/desktop/src/components/main/body/contacts/organization-details.tsx
+++ b/apps/desktop/src/components/main/body/contacts/organization-details.tsx
@@ -5,7 +5,7 @@ import { Icon } from "@iconify-icon/react";
 import { openUrl } from "@tauri-apps/plugin-opener";
 import { Building2, Mail } from "lucide-react";
 
-import * as persisted from "../../../../store/tinybase/persisted";
+import * as main from "../../../../store/tinybase/main";
 import { getInitials } from "./shared";
 
 export function OrganizationDetailsColumn({
@@ -17,15 +17,15 @@ export function OrganizationDetailsColumn({
   handleDeleteOrganization: (id: string) => void;
   onPersonClick?: (personId: string) => void;
 }) {
-  const selectedOrgData = persisted.UI.useRow("organizations", selectedOrganizationId ?? "", persisted.STORE_ID);
+  const selectedOrgData = main.UI.useRow("organizations", selectedOrganizationId ?? "", main.STORE_ID);
 
-  const peopleInOrg = persisted.UI.useSliceRowIds(
-    persisted.INDEXES.humansByOrg,
+  const peopleInOrg = main.UI.useSliceRowIds(
+    main.INDEXES.humansByOrg,
     selectedOrganizationId ?? "",
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
-  const allHumans = persisted.UI.useTable("humans", persisted.STORE_ID);
+  const allHumans = main.UI.useTable("humans", main.STORE_ID);
 
   return (
     <div className="flex-1 flex flex-col">
@@ -168,15 +168,15 @@ export function OrganizationDetailsColumn({
 }
 
 function EditableOrganizationNameField({ organizationId }: { organizationId: string }) {
-  const value = persisted.UI.useCell("organizations", organizationId, "name", persisted.STORE_ID);
+  const value = main.UI.useCell("organizations", organizationId, "name", main.STORE_ID);
 
-  const handleChange = persisted.UI.useSetCellCallback(
+  const handleChange = main.UI.useSetCellCallback(
     "organizations",
     organizationId,
     "name",
     (e: React.ChangeEvent<HTMLInputElement>) => e.target.value,
     [],
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   return (
diff --git a/apps/desktop/src/components/main/body/contacts/organizations.tsx b/apps/desktop/src/components/main/body/contacts/organizations.tsx
index 44c3a317a..1a11fb2f8 100644
--- a/apps/desktop/src/components/main/body/contacts/organizations.tsx
+++ b/apps/desktop/src/components/main/body/contacts/organizations.tsx
@@ -3,7 +3,7 @@ import { cn } from "@hypr/utils";
 import { Building2, CornerDownLeft, User } from "lucide-react";
 import React, { useState } from "react";
 
-import * as persisted from "../../../../store/tinybase/persisted";
+import * as main from "../../../../store/tinybase/main";
 import { ColumnHeader, type SortOption } from "./shared";
 
 export function OrganizationsColumn({
@@ -19,7 +19,7 @@ export function OrganizationsColumn({
   const [searchValue, setSearchValue] = useState("");
   const { organizationIds, sortOption, setSortOption } = useSortedOrganizationIds();
 
-  const allOrgs = persisted.UI.useTable("organizations", persisted.STORE_ID);
+  const allOrgs = main.UI.useTable("organizations", main.STORE_ID);
 
   const filteredOrganizationIds = React.useMemo(() => {
     if (!searchValue.trim()) {
@@ -79,37 +79,37 @@ export function OrganizationsColumn({
 function useSortedOrganizationIds() {
   const [sortOption, setSortOption] = useState<SortOption>("alphabetical");
 
-  const alphabeticalIds = persisted.UI.useResultSortedRowIds(
-    persisted.QUERIES.visibleOrganizations,
+  const alphabeticalIds = main.UI.useResultSortedRowIds(
+    main.QUERIES.visibleOrganizations,
     "name",
     false,
     0,
     undefined,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
-  const reverseAlphabeticalIds = persisted.UI.useResultSortedRowIds(
-    persisted.QUERIES.visibleOrganizations,
+  const reverseAlphabeticalIds = main.UI.useResultSortedRowIds(
+    main.QUERIES.visibleOrganizations,
     "name",
     true,
     0,
     undefined,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
-  const newestIds = persisted.UI.useResultSortedRowIds(
-    persisted.QUERIES.visibleOrganizations,
+  const newestIds = main.UI.useResultSortedRowIds(
+    main.QUERIES.visibleOrganizations,
     "created_at",
     true,
     0,
     undefined,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
-  const oldestIds = persisted.UI.useResultSortedRowIds(
-    persisted.QUERIES.visibleOrganizations,
+  const oldestIds = main.UI.useResultSortedRowIds(
+    main.QUERIES.visibleOrganizations,
     "created_at",
     false,
     0,
     undefined,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   const organizationIds = sortOption === "alphabetical"
@@ -134,7 +134,7 @@ function OrganizationItem({
   isViewingDetails: boolean;
   setSelectedOrganization: (id: string | null) => void;
 }) {
-  const organization = persisted.UI.useRow("organizations", organizationId, persisted.STORE_ID);
+  const organization = main.UI.useRow("organizations", organizationId, main.STORE_ID);
   if (!organization) {
     return null;
   }
@@ -167,7 +167,7 @@ function NewOrganizationForm({
 }) {
   const [name, setName] = useState("");
 
-  const handleAdd = persisted.UI.useAddRowCallback(
+  const handleAdd = main.UI.useAddRowCallback(
     "organizations",
     () => ({
       name: name.trim(),
@@ -175,7 +175,7 @@ function NewOrganizationForm({
       updated_at: new Date().toISOString(),
     }),
     [name],
-    persisted.STORE_ID,
+    main.STORE_ID,
     () => {
       setName("");
       onSave();
diff --git a/apps/desktop/src/components/main/body/contacts/people.tsx b/apps/desktop/src/components/main/body/contacts/people.tsx
index 468e1131e..4cd799f8a 100644
--- a/apps/desktop/src/components/main/body/contacts/people.tsx
+++ b/apps/desktop/src/components/main/body/contacts/people.tsx
@@ -2,7 +2,7 @@ import { cn } from "@hypr/utils";
 
 import { useMemo, useState } from "react";
 
-import * as persisted from "../../../../store/tinybase/persisted";
+import * as main from "../../../../store/tinybase/main";
 import { ColumnHeader, getInitials, type SortOption } from "./shared";
 
 export function PeopleColumn({
@@ -17,7 +17,7 @@ export function PeopleColumn({
   const [searchValue, setSearchValue] = useState("");
   const { humanIds, sortOption, setSortOption } = useSortedHumanIds(currentOrgId);
 
-  const allHumans = persisted.UI.useTable("humans", persisted.STORE_ID);
+  const allHumans = main.UI.useTable("humans", main.STORE_ID);
 
   const filteredHumanIds = useMemo(() => {
     if (!searchValue.trim()) {
@@ -62,43 +62,43 @@ export function PeopleColumn({
 export function useSortedHumanIds(currentOrgId?: string | null) {
   const [sortOption, setSortOption] = useState<SortOption>("alphabetical");
 
-  const allAlphabeticalIds = persisted.UI.useResultSortedRowIds(
-    persisted.QUERIES.visibleHumans,
+  const allAlphabeticalIds = main.UI.useResultSortedRowIds(
+    main.QUERIES.visibleHumans,
     "name",
     false,
     0,
     undefined,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
-  const allReverseAlphabeticalIds = persisted.UI.useResultSortedRowIds(
-    persisted.QUERIES.visibleHumans,
+  const allReverseAlphabeticalIds = main.UI.useResultSortedRowIds(
+    main.QUERIES.visibleHumans,
     "name",
     true,
     0,
     undefined,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
-  const allNewestIds = persisted.UI.useResultSortedRowIds(
-    persisted.QUERIES.visibleHumans,
+  const allNewestIds = main.UI.useResultSortedRowIds(
+    main.QUERIES.visibleHumans,
     "created_at",
     true,
     0,
     undefined,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
-  const allOldestIds = persisted.UI.useResultSortedRowIds(
-    persisted.QUERIES.visibleHumans,
+  const allOldestIds = main.UI.useResultSortedRowIds(
+    main.QUERIES.visibleHumans,
     "created_at",
     false,
     0,
     undefined,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
-  const thisOrgHumanIds = persisted.UI.useSliceRowIds(
-    persisted.INDEXES.humansByOrg,
+  const thisOrgHumanIds = main.UI.useSliceRowIds(
+    main.INDEXES.humansByOrg,
     currentOrgId ?? "",
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   const humanIds = currentOrgId
@@ -129,7 +129,7 @@ function PersonItem({
   active: boolean;
   setSelectedPerson: (id: string | null) => void;
 }) {
-  const person = persisted.UI.useRow("humans", humanId, persisted.STORE_ID);
+  const person = main.UI.useRow("humans", humanId, main.STORE_ID);
 
   return (
     <button
diff --git a/apps/desktop/src/components/main/body/events.tsx b/apps/desktop/src/components/main/body/events.tsx
index 3be2cf919..69d861cc6 100644
--- a/apps/desktop/src/components/main/body/events.tsx
+++ b/apps/desktop/src/components/main/body/events.tsx
@@ -1,6 +1,6 @@
 import { CalendarIcon } from "lucide-react";
 
-import * as persisted from "../../../store/tinybase/persisted";
+import * as main from "../../../store/tinybase/main";
 import { rowIdfromTab, type Tab } from "../../../store/zustand/tabs";
 import { StandardTabWrapper } from "./index";
 import { type TabItem, TabItemBase } from "./shared";
@@ -15,7 +15,7 @@ export const TabItemEvent: TabItem<Extract<Tab, { type: "events" }>> = (
     handleCloseAll,
   },
 ) => {
-  const title = persisted.UI.useCell("events", rowIdfromTab(tab), "title", persisted.STORE_ID);
+  const title = main.UI.useCell("events", rowIdfromTab(tab), "title", main.STORE_ID);
 
   return (
     <TabItemBase
@@ -33,7 +33,7 @@ export const TabItemEvent: TabItem<Extract<Tab, { type: "events" }>> = (
 
 export function TabContentEvent({ tab }: { tab: Extract<Tab, { type: "events" }> }) {
   const id = rowIdfromTab(tab);
-  const event = persisted.UI.useRow("events", id, persisted.STORE_ID);
+  const event = main.UI.useRow("events", id, main.STORE_ID);
 
   return (
     <StandardTabWrapper>
diff --git a/apps/desktop/src/components/main/body/folders/index.tsx b/apps/desktop/src/components/main/body/folders/index.tsx
index 3eaf1617c..b2a888505 100644
--- a/apps/desktop/src/components/main/body/folders/index.tsx
+++ b/apps/desktop/src/components/main/body/folders/index.tsx
@@ -1,7 +1,7 @@
 import { FolderIcon, FoldersIcon, PlusIcon, StickyNoteIcon } from "lucide-react";
 
 import { cn } from "@hypr/utils";
-import * as persisted from "../../../../store/tinybase/persisted";
+import * as main from "../../../../store/tinybase/main";
 import { type Tab, useTabs } from "../../../../store/zustand/tabs";
 import { StandardTabWrapper } from "../index";
 import { type TabItem, TabItemBase } from "../shared";
@@ -53,7 +53,7 @@ const TabItemFolderSpecific: TabItem<Extract<Tab, { type: "folders" }>> = ({
   handleCloseAll,
 }) => {
   const folders = useFolderChain(tab?.id ?? "");
-  const name = persisted.UI.useCell("folders", tab?.id ?? "", "name", persisted.STORE_ID);
+  const name = main.UI.useCell("folders", tab?.id ?? "", "name", main.STORE_ID);
   const title = " .. / ".repeat(folders.length - 1) + name;
 
   return (
@@ -83,10 +83,10 @@ export function TabContentFolder({ tab }: { tab: Tab }) {
 }
 
 function TabContentFolderTopLevel() {
-  const topLevelFolderIds = persisted.UI.useSliceRowIds(
-    persisted.INDEXES.foldersByParent,
+  const topLevelFolderIds = main.UI.useSliceRowIds(
+    main.INDEXES.foldersByParent,
     "",
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   return (
@@ -111,19 +111,19 @@ function TabContentFolderTopLevel() {
 }
 
 function FolderCard({ folderId }: { folderId: string }) {
-  const folder = persisted.UI.useRow("folders", folderId, persisted.STORE_ID);
+  const folder = main.UI.useRow("folders", folderId, main.STORE_ID);
   const { openCurrent } = useTabs();
 
-  const childFolderIds = persisted.UI.useSliceRowIds(
-    persisted.INDEXES.foldersByParent,
+  const childFolderIds = main.UI.useSliceRowIds(
+    main.INDEXES.foldersByParent,
     folderId,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
-  const sessionIds = persisted.UI.useSliceRowIds(
-    persisted.INDEXES.sessionsByFolder,
+  const sessionIds = main.UI.useSliceRowIds(
+    main.INDEXES.sessionsByFolder,
     folderId,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   const childCount = (childFolderIds?.length ?? 0) + (sessionIds?.length ?? 0);
@@ -144,16 +144,16 @@ function FolderCard({ folderId }: { folderId: string }) {
 }
 
 function TabContentFolderSpecific({ folderId }: { folderId: string }) {
-  const childFolderIds = persisted.UI.useSliceRowIds(
-    persisted.INDEXES.foldersByParent,
+  const childFolderIds = main.UI.useSliceRowIds(
+    main.INDEXES.foldersByParent,
     folderId,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
-  const sessionIds = persisted.UI.useSliceRowIds(
-    persisted.INDEXES.sessionsByFolder,
+  const sessionIds = main.UI.useSliceRowIds(
+    main.INDEXES.sessionsByFolder,
     folderId,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   const isEmpty = (childFolderIds?.length ?? 0) === 0 && (sessionIds?.length ?? 0) === 0;
@@ -226,7 +226,7 @@ function TabContentFolderBreadcrumb({ folderId }: { folderId: string }) {
 }
 
 function FolderSessionItem({ sessionId }: { sessionId: string }) {
-  const session = persisted.UI.useRow("sessions", sessionId, persisted.STORE_ID);
+  const session = main.UI.useRow("sessions", sessionId, main.STORE_ID);
   const { openCurrent } = useTabs();
 
   return (
diff --git a/apps/desktop/src/components/main/body/humans.tsx b/apps/desktop/src/components/main/body/humans.tsx
index 689eb14ab..668194436 100644
--- a/apps/desktop/src/components/main/body/humans.tsx
+++ b/apps/desktop/src/components/main/body/humans.tsx
@@ -1,6 +1,6 @@
 import { UserIcon } from "lucide-react";
 
-import * as persisted from "../../../store/tinybase/persisted";
+import * as main from "../../../store/tinybase/main";
 import { type Tab } from "../../../store/zustand/tabs";
 import { StandardTabWrapper } from "./index";
 import { type TabItem, TabItemBase } from "./shared";
@@ -13,7 +13,7 @@ export const TabItemHuman: TabItem<Extract<Tab, { type: "humans" }>> = ({
   handleCloseOthers,
   handleCloseAll,
 }) => {
-  const title = persisted.UI.useCell("humans", tab.id, "name", persisted.STORE_ID);
+  const title = main.UI.useCell("humans", tab.id, "name", main.STORE_ID);
 
   return (
     <TabItemBase
diff --git a/apps/desktop/src/components/main/body/sessions/floating/generate.tsx b/apps/desktop/src/components/main/body/sessions/floating/generate.tsx
index 7e56e698b..cd77b55c6 100644
--- a/apps/desktop/src/components/main/body/sessions/floating/generate.tsx
+++ b/apps/desktop/src/components/main/body/sessions/floating/generate.tsx
@@ -6,7 +6,7 @@ import { cn } from "@hypr/utils";
 import { useAITask } from "../../../../../contexts/ai-task";
 import { useLanguageModel } from "../../../../../hooks/useLLMConnection";
 import { useTaskStatus } from "../../../../../hooks/useTaskStatus";
-import * as persisted from "../../../../../store/tinybase/persisted";
+import * as main from "../../../../../store/tinybase/main";
 import { createTaskId } from "../../../../../store/zustand/ai-task/task-configs";
 import { getTaskState } from "../../../../../store/zustand/ai-task/tasks";
 import { FloatingButton } from "./shared";
@@ -28,12 +28,12 @@ export function GenerateButton({ sessionId }: { sessionId: string }) {
       );
   }, []);
 
-  const updateEnhancedMd = persisted.UI.useSetPartialRowCallback(
+  const updateEnhancedMd = main.UI.useSetPartialRowCallback(
     "sessions",
     sessionId,
     (input: string) => ({ enhanced_md: input }),
     [],
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   const { generate, rawStatus, streamedText, error } = useAITask((state) => {
@@ -58,7 +58,7 @@ export function GenerateButton({ sessionId }: { sessionId: string }) {
     },
   });
 
-  const templates = persisted.UI.useResultTable(persisted.QUERIES.visibleTemplates, persisted.STORE_ID);
+  const templates = main.UI.useResultTable(main.QUERIES.visibleTemplates, main.STORE_ID);
 
   const onRegenerate = async (templateId: string | null) => {
     if (!model) {
diff --git a/apps/desktop/src/components/main/body/sessions/floating/listen.tsx b/apps/desktop/src/components/main/body/sessions/floating/listen.tsx
index e6c7f9f11..46812fffe 100644
--- a/apps/desktop/src/components/main/body/sessions/floating/listen.tsx
+++ b/apps/desktop/src/components/main/body/sessions/floating/listen.tsx
@@ -9,7 +9,7 @@ import { useStartListening } from "../../../../../hooks/useStartListening";
 import { useSTTConnection } from "../../../../../hooks/useSTTConnection";
 import { FloatingButton } from "./shared";
 
-import * as persisted from "../../../../../store/tinybase/persisted";
+import * as main from "../../../../../store/tinybase/main";
 import { type Tab } from "../../../../../store/zustand/tabs";
 
 export function ListenButton({ tab }: { tab: Extract<Tab, { type: "sessions" }> }) {
@@ -128,8 +128,8 @@ function StartButton({
 type RemoteMeeting = { type: "zoom" | "google-meet" | "webex" | "teams"; url: string | null };
 
 function useRemoteMeeting(sessionId: string): RemoteMeeting | null {
-  const eventId = persisted.UI.useRemoteRowId(persisted.RELATIONSHIPS.sessionToEvent, sessionId);
-  const note = persisted.UI.useCell("events", eventId ?? "", "note", persisted.STORE_ID);
+  const eventId = main.UI.useRemoteRowId(main.RELATIONSHIPS.sessionToEvent, sessionId);
+  const note = main.UI.useCell("events", eventId ?? "", "note", main.STORE_ID);
 
   if (!note) {
     return null;
diff --git a/apps/desktop/src/components/main/body/sessions/index.tsx b/apps/desktop/src/components/main/body/sessions/index.tsx
index ca606dca9..0941d86ec 100644
--- a/apps/desktop/src/components/main/body/sessions/index.tsx
+++ b/apps/desktop/src/components/main/body/sessions/index.tsx
@@ -5,7 +5,7 @@ import { StickyNoteIcon } from "lucide-react";
 
 import AudioPlayer from "../../../../contexts/audio-player";
 import { useListener } from "../../../../contexts/listener";
-import * as persisted from "../../../../store/tinybase/persisted";
+import * as main from "../../../../store/tinybase/main";
 import { rowIdfromTab, type Tab } from "../../../../store/zustand/tabs";
 import { StandardTabWrapper } from "../index";
 import { type TabItem, TabItemBase } from "../shared";
@@ -24,7 +24,7 @@ export const TabItemNote: TabItem<Extract<Tab, { type: "sessions" }>> = (
     handleCloseAll,
   },
 ) => {
-  const title = persisted.UI.useCell("sessions", rowIdfromTab(tab), "title", persisted.STORE_ID);
+  const title = main.UI.useCell("sessions", rowIdfromTab(tab), "title", main.STORE_ID);
   const { status, sessionId } = useListener((state) => ({ status: state.status, sessionId: state.sessionId }));
   const isActive = status === "running_active" && sessionId === tab.id;
 
diff --git a/apps/desktop/src/components/main/body/sessions/note-input/enhanced/editor.tsx b/apps/desktop/src/components/main/body/sessions/note-input/enhanced/editor.tsx
index 005f505f4..7c6e4e4e7 100644
--- a/apps/desktop/src/components/main/body/sessions/note-input/enhanced/editor.tsx
+++ b/apps/desktop/src/components/main/body/sessions/note-input/enhanced/editor.tsx
@@ -2,23 +2,23 @@ import { forwardRef } from "react";
 
 import { TiptapEditor } from "@hypr/tiptap/editor";
 import NoteEditor from "@hypr/tiptap/editor";
-import * as persisted from "../../../../../../store/tinybase/persisted";
+import * as main from "../../../../../../store/tinybase/main";
 
 export const EnhancedEditor = forwardRef<{ editor: TiptapEditor | null }, { sessionId: string }>(
   ({ sessionId }, ref) => {
-    const value = persisted.UI.useCell("sessions", sessionId, "enhanced_md", persisted.STORE_ID);
+    const value = main.UI.useCell("sessions", sessionId, "enhanced_md", main.STORE_ID);
 
     const handleEnhancedChange = (c: string) => {
       console.log("handleEnhancedChange", c);
       _handleEnhancedChange(c);
     };
 
-    const _handleEnhancedChange = persisted.UI.useSetPartialRowCallback(
+    const _handleEnhancedChange = main.UI.useSetPartialRowCallback(
       "sessions",
       sessionId,
       (input: string) => ({ enhanced_md: input }),
       [],
-      persisted.STORE_ID,
+      main.STORE_ID,
     );
 
     return (
diff --git a/apps/desktop/src/components/main/body/sessions/note-input/raw.tsx b/apps/desktop/src/components/main/body/sessions/note-input/raw.tsx
index 36526e576..88138c187 100644
--- a/apps/desktop/src/components/main/body/sessions/note-input/raw.tsx
+++ b/apps/desktop/src/components/main/body/sessions/note-input/raw.tsx
@@ -7,19 +7,19 @@ import { forwardRef, useCallback } from "react";
 
 import type { PlaceholderFunction } from "@hypr/tiptap/shared";
 import { cn } from "@hypr/utils";
-import * as persisted from "../../../../../store/tinybase/persisted";
+import * as main from "../../../../../store/tinybase/main";
 import { commands } from "../../../../../types/tauri.gen";
 
 export const RawEditor = forwardRef<{ editor: TiptapEditor | null }, { sessionId: string }>(
   ({ sessionId }, ref) => {
-    const value = persisted.UI.useCell("sessions", sessionId, "raw_md", persisted.STORE_ID);
+    const value = main.UI.useCell("sessions", sessionId, "raw_md", main.STORE_ID);
 
-    const handleRawChange = persisted.UI.useSetPartialRowCallback(
+    const handleRawChange = main.UI.useSetPartialRowCallback(
       "sessions",
       sessionId,
       (input: string) => ({ raw_md: input }),
       [],
-      persisted.STORE_ID,
+      main.STORE_ID,
     );
 
     return (
diff --git a/apps/desktop/src/components/main/body/sessions/note-input/transcript/viewer/segment.ts b/apps/desktop/src/components/main/body/sessions/note-input/transcript/viewer/segment.ts
index a116d79c7..9420dc7f3 100644
--- a/apps/desktop/src/components/main/body/sessions/note-input/transcript/viewer/segment.ts
+++ b/apps/desktop/src/components/main/body/sessions/note-input/transcript/viewer/segment.ts
@@ -1,11 +1,11 @@
 import { useMemo } from "react";
 
 import { useListener } from "../../../../../../../contexts/listener";
-import * as persisted from "../../../../../../../store/tinybase/persisted";
+import * as main from "../../../../../../../store/tinybase/main";
 import { buildSegments, mergeWordsByChannel, type PartialWord } from "../../../../../../../utils/segments";
 
 export function useMergedWordsByChannel(
-  finalWords: Record<string, persisted.Word>,
+  finalWords: Record<string, main.Word>,
   partialWords: Record<number, PartialWord[]>,
 ) {
   return useMemo(
@@ -19,19 +19,19 @@ export function usePartialWords() {
 }
 
 export function useFinalWords(sessionId: string) {
-  const store = persisted.UI.useStore(persisted.STORE_ID);
+  const store = main.UI.useStore(main.STORE_ID);
 
-  const transcriptIds = persisted.UI.useSliceRowIds(
-    persisted.INDEXES.transcriptBySession,
+  const transcriptIds = main.UI.useSliceRowIds(
+    main.INDEXES.transcriptBySession,
     sessionId,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
   const transcriptId = transcriptIds?.[0];
 
-  const wordIds = persisted.UI.useSliceRowIds(
-    persisted.INDEXES.wordsByTranscript,
+  const wordIds = main.UI.useSliceRowIds(
+    main.INDEXES.wordsByTranscript,
     transcriptId,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   return useMemo(() => {
@@ -39,11 +39,11 @@ export function useFinalWords(sessionId: string) {
       return {};
     }
 
-    const words: Record<string, persisted.Word> = {};
+    const words: Record<string, main.Word> = {};
     wordIds?.forEach((wordId) => {
       const word = store.getRow("words", wordId);
       if (word) {
-        words[wordId] = word as persisted.Word;
+        words[wordId] = word as main.Word;
       }
     });
     return words;
diff --git a/apps/desktop/src/components/main/body/sessions/note-input/transcript/viewer/test-utils.ts b/apps/desktop/src/components/main/body/sessions/note-input/transcript/viewer/test-utils.ts
index 91f7ded92..732621e35 100644
--- a/apps/desktop/src/components/main/body/sessions/note-input/transcript/viewer/test-utils.ts
+++ b/apps/desktop/src/components/main/body/sessions/note-input/transcript/viewer/test-utils.ts
@@ -1,6 +1,6 @@
 import { expect } from "vitest";
 
-import type * as persisted from "../../../../../../../store/tinybase/persisted";
+import type * as main from "../../../../../../../store/tinybase/main";
 import type { MaybePartialWord } from "../../../../../../../utils/segments";
 
 interface CustomMatchers<R = unknown> {
@@ -68,7 +68,7 @@ export function word(
   start_ms: number,
   end_ms: number,
   channel: number = 0,
-): persisted.Word {
+): main.Word {
   return {
     text,
     start_ms,
diff --git a/apps/desktop/src/components/main/body/sessions/outer-header/folder.tsx b/apps/desktop/src/components/main/body/sessions/outer-header/folder.tsx
index 3fa1f0696..359b58dd6 100644
--- a/apps/desktop/src/components/main/body/sessions/outer-header/folder.tsx
+++ b/apps/desktop/src/components/main/body/sessions/outer-header/folder.tsx
@@ -9,21 +9,21 @@ import {
 
 import { FolderIcon } from "lucide-react";
 
-import * as persisted from "../../../../../store/tinybase/persisted";
+import * as main from "../../../../../store/tinybase/main";
 import { useTabs } from "../../../../../store/zustand/tabs";
 import { FolderBreadcrumb } from "../../shared/folder-breadcrumb";
 import { SearchableFolderDropdown } from "./shared/folder";
 
 export function FolderChain({ sessionId }: { sessionId: string }) {
-  const folderId = persisted.UI.useCell("sessions", sessionId, "folder_id", persisted.STORE_ID);
-  const title = persisted.UI.useCell("sessions", sessionId, "title", persisted.STORE_ID) ?? "Untitled";
+  const folderId = main.UI.useCell("sessions", sessionId, "folder_id", main.STORE_ID);
+  const title = main.UI.useCell("sessions", sessionId, "title", main.STORE_ID) ?? "Untitled";
 
-  const handleChangeTitle = persisted.UI.useSetPartialRowCallback(
+  const handleChangeTitle = main.UI.useSetPartialRowCallback(
     "sessions",
     sessionId,
     (title: string) => ({ title }),
     [],
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   return (
diff --git a/apps/desktop/src/components/main/body/sessions/outer-header/metadata/participants.tsx b/apps/desktop/src/components/main/body/sessions/outer-header/metadata/participants.tsx
index 416fbd185..4f920b369 100644
--- a/apps/desktop/src/components/main/body/sessions/outer-header/metadata/participants.tsx
+++ b/apps/desktop/src/components/main/body/sessions/outer-header/metadata/participants.tsx
@@ -8,7 +8,7 @@ import { useCallback, useMemo, useState } from "react";
 
 import { useQuery } from "../../../../../../hooks/useQuery";
 import * as internal from "../../../../../../store/tinybase/internal";
-import * as persisted from "../../../../../../store/tinybase/persisted";
+import * as main from "../../../../../../store/tinybase/main";
 import { useTabs } from "../../../../../../store/zustand/tabs";
 import { getInitials } from "../../../contacts/shared";
 
@@ -115,13 +115,13 @@ export function MeetingParticipants({ sessionId }: { sessionId: string }) {
   const { openNew } = useTabs();
   const { user_id } = internal.UI.useValues(internal.STORE_ID);
 
-  const store = persisted.UI.useStore(persisted.STORE_ID);
-  const indexes = persisted.UI.useIndexes(persisted.STORE_ID);
+  const store = main.UI.useStore(main.STORE_ID);
+  const indexes = main.UI.useIndexes(main.STORE_ID);
 
-  const participantMappingIds = persisted.UI.useSliceRowIds(
-    persisted.INDEXES.sessionParticipantsBySession,
+  const participantMappingIds = main.UI.useSliceRowIds(
+    main.INDEXES.sessionParticipantsBySession,
     sessionId,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   // Get participants with full data
@@ -166,7 +166,7 @@ export function MeetingParticipants({ sessionId }: { sessionId: string }) {
       const existingParticipantIds = new Set<string>();
 
       const participantMappings = indexes!.getSliceRowIds(
-        persisted.INDEXES.sessionParticipantsBySession,
+        main.INDEXES.sessionParticipantsBySession,
         sessionId,
       );
       participantMappings?.forEach((mappingId: string) => {
diff --git a/apps/desktop/src/components/main/body/sessions/outer-header/metadata/shared.ts b/apps/desktop/src/components/main/body/sessions/outer-header/metadata/shared.ts
index f36e08659..f55db7077 100644
--- a/apps/desktop/src/components/main/body/sessions/outer-header/metadata/shared.ts
+++ b/apps/desktop/src/components/main/body/sessions/outer-header/metadata/shared.ts
@@ -1,4 +1,4 @@
-import * as persisted from "../../../../../../store/tinybase/persisted";
+import * as main from "../../../../../../store/tinybase/main";
 
 export type MeetingMetadata = {
   tood: string;
@@ -11,15 +11,15 @@ export type MeetingMetadata = {
 };
 
 export function useMeetingMetadata(sessionId: string): MeetingMetadata | null {
-  const eventId = persisted.UI.useCell("sessions", sessionId, "event_id", persisted.STORE_ID);
+  const eventId = main.UI.useCell("sessions", sessionId, "event_id", main.STORE_ID);
 
-  const eventNote = persisted.UI.useCell("events", eventId ?? "", "note", persisted.STORE_ID);
-  const meetingLink = persisted.UI.useCell("events", eventId ?? "", "meeting_link", persisted.STORE_ID);
-  const title = persisted.UI.useCell("events", eventId ?? "", "title", persisted.STORE_ID);
-  const startedAt = persisted.UI.useCell("events", eventId ?? "", "started_at", persisted.STORE_ID);
-  const endedAt = persisted.UI.useCell("events", eventId ?? "", "ended_at", persisted.STORE_ID);
-  const location = persisted.UI.useCell("events", eventId ?? "", "location", persisted.STORE_ID);
-  const description = persisted.UI.useCell("events", eventId ?? "", "description", persisted.STORE_ID);
+  const eventNote = main.UI.useCell("events", eventId ?? "", "note", main.STORE_ID);
+  const meetingLink = main.UI.useCell("events", eventId ?? "", "meeting_link", main.STORE_ID);
+  const title = main.UI.useCell("events", eventId ?? "", "title", main.STORE_ID);
+  const startedAt = main.UI.useCell("events", eventId ?? "", "started_at", main.STORE_ID);
+  const endedAt = main.UI.useCell("events", eventId ?? "", "ended_at", main.STORE_ID);
+  const location = main.UI.useCell("events", eventId ?? "", "location", main.STORE_ID);
+  const description = main.UI.useCell("events", eventId ?? "", "description", main.STORE_ID);
 
   if (!eventId || !title || !startedAt || !endedAt) {
     return null;
diff --git a/apps/desktop/src/components/main/body/sessions/outer-header/overflow.tsx b/apps/desktop/src/components/main/body/sessions/outer-header/overflow.tsx
index c5b5f89b6..217d796cb 100644
--- a/apps/desktop/src/components/main/body/sessions/outer-header/overflow.tsx
+++ b/apps/desktop/src/components/main/body/sessions/outer-header/overflow.tsx
@@ -14,7 +14,7 @@ import {
 } from "@hypr/ui/components/ui/dropdown-menu";
 import { useListener } from "../../../../../contexts/listener";
 import { useStartListening } from "../../../../../hooks/useStartListening";
-import * as persisted from "../../../../../store/tinybase/persisted";
+import * as main from "../../../../../store/tinybase/main";
 import { SearchableFolderSubmenuContent } from "./shared/folder";
 
 export function OverflowButton({ sessionId }: { sessionId: string }) {
@@ -108,10 +108,10 @@ function Listening({ sessionId }: { sessionId: string }) {
 }
 
 function DeleteNote({ sessionId }: { sessionId: string }) {
-  const deleteRow = persisted.UI.useDelRowCallback(
+  const deleteRow = main.UI.useDelRowCallback(
     "sessions",
     sessionId,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   const handleDeleteNote = useCallback(() => {
diff --git a/apps/desktop/src/components/main/body/sessions/outer-header/shared/folder.tsx b/apps/desktop/src/components/main/body/sessions/outer-header/shared/folder.tsx
index 98a9015ab..6acfa3bc9 100644
--- a/apps/desktop/src/components/main/body/sessions/outer-header/shared/folder.tsx
+++ b/apps/desktop/src/components/main/body/sessions/outer-header/shared/folder.tsx
@@ -16,18 +16,18 @@ import {
   DropdownMenuTrigger,
 } from "@hypr/ui/components/ui/dropdown-menu";
 
-import * as persisted from "../../../../../../store/tinybase/persisted";
+import * as main from "../../../../../../store/tinybase/main";
 
 export function SearchableFolderDropdown({ sessionId, trigger }: { sessionId: string; trigger: ReactNode }) {
   const [open, setOpen] = useState(false);
-  const folders = persisted.UI.useResultTable(persisted.QUERIES.visibleFolders, persisted.STORE_ID);
+  const folders = main.UI.useResultTable(main.QUERIES.visibleFolders, main.STORE_ID);
 
-  const handleSelectFolder = persisted.UI.useSetPartialRowCallback(
+  const handleSelectFolder = main.UI.useSetPartialRowCallback(
     "sessions",
     sessionId,
     (folderId: string) => ({ folder_id: folderId }),
     [],
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   return (
@@ -45,14 +45,14 @@ export function SearchableFolderDropdown({ sessionId, trigger }: { sessionId: st
 export function SearchableFolderSubmenuContent(
   { sessionId, setOpen }: { sessionId: string; setOpen?: (open: boolean) => void },
 ) {
-  const folders = persisted.UI.useResultTable(persisted.QUERIES.visibleFolders, persisted.STORE_ID);
+  const folders = main.UI.useResultTable(main.QUERIES.visibleFolders, main.STORE_ID);
 
-  const handleSelectFolder = persisted.UI.useSetPartialRowCallback(
+  const handleSelectFolder = main.UI.useSetPartialRowCallback(
     "sessions",
     sessionId,
     (folderId: string) => ({ folder_id: folderId }),
     [],
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   return (
diff --git a/apps/desktop/src/components/main/body/sessions/shared.tsx b/apps/desktop/src/components/main/body/sessions/shared.tsx
index 60e9f8bc8..ac4657b9b 100644
--- a/apps/desktop/src/components/main/body/sessions/shared.tsx
+++ b/apps/desktop/src/components/main/body/sessions/shared.tsx
@@ -1,15 +1,15 @@
 import { useMemo } from "react";
 
 import { useListener } from "../../../../contexts/listener";
-import * as persisted from "../../../../store/tinybase/persisted";
+import * as main from "../../../../store/tinybase/main";
 import type { Tab } from "../../../../store/zustand/tabs/schema";
 import { type EditorView } from "../../../../store/zustand/tabs/schema";
 
 export function useHasTranscript(sessionId: string): boolean {
-  const transcriptIds = persisted.UI.useSliceRowIds(
-    persisted.INDEXES.transcriptBySession,
+  const transcriptIds = main.UI.useSliceRowIds(
+    main.INDEXES.transcriptBySession,
     sessionId,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   return !!transcriptIds && transcriptIds.length > 0;
diff --git a/apps/desktop/src/components/main/body/sessions/title-input.tsx b/apps/desktop/src/components/main/body/sessions/title-input.tsx
index bbe8c0f83..146fcdabd 100644
--- a/apps/desktop/src/components/main/body/sessions/title-input.tsx
+++ b/apps/desktop/src/components/main/body/sessions/title-input.tsx
@@ -1,18 +1,18 @@
 import { cn } from "@hypr/utils";
 
-import * as persisted from "../../../../store/tinybase/persisted";
+import * as main from "../../../../store/tinybase/main";
 import { type Tab } from "../../../../store/zustand/tabs";
 
 export function TitleInput({ tab }: { tab: Extract<Tab, { type: "sessions" }> }) {
   const { id: sessionId, state: { editor } } = tab;
-  const title = persisted.UI.useCell("sessions", sessionId, "title", persisted.STORE_ID);
+  const title = main.UI.useCell("sessions", sessionId, "title", main.STORE_ID);
 
-  const handleEditTitle = persisted.UI.useSetPartialRowCallback(
+  const handleEditTitle = main.UI.useSetPartialRowCallback(
     "sessions",
     sessionId,
     (title: string) => ({ title }),
     [],
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   return (
diff --git a/apps/desktop/src/components/main/body/shared/folder-breadcrumb.tsx b/apps/desktop/src/components/main/body/shared/folder-breadcrumb.tsx
index 308ca8486..6cae387c8 100644
--- a/apps/desktop/src/components/main/body/shared/folder-breadcrumb.tsx
+++ b/apps/desktop/src/components/main/body/shared/folder-breadcrumb.tsx
@@ -1,6 +1,6 @@
 import { type ReactNode, useMemo } from "react";
 
-import * as persisted from "../../../../store/tinybase/persisted";
+import * as main from "../../../../store/tinybase/main";
 
 export function FolderBreadcrumb(
   {
@@ -52,15 +52,15 @@ function FolderWrapper(
     children: (props: { id: string; name: string; isLast: boolean }) => ReactNode;
   },
 ) {
-  const name = persisted.UI.useCell("folders", folderId, "name", persisted.STORE_ID);
+  const name = main.UI.useCell("folders", folderId, "name", main.STORE_ID);
   return <>{children({ id: folderId, name: name ?? "Untitled", isLast: false })}</>;
 }
 
 export function useFolderChain(folderId: string) {
-  const folderIds = persisted.UI.useLinkedRowIds(
+  const folderIds = main.UI.useLinkedRowIds(
     "folderToParentFolder",
     folderId,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   return useMemo(() => {
diff --git a/apps/desktop/src/components/main/sidebar/search/item.tsx b/apps/desktop/src/components/main/sidebar/search/item.tsx
index edf4ab7f2..a75c2a6b4 100644
--- a/apps/desktop/src/components/main/sidebar/search/item.tsx
+++ b/apps/desktop/src/components/main/sidebar/search/item.tsx
@@ -3,7 +3,7 @@ import { useCallback, useMemo } from "react";
 
 import { cn } from "@hypr/utils";
 import { type SearchResult } from "../../../../contexts/search/ui";
-import * as persisted from "../../../../store/tinybase/persisted";
+import * as main from "../../../../store/tinybase/main";
 import { type TabInput, useTabs } from "../../../../store/zustand/tabs";
 import { getInitials } from "../../body/contacts/shared";
 
@@ -67,10 +67,10 @@ function HumanSearchResultItem({ result, onClick }: { result: SearchResult; onCl
 }
 
 function OrganizationSearchResultItem({ result, onClick }: { result: SearchResult; onClick: () => void }) {
-  const humanIds = persisted.UI.useSliceRowIds(
-    persisted.INDEXES.humansByOrg,
+  const humanIds = main.UI.useSliceRowIds(
+    main.INDEXES.humansByOrg,
     result.id,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   const sanitizedTitle = useMemo(
diff --git a/apps/desktop/src/components/main/sidebar/timeline/index.tsx b/apps/desktop/src/components/main/sidebar/timeline/index.tsx
index 2b59d93ba..8e75d4889 100644
--- a/apps/desktop/src/components/main/sidebar/timeline/index.tsx
+++ b/apps/desktop/src/components/main/sidebar/timeline/index.tsx
@@ -5,7 +5,7 @@ import { type ReactNode, useMemo } from "react";
 
 import { Button } from "@hypr/ui/components/ui/button";
 import { cn } from "@hypr/utils";
-import * as persisted from "../../../../store/tinybase/persisted";
+import * as main from "../../../../store/tinybase/main";
 import {
   buildTimelineBuckets,
   calculateIndicatorIndex,
@@ -197,13 +197,13 @@ function TodayBucket({
 }
 
 function useTimelineData(): TimelineBucket[] {
-  const eventsWithoutSessionTable = persisted.UI.useResultTable(
-    persisted.QUERIES.eventsWithoutSession,
-    persisted.STORE_ID,
+  const eventsWithoutSessionTable = main.UI.useResultTable(
+    main.QUERIES.eventsWithoutSession,
+    main.STORE_ID,
   );
-  const sessionsWithMaybeEventTable = persisted.UI.useResultTable(
-    persisted.QUERIES.sessionsWithMaybeEvent,
-    persisted.STORE_ID,
+  const sessionsWithMaybeEventTable = main.UI.useResultTable(
+    main.QUERIES.sessionsWithMaybeEvent,
+    main.STORE_ID,
   );
 
   return useMemo(
diff --git a/apps/desktop/src/components/main/sidebar/timeline/item.tsx b/apps/desktop/src/components/main/sidebar/timeline/item.tsx
index 6dc0d6606..ac97653d4 100644
--- a/apps/desktop/src/components/main/sidebar/timeline/item.tsx
+++ b/apps/desktop/src/components/main/sidebar/timeline/item.tsx
@@ -3,7 +3,7 @@ import { cn } from "@hypr/utils";
 
 import { useCallback, useMemo } from "react";
 
-import * as persisted from "../../../../store/tinybase/persisted";
+import * as main from "../../../../store/tinybase/main";
 import { type TabInput, useTabs } from "../../../../store/zustand/tabs";
 import { id } from "../../../../utils";
 import { type TimelineItem, TimelinePrecision } from "../../../../utils/timeline";
@@ -11,7 +11,7 @@ import { InteractiveButton } from "../../../interactive-button";
 
 export function TimelineItemComponent({ item, precision }: { item: TimelineItem; precision: TimelinePrecision }) {
   const { currentTab, openCurrent, openNew, invalidateResource } = useTabs();
-  const store = persisted.UI.useStore(persisted.STORE_ID);
+  const store = main.UI.useStore(main.STORE_ID);
 
   const title = item.data.title || "Untitled";
   const timestamp = item.type === "event" ? item.data.started_at : item.data.created_at;
diff --git a/apps/desktop/src/components/settings/memory/custom-vocabulary.tsx b/apps/desktop/src/components/settings/memory/custom-vocabulary.tsx
index c290551d0..df73bdef7 100644
--- a/apps/desktop/src/components/settings/memory/custom-vocabulary.tsx
+++ b/apps/desktop/src/components/settings/memory/custom-vocabulary.tsx
@@ -6,7 +6,7 @@ import { Button } from "@hypr/ui/components/ui/button";
 import { cn } from "@hypr/utils";
 
 import * as internal from "../../../store/tinybase/internal";
-import { QUERIES, STORE_ID, UI } from "../../../store/tinybase/persisted";
+import { QUERIES, STORE_ID, UI } from "../../../store/tinybase/main";
 import { id } from "../../../utils";
 
 interface CustomVocabularyViewProps {
diff --git a/apps/desktop/src/components/settings/template/editor.tsx b/apps/desktop/src/components/settings/template/editor.tsx
index a04ae8f3e..ebc3adecf 100644
--- a/apps/desktop/src/components/settings/template/editor.tsx
+++ b/apps/desktop/src/components/settings/template/editor.tsx
@@ -2,13 +2,13 @@ import { useForm } from "@tanstack/react-form";
 
 import { Input } from "@hypr/ui/components/ui/input";
 import { Textarea } from "@hypr/ui/components/ui/textarea";
-import * as persisted from "../../../store/tinybase/persisted";
+import * as main from "../../../store/tinybase/main";
 import { SectionsList } from "./sections-list";
 
 export function TemplateEditor({ id }: { id: string }) {
-  const _value = persisted.UI.useRow("templates", id, persisted.STORE_ID);
+  const _value = main.UI.useRow("templates", id, main.STORE_ID);
   const value = _value
-    ? persisted.templateSchema.parse({
+    ? main.templateSchema.parse({
       user_id: _value.user_id ?? "",
       created_at: _value.created_at ?? new Date().toISOString(),
       title: _value.title ?? "",
@@ -17,15 +17,15 @@ export function TemplateEditor({ id }: { id: string }) {
     })
     : undefined;
 
-  const handleUpdate = persisted.UI.useSetPartialRowCallback(
+  const handleUpdate = main.UI.useSetPartialRowCallback(
     "templates",
     id,
-    (row: Partial<persisted.Template>) => ({
+    (row: Partial<main.Template>) => ({
       ...row,
       sections: row.sections ? JSON.stringify(row.sections) : undefined,
-    } satisfies Partial<persisted.TemplateStorage>),
+    } satisfies Partial<main.TemplateStorage>),
     [id],
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   const form = useForm({
diff --git a/apps/desktop/src/components/settings/template/index.tsx b/apps/desktop/src/components/settings/template/index.tsx
index b3ebffe63..c140aee42 100644
--- a/apps/desktop/src/components/settings/template/index.tsx
+++ b/apps/desktop/src/components/settings/template/index.tsx
@@ -8,7 +8,7 @@ import { Input } from "@hypr/ui/components/ui/input";
 import { cn } from "@hypr/utils";
 
 import * as internal from "../../../store/tinybase/internal";
-import * as persisted from "../../../store/tinybase/persisted";
+import * as main from "../../../store/tinybase/main";
 import { TemplateEditor } from "./editor";
 import { useTemplateNavigation } from "./use-template-navigation";
 
@@ -135,11 +135,11 @@ function TemplateCard({
 
 function useTemplates() {
   const { user_id } = internal.UI.useValues(internal.STORE_ID);
-  const store = persisted.UI.useStore(persisted.STORE_ID);
+  const store = main.UI.useStore(main.STORE_ID);
 
   const USER_TEMPLATE_QUERY = "user_templates";
 
-  const quries = persisted.UI.useCreateQueries(
+  const quries = main.UI.useCreateQueries(
     store,
     (store) =>
       createQueries(store).setQueryDefinition(USER_TEMPLATE_QUERY, "templates", ({ select, where }) => {
@@ -151,6 +151,6 @@ function useTemplates() {
     [user_id],
   );
 
-  const templates = persisted.UI.useResultTable(USER_TEMPLATE_QUERY, quries);
-  return templates as unknown as Record<string, persisted.Template>;
+  const templates = main.UI.useResultTable(USER_TEMPLATE_QUERY, quries);
+  return templates as unknown as Record<string, main.Template>;
 }
diff --git a/apps/desktop/src/components/settings/template/sections-list.tsx b/apps/desktop/src/components/settings/template/sections-list.tsx
index d36060b10..53a340e8b 100644
--- a/apps/desktop/src/components/settings/template/sections-list.tsx
+++ b/apps/desktop/src/components/settings/template/sections-list.tsx
@@ -7,9 +7,9 @@ import { GripVertical as HandleIcon, Plus, X } from "lucide-react";
 import { Reorder, useDragControls } from "motion/react";
 import { useCallback, useState } from "react";
 
-import * as persisted from "../../../store/tinybase/persisted";
+import * as main from "../../../store/tinybase/main";
 
-type ReorderItem = persisted.TemplateSection;
+type ReorderItem = main.TemplateSection;
 
 interface SectionsListProps {
   disabled: boolean;
diff --git a/apps/desktop/src/components/settings/template/use-template-navigation.ts b/apps/desktop/src/components/settings/template/use-template-navigation.ts
index 0c1058103..510dbaf2a 100644
--- a/apps/desktop/src/components/settings/template/use-template-navigation.ts
+++ b/apps/desktop/src/components/settings/template/use-template-navigation.ts
@@ -1,14 +1,14 @@
 import { useCallback } from "react";
 import { Route as SettingsRoute } from "../../../routes/app/settings/_layout";
 import * as internal from "../../../store/tinybase/internal";
-import * as persisted from "../../../store/tinybase/persisted";
+import * as main from "../../../store/tinybase/main";
 
 export function useTemplateNavigation() {
   const search = SettingsRoute.useSearch();
   const navigate = SettingsRoute.useNavigate();
   const { user_id } = internal.UI.useValues(internal.STORE_ID);
 
-  const setRow = persisted.UI.useSetRowCallback(
+  const setRow = main.UI.useSetRowCallback(
     "templates",
     (p: { id: string; user_id: string; created_at: string; title: string; description: string; sections: any[] }) =>
       p.id,
@@ -18,9 +18,9 @@ export function useTemplateNavigation() {
       title: p.title,
       description: p.description,
       sections: JSON.stringify(p.sections),
-    } satisfies persisted.TemplateStorage),
+    } satisfies main.TemplateStorage),
     [],
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   const goToList = useCallback(() => {
diff --git a/apps/desktop/src/contexts/search/engine/index.tsx b/apps/desktop/src/contexts/search/engine/index.tsx
index 130f8817a..b5179ece3 100644
--- a/apps/desktop/src/contexts/search/engine/index.tsx
+++ b/apps/desktop/src/contexts/search/engine/index.tsx
@@ -3,7 +3,7 @@ import { createContext, useCallback, useContext, useEffect, useRef, useState } f
 import { create, search as oramaSearch } from "@orama/orama";
 import { pluginQPS } from "@orama/plugin-qps";
 
-import { type Store as PersistedStore } from "../../../store/tinybase/persisted";
+import { type Store as PersistedStore } from "../../../store/tinybase/main";
 import { buildOramaFilters } from "./filters";
 import { indexHumans, indexOrganizations, indexSessions } from "./indexing";
 import { createHumanListener, createOrganizationListener, createSessionListener } from "./listeners";
diff --git a/apps/desktop/src/contexts/search/engine/indexing.ts b/apps/desktop/src/contexts/search/engine/indexing.ts
index d9e732600..49556eeb5 100644
--- a/apps/desktop/src/contexts/search/engine/indexing.ts
+++ b/apps/desktop/src/contexts/search/engine/indexing.ts
@@ -1,6 +1,6 @@
 import { insert } from "@orama/orama";
 
-import { type Store as PersistedStore } from "../../../store/tinybase/persisted";
+import { type Store as PersistedStore } from "../../../store/tinybase/main";
 import { createHumanSearchableContent, createSessionSearchableContent } from "./content";
 import type { Index } from "./types";
 import { collectCells, toNumber, toTrimmedString } from "./utils";
diff --git a/apps/desktop/src/contexts/search/engine/listeners.ts b/apps/desktop/src/contexts/search/engine/listeners.ts
index dc805470e..961018eb9 100644
--- a/apps/desktop/src/contexts/search/engine/listeners.ts
+++ b/apps/desktop/src/contexts/search/engine/listeners.ts
@@ -1,8 +1,8 @@
 import { remove, type TypedDocument, update } from "@orama/orama";
 import { RowListener } from "tinybase/with-schemas";
 
-import { Schemas } from "../../../store/tinybase/persisted";
-import { type Store as PersistedStore } from "../../../store/tinybase/persisted";
+import { Schemas } from "../../../store/tinybase/main";
+import { type Store as PersistedStore } from "../../../store/tinybase/main";
 import { createHumanSearchableContent, createSessionSearchableContent } from "./content";
 import type { Index } from "./types";
 import { collectCells, toNumber, toTrimmedString } from "./utils";
diff --git a/apps/desktop/src/devtool/index.tsx b/apps/desktop/src/devtool/index.tsx
index d326dd79b..5db2ea22e 100644
--- a/apps/desktop/src/devtool/index.tsx
+++ b/apps/desktop/src/devtool/index.tsx
@@ -5,7 +5,7 @@ import { useStores } from "tinybase/ui-react";
 import { commands as windowsCommands } from "@hypr/plugin-windows";
 import { cn } from "@hypr/utils";
 import { useAutoCloser } from "../hooks/useAutoCloser";
-import { type Store as PersistedStore, STORE_ID as STORE_ID_PERSISTED } from "../store/tinybase/persisted";
+import { type Store as PersistedStore, STORE_ID as STORE_ID_PERSISTED } from "../store/tinybase/main";
 import { SeedDefinition, seeds } from "./seed/index";
 import { TinyTickMonitor } from "./tinytick";
 
diff --git a/apps/desktop/src/devtool/seed/data/loader.ts b/apps/desktop/src/devtool/seed/data/loader.ts
index 990f345d8..1dfb5873d 100644
--- a/apps/desktop/src/devtool/seed/data/loader.ts
+++ b/apps/desktop/src/devtool/seed/data/loader.ts
@@ -1,6 +1,6 @@
 import type { Tables } from "tinybase/with-schemas";
 
-import type { Schemas } from "../../../store/tinybase/persisted";
+import type { Schemas } from "../../../store/tinybase/main";
 import { DEFAULT_USER_ID, id } from "../../../utils";
 import { type CuratedData, CuratedDataSchema } from "./schema";
 
diff --git a/apps/desktop/src/devtool/seed/shared/builders.ts b/apps/desktop/src/devtool/seed/shared/builders.ts
index fa55ba67f..09afe6b3a 100644
--- a/apps/desktop/src/devtool/seed/shared/builders.ts
+++ b/apps/desktop/src/devtool/seed/shared/builders.ts
@@ -16,7 +16,7 @@ import type {
   TemplateStorage,
   Transcript,
   Word,
-} from "../../../store/tinybase/persisted";
+} from "../../../store/tinybase/main";
 import { DEFAULT_USER_ID, id } from "../../../utils";
 import { createCalendar } from "./calendar";
 import { createChatGroup, createChatMessage } from "./chat";
diff --git a/apps/desktop/src/devtool/seed/shared/calendar.ts b/apps/desktop/src/devtool/seed/shared/calendar.ts
index 5949b3a2d..f1b470c4d 100644
--- a/apps/desktop/src/devtool/seed/shared/calendar.ts
+++ b/apps/desktop/src/devtool/seed/shared/calendar.ts
@@ -1,6 +1,6 @@
 import { faker } from "@faker-js/faker";
 
-import type { Calendar } from "../../../store/tinybase/persisted";
+import type { Calendar } from "../../../store/tinybase/main";
 import { DEFAULT_USER_ID, id } from "../../../utils";
 
 export const createCalendar = () => {
diff --git a/apps/desktop/src/devtool/seed/shared/chat.ts b/apps/desktop/src/devtool/seed/shared/chat.ts
index ece19aadf..dcfd55a49 100644
--- a/apps/desktop/src/devtool/seed/shared/chat.ts
+++ b/apps/desktop/src/devtool/seed/shared/chat.ts
@@ -1,6 +1,6 @@
 import { faker } from "@faker-js/faker";
 
-import type { ChatGroup, ChatMessageStorage } from "../../../store/tinybase/persisted";
+import type { ChatGroup, ChatMessageStorage } from "../../../store/tinybase/main";
 import { DEFAULT_USER_ID, id } from "../../../utils";
 
 export const createChatGroup = () => ({
diff --git a/apps/desktop/src/devtool/seed/shared/event.ts b/apps/desktop/src/devtool/seed/shared/event.ts
index f86d4dc9e..403e8b30d 100644
--- a/apps/desktop/src/devtool/seed/shared/event.ts
+++ b/apps/desktop/src/devtool/seed/shared/event.ts
@@ -1,6 +1,6 @@
 import { faker } from "@faker-js/faker";
 
-import type { Event } from "../../../store/tinybase/persisted";
+import type { Event } from "../../../store/tinybase/main";
 import { DEFAULT_USER_ID, id } from "../../../utils";
 
 const MEETING_TITLES = [
diff --git a/apps/desktop/src/devtool/seed/shared/folder.ts b/apps/desktop/src/devtool/seed/shared/folder.ts
index 3597b2542..266cf00d8 100644
--- a/apps/desktop/src/devtool/seed/shared/folder.ts
+++ b/apps/desktop/src/devtool/seed/shared/folder.ts
@@ -1,6 +1,6 @@
 import { faker } from "@faker-js/faker";
 
-import type { Folder } from "../../../store/tinybase/persisted";
+import type { Folder } from "../../../store/tinybase/main";
 import { DEFAULT_USER_ID, id } from "../../../utils";
 
 export const createFolder = (parentFolderId?: string) => ({
diff --git a/apps/desktop/src/devtool/seed/shared/human.ts b/apps/desktop/src/devtool/seed/shared/human.ts
index 7216b2409..4545c7d33 100644
--- a/apps/desktop/src/devtool/seed/shared/human.ts
+++ b/apps/desktop/src/devtool/seed/shared/human.ts
@@ -1,6 +1,6 @@
 import { faker } from "@faker-js/faker";
 
-import type { Human } from "../../../store/tinybase/persisted";
+import type { Human } from "../../../store/tinybase/main";
 import { DEFAULT_USER_ID, id } from "../../../utils";
 
 export const createHuman = (org_id: string, isUser = false) => {
diff --git a/apps/desktop/src/devtool/seed/shared/index.ts b/apps/desktop/src/devtool/seed/shared/index.ts
index 16ac8ba1d..4ee2e1c79 100644
--- a/apps/desktop/src/devtool/seed/shared/index.ts
+++ b/apps/desktop/src/devtool/seed/shared/index.ts
@@ -1,4 +1,4 @@
-import type { Store as PersistedStore } from "../../../store/tinybase/persisted";
+import type { Store as PersistedStore } from "../../../store/tinybase/main";
 
 export * from "./builders";
 export { createCalendar } from "./calendar";
diff --git a/apps/desktop/src/devtool/seed/shared/mapping.ts b/apps/desktop/src/devtool/seed/shared/mapping.ts
index f80d9eda9..1caaf419e 100644
--- a/apps/desktop/src/devtool/seed/shared/mapping.ts
+++ b/apps/desktop/src/devtool/seed/shared/mapping.ts
@@ -1,6 +1,6 @@
 import { faker } from "@faker-js/faker";
 
-import type { mappingSessionParticipant, MappingTagSession } from "../../../store/tinybase/persisted";
+import type { mappingSessionParticipant, MappingTagSession } from "../../../store/tinybase/main";
 import { DEFAULT_USER_ID, id } from "../../../utils";
 
 export const createmappingSessionParticipant = (session_id: string, human_id: string) => ({
diff --git a/apps/desktop/src/devtool/seed/shared/memory.ts b/apps/desktop/src/devtool/seed/shared/memory.ts
index e12502638..865a54f3a 100644
--- a/apps/desktop/src/devtool/seed/shared/memory.ts
+++ b/apps/desktop/src/devtool/seed/shared/memory.ts
@@ -1,6 +1,6 @@
 import { faker } from "@faker-js/faker";
 
-import type { MemoryStorage } from "../../../store/tinybase/persisted";
+import type { MemoryStorage } from "../../../store/tinybase/main";
 import { DEFAULT_USER_ID, id } from "../../../utils";
 
 export const createMemory = (type: string, text: string): { id: string; data: MemoryStorage } => {
diff --git a/apps/desktop/src/devtool/seed/shared/organization.ts b/apps/desktop/src/devtool/seed/shared/organization.ts
index cd7a56f97..33dfbc3d1 100644
--- a/apps/desktop/src/devtool/seed/shared/organization.ts
+++ b/apps/desktop/src/devtool/seed/shared/organization.ts
@@ -1,6 +1,6 @@
 import { faker } from "@faker-js/faker";
 
-import type { Organization } from "../../../store/tinybase/persisted";
+import type { Organization } from "../../../store/tinybase/main";
 import { DEFAULT_USER_ID, id } from "../../../utils";
 
 export const createOrganization = () => ({
diff --git a/apps/desktop/src/devtool/seed/shared/session.ts b/apps/desktop/src/devtool/seed/shared/session.ts
index c6d60e8ac..0914d9008 100644
--- a/apps/desktop/src/devtool/seed/shared/session.ts
+++ b/apps/desktop/src/devtool/seed/shared/session.ts
@@ -1,6 +1,6 @@
 import { faker } from "@faker-js/faker";
 
-import type { SessionStorage } from "../../../store/tinybase/persisted";
+import type { SessionStorage } from "../../../store/tinybase/main";
 import { DEFAULT_USER_ID, id } from "../../../utils";
 
 export const generateTitle = () => {
diff --git a/apps/desktop/src/devtool/seed/shared/tag.ts b/apps/desktop/src/devtool/seed/shared/tag.ts
index 7805a9b5e..79b80e785 100644
--- a/apps/desktop/src/devtool/seed/shared/tag.ts
+++ b/apps/desktop/src/devtool/seed/shared/tag.ts
@@ -1,6 +1,6 @@
 import { faker } from "@faker-js/faker";
 
-import type { Tag } from "../../../store/tinybase/persisted";
+import type { Tag } from "../../../store/tinybase/main";
 import { DEFAULT_USER_ID, id } from "../../../utils";
 
 export const createTag = () => ({
diff --git a/apps/desktop/src/devtool/seed/shared/template.ts b/apps/desktop/src/devtool/seed/shared/template.ts
index e86890d35..5fa1e7e74 100644
--- a/apps/desktop/src/devtool/seed/shared/template.ts
+++ b/apps/desktop/src/devtool/seed/shared/template.ts
@@ -1,6 +1,6 @@
 import { faker } from "@faker-js/faker";
 
-import type { TemplateSection, TemplateStorage } from "../../../store/tinybase/persisted";
+import type { TemplateSection, TemplateStorage } from "../../../store/tinybase/main";
 import { DEFAULT_USER_ID, id } from "../../../utils";
 
 export const createTemplate = (): { id: string; data: TemplateStorage } => {
diff --git a/apps/desktop/src/devtool/seed/shared/transcript.ts b/apps/desktop/src/devtool/seed/shared/transcript.ts
index a81b29161..6fa96ba51 100644
--- a/apps/desktop/src/devtool/seed/shared/transcript.ts
+++ b/apps/desktop/src/devtool/seed/shared/transcript.ts
@@ -1,6 +1,6 @@
 import { faker } from "@faker-js/faker";
 
-import type { Word } from "../../../store/tinybase/persisted";
+import type { Word } from "../../../store/tinybase/main";
 import { DEFAULT_USER_ID, id } from "../../../utils";
 
 const selectWeighted = <T>(choices: Array<{ weight: number; value: T }>): T =>
diff --git a/apps/desktop/src/devtool/seed/versions/curated.ts b/apps/desktop/src/devtool/seed/versions/curated.ts
index e850328d9..c5f70628b 100644
--- a/apps/desktop/src/devtool/seed/versions/curated.ts
+++ b/apps/desktop/src/devtool/seed/versions/curated.ts
@@ -1,4 +1,4 @@
-import type { Store as PersistedStore } from "../../../store/tinybase/persisted";
+import type { Store as PersistedStore } from "../../../store/tinybase/main";
 import curatedData from "../data/curated.json";
 import { CuratedDataSchema, loadCuratedData } from "../data/loader";
 import type { SeedDefinition } from "../shared";
diff --git a/apps/desktop/src/devtool/seed/versions/empty.ts b/apps/desktop/src/devtool/seed/versions/empty.ts
index 02e7ed758..c449d6a7d 100644
--- a/apps/desktop/src/devtool/seed/versions/empty.ts
+++ b/apps/desktop/src/devtool/seed/versions/empty.ts
@@ -1,4 +1,4 @@
-import type { Store as PersistedStore } from "../../../store/tinybase/persisted";
+import type { Store as PersistedStore } from "../../../store/tinybase/main";
 import type { SeedDefinition } from "../shared";
 
 export const emptySeed: SeedDefinition = {
diff --git a/apps/desktop/src/devtool/seed/versions/random.ts b/apps/desktop/src/devtool/seed/versions/random.ts
index 639225f9e..d94b1aeed 100644
--- a/apps/desktop/src/devtool/seed/versions/random.ts
+++ b/apps/desktop/src/devtool/seed/versions/random.ts
@@ -1,8 +1,8 @@
 import { faker } from "@faker-js/faker";
 import type { Tables } from "tinybase/with-schemas";
 
-import type { Schemas } from "../../../store/tinybase/persisted";
-import type { Store as PersistedStore } from "../../../store/tinybase/persisted";
+import type { Schemas } from "../../../store/tinybase/main";
+import type { Store as PersistedStore } from "../../../store/tinybase/main";
 import type { SeedDefinition } from "../shared";
 import {
   buildCalendars,
diff --git a/apps/desktop/src/hooks/useAutoEnhance.ts b/apps/desktop/src/hooks/useAutoEnhance.ts
index d4660b3c6..0cdc5c209 100644
--- a/apps/desktop/src/hooks/useAutoEnhance.ts
+++ b/apps/desktop/src/hooks/useAutoEnhance.ts
@@ -3,7 +3,7 @@ import { useEffect } from "react";
 
 import { useAITask } from "../contexts/ai-task";
 import { useListener } from "../contexts/listener";
-import * as persisted from "../store/tinybase/persisted";
+import * as main from "../store/tinybase/main";
 import { createTaskId } from "../store/zustand/ai-task/task-configs";
 import { getTaskState } from "../store/zustand/ai-task/tasks";
 import { useTabs } from "../store/zustand/tabs";
@@ -19,21 +19,21 @@ export function useAutoEnhance(tab: Extract<Tab, { type: "sessions" }>) {
   const listenerStatus = useListener((state) => state.status);
   const prevListenerStatus = usePrevious(listenerStatus);
 
-  const transcriptIds = persisted.UI.useSliceRowIds(
-    persisted.INDEXES.transcriptBySession,
+  const transcriptIds = main.UI.useSliceRowIds(
+    main.INDEXES.transcriptBySession,
     sessionId,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
   const hasTranscript = !!transcriptIds && transcriptIds.length > 0;
 
   const taskId = createTaskId(sessionId, "enhance");
 
-  const updateEnhancedMd = persisted.UI.useSetPartialRowCallback(
+  const updateEnhancedMd = main.UI.useSetPartialRowCallback(
     "sessions",
     sessionId,
     (input: string) => ({ enhanced_md: input }),
     [],
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   const { generate, rawStatus, streamedText, error } = useAITask((state) => {
diff --git a/apps/desktop/src/hooks/useAutoGenerateTitle.ts b/apps/desktop/src/hooks/useAutoGenerateTitle.ts
index 8465d9048..5d7a96cb1 100644
--- a/apps/desktop/src/hooks/useAutoGenerateTitle.ts
+++ b/apps/desktop/src/hooks/useAutoGenerateTitle.ts
@@ -2,7 +2,7 @@ import { usePrevious } from "@uidotdev/usehooks";
 import { useEffect } from "react";
 
 import { useAITask } from "../contexts/ai-task";
-import * as persisted from "../store/tinybase/persisted";
+import * as main from "../store/tinybase/main";
 import { createTaskId } from "../store/zustand/ai-task/task-configs";
 import { getTaskState } from "../store/zustand/ai-task/tasks";
 import type { Tab } from "../store/zustand/tabs/schema";
@@ -13,18 +13,18 @@ export function useAutoGenerateTitle(tab: Extract<Tab, { type: "sessions" }>) {
   const sessionId = tab.id;
   const model = useLanguageModel();
 
-  const title = persisted.UI.useCell("sessions", sessionId, "title", persisted.STORE_ID);
-  const enhancedMd = persisted.UI.useCell("sessions", sessionId, "enhanced_md", persisted.STORE_ID);
+  const title = main.UI.useCell("sessions", sessionId, "title", main.STORE_ID);
+  const enhancedMd = main.UI.useCell("sessions", sessionId, "enhanced_md", main.STORE_ID);
   const prevEnhancedMd = usePrevious(enhancedMd);
 
   const taskId = createTaskId(sessionId, "title");
 
-  const updateTitle = persisted.UI.useSetPartialRowCallback(
+  const updateTitle = main.UI.useSetPartialRowCallback(
     "sessions",
     sessionId,
     (input: string) => ({ title: input }),
     [],
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   const { generate, rawStatus, streamedText, error } = useAITask((state) => {
diff --git a/apps/desktop/src/hooks/useStartListening.ts b/apps/desktop/src/hooks/useStartListening.ts
index 03ab85a3a..84f9a9757 100644
--- a/apps/desktop/src/hooks/useStartListening.ts
+++ b/apps/desktop/src/hooks/useStartListening.ts
@@ -1,7 +1,7 @@
 import { useCallback, useMemo } from "react";
 
 import { useListener } from "../contexts/listener";
-import * as persisted from "../store/tinybase/persisted";
+import * as main from "../store/tinybase/main";
 import type { PersistFinalCallback } from "../store/zustand/listener/transcript";
 import { id } from "../utils";
 import { useSTTConnection } from "./useSTTConnection";
@@ -9,7 +9,7 @@ import { useSTTConnection } from "./useSTTConnection";
 export function useStartListening(sessionId: string) {
   const start = useListener((state) => state.start);
   const conn = useSTTConnection();
-  const store = persisted.UI.useStore(persisted.STORE_ID);
+  const store = main.UI.useStore(main.STORE_ID);
   const keywords = useVocabs();
 
   const persistFinal = useCallback<PersistFinalCallback>((words) => {
@@ -73,7 +73,7 @@ export function useStartListening(sessionId: string) {
 }
 
 function useVocabs() {
-  const table = persisted.UI.useResultTable(persisted.QUERIES.visibleVocabs, persisted.STORE_ID);
+  const table = main.UI.useResultTable(main.QUERIES.visibleVocabs, main.STORE_ID);
 
   const ret = useMemo(() => {
     return Object.values(table).map(({ text }) => text as string);
diff --git a/apps/desktop/src/main.tsx b/apps/desktop/src/main.tsx
index f9ad6f869..c88b80272 100644
--- a/apps/desktop/src/main.tsx
+++ b/apps/desktop/src/main.tsx
@@ -15,7 +15,7 @@ import {
   type Store as PersistedStore,
   STORE_ID as STORE_ID_PERSISTED,
   StoreComponent as StoreComponentPersisted,
-} from "./store/tinybase/persisted";
+} from "./store/tinybase/main";
 
 import { createToolRegistry } from "./contexts/tool-registry/core";
 import { routeTree } from "./routeTree.gen";
diff --git a/apps/desktop/src/routes/app/settings/_layout.tsx b/apps/desktop/src/routes/app/settings/_layout.tsx
index c59c32707..5cc869225 100644
--- a/apps/desktop/src/routes/app/settings/_layout.tsx
+++ b/apps/desktop/src/routes/app/settings/_layout.tsx
@@ -28,7 +28,7 @@ import {
 } from "@hypr/ui/components/ui/dropdown-menu";
 import { cn } from "@hypr/utils";
 import { useTemplateNavigation } from "../../../components/settings/template/use-template-navigation";
-import * as persisted from "../../../store/tinybase/persisted";
+import * as main from "../../../store/tinybase/main";
 
 const TABS = [
   "general",
@@ -255,7 +255,7 @@ function TopLevelHeader() {
 }
 
 function InnerHeader({ templateId, onBack }: { templateId: string; onBack: () => void }) {
-  const value = persisted.UI.useCell("templates", templateId, "title", persisted.STORE_ID);
+  const value = main.UI.useCell("templates", templateId, "title", main.STORE_ID);
   const handleDelete = useDeleteTemplate(templateId);
 
   return (
@@ -306,10 +306,10 @@ function InnerHeader({ templateId, onBack }: { templateId: string; onBack: () =>
 }
 
 function useDeleteTemplate(templateId: string) {
-  const handleDeleteRow = persisted.UI.useDelRowCallback(
+  const handleDeleteRow = main.UI.useDelRowCallback(
     "templates",
     templateId,
-    persisted.STORE_ID,
+    main.STORE_ID,
   );
 
   const navigate = Route.useNavigate();
diff --git a/apps/desktop/src/store/tinybase/cloudPersister.ts b/apps/desktop/src/store/tinybase/cloudPersister.ts
index 67ce8b7f8..e000679a1 100644
--- a/apps/desktop/src/store/tinybase/cloudPersister.ts
+++ b/apps/desktop/src/store/tinybase/cloudPersister.ts
@@ -3,7 +3,7 @@ import { useCallback } from "react";
 
 import { useAuth } from "../../auth";
 import * as internal from "./internal";
-import * as persisted from "./persisted";
+import * as main from "./main";
 
 const ELECTRIC_URL = "http://localhost:3001/v1/shape";
 
@@ -39,7 +39,7 @@ const useCloudSaver = () => {
     throw new Error("'auth' is not set");
   }
 
-  const store = persisted.UI.useStore(persisted.STORE_ID)!;
+  const store = main.UI.useStore(main.STORE_ID)!;
   const store2 = internal.UI.useStore(internal.STORE_ID)!;
 
   const user_id = store2.getValue("user_id");
@@ -51,7 +51,7 @@ const useCloudSaver = () => {
     const changesTable = store2.getTable("changes")!;
     const tables = store.getTables();
 
-    const changes = persisted.TABLES.flatMap((tableName) => {
+    const changes = main.TABLES.flatMap((tableName) => {
       const table = tables[tableName];
       if (!table) {
         return [];
@@ -87,7 +87,7 @@ const useCloudSaver = () => {
 };
 
 const useCloudLoader = () => {
-  const store = persisted.UI.useStore(persisted.STORE_ID)!;
+  const store = main.UI.useStore(main.STORE_ID)!;
   const store2 = internal.UI.useStore(internal.STORE_ID)!;
 
   const user_id = store2.getValue("user_id");
@@ -98,7 +98,7 @@ const useCloudLoader = () => {
   const metaTable = store2.getTable("electric")!;
 
   const load = useCallback(async () => {
-    const steams = persisted.TABLES.map((table) => {
+    const steams = main.TABLES.map((table) => {
       const metaRow = Object.values(metaTable).find((row) => row.table === table);
 
       const resumable: {
@@ -150,14 +150,14 @@ const useCloudLoader = () => {
       }),
     );
 
-    const results = persisted.TABLES.reduce((acc, table, index) => {
+    const results = main.TABLES.reduce((acc, table, index) => {
       acc[table] = resultsArray[index];
       return acc;
-    }, {} as Record<typeof persisted.TABLES[number], IncomingChangeMessage[]>);
+    }, {} as Record<typeof main.TABLES[number], IncomingChangeMessage[]>);
 
     for (
       const [table, messages] of Object.entries(results) as [
-        typeof persisted.TABLES[number],
+        typeof main.TABLES[number],
         IncomingChangeMessage[],
       ][]
     ) {
diff --git a/apps/desktop/src/store/tinybase/persisted.ts b/apps/desktop/src/store/tinybase/main.ts
similarity index 100%
rename from apps/desktop/src/store/tinybase/persisted.ts
rename to apps/desktop/src/store/tinybase/main.ts
diff --git a/apps/desktop/src/store/zustand/ai-task/index.ts b/apps/desktop/src/store/zustand/ai-task/index.ts
index 4dfb56411..9940c1d1c 100644
--- a/apps/desktop/src/store/zustand/ai-task/index.ts
+++ b/apps/desktop/src/store/zustand/ai-task/index.ts
@@ -1,7 +1,7 @@
 import { createStore } from "zustand";
 
 import type { ToolRegistry } from "../../../contexts/tool-registry/core";
-import type { Store as PersistedStore } from "../../tinybase/persisted";
+import type { Store as PersistedStore } from "../../tinybase/main";
 import { createTasksSlice, type TasksActions, type TasksState } from "./tasks";
 
 type State = TasksState;
diff --git a/apps/desktop/src/store/zustand/ai-task/task-configs/enhance.ts b/apps/desktop/src/store/zustand/ai-task/task-configs/enhance.ts
index 713042dbb..892bd0966 100644
--- a/apps/desktop/src/store/zustand/ai-task/task-configs/enhance.ts
+++ b/apps/desktop/src/store/zustand/ai-task/task-configs/enhance.ts
@@ -4,7 +4,7 @@ import { z } from "zod";
 
 import { commands as templateCommands } from "@hypr/plugin-template";
 import { buildSegments } from "../../../../utils/segments";
-import type { Store as PersistedStore } from "../../../tinybase/persisted";
+import type { Store as PersistedStore } from "../../../tinybase/main";
 import { trimBeforeMarker } from "../shared/transform_impl";
 import type { TaskArgsMap, TaskConfig } from ".";
 
diff --git a/apps/desktop/src/store/zustand/ai-task/task-configs/index.ts b/apps/desktop/src/store/zustand/ai-task/task-configs/index.ts
index 2b51b6886..47c54bff1 100644
--- a/apps/desktop/src/store/zustand/ai-task/task-configs/index.ts
+++ b/apps/desktop/src/store/zustand/ai-task/task-configs/index.ts
@@ -1,6 +1,6 @@
 import type { Experimental_Agent as Agent, LanguageModel, Tool } from "ai";
 
-import type { Store as PersistedStore } from "../../../tinybase/persisted";
+import type { Store as PersistedStore } from "../../../tinybase/main";
 import { StreamTransform } from "../shared/transform_infra";
 import { chat } from "./chat";
 import { enhance } from "./enhance";
diff --git a/apps/desktop/src/store/zustand/ai-task/task-configs/title.ts b/apps/desktop/src/store/zustand/ai-task/task-configs/title.ts
index 910fe8274..65a40e23b 100644
--- a/apps/desktop/src/store/zustand/ai-task/task-configs/title.ts
+++ b/apps/desktop/src/store/zustand/ai-task/task-configs/title.ts
@@ -1,7 +1,7 @@
 import { Experimental_Agent as Agent, type LanguageModel, Tool } from "ai";
 
 import { commands as templateCommands } from "@hypr/plugin-template";
-import type { Store as PersistedStore } from "../../../tinybase/persisted";
+import type { Store as PersistedStore } from "../../../tinybase/main";
 import type { TaskArgsMap, TaskConfig } from ".";
 
 export const title: TaskConfig<"title"> = {
diff --git a/apps/desktop/src/store/zustand/ai-task/tasks.ts b/apps/desktop/src/store/zustand/ai-task/tasks.ts
index 1ca419cd5..94d89f066 100644
--- a/apps/desktop/src/store/zustand/ai-task/tasks.ts
+++ b/apps/desktop/src/store/zustand/ai-task/tasks.ts
@@ -3,7 +3,7 @@ import { create as mutate } from "mutative";
 import type { StoreApi } from "zustand";
 
 import type { ToolRegistry } from "../../../contexts/tool-registry/core";
-import type { Store as PersistedStore } from "../../tinybase/persisted";
+import type { Store as PersistedStore } from "../../tinybase/main";
 import { applyTransforms } from "./shared/transform_infra";
 import { TASK_CONFIGS, type TaskArgsMap, type TaskId, type TaskType, type ToolNamesByTask } from "./task-configs";
 
diff --git a/apps/desktop/src/store/zustand/listener/transcript.ts b/apps/desktop/src/store/zustand/listener/transcript.ts
index 5a682ae91..1979efcfd 100644
--- a/apps/desktop/src/store/zustand/listener/transcript.ts
+++ b/apps/desktop/src/store/zustand/listener/transcript.ts
@@ -2,9 +2,9 @@ import { create as mutate } from "mutative";
 import type { StoreApi } from "zustand";
 
 import type { StreamResponse, Word } from "@hypr/plugin-listener";
-import * as persisted from "../../tinybase/persisted";
+import * as main from "../../tinybase/main";
 
-type PartialWord = Pick<persisted.Word, "text" | "start_ms" | "end_ms" | "channel">;
+type PartialWord = Pick<main.Word, "text" | "start_ms" | "end_ms" | "channel">;
 type WordsByChannel = Record<number, PartialWord[]>;
 
 export type PersistFinalCallback = (words: PartialWord[]) => void;
diff --git a/apps/desktop/src/store/zustand/tabs/schema.ts b/apps/desktop/src/store/zustand/tabs/schema.ts
index 8ed0508ab..e6e582d51 100644
--- a/apps/desktop/src/store/zustand/tabs/schema.ts
+++ b/apps/desktop/src/store/zustand/tabs/schema.ts
@@ -1,6 +1,6 @@
 import { z } from "zod";
 
-import { TABLES } from "../../tinybase/persisted";
+import { TABLES } from "../../tinybase/main";
 
 const baseTabSchema = z.object({
   active: z.boolean(),
diff --git a/apps/desktop/src/types/index.ts b/apps/desktop/src/types/index.ts
index 58258be83..f801c377f 100644
--- a/apps/desktop/src/types/index.ts
+++ b/apps/desktop/src/types/index.ts
@@ -1,5 +1,5 @@
 import { type Store as InternalStore } from "../store/tinybase/internal";
-import { type Store as PersistedStore } from "../store/tinybase/persisted";
+import { type Store as PersistedStore } from "../store/tinybase/main";
 
 import type { ToolRegistry } from "../contexts/tool-registry/core";
 import type { AITaskStore } from "../store/zustand/ai-task";
diff --git a/apps/desktop/src/utils/segments.ts b/apps/desktop/src/utils/segments.ts
index 3ad84f889..7f4a3ebea 100644
--- a/apps/desktop/src/utils/segments.ts
+++ b/apps/desktop/src/utils/segments.ts
@@ -1,7 +1,7 @@
-import type * as persisted from "../store/tinybase/persisted";
+import type * as main from "../store/tinybase/main";
 
 export type MaybePartialWord = Omit<
-  persisted.Word & { isFinal: boolean },
+  main.Word & { isFinal: boolean },
   "transcript_id" | "user_id" | "created_at"
 >;
 
@@ -18,7 +18,7 @@ export type Segment = {
 };
 
 export function mergeWordsByChannel(
-  finalWords: Record<string, persisted.Word>,
+  finalWords: Record<string, main.Word>,
   partialWords: Record<number, PartialWord[]>,
 ): Map<number, MaybePartialWord[]> {
   const channels = new Map<number, MaybePartialWord[]>();
@@ -210,7 +210,7 @@ export function mergeSameChannelSegments(segments: Segment[]): Segment[] {
 }
 
 export function buildSegments(
-  finalWords: Record<string, persisted.Word>,
+  finalWords: Record<string, main.Word>,
   partialWords: Record<number, PartialWord[]>,
 ): Segment[] {
   const turns = groupIntoTurns(mergeWordsByChannel(finalWords, partialWords));
diff --git a/apps/desktop/src/utils/timeline.ts b/apps/desktop/src/utils/timeline.ts
index 2091f3dab..08f89af87 100644
--- a/apps/desktop/src/utils/timeline.ts
+++ b/apps/desktop/src/utils/timeline.ts
@@ -1,5 +1,5 @@
 import { differenceInCalendarMonths, differenceInDays, format, isPast, startOfDay } from "@hypr/utils";
-import type * as persisted from "../store/tinybase/persisted";
+import type * as main from "../store/tinybase/main";
 
 export type TimelineEventRow = {
   started_at?: string | null;
@@ -20,8 +20,8 @@ export type EventsWithoutSessionTable = Record<string, TimelineEventRow> | null
 export type SessionsWithMaybeEventTable = Record<string, TimelineSessionRow> | null | undefined;
 
 export type TimelineItem =
-  | { type: "event"; id: string; date: string; data: persisted.Event }
-  | { type: "session"; id: string; date: string; data: persisted.Session };
+  | { type: "event"; id: string; date: string; data: main.Event }
+  | { type: "session"; id: string; date: string; data: main.Session };
 
 export type TimelinePrecision = "time" | "date";
 
@@ -150,7 +150,7 @@ export function buildTimelineBuckets({
           type: "event",
           id: eventId,
           date: format(eventStartTime, "yyyy-MM-dd"),
-          data: row as unknown as persisted.Event,
+          data: row as unknown as main.Event,
         });
         seenEvents.add(eventId);
       }
@@ -175,7 +175,7 @@ export function buildTimelineBuckets({
           type: "session",
           id: sessionId,
           date: format(date, "yyyy-MM-dd"),
-          data: row as unknown as persisted.Session,
+          data: row as unknown as main.Session,
         });
       }
     });
diff --git a/apps/desktop/src/utils/transcript.ts b/apps/desktop/src/utils/transcript.ts
index d6d38852e..9df7204c5 100644
--- a/apps/desktop/src/utils/transcript.ts
+++ b/apps/desktop/src/utils/transcript.ts
@@ -1,4 +1,4 @@
-import type { Word } from "../store/tinybase/persisted";
+import type { Word } from "../store/tinybase/main";
 
 type Segment = {
   text: string;

From bf7b87a1eaf2f1f0560948e46e6332a2cbc74525 Mon Sep 17 00:00:00 2001
From: Yujong Lee <yujonglee.dev@gmail.com>
Date: Thu, 30 Oct 2025 09:02:03 +0900
Subject: [PATCH 2/5] extract schema-external

---
 apps/desktop/src/store/tinybase/main.ts       | 231 +-----------------
 .../src/store/tinybase/schema-external.ts     | 229 +++++++++++++++++
 .../src/store/tinybase/schema-internal.ts     |   1 +
 3 files changed, 234 insertions(+), 227 deletions(-)
 create mode 100644 apps/desktop/src/store/tinybase/schema-external.ts
 create mode 100644 apps/desktop/src/store/tinybase/schema-internal.ts

diff --git a/apps/desktop/src/store/tinybase/main.ts b/apps/desktop/src/store/tinybase/main.ts
index c584cff42..b5c1dbf53 100644
--- a/apps/desktop/src/store/tinybase/main.ts
+++ b/apps/desktop/src/store/tinybase/main.ts
@@ -10,242 +10,19 @@ import {
   type TablesSchema,
   ValuesSchema,
 } from "tinybase/with-schemas";
-import { z } from "zod";
 
-import {
-  calendarSchema as baseCalendarSchema,
-  chatGroupSchema as baseChatGroupSchema,
-  chatMessageSchema as baseChatMessageSchema,
-  eventSchema as baseEventSchema,
-  folderSchema as baseFolderSchema,
-  humanSchema as baseHumanSchema,
-  mappingSessionParticipantSchema as baseMappingSessionParticipantSchema,
-  mappingTagSessionSchema as baseMappingTagSessionSchema,
-  memorySchema as baseMemorySchema,
-  organizationSchema as baseOrganizationSchema,
-  sessionSchema as baseSessionSchema,
-  TABLE_HUMANS,
-  TABLE_SESSIONS,
-  tagSchema as baseTagSchema,
-  templateSchema as baseTemplateSchema,
-  transcriptSchema as baseTranscriptSchema,
-  wordSchema,
-} from "@hypr/db";
+import { TABLE_HUMANS, TABLE_SESSIONS } from "@hypr/db";
 import { createBroadcastChannelSynchronizer } from "tinybase/synchronizers/synchronizer-broadcast-channel/with-schemas";
 import * as internal from "./internal";
 import { createLocalPersister } from "./localPersister";
-import { type InferTinyBaseSchema, jsonObject, type ToStorageType } from "./shared";
-
-export const STORE_ID = "persisted";
-
-export const humanSchema = baseHumanSchema.omit({ id: true }).extend({
-  created_at: z.string(),
-  job_title: z.preprocess(val => val ?? undefined, z.string().optional()),
-  linkedin_username: z.preprocess(val => val ?? undefined, z.string().optional()),
-  is_user: z.preprocess(val => val ?? undefined, z.boolean().optional()),
-  memo: z.preprocess(val => val ?? undefined, z.string().optional()),
-});
-
-export const eventSchema = baseEventSchema.omit({ id: true }).extend({
-  created_at: z.string(),
-  started_at: z.string(),
-  ended_at: z.string(),
-  location: z.preprocess(val => val ?? undefined, z.string().optional()),
-  meeting_link: z.preprocess(val => val ?? undefined, z.string().optional()),
-  description: z.preprocess(val => val ?? undefined, z.string().optional()),
-  note: z.preprocess(val => val ?? undefined, z.string().optional()),
-});
-
-export const calendarSchema = baseCalendarSchema.omit({ id: true }).extend({ created_at: z.string() });
-
-export const organizationSchema = baseOrganizationSchema.omit({ id: true }).extend({ created_at: z.string() });
-
-export const folderSchema = baseFolderSchema.omit({ id: true }).extend({
-  created_at: z.string(),
-  parent_folder_id: z.preprocess(val => val ?? undefined, z.string().optional()),
-});
-
-export const sessionSchema = baseSessionSchema.omit({ id: true }).extend({
-  created_at: z.string(),
-  event_id: z.preprocess(val => val ?? undefined, z.string().optional()),
-  folder_id: z.preprocess(val => val ?? undefined, z.string().optional()),
-});
-
-export const transcriptSchema = baseTranscriptSchema.omit({ id: true }).extend({
-  created_at: z.string(),
-});
-
-export const mappingSessionParticipantSchema = baseMappingSessionParticipantSchema.omit({ id: true }).extend({
-  created_at: z.string(),
-});
-
-export const tagSchema = baseTagSchema.omit({ id: true }).extend({
-  created_at: z.string(),
-});
-
-export const mappingTagSessionSchema = baseMappingTagSessionSchema.omit({ id: true }).extend({
-  created_at: z.string(),
-});
-
-export const templateSectionSchema = z.object({
-  title: z.string(),
-  description: z.string(),
-});
-
-export const templateSchema = baseTemplateSchema.omit({ id: true }).extend({
-  created_at: z.string(),
-  sections: jsonObject(z.array(templateSectionSchema)),
-});
-
-export const chatGroupSchema = baseChatGroupSchema.omit({ id: true }).extend({ created_at: z.string() });
-export const chatMessageSchema = baseChatMessageSchema.omit({ id: true }).extend({
-  created_at: z.string(),
-  metadata: jsonObject(z.any()),
-  parts: jsonObject(z.any()),
-});
-
-export const memorySchema = baseMemorySchema.omit({ id: true }).extend({
-  created_at: z.string(),
-});
-
-export const wordSchemaOverride = wordSchema.omit({ id: true }).extend({
-  created_at: z.string(),
-  speaker: z.preprocess(val => val ?? undefined, z.string().optional()),
-  transcript_id: z.string(),
-});
-
-export type Human = z.infer<typeof humanSchema>;
-export type Event = z.infer<typeof eventSchema>;
-export type Calendar = z.infer<typeof calendarSchema>;
-export type Organization = z.infer<typeof organizationSchema>;
-export type Folder = z.infer<typeof folderSchema>;
-export type Session = z.infer<typeof sessionSchema>;
-export type Transcript = z.infer<typeof transcriptSchema>;
-export type Word = z.infer<typeof wordSchemaOverride>;
-export type mappingSessionParticipant = z.infer<typeof mappingSessionParticipantSchema>;
-export type Tag = z.infer<typeof tagSchema>;
-export type MappingTagSession = z.infer<typeof mappingTagSessionSchema>;
-export type Template = z.infer<typeof templateSchema>;
-export type TemplateSection = z.infer<typeof templateSectionSchema>;
-export type ChatGroup = z.infer<typeof chatGroupSchema>;
-export type ChatMessage = z.infer<typeof chatMessageSchema>;
-export type Memory = z.infer<typeof memorySchema>;
+import { externalTableSchemaForTinybase } from "./schema-external";
 
-export type SessionStorage = ToStorageType<typeof sessionSchema>;
-export type TranscriptStorage = ToStorageType<typeof transcriptSchema>;
-export type TemplateStorage = ToStorageType<typeof templateSchema>;
-export type ChatMessageStorage = ToStorageType<typeof chatMessageSchema>;
-export type MemoryStorage = ToStorageType<typeof memorySchema>;
+export const STORE_ID = "main";
 
 const SCHEMA = {
   value: {} as const satisfies ValuesSchema,
   table: {
-    folders: {
-      user_id: { type: "string" },
-      created_at: { type: "string" },
-      name: { type: "string" },
-      parent_folder_id: { type: "string" },
-    } satisfies InferTinyBaseSchema<typeof folderSchema>,
-    sessions: {
-      user_id: { type: "string" },
-      created_at: { type: "string" },
-      folder_id: { type: "string" },
-      event_id: { type: "string" },
-      title: { type: "string" },
-      raw_md: { type: "string" },
-      enhanced_md: { type: "string" },
-    } satisfies InferTinyBaseSchema<typeof sessionSchema>,
-    transcripts: {
-      user_id: { type: "string" },
-      created_at: { type: "string" },
-      session_id: { type: "string" },
-    } satisfies InferTinyBaseSchema<typeof transcriptSchema>,
-    words: {
-      user_id: { type: "string" },
-      created_at: { type: "string" },
-      text: { type: "string" },
-      transcript_id: { type: "string" },
-      start_ms: { type: "number" },
-      end_ms: { type: "number" },
-      channel: { type: "number" },
-    } satisfies InferTinyBaseSchema<typeof wordSchema>,
-    humans: {
-      user_id: { type: "string" },
-      created_at: { type: "string" },
-      name: { type: "string" },
-      email: { type: "string" },
-      org_id: { type: "string" },
-      job_title: { type: "string" },
-      linkedin_username: { type: "string" },
-      is_user: { type: "boolean" },
-      memo: { type: "string" },
-    } satisfies InferTinyBaseSchema<typeof humanSchema>,
-    organizations: {
-      user_id: { type: "string" },
-      created_at: { type: "string" },
-      name: { type: "string" },
-    } satisfies InferTinyBaseSchema<typeof organizationSchema>,
-    calendars: {
-      user_id: { type: "string" },
-      created_at: { type: "string" },
-      name: { type: "string" },
-    } satisfies InferTinyBaseSchema<typeof calendarSchema>,
-    events: {
-      user_id: { type: "string" },
-      created_at: { type: "string" },
-      calendar_id: { type: "string" },
-      title: { type: "string" },
-      started_at: { type: "string" },
-      ended_at: { type: "string" },
-      location: { type: "string" },
-      meeting_link: { type: "string" },
-      description: { type: "string" },
-      note: { type: "string" },
-    } satisfies InferTinyBaseSchema<typeof eventSchema>,
-    mapping_session_participant: {
-      user_id: { type: "string" },
-      created_at: { type: "string" },
-      session_id: { type: "string" },
-      human_id: { type: "string" },
-    } satisfies InferTinyBaseSchema<typeof mappingSessionParticipantSchema>,
-    tags: {
-      user_id: { type: "string" },
-      created_at: { type: "string" },
-      name: { type: "string" },
-    } satisfies InferTinyBaseSchema<typeof tagSchema>,
-    mapping_tag_session: {
-      user_id: { type: "string" },
-      created_at: { type: "string" },
-      tag_id: { type: "string" },
-      session_id: { type: "string" },
-    } satisfies InferTinyBaseSchema<typeof mappingTagSessionSchema>,
-    templates: {
-      user_id: { type: "string" },
-      created_at: { type: "string" },
-      title: { type: "string" },
-      description: { type: "string" },
-      sections: { type: "string" },
-    } satisfies InferTinyBaseSchema<typeof templateSchema>,
-    chat_groups: {
-      user_id: { type: "string" },
-      created_at: { type: "string" },
-      title: { type: "string" },
-    } satisfies InferTinyBaseSchema<typeof chatGroupSchema>,
-    chat_messages: {
-      user_id: { type: "string" },
-      created_at: { type: "string" },
-      chat_group_id: { type: "string" },
-      role: { type: "string" },
-      content: { type: "string" },
-      metadata: { type: "string" },
-      parts: { type: "string" },
-    } satisfies InferTinyBaseSchema<typeof chatMessageSchema>,
-    memories: {
-      user_id: { type: "string" },
-      created_at: { type: "string" },
-      type: { type: "string" },
-      text: { type: "string" },
-    } satisfies InferTinyBaseSchema<typeof memorySchema>,
+    ...externalTableSchemaForTinybase,
   } as const satisfies TablesSchema,
 };
 
diff --git a/apps/desktop/src/store/tinybase/schema-external.ts b/apps/desktop/src/store/tinybase/schema-external.ts
new file mode 100644
index 000000000..68111997f
--- /dev/null
+++ b/apps/desktop/src/store/tinybase/schema-external.ts
@@ -0,0 +1,229 @@
+import type { TablesSchema } from "tinybase/with-schemas";
+import { z } from "zod";
+
+import {
+  calendarSchema as baseCalendarSchema,
+  chatGroupSchema as baseChatGroupSchema,
+  chatMessageSchema as baseChatMessageSchema,
+  eventSchema as baseEventSchema,
+  folderSchema as baseFolderSchema,
+  humanSchema as baseHumanSchema,
+  mappingSessionParticipantSchema as baseMappingSessionParticipantSchema,
+  mappingTagSessionSchema as baseMappingTagSessionSchema,
+  memorySchema as baseMemorySchema,
+  organizationSchema as baseOrganizationSchema,
+  sessionSchema as baseSessionSchema,
+  tagSchema as baseTagSchema,
+  templateSchema as baseTemplateSchema,
+  transcriptSchema as baseTranscriptSchema,
+  wordSchema,
+} from "@hypr/db";
+import { InferTinyBaseSchema, jsonObject, type ToStorageType } from "./shared";
+
+export const humanSchema = baseHumanSchema.omit({ id: true }).extend({
+  created_at: z.string(),
+  job_title: z.preprocess(val => val ?? undefined, z.string().optional()),
+  linkedin_username: z.preprocess(val => val ?? undefined, z.string().optional()),
+  is_user: z.preprocess(val => val ?? undefined, z.boolean().optional()),
+  memo: z.preprocess(val => val ?? undefined, z.string().optional()),
+});
+
+export const eventSchema = baseEventSchema.omit({ id: true }).extend({
+  created_at: z.string(),
+  started_at: z.string(),
+  ended_at: z.string(),
+  location: z.preprocess(val => val ?? undefined, z.string().optional()),
+  meeting_link: z.preprocess(val => val ?? undefined, z.string().optional()),
+  description: z.preprocess(val => val ?? undefined, z.string().optional()),
+  note: z.preprocess(val => val ?? undefined, z.string().optional()),
+});
+
+export const calendarSchema = baseCalendarSchema.omit({ id: true }).extend({ created_at: z.string() });
+
+export const organizationSchema = baseOrganizationSchema.omit({ id: true }).extend({ created_at: z.string() });
+
+export const folderSchema = baseFolderSchema.omit({ id: true }).extend({
+  created_at: z.string(),
+  parent_folder_id: z.preprocess(val => val ?? undefined, z.string().optional()),
+});
+
+export const sessionSchema = baseSessionSchema.omit({ id: true }).extend({
+  created_at: z.string(),
+  event_id: z.preprocess(val => val ?? undefined, z.string().optional()),
+  folder_id: z.preprocess(val => val ?? undefined, z.string().optional()),
+});
+
+export const transcriptSchema = baseTranscriptSchema.omit({ id: true }).extend({
+  created_at: z.string(),
+});
+
+export const mappingSessionParticipantSchema = baseMappingSessionParticipantSchema.omit({ id: true }).extend({
+  created_at: z.string(),
+});
+
+export const tagSchema = baseTagSchema.omit({ id: true }).extend({
+  created_at: z.string(),
+});
+
+export const mappingTagSessionSchema = baseMappingTagSessionSchema.omit({ id: true }).extend({
+  created_at: z.string(),
+});
+
+export const templateSectionSchema = z.object({
+  title: z.string(),
+  description: z.string(),
+});
+
+export const templateSchema = baseTemplateSchema.omit({ id: true }).extend({
+  created_at: z.string(),
+  sections: jsonObject(z.array(templateSectionSchema)),
+});
+
+export const chatGroupSchema = baseChatGroupSchema.omit({ id: true }).extend({ created_at: z.string() });
+export const chatMessageSchema = baseChatMessageSchema.omit({ id: true }).extend({
+  created_at: z.string(),
+  metadata: jsonObject(z.any()),
+  parts: jsonObject(z.any()),
+});
+
+export const memorySchema = baseMemorySchema.omit({ id: true }).extend({
+  created_at: z.string(),
+});
+
+export const wordSchemaOverride = wordSchema.omit({ id: true }).extend({
+  created_at: z.string(),
+  speaker: z.preprocess(val => val ?? undefined, z.string().optional()),
+  transcript_id: z.string(),
+});
+
+export type Human = z.infer<typeof humanSchema>;
+export type Event = z.infer<typeof eventSchema>;
+export type Calendar = z.infer<typeof calendarSchema>;
+export type Organization = z.infer<typeof organizationSchema>;
+export type Folder = z.infer<typeof folderSchema>;
+export type Session = z.infer<typeof sessionSchema>;
+export type Transcript = z.infer<typeof transcriptSchema>;
+export type Word = z.infer<typeof wordSchemaOverride>;
+export type mappingSessionParticipant = z.infer<typeof mappingSessionParticipantSchema>;
+export type Tag = z.infer<typeof tagSchema>;
+export type MappingTagSession = z.infer<typeof mappingTagSessionSchema>;
+export type Template = z.infer<typeof templateSchema>;
+export type TemplateSection = z.infer<typeof templateSectionSchema>;
+export type ChatGroup = z.infer<typeof chatGroupSchema>;
+export type ChatMessage = z.infer<typeof chatMessageSchema>;
+export type Memory = z.infer<typeof memorySchema>;
+
+export type SessionStorage = ToStorageType<typeof sessionSchema>;
+export type TranscriptStorage = ToStorageType<typeof transcriptSchema>;
+export type TemplateStorage = ToStorageType<typeof templateSchema>;
+export type ChatMessageStorage = ToStorageType<typeof chatMessageSchema>;
+export type MemoryStorage = ToStorageType<typeof memorySchema>;
+
+export const externalTableSchemaForTinybase = {
+  folders: {
+    user_id: { type: "string" },
+    created_at: { type: "string" },
+    name: { type: "string" },
+    parent_folder_id: { type: "string" },
+  } satisfies InferTinyBaseSchema<typeof folderSchema>,
+  sessions: {
+    user_id: { type: "string" },
+    created_at: { type: "string" },
+    folder_id: { type: "string" },
+    event_id: { type: "string" },
+    title: { type: "string" },
+    raw_md: { type: "string" },
+    enhanced_md: { type: "string" },
+  } satisfies InferTinyBaseSchema<typeof sessionSchema>,
+  transcripts: {
+    user_id: { type: "string" },
+    created_at: { type: "string" },
+    session_id: { type: "string" },
+  } satisfies InferTinyBaseSchema<typeof transcriptSchema>,
+  words: {
+    user_id: { type: "string" },
+    created_at: { type: "string" },
+    text: { type: "string" },
+    transcript_id: { type: "string" },
+    start_ms: { type: "number" },
+    end_ms: { type: "number" },
+    channel: { type: "number" },
+  } satisfies InferTinyBaseSchema<typeof wordSchema>,
+  humans: {
+    user_id: { type: "string" },
+    created_at: { type: "string" },
+    name: { type: "string" },
+    email: { type: "string" },
+    org_id: { type: "string" },
+    job_title: { type: "string" },
+    linkedin_username: { type: "string" },
+    is_user: { type: "boolean" },
+    memo: { type: "string" },
+  } satisfies InferTinyBaseSchema<typeof humanSchema>,
+  organizations: {
+    user_id: { type: "string" },
+    created_at: { type: "string" },
+    name: { type: "string" },
+  } satisfies InferTinyBaseSchema<typeof organizationSchema>,
+  calendars: {
+    user_id: { type: "string" },
+    created_at: { type: "string" },
+    name: { type: "string" },
+  } satisfies InferTinyBaseSchema<typeof calendarSchema>,
+  events: {
+    user_id: { type: "string" },
+    created_at: { type: "string" },
+    calendar_id: { type: "string" },
+    title: { type: "string" },
+    started_at: { type: "string" },
+    ended_at: { type: "string" },
+    location: { type: "string" },
+    meeting_link: { type: "string" },
+    description: { type: "string" },
+    note: { type: "string" },
+  } satisfies InferTinyBaseSchema<typeof eventSchema>,
+  mapping_session_participant: {
+    user_id: { type: "string" },
+    created_at: { type: "string" },
+    session_id: { type: "string" },
+    human_id: { type: "string" },
+  } satisfies InferTinyBaseSchema<typeof mappingSessionParticipantSchema>,
+  tags: {
+    user_id: { type: "string" },
+    created_at: { type: "string" },
+    name: { type: "string" },
+  } satisfies InferTinyBaseSchema<typeof tagSchema>,
+  mapping_tag_session: {
+    user_id: { type: "string" },
+    created_at: { type: "string" },
+    tag_id: { type: "string" },
+    session_id: { type: "string" },
+  } satisfies InferTinyBaseSchema<typeof mappingTagSessionSchema>,
+  templates: {
+    user_id: { type: "string" },
+    created_at: { type: "string" },
+    title: { type: "string" },
+    description: { type: "string" },
+    sections: { type: "string" },
+  } satisfies InferTinyBaseSchema<typeof templateSchema>,
+  chat_groups: {
+    user_id: { type: "string" },
+    created_at: { type: "string" },
+    title: { type: "string" },
+  } satisfies InferTinyBaseSchema<typeof chatGroupSchema>,
+  chat_messages: {
+    user_id: { type: "string" },
+    created_at: { type: "string" },
+    chat_group_id: { type: "string" },
+    role: { type: "string" },
+    content: { type: "string" },
+    metadata: { type: "string" },
+    parts: { type: "string" },
+  } satisfies InferTinyBaseSchema<typeof chatMessageSchema>,
+  memories: {
+    user_id: { type: "string" },
+    created_at: { type: "string" },
+    type: { type: "string" },
+    text: { type: "string" },
+  } satisfies InferTinyBaseSchema<typeof memorySchema>,
+} as const satisfies TablesSchema;
diff --git a/apps/desktop/src/store/tinybase/schema-internal.ts b/apps/desktop/src/store/tinybase/schema-internal.ts
new file mode 100644
index 000000000..70b786d12
--- /dev/null
+++ b/apps/desktop/src/store/tinybase/schema-internal.ts
@@ -0,0 +1 @@
+// TODO

From 9cc5d36ac2ab683f91436958fe2c601bfdb9e55a Mon Sep 17 00:00:00 2001
From: Yujong Lee <yujonglee.dev@gmail.com>
Date: Thu, 30 Oct 2025 09:06:52 +0900
Subject: [PATCH 3/5] extract schema-internal

---
 apps/desktop/src/store/tinybase/internal.ts   | 83 ++-----------------
 .../src/store/tinybase/schema-internal.ts     | 77 ++++++++++++++++-
 2 files changed, 82 insertions(+), 78 deletions(-)

diff --git a/apps/desktop/src/store/tinybase/internal.ts b/apps/desktop/src/store/tinybase/internal.ts
index c5706d2f0..f54385985 100644
--- a/apps/desktop/src/store/tinybase/internal.ts
+++ b/apps/desktop/src/store/tinybase/internal.ts
@@ -1,85 +1,14 @@
 import * as _UI from "tinybase/ui-react/with-schemas";
-import { createMergeableStore, createQueries, type MergeableStore, type TablesSchema } from "tinybase/with-schemas";
-import { z } from "zod";
+import { createMergeableStore, createQueries, type MergeableStore } from "tinybase/with-schemas";
 
 import { createBroadcastChannelSynchronizer } from "tinybase/synchronizers/synchronizer-broadcast-channel/with-schemas";
 import { DEFAULT_USER_ID } from "../../utils";
-import { type InferTinyBaseSchema, jsonObject, type ToStorageType } from "./shared";
+import { internalSchemaForTinybase } from "./schema-internal";
 
-export const generalSchema = z.object({
-  user_id: z.string(),
-  autostart: z.boolean().default(false),
-  telemetry_consent: z.boolean().default(true),
-  save_recordings: z.boolean().default(true),
-  notification_event: z.boolean().default(true),
-  notification_detect: z.boolean().default(true),
-  respect_dnd: z.boolean().default(true),
-  ai_language: z.string().default("en"),
-  spoken_languages: jsonObject(z.array(z.string()).default(["en"])),
-  ignored_platforms: jsonObject(z.array(z.string()).default([])),
-  current_llm_provider: z.string().optional(),
-  current_llm_model: z.string().optional(),
-  current_stt_provider: z.string().optional(),
-  current_stt_model: z.string().optional(),
-});
-
-export const aiProviderSchema = z.object({
-  type: z.enum(["stt", "llm"]),
-  base_url: z.url().min(1),
-  api_key: z.string(),
-}).refine(
-  (data) => !data.base_url.startsWith("https:") || data.api_key.length > 0,
-  {
-    message: "API key is required for HTTPS URLs",
-    path: ["api_key"],
-  },
-);
-
-export type AIProvider = z.infer<typeof aiProviderSchema>;
-export type AIProviderStorage = ToStorageType<typeof aiProviderSchema>;
-
-export type General = z.infer<typeof generalSchema>;
-export type GeneralStorage = ToStorageType<typeof generalSchema>;
+export * from "./schema-internal";
 
 export const STORE_ID = "internal";
 
-export const SCHEMA = {
-  value: {
-    user_id: { type: "string" },
-    autostart: { type: "boolean" },
-    save_recordings: { type: "boolean" },
-    notification_event: { type: "boolean" },
-    notification_detect: { type: "boolean" },
-    respect_dnd: { type: "boolean" },
-    telemetry_consent: { type: "boolean" },
-    ai_language: { type: "string" },
-    spoken_languages: { type: "string" },
-    ignored_platforms: { type: "string" },
-    current_llm_provider: { type: "string" },
-    current_llm_model: { type: "string" },
-    current_stt_provider: { type: "string" },
-    current_stt_model: { type: "string" },
-  } as const satisfies InferTinyBaseSchema<typeof generalSchema>,
-  table: {
-    ai_providers: {
-      type: { type: "string" },
-      base_url: { type: "string" },
-      api_key: { type: "string" },
-    } as const satisfies InferTinyBaseSchema<typeof aiProviderSchema>,
-    changes: {
-      row_id: { type: "string" },
-      table: { type: "string" },
-      updated: { type: "boolean" },
-      deleted: { type: "boolean" },
-    },
-    electric: {
-      offset: { type: "string" },
-      handle: { type: "string" },
-      table: { type: "string" },
-    },
-  } as const satisfies TablesSchema,
-};
-
 const {
   useCreateMergeableStore,
   useCreateSynchronizer,
@@ -91,12 +20,12 @@ const {
 
 export const UI = _UI as _UI.WithSchemas<Schemas>;
 export type Store = MergeableStore<Schemas>;
-export type Schemas = [typeof SCHEMA.table, typeof SCHEMA.value];
+export type Schemas = [typeof internalSchemaForTinybase.table, typeof internalSchemaForTinybase.value];
 
 export const createStore = () => {
   const store = createMergeableStore()
-    .setTablesSchema(SCHEMA.table)
-    .setValuesSchema(SCHEMA.value);
+    .setTablesSchema(internalSchemaForTinybase.table)
+    .setValuesSchema(internalSchemaForTinybase.value);
 
   return store;
 };
diff --git a/apps/desktop/src/store/tinybase/schema-internal.ts b/apps/desktop/src/store/tinybase/schema-internal.ts
index 70b786d12..8b8961f4e 100644
--- a/apps/desktop/src/store/tinybase/schema-internal.ts
+++ b/apps/desktop/src/store/tinybase/schema-internal.ts
@@ -1 +1,76 @@
-// TODO
+import type { TablesSchema } from "tinybase/with-schemas";
+import { z } from "zod";
+
+import { type InferTinyBaseSchema, jsonObject, type ToStorageType } from "./shared";
+
+export const generalSchema = z.object({
+  user_id: z.string(),
+  autostart: z.boolean().default(false),
+  telemetry_consent: z.boolean().default(true),
+  save_recordings: z.boolean().default(true),
+  notification_event: z.boolean().default(true),
+  notification_detect: z.boolean().default(true),
+  respect_dnd: z.boolean().default(true),
+  ai_language: z.string().default("en"),
+  spoken_languages: jsonObject(z.array(z.string()).default(["en"])),
+  ignored_platforms: jsonObject(z.array(z.string()).default([])),
+  current_llm_provider: z.string().optional(),
+  current_llm_model: z.string().optional(),
+  current_stt_provider: z.string().optional(),
+  current_stt_model: z.string().optional(),
+});
+
+export const aiProviderSchema = z.object({
+  type: z.enum(["stt", "llm"]),
+  base_url: z.url().min(1),
+  api_key: z.string(),
+}).refine(
+  (data) => !data.base_url.startsWith("https:") || data.api_key.length > 0,
+  {
+    message: "API key is required for HTTPS URLs",
+    path: ["api_key"],
+  },
+);
+
+export type AIProvider = z.infer<typeof aiProviderSchema>;
+export type General = z.infer<typeof generalSchema>;
+
+export type AIProviderStorage = ToStorageType<typeof aiProviderSchema>;
+export type GeneralStorage = ToStorageType<typeof generalSchema>;
+
+export const internalSchemaForTinybase = {
+  value: {
+    user_id: { type: "string" },
+    autostart: { type: "boolean" },
+    save_recordings: { type: "boolean" },
+    notification_event: { type: "boolean" },
+    notification_detect: { type: "boolean" },
+    respect_dnd: { type: "boolean" },
+    telemetry_consent: { type: "boolean" },
+    ai_language: { type: "string" },
+    spoken_languages: { type: "string" },
+    ignored_platforms: { type: "string" },
+    current_llm_provider: { type: "string" },
+    current_llm_model: { type: "string" },
+    current_stt_provider: { type: "string" },
+    current_stt_model: { type: "string" },
+  } as const satisfies InferTinyBaseSchema<typeof generalSchema>,
+  table: {
+    ai_providers: {
+      type: { type: "string" },
+      base_url: { type: "string" },
+      api_key: { type: "string" },
+    } as const satisfies InferTinyBaseSchema<typeof aiProviderSchema>,
+    changes: {
+      row_id: { type: "string" },
+      table: { type: "string" },
+      updated: { type: "boolean" },
+      deleted: { type: "boolean" },
+    },
+    electric: {
+      offset: { type: "string" },
+      handle: { type: "string" },
+      table: { type: "string" },
+    },
+  } as const satisfies TablesSchema,
+};

From f910f095ac42f0e0a731461a0523ee08d378941b Mon Sep 17 00:00:00 2001
From: Yujong Lee <yujonglee.dev@gmail.com>
Date: Thu, 30 Oct 2025 09:17:16 +0900
Subject: [PATCH 4/5] merge internal store into main

---
 apps/desktop/src/components/chat/session.tsx  |  3 +-
 apps/desktop/src/components/chat/view.tsx     |  3 +-
 .../outer-header/metadata/participants.tsx    |  3 +-
 .../components/settings/ai/llm/configure.tsx  |  6 +-
 .../src/components/settings/ai/llm/select.tsx | 14 +--
 .../components/settings/ai/shared/index.tsx   | 14 +--
 .../components/settings/ai/stt/configure.tsx  |  6 +-
 .../src/components/settings/ai/stt/select.tsx | 16 ++--
 .../src/components/settings/general/index.tsx | 14 +--
 .../settings/memory/custom-vocabulary.tsx     |  4 +-
 .../src/components/settings/notification.tsx  | 20 ++---
 .../components/settings/template/index.tsx    |  3 +-
 .../template/use-template-navigation.ts       |  3 +-
 apps/desktop/src/contexts/listener.tsx        |  6 +-
 apps/desktop/src/hooks/useLLMConnection.ts    | 10 +--
 apps/desktop/src/hooks/useSTTConnection.ts    | 10 +--
 apps/desktop/src/main.tsx                     | 24 ++----
 .../src/store/tinybase/cloudPersister.ts      | 11 +--
 apps/desktop/src/store/tinybase/internal.ts   | 86 -------------------
 apps/desktop/src/store/tinybase/main.ts       | 55 +++++++++---
 apps/desktop/src/types/index.ts               |  2 +-
 21 files changed, 122 insertions(+), 191 deletions(-)
 delete mode 100644 apps/desktop/src/store/tinybase/internal.ts

diff --git a/apps/desktop/src/components/chat/session.tsx b/apps/desktop/src/components/chat/session.tsx
index 78f64eb42..24b56e4da 100644
--- a/apps/desktop/src/components/chat/session.tsx
+++ b/apps/desktop/src/components/chat/session.tsx
@@ -6,7 +6,6 @@ import { CustomChatTransport } from "../../chat/transport";
 import type { HyprUIMessage } from "../../chat/types";
 import { useToolRegistry } from "../../contexts/tool";
 import { useLanguageModel } from "../../hooks/useLLMConnection";
-import * as internal from "../../store/tinybase/internal";
 import * as main from "../../store/tinybase/main";
 import { id } from "../../utils";
 
@@ -31,7 +30,7 @@ export function ChatSession({
   const transport = useTransport();
   const store = main.UI.useStore(main.STORE_ID);
 
-  const { user_id } = internal.UI.useValues(internal.STORE_ID);
+  const { user_id } = main.UI.useValues(main.STORE_ID);
 
   const createChatMessage = main.UI.useSetRowCallback(
     "chat_messages",
diff --git a/apps/desktop/src/components/chat/view.tsx b/apps/desktop/src/components/chat/view.tsx
index 252072d9c..43253b34f 100644
--- a/apps/desktop/src/components/chat/view.tsx
+++ b/apps/desktop/src/components/chat/view.tsx
@@ -2,7 +2,6 @@ import { useCallback, useRef } from "react";
 
 import type { HyprUIMessage } from "../../chat/types";
 import { useShell } from "../../contexts/shell";
-import * as internal from "../../store/tinybase/internal";
 import * as main from "../../store/tinybase/main";
 import { id } from "../../utils";
 
@@ -19,7 +18,7 @@ export function ChatView() {
   const stableSessionId = useStableSessionId(groupId);
   const model = useLanguageModel();
 
-  const { user_id } = internal.UI.useValues(internal.STORE_ID);
+  const { user_id } = main.UI.useValues(main.STORE_ID);
 
   const createChatGroup = main.UI.useSetRowCallback(
     "chat_groups",
diff --git a/apps/desktop/src/components/main/body/sessions/outer-header/metadata/participants.tsx b/apps/desktop/src/components/main/body/sessions/outer-header/metadata/participants.tsx
index 4f920b369..94226383b 100644
--- a/apps/desktop/src/components/main/body/sessions/outer-header/metadata/participants.tsx
+++ b/apps/desktop/src/components/main/body/sessions/outer-header/metadata/participants.tsx
@@ -7,7 +7,6 @@ import { CheckIcon, MailIcon, MinusCircleIcon, SearchIcon, XIcon } from "lucide-
 import { useCallback, useMemo, useState } from "react";
 
 import { useQuery } from "../../../../../../hooks/useQuery";
-import * as internal from "../../../../../../store/tinybase/internal";
 import * as main from "../../../../../../store/tinybase/main";
 import { useTabs } from "../../../../../../store/zustand/tabs";
 import { getInitials } from "../../../contacts/shared";
@@ -113,7 +112,7 @@ export function MeetingParticipants({ sessionId }: { sessionId: string }) {
   const [isFocused, setIsFocused] = useState(false);
   const [selectedIndex, setSelectedIndex] = useState(-1);
   const { openNew } = useTabs();
-  const { user_id } = internal.UI.useValues(internal.STORE_ID);
+  const { user_id } = main.UI.useValues(main.STORE_ID);
 
   const store = main.UI.useStore(main.STORE_ID);
   const indexes = main.UI.useIndexes(main.STORE_ID);
diff --git a/apps/desktop/src/components/settings/ai/llm/configure.tsx b/apps/desktop/src/components/settings/ai/llm/configure.tsx
index 8aca35d23..78110ae83 100644
--- a/apps/desktop/src/components/settings/ai/llm/configure.tsx
+++ b/apps/desktop/src/components/settings/ai/llm/configure.tsx
@@ -4,8 +4,8 @@ import { Streamdown } from "streamdown";
 
 import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@hypr/ui/components/ui/accordion";
 import { cn } from "@hypr/utils";
-import { aiProviderSchema } from "../../../../store/tinybase/internal";
-import * as internal from "../../../../store/tinybase/internal";
+import { aiProviderSchema } from "../../../../store/tinybase/main";
+import * as main from "../../../../store/tinybase/main";
 import { FormField, useProvider } from "../shared";
 import { ProviderId, PROVIDERS } from "./shared";
 
@@ -52,7 +52,7 @@ function NonHyprProviderCard({ config }: { config: typeof PROVIDERS[number] }) {
         type: "llm",
         base_url: config.baseUrl ?? "",
         api_key: "",
-      } satisfies internal.AIProvider),
+      } satisfies main.AIProvider),
     listeners: {
       onChange: ({ formApi }) => {
         queueMicrotask(() => {
diff --git a/apps/desktop/src/components/settings/ai/llm/select.tsx b/apps/desktop/src/components/settings/ai/llm/select.tsx
index 55534e080..4f3c3b152 100644
--- a/apps/desktop/src/components/settings/ai/llm/select.tsx
+++ b/apps/desktop/src/components/settings/ai/llm/select.tsx
@@ -4,7 +4,7 @@ import { useMemo } from "react";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@hypr/ui/components/ui/select";
 import { cn } from "@hypr/utils";
 import { useAuth } from "../../../../auth";
-import * as internal from "../../../../store/tinybase/internal";
+import * as main from "../../../../store/tinybase/main";
 import {
   listAnthropicModels,
   listGenericModels,
@@ -19,19 +19,19 @@ import { PROVIDERS } from "./shared";
 
 export function SelectProviderAndModel() {
   const configuredProviders = useConfiguredMapping();
-  const { current_llm_model, current_llm_provider } = internal.UI.useValues(internal.STORE_ID);
+  const { current_llm_model, current_llm_provider } = main.UI.useValues(main.STORE_ID);
 
-  const handleSelectProvider = internal.UI.useSetValueCallback(
+  const handleSelectProvider = main.UI.useSetValueCallback(
     "current_llm_provider",
     (provider: string) => provider,
     [],
-    internal.STORE_ID,
+    main.STORE_ID,
   );
-  const handleSelectModel = internal.UI.useSetValueCallback(
+  const handleSelectModel = main.UI.useSetValueCallback(
     "current_llm_model",
     (model: string) => model,
     [],
-    internal.STORE_ID,
+    main.STORE_ID,
   );
 
   const form = useForm({
@@ -131,7 +131,7 @@ export function SelectProviderAndModel() {
 
 function useConfiguredMapping(): Record<string, null | (() => Promise<ListModelsResult>)> {
   const auth = useAuth();
-  const configuredProviders = internal.UI.useResultTable(internal.QUERIES.llmProviders, internal.STORE_ID);
+  const configuredProviders = main.UI.useResultTable(main.QUERIES.llmProviders, main.STORE_ID);
 
   const mapping = useMemo(() => {
     return Object.fromEntries(
diff --git a/apps/desktop/src/components/settings/ai/shared/index.tsx b/apps/desktop/src/components/settings/ai/shared/index.tsx
index 4a7a92b7c..2acf1e4bf 100644
--- a/apps/desktop/src/components/settings/ai/shared/index.tsx
+++ b/apps/desktop/src/components/settings/ai/shared/index.tsx
@@ -2,21 +2,21 @@ import { Icon } from "@iconify-icon/react";
 
 import { InputGroup, InputGroupAddon, InputGroupInput, InputGroupText } from "@hypr/ui/components/ui/input-group";
 import { type AnyFieldApi } from "@tanstack/react-form";
-import * as internal from "../../../../store/tinybase/internal";
+import * as main from "../../../../store/tinybase/main";
 
 export * from "./model-combobox";
 
 export function useProvider(id: string) {
-  const providerRow = internal.UI.useRow("ai_providers", id, internal.STORE_ID);
-  const setProvider = internal.UI.useSetPartialRowCallback(
+  const providerRow = main.UI.useRow("ai_providers", id, main.STORE_ID);
+  const setProvider = main.UI.useSetPartialRowCallback(
     "ai_providers",
     id,
-    (row: Partial<internal.AIProvider>) => row,
+    (row: Partial<main.AIProvider>) => row,
     [id],
-    internal.STORE_ID,
-  ) as (row: Partial<internal.AIProvider>) => void;
+    main.STORE_ID,
+  ) as (row: Partial<main.AIProvider>) => void;
 
-  const { data } = internal.aiProviderSchema.safeParse(providerRow);
+  const { data } = main.aiProviderSchema.safeParse(providerRow);
   return [data, setProvider] as const;
 }
 
diff --git a/apps/desktop/src/components/settings/ai/stt/configure.tsx b/apps/desktop/src/components/settings/ai/stt/configure.tsx
index da0db83ed..caa97947d 100644
--- a/apps/desktop/src/components/settings/ai/stt/configure.tsx
+++ b/apps/desktop/src/components/settings/ai/stt/configure.tsx
@@ -11,8 +11,8 @@ import type { SupportedSttModel } from "@hypr/plugin-local-stt";
 import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@hypr/ui/components/ui/accordion";
 import { Button } from "@hypr/ui/components/ui/button";
 import { cn } from "@hypr/utils";
-import * as internal from "../../../../store/tinybase/internal";
-import { aiProviderSchema } from "../../../../store/tinybase/internal";
+import * as main from "../../../../store/tinybase/main";
+import { aiProviderSchema } from "../../../../store/tinybase/main";
 import {
   DOWNLOAD_MODEL_TASK_ID,
   registerDownloadProgressCallback,
@@ -54,7 +54,7 @@ function NonHyprProviderCard({ config }: { config: typeof PROVIDERS[number] }) {
         type: "stt",
         base_url: config.baseUrl ?? "",
         api_key: "",
-      } satisfies internal.AIProvider),
+      } satisfies main.AIProvider),
     listeners: {
       onChange: ({ formApi }) => {
         queueMicrotask(() => {
diff --git a/apps/desktop/src/components/settings/ai/stt/select.tsx b/apps/desktop/src/components/settings/ai/stt/select.tsx
index 65c1e2aa4..3742d6c68 100644
--- a/apps/desktop/src/components/settings/ai/stt/select.tsx
+++ b/apps/desktop/src/components/settings/ai/stt/select.tsx
@@ -5,11 +5,11 @@ import { useCallback } from "react";
 import { commands as localSttCommands, type SupportedSttModel } from "@hypr/plugin-local-stt";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@hypr/ui/components/ui/select";
 import { cn } from "@hypr/utils";
-import * as internal from "../../../../store/tinybase/internal";
+import * as main from "../../../../store/tinybase/main";
 import { displayModelId, type ProviderId, PROVIDERS, sttModelQueries } from "./shared";
 
 export function SelectProviderAndModel() {
-  const { current_stt_provider, current_stt_model } = internal.UI.useValues(internal.STORE_ID);
+  const { current_stt_provider, current_stt_model } = main.UI.useValues(main.STORE_ID);
   const configuredProviders = useConfiguredMapping();
 
   const server = useQuery({
@@ -36,18 +36,18 @@ export function SelectProviderAndModel() {
     }
   }, [current_stt_provider, current_stt_model]);
 
-  const handleSelectProvider = internal.UI.useSetValueCallback(
+  const handleSelectProvider = main.UI.useSetValueCallback(
     "current_stt_provider",
     (provider: string) => provider,
     [],
-    internal.STORE_ID,
+    main.STORE_ID,
   );
 
-  const handleSelectModel = internal.UI.useSetValueCallback(
+  const handleSelectModel = main.UI.useSetValueCallback(
     "current_stt_model",
     (model: string) => model,
     [],
-    internal.STORE_ID,
+    main.STORE_ID,
   );
 
   const form = useForm({
@@ -161,7 +161,7 @@ export function SelectProviderAndModel() {
 }
 
 function useConfiguredMapping(): Record<ProviderId, Array<{ id: string; isDownloaded: boolean }>> {
-  const configuredProviders = internal.UI.useResultTable(internal.QUERIES.sttProviders, internal.STORE_ID);
+  const configuredProviders = main.UI.useResultTable(main.QUERIES.sttProviders, main.STORE_ID);
 
   const [p2, p3] = useQueries({
     queries: [
@@ -182,7 +182,7 @@ function useConfiguredMapping(): Record<ProviderId, Array<{ id: string; isDownlo
         ];
       }
 
-      const config = configuredProviders[provider.id] as internal.AIProviderStorage | undefined;
+      const config = configuredProviders[provider.id] as main.AIProviderStorage | undefined;
 
       if (!config) {
         return [provider.id, []];
diff --git a/apps/desktop/src/components/settings/general/index.tsx b/apps/desktop/src/components/settings/general/index.tsx
index 22515a67e..04f232c84 100644
--- a/apps/desktop/src/components/settings/general/index.tsx
+++ b/apps/desktop/src/components/settings/general/index.tsx
@@ -1,24 +1,24 @@
 import { LANGUAGES_ISO_639_1 } from "@huggingface/languages";
 import { useForm } from "@tanstack/react-form";
 
-import * as internal from "../../../store/tinybase/internal";
+import * as main from "../../../store/tinybase/main";
 import { AppSettingsView } from "./app-settings";
 import { MainLanguageView } from "./main-language";
 import { Permissions } from "./permissions";
 import { SpokenLanguagesView } from "./spoken-languages";
 
 export function SettingsGeneral() {
-  const _value = internal.UI.useValues(internal.STORE_ID);
-  const value = internal.generalSchema.parse(_value);
+  const _value = main.UI.useValues(main.STORE_ID);
+  const value = main.generalSchema.parse(_value);
 
-  const setPartialValues = internal.UI.useSetPartialValuesCallback(
-    (row: Partial<internal.General>) => ({
+  const setPartialValues = main.UI.useSetPartialValuesCallback(
+    (row: Partial<main.General>) => ({
       ...row,
       spoken_languages: row.spoken_languages ? JSON.stringify(row.spoken_languages) : undefined,
       ignored_platforms: row.ignored_platforms ? JSON.stringify(row.ignored_platforms) : undefined,
-    } satisfies Partial<internal.GeneralStorage>),
+    } satisfies Partial<main.GeneralStorage>),
     [],
-    internal.STORE_ID,
+    main.STORE_ID,
   );
 
   const form = useForm({
diff --git a/apps/desktop/src/components/settings/memory/custom-vocabulary.tsx b/apps/desktop/src/components/settings/memory/custom-vocabulary.tsx
index df73bdef7..d4cf41826 100644
--- a/apps/desktop/src/components/settings/memory/custom-vocabulary.tsx
+++ b/apps/desktop/src/components/settings/memory/custom-vocabulary.tsx
@@ -5,7 +5,7 @@ import { useEffect, useMemo, useState } from "react";
 import { Button } from "@hypr/ui/components/ui/button";
 import { cn } from "@hypr/utils";
 
-import * as internal from "../../../store/tinybase/internal";
+import * as main from "../../../store/tinybase/main";
 import { QUERIES, STORE_ID, UI } from "../../../store/tinybase/main";
 import { id } from "../../../utils";
 
@@ -16,7 +16,7 @@ interface CustomVocabularyViewProps {
 
 export function CustomVocabularyView({ value: _value, onChange: _onChange }: CustomVocabularyViewProps) {
   const store = UI.useStore(STORE_ID);
-  const internalStore = internal.UI.useStore(internal.STORE_ID);
+  const internalStore = main.UI.useStore(main.STORE_ID);
   const userId = internalStore?.getValue("user_id");
   const [searchValue, setSearchValue] = useState("");
   const [editingIndex, setEditingIndex] = useState<number | null>(null);
diff --git a/apps/desktop/src/components/settings/notification.tsx b/apps/desktop/src/components/settings/notification.tsx
index 79cf35bcd..32a1e6e50 100644
--- a/apps/desktop/src/components/settings/notification.tsx
+++ b/apps/desktop/src/components/settings/notification.tsx
@@ -9,40 +9,40 @@ import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem } from "
 import { Popover, PopoverContent, PopoverTrigger } from "@hypr/ui/components/ui/popover";
 import { Switch } from "@hypr/ui/components/ui/switch";
 import { cn } from "@hypr/utils";
-import * as internal from "../../store/tinybase/internal";
+import * as main from "../../store/tinybase/main";
 
 export function SettingsNotifications() {
-  const values = internal.UI.useValues(internal.STORE_ID);
+  const values = main.UI.useValues(main.STORE_ID);
   const [popoverOpen, setPopoverOpen] = useState(false);
   const [newAppName, setNewAppName] = useState("");
   const [applications, setApplications] = useState<string[]>([]);
 
-  const handleSetNotificationEvent = internal.UI.useSetValueCallback(
+  const handleSetNotificationEvent = main.UI.useSetValueCallback(
     "notification_event",
     (value: boolean) => value,
     [],
-    internal.STORE_ID,
+    main.STORE_ID,
   );
 
-  const handleSetNotificationDetect = internal.UI.useSetValueCallback(
+  const handleSetNotificationDetect = main.UI.useSetValueCallback(
     "notification_detect",
     (value: boolean) => value,
     [],
-    internal.STORE_ID,
+    main.STORE_ID,
   );
 
-  const handleSetRespectDnd = internal.UI.useSetValueCallback(
+  const handleSetRespectDnd = main.UI.useSetValueCallback(
     "respect_dnd",
     (value: boolean) => value,
     [],
-    internal.STORE_ID,
+    main.STORE_ID,
   );
 
-  const handleSetIgnoredPlatforms = internal.UI.useSetValueCallback(
+  const handleSetIgnoredPlatforms = main.UI.useSetValueCallback(
     "ignored_platforms",
     (value: string[]) => JSON.stringify(value),
     [],
-    internal.STORE_ID,
+    main.STORE_ID,
   );
 
   const form = useForm({
diff --git a/apps/desktop/src/components/settings/template/index.tsx b/apps/desktop/src/components/settings/template/index.tsx
index c140aee42..b4b1c8db8 100644
--- a/apps/desktop/src/components/settings/template/index.tsx
+++ b/apps/desktop/src/components/settings/template/index.tsx
@@ -7,7 +7,6 @@ import { ButtonGroup } from "@hypr/ui/components/ui/button-group";
 import { Input } from "@hypr/ui/components/ui/input";
 import { cn } from "@hypr/utils";
 
-import * as internal from "../../../store/tinybase/internal";
 import * as main from "../../../store/tinybase/main";
 import { TemplateEditor } from "./editor";
 import { useTemplateNavigation } from "./use-template-navigation";
@@ -134,7 +133,7 @@ function TemplateCard({
 }
 
 function useTemplates() {
-  const { user_id } = internal.UI.useValues(internal.STORE_ID);
+  const { user_id } = main.UI.useValues(main.STORE_ID);
   const store = main.UI.useStore(main.STORE_ID);
 
   const USER_TEMPLATE_QUERY = "user_templates";
diff --git a/apps/desktop/src/components/settings/template/use-template-navigation.ts b/apps/desktop/src/components/settings/template/use-template-navigation.ts
index 510dbaf2a..fed6330b0 100644
--- a/apps/desktop/src/components/settings/template/use-template-navigation.ts
+++ b/apps/desktop/src/components/settings/template/use-template-navigation.ts
@@ -1,12 +1,11 @@
 import { useCallback } from "react";
 import { Route as SettingsRoute } from "../../../routes/app/settings/_layout";
-import * as internal from "../../../store/tinybase/internal";
 import * as main from "../../../store/tinybase/main";
 
 export function useTemplateNavigation() {
   const search = SettingsRoute.useSearch();
   const navigate = SettingsRoute.useNavigate();
-  const { user_id } = internal.UI.useValues(internal.STORE_ID);
+  const { user_id } = main.UI.useValues(main.STORE_ID);
 
   const setRow = main.UI.useSetRowCallback(
     "templates",
diff --git a/apps/desktop/src/contexts/listener.tsx b/apps/desktop/src/contexts/listener.tsx
index 304c8a6db..5bf97fcc1 100644
--- a/apps/desktop/src/contexts/listener.tsx
+++ b/apps/desktop/src/contexts/listener.tsx
@@ -3,7 +3,7 @@ import { useStore } from "zustand";
 import { useShallow } from "zustand/shallow";
 
 import { commands as localSttCommands, type SupportedSttModel } from "@hypr/plugin-local-stt";
-import * as internal from "../store/tinybase/internal";
+import * as main from "../store/tinybase/main";
 import { createListenerStore, type ListenerStore } from "../store/zustand/listener";
 
 const ListenerContext = createContext<ListenerStore | null>(null);
@@ -46,8 +46,8 @@ export const useListener = <T,>(
 };
 
 function useAutoStartSTT() {
-  const currentSttProvider = internal.UI.useValue("current_stt_provider", internal.STORE_ID);
-  const currentSttModel = internal.UI.useValue("current_stt_model", internal.STORE_ID);
+  const currentSttProvider = main.UI.useValue("current_stt_provider", main.STORE_ID);
+  const currentSttModel = main.UI.useValue("current_stt_model", main.STORE_ID);
 
   useEffect(() => {
     if (currentSttProvider !== "hyprnote") {
diff --git a/apps/desktop/src/hooks/useLLMConnection.ts b/apps/desktop/src/hooks/useLLMConnection.ts
index f8ddd0f82..bc17f326c 100644
--- a/apps/desktop/src/hooks/useLLMConnection.ts
+++ b/apps/desktop/src/hooks/useLLMConnection.ts
@@ -9,7 +9,7 @@ import { useMemo } from "react";
 import { useAuth } from "../auth";
 import { type ProviderId, PROVIDERS } from "../components/settings/ai/llm/shared";
 import { env } from "../env";
-import * as internal from "../store/tinybase/internal";
+import * as main from "../store/tinybase/main";
 
 export const useLanguageModel = (): LanguageModel | null => {
   const connection = useLLMConnection();
@@ -84,12 +84,12 @@ const useLLMConnection = (): {
 } | null => {
   const auth = useAuth();
 
-  const { current_llm_provider, current_llm_model } = internal.UI.useValues(internal.STORE_ID);
-  const providerConfig = internal.UI.useRow(
+  const { current_llm_provider, current_llm_model } = main.UI.useValues(main.STORE_ID);
+  const providerConfig = main.UI.useRow(
     "ai_providers",
     current_llm_provider ?? "",
-    internal.STORE_ID,
-  ) as internal.AIProviderStorage | undefined;
+    main.STORE_ID,
+  ) as main.AIProviderStorage | undefined;
 
   return useMemo(() => {
     if (!current_llm_provider || !current_llm_model) {
diff --git a/apps/desktop/src/hooks/useSTTConnection.ts b/apps/desktop/src/hooks/useSTTConnection.ts
index 8b3538433..2e6ce0d6e 100644
--- a/apps/desktop/src/hooks/useSTTConnection.ts
+++ b/apps/desktop/src/hooks/useSTTConnection.ts
@@ -2,7 +2,7 @@ import { useQuery } from "@tanstack/react-query";
 
 import { commands as localSttCommands } from "@hypr/plugin-local-stt";
 import { ProviderId } from "../components/settings/ai/stt/shared";
-import * as internal from "../store/tinybase/internal";
+import * as main from "../store/tinybase/main";
 
 type Connection = {
   provider: ProviderId;
@@ -12,16 +12,16 @@ type Connection = {
 };
 
 export const useSTTConnection = (): Connection | null => {
-  const { current_stt_provider, current_stt_model } = internal.UI.useValues(internal.STORE_ID) as {
+  const { current_stt_provider, current_stt_model } = main.UI.useValues(main.STORE_ID) as {
     current_stt_provider: ProviderId | undefined;
     current_stt_model: string | undefined;
   };
 
-  const providerConfig = internal.UI.useRow(
+  const providerConfig = main.UI.useRow(
     "ai_providers",
     current_stt_provider ?? "",
-    internal.STORE_ID,
-  ) as internal.AIProviderStorage | undefined;
+    main.STORE_ID,
+  ) as main.AIProviderStorage | undefined;
 
   const isLocalModel = current_stt_provider === "hyprnote" && current_stt_model?.startsWith("am-");
 
diff --git a/apps/desktop/src/main.tsx b/apps/desktop/src/main.tsx
index c88b80272..cf1147027 100644
--- a/apps/desktop/src/main.tsx
+++ b/apps/desktop/src/main.tsx
@@ -10,12 +10,7 @@ import { createManager } from "tinytick";
 import { Provider as TinyTickProvider, useCreateManager } from "tinytick/ui-react";
 
 import { TaskManager } from "./components/task-manager";
-import { type Store as InternalStore, STORE_ID as STORE_ID_INTERNAL } from "./store/tinybase/internal";
-import {
-  type Store as PersistedStore,
-  STORE_ID as STORE_ID_PERSISTED,
-  StoreComponent as StoreComponentPersisted,
-} from "./store/tinybase/main";
+import { type Store, STORE_ID, StoreComponent } from "./store/tinybase/main";
 
 import { createToolRegistry } from "./contexts/tool-registry/core";
 import { routeTree } from "./routeTree.gen";
@@ -37,17 +32,16 @@ declare module "@tanstack/react-router" {
 function App() {
   const stores = useStores();
 
-  const persistedStore = stores[STORE_ID_PERSISTED] as unknown as PersistedStore;
-  const internalStore = stores[STORE_ID_INTERNAL] as unknown as InternalStore;
+  const store = stores[STORE_ID] as unknown as Store;
 
   const aiTaskStore = useMemo(() => {
-    if (!persistedStore) {
+    if (!store) {
       return null;
     }
-    return createAITaskStore({ toolRegistry, persistedStore });
-  }, [persistedStore]);
+    return createAITaskStore({ toolRegistry, persistedStore: store });
+  }, [store]);
 
-  if (!persistedStore || !internalStore || !aiTaskStore) {
+  if (!store || !aiTaskStore) {
     return null;
   }
 
@@ -55,8 +49,8 @@ function App() {
     <RouterProvider
       router={router}
       context={{
-        persistedStore,
-        internalStore,
+        persistedStore: store,
+        internalStore: store,
         listenerStore,
         aiTaskStore,
         toolRegistry,
@@ -75,7 +69,7 @@ function AppWithTiny() {
       <TinyTickProvider manager={manager}>
         <TinyBaseProvider>
           <App />
-          <StoreComponentPersisted />
+          <StoreComponent />
           <TaskManager />
         </TinyBaseProvider>
       </TinyTickProvider>
diff --git a/apps/desktop/src/store/tinybase/cloudPersister.ts b/apps/desktop/src/store/tinybase/cloudPersister.ts
index e000679a1..042e6057c 100644
--- a/apps/desktop/src/store/tinybase/cloudPersister.ts
+++ b/apps/desktop/src/store/tinybase/cloudPersister.ts
@@ -2,7 +2,6 @@ import { type ChangeMessage as IncomingChangeMessage, type Offset, ShapeStream }
 import { useCallback } from "react";
 
 import { useAuth } from "../../auth";
-import * as internal from "./internal";
 import * as main from "./main";
 
 const ELECTRIC_URL = "http://localhost:3001/v1/shape";
@@ -40,15 +39,14 @@ const useCloudSaver = () => {
   }
 
   const store = main.UI.useStore(main.STORE_ID)!;
-  const store2 = internal.UI.useStore(internal.STORE_ID)!;
 
-  const user_id = store2.getValue("user_id");
+  const user_id = store.getValue("user_id");
   if (!user_id) {
     throw new Error("'user_id' is not set");
   }
 
   const save = useCallback(async () => {
-    const changesTable = store2.getTable("changes")!;
+    const changesTable = store.getTable("changes")!;
     const tables = store.getTables();
 
     const changes = main.TABLES.flatMap((tableName) => {
@@ -88,14 +86,13 @@ const useCloudSaver = () => {
 
 const useCloudLoader = () => {
   const store = main.UI.useStore(main.STORE_ID)!;
-  const store2 = internal.UI.useStore(internal.STORE_ID)!;
 
-  const user_id = store2.getValue("user_id");
+  const user_id = store.getValue("user_id");
   if (!user_id) {
     throw new Error("'user_id' is not set");
   }
 
-  const metaTable = store2.getTable("electric")!;
+  const metaTable = store.getTable("electric")!;
 
   const load = useCallback(async () => {
     const steams = main.TABLES.map((table) => {
diff --git a/apps/desktop/src/store/tinybase/internal.ts b/apps/desktop/src/store/tinybase/internal.ts
deleted file mode 100644
index f54385985..000000000
--- a/apps/desktop/src/store/tinybase/internal.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import * as _UI from "tinybase/ui-react/with-schemas";
-import { createMergeableStore, createQueries, type MergeableStore } from "tinybase/with-schemas";
-
-import { createBroadcastChannelSynchronizer } from "tinybase/synchronizers/synchronizer-broadcast-channel/with-schemas";
-import { DEFAULT_USER_ID } from "../../utils";
-import { internalSchemaForTinybase } from "./schema-internal";
-
-export * from "./schema-internal";
-
-export const STORE_ID = "internal";
-
-const {
-  useCreateMergeableStore,
-  useCreateSynchronizer,
-  useCreateQueries,
-  useProvideStore,
-  useProvideQueries,
-  useProvideSynchronizer,
-} = _UI as _UI.WithSchemas<Schemas>;
-
-export const UI = _UI as _UI.WithSchemas<Schemas>;
-export type Store = MergeableStore<Schemas>;
-export type Schemas = [typeof internalSchemaForTinybase.table, typeof internalSchemaForTinybase.value];
-
-export const createStore = () => {
-  const store = createMergeableStore()
-    .setTablesSchema(internalSchemaForTinybase.table)
-    .setValuesSchema(internalSchemaForTinybase.value);
-
-  return store;
-};
-
-export const useStore = () => {
-  const store = useCreateMergeableStore(() => createStore());
-
-  store.setValue("user_id", DEFAULT_USER_ID);
-
-  const synchronizer = useCreateSynchronizer(
-    store,
-    async (store) =>
-      createBroadcastChannelSynchronizer(
-        store,
-        "hypr-sync-internal",
-      ).startSync(),
-  );
-
-  const queries = useCreateQueries(
-    store,
-    (store) =>
-      createQueries(store)
-        .setQueryDefinition(
-          QUERIES.llmProviders,
-          "ai_providers",
-          ({ select, where }) => {
-            select("type");
-            select("base_url");
-            select("api_key");
-            where((getCell) => getCell("type") === "llm");
-          },
-        )
-        .setQueryDefinition(
-          QUERIES.sttProviders,
-          "ai_providers",
-          ({ select, where }) => {
-            select("type");
-            select("base_url");
-            select("api_key");
-            where((getCell) => getCell("type") === "stt");
-          },
-        ),
-    [],
-  )!;
-
-  useProvideStore(STORE_ID, store);
-  useProvideQueries(STORE_ID, queries);
-  useProvideSynchronizer(STORE_ID, synchronizer);
-
-  return store;
-};
-
-export const rowIdOfChange = (table: string, row: string) => `${table}:${row}`;
-
-export const QUERIES = {
-  llmProviders: "llmProviders",
-  sttProviders: "sttProviders",
-};
diff --git a/apps/desktop/src/store/tinybase/main.ts b/apps/desktop/src/store/tinybase/main.ts
index b5c1dbf53..75317f600 100644
--- a/apps/desktop/src/store/tinybase/main.ts
+++ b/apps/desktop/src/store/tinybase/main.ts
@@ -13,16 +13,23 @@ import {
 
 import { TABLE_HUMANS, TABLE_SESSIONS } from "@hypr/db";
 import { createBroadcastChannelSynchronizer } from "tinybase/synchronizers/synchronizer-broadcast-channel/with-schemas";
-import * as internal from "./internal";
+import { DEFAULT_USER_ID } from "../../utils";
 import { createLocalPersister } from "./localPersister";
 import { externalTableSchemaForTinybase } from "./schema-external";
+import { internalSchemaForTinybase } from "./schema-internal";
+
+export * from "./schema-external";
+export * from "./schema-internal";
 
 export const STORE_ID = "main";
 
 const SCHEMA = {
-  value: {} as const satisfies ValuesSchema,
+  value: {
+    ...internalSchemaForTinybase.value,
+  } as const satisfies ValuesSchema,
   table: {
     ...externalTableSchemaForTinybase,
+    ...internalSchemaForTinybase.table,
   } as const satisfies TablesSchema,
 };
 
@@ -51,7 +58,13 @@ export type Store = MergeableStore<Schemas>;
 export type Schemas = [typeof SCHEMA.table, typeof SCHEMA.value];
 
 export const StoreComponent = () => {
-  const store2 = internal.useStore();
+  const store = useCreateMergeableStore(() =>
+    createMergeableStore()
+      .setTablesSchema(SCHEMA.table)
+      .setValuesSchema(SCHEMA.value)
+  );
+
+  store.setValue("user_id", DEFAULT_USER_ID);
 
   useDidFinishTransactionListener(
     () => {
@@ -63,9 +76,9 @@ export const StoreComponent = () => {
         }
 
         Object.entries(rows).forEach(([rowId, cells]) => {
-          const id = internal.rowIdOfChange(tableId, rowId);
+          const id = rowIdOfChange(tableId, rowId);
 
-          store2.setRow("changes", id, {
+          store.setRow("changes", id, {
             row_id: rowId,
             table: tableId,
             deleted: !cells,
@@ -78,12 +91,6 @@ export const StoreComponent = () => {
     STORE_ID,
   );
 
-  const store = useCreateMergeableStore(() =>
-    createMergeableStore()
-      .setTablesSchema(SCHEMA.table)
-      .setValuesSchema(SCHEMA.value)
-  );
-
   const localPersister = useCreatePersister(
     store,
     (store) =>
@@ -270,8 +277,28 @@ export const StoreComponent = () => {
             select("created_at");
             where((getCell) => getCell("type") === "vocab");
           },
+        )
+        .setQueryDefinition(
+          QUERIES.llmProviders,
+          "ai_providers",
+          ({ select, where }) => {
+            select("type");
+            select("base_url");
+            select("api_key");
+            where((getCell) => getCell("type") === "llm");
+          },
+        )
+        .setQueryDefinition(
+          QUERIES.sttProviders,
+          "ai_providers",
+          ({ select, where }) => {
+            select("type");
+            select("base_url");
+            select("api_key");
+            where((getCell) => getCell("type") === "stt");
+          },
         ),
-    [store2],
+    [],
   )!;
 
   const indexes = useCreateIndexes(store, (store) =>
@@ -358,6 +385,8 @@ export const StoreComponent = () => {
   return null;
 };
 
+export const rowIdOfChange = (table: string, row: string) => `${table}:${row}`;
+
 export const QUERIES = {
   eventsWithoutSession: "eventsWithoutSession",
   sessionsWithMaybeEvent: "sessionsWithMaybeEvent",
@@ -366,6 +395,8 @@ export const QUERIES = {
   visibleTemplates: "visibleTemplates",
   visibleFolders: "visibleFolders",
   visibleVocabs: "visibleVocabs",
+  llmProviders: "llmProviders",
+  sttProviders: "sttProviders",
 };
 
 export const METRICS = {
diff --git a/apps/desktop/src/types/index.ts b/apps/desktop/src/types/index.ts
index f801c377f..8b6fd2694 100644
--- a/apps/desktop/src/types/index.ts
+++ b/apps/desktop/src/types/index.ts
@@ -1,4 +1,4 @@
-import { type Store as InternalStore } from "../store/tinybase/internal";
+import { type Store as InternalStore } from "../store/tinybase/main";
 import { type Store as PersistedStore } from "../store/tinybase/main";
 
 import type { ToolRegistry } from "../contexts/tool-registry/core";

From 915f4a730a7f219a628b72c9d964e097450e4bc3 Mon Sep 17 00:00:00 2001
From: Yujong Lee <yujonglee.dev@gmail.com>
Date: Thu, 30 Oct 2025 09:45:10 +0900
Subject: [PATCH 5/5] local persister fifx

---
 apps/desktop/src/store/tinybase/localPersister.ts | 14 +++++++++++---
 apps/desktop/src/store/tinybase/main.ts           | 14 ++++++++++----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/apps/desktop/src/store/tinybase/localPersister.ts b/apps/desktop/src/store/tinybase/localPersister.ts
index 59f0aa5f2..07e78bb2a 100644
--- a/apps/desktop/src/store/tinybase/localPersister.ts
+++ b/apps/desktop/src/store/tinybase/localPersister.ts
@@ -4,6 +4,7 @@ import type { MergeableStore, OptionalSchemas } from "tinybase/with-schemas";
 import { commands as db2Commands } from "@hypr/plugin-db2";
 import { MergeableStoreOnly } from "./shared";
 
+// https://tinybase.org/api/persisters/functions/creation/createcustomsqlitepersister
 export function createLocalPersister<Schemas extends OptionalSchemas>(
   store: MergeableStore<Schemas>,
   config: Omit<DpcJson, "mode">,
@@ -15,12 +16,19 @@ export function createLocalPersister<Schemas extends OptionalSchemas>(
       const r = await db2Commands.executeLocal(sql, args);
       if (r.status === "error") {
         console.error(r.error);
+        return [];
       }
+      return r.data;
+    },
+    (listener: (tableName: string) => void) => {
+      const interval = setInterval(() => listener(""), 1000);
+      return interval;
+    },
+    (handle: NodeJS.Timeout) => {
+      clearInterval(handle);
     },
-    () => {},
-    (unsubscribeFunction: any): any => unsubscribeFunction(),
     false ? console.log.bind(console, "[LocalPersister]") : () => {},
-    false ? console.error.bind(console, "[LocalPersister]") : () => {},
+    true ? console.error.bind(console, "[LocalPersister]") : () => {},
     () => {},
     MergeableStoreOnly,
     null,
diff --git a/apps/desktop/src/store/tinybase/main.ts b/apps/desktop/src/store/tinybase/main.ts
index 75317f600..4ff7594e5 100644
--- a/apps/desktop/src/store/tinybase/main.ts
+++ b/apps/desktop/src/store/tinybase/main.ts
@@ -64,8 +64,6 @@ export const StoreComponent = () => {
       .setValuesSchema(SCHEMA.value)
   );
 
-  store.setValue("user_id", DEFAULT_USER_ID);
-
   useDidFinishTransactionListener(
     () => {
       const [changedTables, _changedValues] = store.getTransactionChanges();
@@ -97,10 +95,18 @@ export const StoreComponent = () => {
       createLocalPersister<Schemas>(store as Store, {
         storeTableName: STORE_ID,
         storeIdColumnName: "id",
-        autoLoadIntervalSeconds: 9999,
       }),
     [],
-    (persister) => persister.startAutoPersisting(),
+    async (persister) => {
+      await persister.load();
+
+      if (!store.getValue("user_id")) {
+        store.setValue("user_id", DEFAULT_USER_ID);
+      }
+
+      await persister.startAutoSave();
+      await persister.startAutoLoad();
+    },
   );
 
   const synchronizer = useCreateSynchronizer(