feat: enhance state management by introducing a helper function for persisting and updating local state

Author: ErcinDedeoglu

src/plugin/background-sync.ts

@@ -12,6 +12,15 @@ import { getPluginState } from './state-manager.js';
 import { isContinuousSyncReady } from './validation.js';
 import { getErrorMessage, writePulledData, persistLocalState } from '../shared/index.js';
 
+/** Helper to persist state and update in-memory state */
+async function persistAndUpdateState(pathConfig: PathConfig): Promise<void> {
+  const state = getPluginState();
+  const newState = await persistLocalState(pathConfig, state.engine);
+  if (newState) {
+    state.localState = newState;
+  }
+}
+
 /** Active file watcher instance */
 let activeWatcher: FileWatcher | null = null;
 
@@ -46,7 +55,7 @@ export function startFileWatcher(pathConfig: PathConfig): void {
           const { categories } = await loadLocalData(pathConfig, config.sync);
           const result = await engine.sync(categories);
           if (result.success) {
-            await persistLocalState(pathConfig);
+            await persistAndUpdateState(pathConfig);
           }
         } catch (error) {
           log(`WARNING: File watcher sync failed: ${getErrorMessage(error)}`);
@@ -79,7 +88,7 @@ export function startIntervalSync(pathConfig: PathConfig): void {
         const result = await engine.sync(categories);
         if (result.success) {
           await writePulledData(pathConfig, result);
-          await persistLocalState(pathConfig);
+          await persistAndUpdateState(pathConfig);
         }
         logIntervalResult(result);
       } catch (error) {

src/plugin/plugin.ts

@@ -139,7 +139,10 @@ function performInitialSync(pathConfig: PathConfig): void {
 
       if (result.success && result.action !== 'error') {
         await writePulledData(pathConfig, result);
-        await persistLocalState(pathConfig);
+        const newState = await persistLocalState(pathConfig, engine);
+        if (newState) {
+          getPluginState().localState = newState;
+        }
         log(`Initial sync complete in ${String(dur)}ms: ${result.message}`);
       } else {
         log(`Sync completed in ${String(dur)}ms: ${result.message}`);

src/plugin/sync-handler.ts

@@ -53,9 +53,14 @@ async function handleSyncSuccess(
   client: LogClient,
   result: SyncResult
 ): Promise<void> {
+  const state = getPluginState();
+
   // Write pulled data and persist state using shared utilities
   await writePulledData(pathConfig, result);
-  await persistLocalState(pathConfig);
+  const newState = await persistLocalState(pathConfig, state.engine);
+  if (newState) {
+    state.localState = newState;
+  }
 
   await client.app.log({
     body: {

src/shared/index.ts

@@ -8,7 +8,12 @@ export { calculateChecksum, uint8ArrayToBase64, base64ToUint8Array } from './enc
 
 export { getErrorMessage, getErrorStack, toError, isError } from './error-utils.js';
 
-export { writePulledData, persistLocalState, processSyncResult } from './sync-result-handler.js';
+export {
+  writePulledData,
+  persistLocalState,
+  processSyncResult,
+  type StateProvider,
+} from './sync-result-handler.js';
 
 export {
   AppError,

src/shared/sync-result-handler.ts

@@ -6,11 +6,15 @@
  */
 
 import type { PathConfig } from '../types/paths.js';
-import type { SyncResult } from '../types/sync.js';
+import type { SyncResult, LocalSyncState } from '../types/sync.js';
 import type { CategoryData } from '../sync/operations/types.js';
 import { writeLocalData, deleteTombstonedItems, saveLocalState } from '../data/index.js';
 import { syncLog } from '../logging/index.js';
-import { getPluginState } from '../plugin/state-manager.js';
+
+/** Interface for engine that can provide local state */
+export interface StateProvider {
+  getLocalState(): LocalSyncState | null;
+}
 
 /** Actions that should trigger writing pulled data to disk */
 const WRITE_ACTIONS = new Set(['pulled', 'merged', 'pushed']);
@@ -43,22 +47,28 @@ export async function writePulledData(pathConfig: PathConfig, result: SyncResult
 
 /**
  * Persist engine's local state to disk after successful sync.
- * Updates both the state file and the in-memory plugin state.
+ * Returns the new state for the caller to update their in-memory state.
  */
-export async function persistLocalState(pathConfig: PathConfig): Promise<void> {
-  const state = getPluginState();
-  const newState = state.engine?.getLocalState();
+export async function persistLocalState(
+  pathConfig: PathConfig,
+  engine: StateProvider | null | undefined
+): Promise<LocalSyncState | null> {
+  const newState = engine?.getLocalState() ?? null;
   if (newState) {
     await saveLocalState(pathConfig, newState);
-    state.localState = newState;
   }
+  return newState;
 }
 
 /**
  * Process a successful sync result - write data and persist state.
  * Combines writePulledData and persistLocalState into a single call.
  */
-export async function processSyncResult(pathConfig: PathConfig, result: SyncResult): Promise<void> {
+export async function processSyncResult(
+  pathConfig: PathConfig,
+  result: SyncResult,
+  engine: StateProvider | null | undefined
+): Promise<LocalSyncState | null> {
   await writePulledData(pathConfig, result);
-  await persistLocalState(pathConfig);
+  return persistLocalState(pathConfig, engine);
 }

src/sync/engine/types.ts

@@ -6,7 +6,6 @@
 
 import type { SyncConfig, LocalSyncState } from '../../types/index.js';
 import type { StorageBackend } from '../../storage/index.js';
-import type { CryptoOptions } from '../operations/types.js';
 
 export interface SyncEngineOptions {
   config: SyncConfig;
@@ -19,15 +18,4 @@ export interface SyncEngineOptions {
   lockPath?: string;
 }
 
-/** Get crypto options from engine options */
-export function getCryptoOptions(options: {
-  passphrase?: string;
-  oldPassphrase?: string;
-}): CryptoOptions {
-  const result: CryptoOptions = {};
-  if (options.passphrase) result.passphrase = options.passphrase;
-  if (options.oldPassphrase) result.oldPassphrase = options.oldPassphrase;
-  return result;
-}
-
 export const MANIFEST_FILENAME = 'manifest.json';

src/sync/tombstone.ts

@@ -126,23 +126,6 @@ export function detectLocalDeletions(
   return deletions;
 }
 
-/**
- * Remove items from category info that have tombstones.
- * This ensures tombstoned items aren't included in the live items.
- */
-export function removeItemsWithTombstones(
-  items: Record<string, unknown>,
-  tombstones: Record<string, Tombstone>
-): Record<string, unknown> {
-  const result: Record<string, unknown> = {};
-  for (const [itemId, item] of Object.entries(items)) {
-    if (!(itemId in tombstones)) {
-      result[itemId] = item;
-    }
-  }
-  return result;
-}
-
 // Re-export TombstonesFile functions for backward compatibility
 export {
   parseTombstonesFile,