remove cleanups

Author: yujonglee

apps/desktop/src/store/tinybase/persister/chat/persister.ts

@@ -9,7 +9,6 @@ import {
 import { buildChatSaveOps } from "./save";
 
 import { createMultiTableDirPersister } from "~/store/tinybase/persister/factories";
-import { CHAT_MESSAGES_FILE } from "~/store/tinybase/persister/shared";
 import type { Store } from "~/store/tinybase/store/main";
 
 export function createChatPersister(store: Store) {
@@ -21,14 +20,6 @@ export function createChatPersister(store: Store) {
       { tableName: "chat_groups", isPrimary: true },
       { tableName: "chat_messages", foreignKey: "chat_group_id" },
     ],
-    cleanup: (tables) => [
-      {
-        type: "dirs",
-        subdir: "chats",
-        markerFile: CHAT_MESSAGES_FILE,
-        keepIds: Object.keys(tables.chat_groups ?? {}),
-      },
-    ],
     loadAll: loadAllChatGroups,
     loadSingle: loadSingleChatGroup,
     save: (_store, tables, dataDir, changedTables) => {

apps/desktop/src/store/tinybase/persister/factories/collector.ts

@@ -30,42 +30,12 @@ import {
 } from "~/store/tinybase/persister/shared/types";
 import { StoreOrMergeableStore } from "~/store/tinybase/store/shared";
 
-const CLEANUP_SAFEGUARD_MIN_DISK_COUNT = 5;
-const CLEANUP_SAFEGUARD_MIN_KEEP_RATIO = 0.5;
-
 type LoadSingleFn<Schemas extends OptionalSchemas> = (
   entityId: string,
 ) => Promise<
   PersistedChanges<Schemas, Persists.StoreOrMergeableStore> | undefined
 >;
 
-type OrphanCleanupDirs = {
-  type: "dirs";
-  subdir: string;
-  markerFile: string;
-  keepIds: string[];
-};
-
-type OrphanCleanupFiles = {
-  type: "files";
-  subdir: string;
-  extension: string;
-  keepIds: string[];
-};
-
-type OrphanCleanupFilesRecursive = {
-  type: "filesRecursive";
-  subdir: string;
-  markerFile: string;
-  extension: string;
-  keepIds: string[];
-};
-
-export type OrphanCleanupConfig =
-  | OrphanCleanupDirs
-  | OrphanCleanupFiles
-  | OrphanCleanupFilesRecursive;
-
 type BaseCollectorOptions<Schemas extends OptionalSchemas> = {
   label: string;
   save: (
@@ -75,7 +45,6 @@ type BaseCollectorOptions<Schemas extends OptionalSchemas> = {
     changedTables?: ChangedTables,
   ) => SaveResult;
   load?: () => Promise<Content<Schemas> | undefined>;
-  cleanup?: (tables: TablesContent) => OrphanCleanupConfig[];
   watchPaths?: string[];
   watchIntervalMs?: number;
 };
@@ -161,11 +130,6 @@ export function createCollectorPersister<Schemas extends OptionalSchemas>(
         await writeDocumentBatch(documentItems, options.label);
         await deleteFiles(deletePaths, options.label);
       }
-
-      if (options.cleanup) {
-        const cleanupConfigs = options.cleanup(tables ?? {});
-        await runOrphanCleanup(cleanupConfigs, options.label);
-      }
     } catch (error) {
       console.error(`[${options.label}] save error:`, error);
     }
@@ -244,100 +208,3 @@ async function deleteFiles(paths: string[], label: string): Promise<void> {
     }
   }
 }
-
-async function countItemsOnDisk(config: OrphanCleanupConfig): Promise<number> {
-  try {
-    const dataDir = await getDataDir();
-    const subdir = [dataDir, config.subdir].join("/");
-
-    if (config.type === "dirs") {
-      const result = await fsSyncCommands.scanAndRead(
-        subdir,
-        [config.markerFile],
-        true,
-        null,
-      );
-      if (result.status === "ok") {
-        return result.data.dirs.length;
-      }
-    } else if (config.type === "files") {
-      const result = await fsSyncCommands.scanAndRead(
-        subdir,
-        [`*.${config.extension}`],
-        false,
-        null,
-      );
-      if (result.status === "ok") {
-        return Object.keys(result.data.files).length;
-      }
-    } else if (config.type === "filesRecursive") {
-      const result = await fsSyncCommands.scanAndRead(
-        subdir,
-        [`*.${config.extension}`],
-        true,
-        null,
-      );
-      if (result.status === "ok") {
-        return Object.keys(result.data.files).length;
-      }
-    }
-  } catch {
-    // Ignore counting errors - we'll proceed with cleanup
-  }
-  return 0;
-}
-
-async function runOrphanCleanup(
-  configs: OrphanCleanupConfig[],
-  label: string,
-): Promise<void> {
-  for (const config of configs) {
-    if (config.keepIds.length === 0) {
-      continue;
-    }
-
-    const diskCount = await countItemsOnDisk(config);
-    const keepRatio = config.keepIds.length / Math.max(diskCount, 1);
-
-    if (
-      diskCount > CLEANUP_SAFEGUARD_MIN_DISK_COUNT &&
-      keepRatio < CLEANUP_SAFEGUARD_MIN_KEEP_RATIO
-    ) {
-      console.warn(
-        `[${label}] Skipping ${config.type} cleanup: keeping ${config.keepIds.length}/${diskCount} ` +
-          `(${(keepRatio * 100).toFixed(0)}%) - possible load failure`,
-      );
-      continue;
-    }
-
-    try {
-      if (config.type === "dirs") {
-        await fsSyncCommands.cleanupOrphan(
-          {
-            type: "dirs",
-            subdir: config.subdir,
-            marker_file: config.markerFile,
-          },
-          config.keepIds,
-        );
-      } else if (config.type === "files") {
-        await fsSyncCommands.cleanupOrphan(
-          { type: "files", subdir: config.subdir, extension: config.extension },
-          config.keepIds,
-        );
-      } else if (config.type === "filesRecursive") {
-        await fsSyncCommands.cleanupOrphan(
-          {
-            type: "filesRecursive",
-            subdir: config.subdir,
-            marker_file: config.markerFile,
-            extension: config.extension,
-          },
-          config.keepIds,
-        );
-      }
-    } catch (error) {
-      console.error(`[${label}] Cleanup error for ${config.type}:`, error);
-    }
-  }
-}

apps/desktop/src/store/tinybase/persister/factories/markdown-dir.test.ts

@@ -22,7 +22,6 @@ const fsSyncMocks = vi.hoisted(() => ({
   serialize: vi.fn().mockResolvedValue({ status: "ok", data: "" }),
   writeDocumentBatch: vi.fn().mockResolvedValue({ status: "ok", data: null }),
   readDocumentBatch: vi.fn(),
-  cleanupOrphan: vi.fn().mockResolvedValue({ status: "ok", data: 0 }),
 }));
 
 const fs2Mocks = vi.hoisted(() => ({

apps/desktop/src/store/tinybase/persister/factories/markdown-dir.ts

@@ -166,16 +166,6 @@ export function createMarkdownDirPersister<
   return createCollectorPersister(store, {
     label,
     watchPaths: [`${dirName}/`],
-    cleanup: (tables) => [
-      {
-        type: "files",
-        subdir: dirName,
-        extension: "md",
-        keepIds: Object.keys(
-          (tables as Record<string, Record<string, unknown>>)[tableName] ?? {},
-        ),
-      },
-    ],
     entityParser,
     loadSingle: (entityId: string) =>
       loadSingleEntity(config, entityId, deletionMarker),

apps/desktop/src/store/tinybase/persister/factories/multi-table-dir.test.ts

@@ -16,7 +16,6 @@ const fsSyncMocks = vi.hoisted(() => ({
   serialize: vi.fn().mockResolvedValue({ status: "ok", data: "" }),
   writeDocumentBatch: vi.fn().mockResolvedValue({ status: "ok", data: null }),
   readDocumentBatch: vi.fn(),
-  cleanupOrphan: vi.fn().mockResolvedValue({ status: "ok", data: 0 }),
 }));
 
 const fs2Mocks = vi.hoisted(() => ({
@@ -42,7 +41,6 @@ describe("createMultiTableDirPersister", () => {
       dirName: "test",
       entityParser: () => null,
       tables: [{ tableName: "sessions", isPrimary: true }],
-      cleanup: () => [],
       loadAll: async () => ok({ sessions: {} }),
       loadSingle: async () => ok({ sessions: {} }),
       save: () => ({ operations: [] }),

apps/desktop/src/store/tinybase/persister/factories/multi-table-dir.ts

@@ -2,10 +2,7 @@ import type { MergeableStore, OptionalSchemas } from "tinybase/with-schemas";
 
 import { toContent, toPersistedChanges } from "@hypr/tinybase-utils";
 
-import {
-  createCollectorPersister,
-  type OrphanCleanupConfig,
-} from "./collector";
+import { createCollectorPersister } from "./collector";
 
 import {
   createDeletionMarker,
@@ -30,7 +27,6 @@ export type MultiTableDirConfig<
   dirName: string;
   entityParser: (path: string) => string | null;
   tables: TableConfigEntry<Schemas, TLoadedData>[];
-  cleanup: (tables: TablesContent) => OrphanCleanupConfig[];
   loadAll: (dataDir: string) => Promise<LoadResult<TLoadedData>>;
   loadSingle: (
     dataDir: string,
@@ -58,16 +54,8 @@ export function createMultiTableDirPersister<
   store: MergeableStore<Schemas>,
   config: MultiTableDirConfig<Schemas, TLoadedData>,
 ): ReturnType<typeof createCollectorPersister<Schemas>> {
-  const {
-    label,
-    dirName,
-    entityParser,
-    tables,
-    cleanup,
-    loadAll,
-    loadSingle,
-    save,
-  } = config;
+  const { label, dirName, entityParser, tables, loadAll, loadSingle, save } =
+    config;
 
   const deletionMarker = createDeletionMarker<TLoadedData>(
     store as DeletionMarkerStore,
@@ -78,7 +66,6 @@ export function createMultiTableDirPersister<
   return createCollectorPersister(store, {
     label,
     watchPaths: [`${dirName}/`],
-    cleanup,
     entityParser,
     loadSingle: async (entityId: string) => {
       try {

apps/desktop/src/store/tinybase/persister/human/persister.test.ts

@@ -19,7 +19,6 @@ const fsSyncMocks = vi.hoisted(() => ({
   serialize: vi.fn().mockResolvedValue({ status: "ok", data: "" }),
   writeDocumentBatch: vi.fn().mockResolvedValue({ status: "ok", data: null }),
   readDocumentBatch: vi.fn(),
-  cleanupOrphan: vi.fn().mockResolvedValue({ status: "ok", data: 0 }),
 }));
 
 const fs2Mocks = vi.hoisted(() => ({

apps/desktop/src/store/tinybase/persister/organization/persister.test.ts

@@ -18,7 +18,6 @@ const fsSyncMocks = vi.hoisted(() => ({
   serialize: vi.fn().mockResolvedValue({ status: "ok", data: "" }),
   writeDocumentBatch: vi.fn().mockResolvedValue({ status: "ok", data: null }),
   readDocumentBatch: vi.fn(),
-  cleanupOrphan: vi.fn().mockResolvedValue({ status: "ok", data: 0 }),
 }));
 
 const fs2Mocks = vi.hoisted(() => ({

apps/desktop/src/store/tinybase/persister/session/persister.ts

@@ -13,10 +13,6 @@ import {
 } from "./save/index";
 
 import { createMultiTableDirPersister } from "~/store/tinybase/persister/factories";
-import {
-  SESSION_META_FILE,
-  SESSION_NOTE_EXTENSION,
-} from "~/store/tinybase/persister/shared";
 import type { Store } from "~/store/tinybase/store/main";
 
 export function createSessionPersister(store: Store) {
@@ -32,21 +28,6 @@ export function createSessionPersister(store: Store) {
       { tableName: "transcripts", foreignKey: "session_id" },
       { tableName: "enhanced_notes", foreignKey: "session_id" },
     ],
-    cleanup: (tables) => [
-      {
-        type: "dirs",
-        subdir: "sessions",
-        markerFile: SESSION_META_FILE,
-        keepIds: Object.keys(tables.sessions ?? {}),
-      },
-      {
-        type: "filesRecursive",
-        subdir: "sessions",
-        markerFile: SESSION_META_FILE,
-        extension: SESSION_NOTE_EXTENSION.slice(1),
-        keepIds: Object.keys(tables.enhanced_notes ?? {}),
-      },
-    ],
     loadAll: loadAllSessionData,
     loadSingle: loadSingleSession,
     save: (store, tables, dataDir, changedTables) => {