@withone/cli 1.37.1 → 1.37.3

package/dist/index.js

@@ -4853,30 +4853,82 @@ function handleId(response, config2, records) {
 import fs9 from "fs";
 import path9 from "path";
 var SYNC_DIR = path9.join(".one", "sync");
-var STATE_FILE = path9.join(SYNC_DIR, "sync_state.json");
-function readSyncState() {
+var STATE_DIR = path9.join(SYNC_DIR, "state");
+var LEGACY_STATE_FILE = path9.join(SYNC_DIR, "sync_state.json");
+function modelFilePath(platform, model) {
+  return path9.join(STATE_DIR, platform, `${model}.json`);
+}
+function migrateLegacyIfNeeded() {
+  if (!fs9.existsSync(LEGACY_STATE_FILE)) return;
   try {
-    if (!fs9.existsSync(STATE_FILE)) return {};
-    const raw = fs9.readFileSync(STATE_FILE, "utf-8");
-    return JSON.parse(raw);
+    const raw = fs9.readFileSync(LEGACY_STATE_FILE, "utf-8");
+    const legacy = JSON.parse(raw);
+    for (const [platform, models] of Object.entries(legacy)) {
+      for (const [model, modelState] of Object.entries(models)) {
+        if (fs9.existsSync(modelFilePath(platform, model))) continue;
+        writeModelFile(platform, model, modelState);
+      }
+    }
+    fs9.unlinkSync(LEGACY_STATE_FILE);
   } catch {
-    return {};
+    try {
+      fs9.unlinkSync(LEGACY_STATE_FILE);
+    } catch {
+    }
   }
 }
-function writeSyncState(state) {
-  fs9.mkdirSync(SYNC_DIR, { recursive: true });
-  const tmp = STATE_FILE + ".tmp";
+function writeModelFile(platform, model, state) {
+  const dir = path9.join(STATE_DIR, platform);
+  fs9.mkdirSync(dir, { recursive: true });
+  const file = path9.join(dir, `${model}.json`);
+  const tmp = `${file}.${process.pid}.${Math.random().toString(36).slice(2, 10)}.tmp`;
   fs9.writeFileSync(tmp, JSON.stringify(state, null, 2));
-  fs9.renameSync(tmp, STATE_FILE);
+  fs9.renameSync(tmp, file);
+}
+function readModelFile(platform, model) {
+  try {
+    const raw = fs9.readFileSync(modelFilePath(platform, model), "utf-8");
+    return JSON.parse(raw);
+  } catch {
+    return null;
+  }
+}
+function readSyncState() {
+  migrateLegacyIfNeeded();
+  const result = {};
+  let platforms;
+  try {
+    platforms = fs9.readdirSync(STATE_DIR);
+  } catch {
+    return result;
+  }
+  for (const platform of platforms) {
+    const platformDir = path9.join(STATE_DIR, platform);
+    let entries;
+    try {
+      entries = fs9.readdirSync(platformDir);
+    } catch {
+      continue;
+    }
+    for (const entry of entries) {
+      if (!entry.endsWith(".json")) continue;
+      const model = entry.slice(0, -".json".length);
+      const modelState = readModelFile(platform, model);
+      if (modelState) {
+        if (!result[platform]) result[platform] = {};
+        result[platform][model] = modelState;
+      }
+    }
+  }
+  return result;
 }
 function getModelState(platform, model) {
-  const state = readSyncState();
-  return state[platform]?.[model] ?? null;
+  migrateLegacyIfNeeded();
+  return readModelFile(platform, model);
 }
 function updateModelState(platform, model, partial) {
-  const state = readSyncState();
-  if (!state[platform]) state[platform] = {};
-  const existing = state[platform][model] ?? {
+  migrateLegacyIfNeeded();
+  const existing = readModelFile(platform, model) ?? {
     lastSync: null,
     lastCursor: null,
     totalRecords: 0,
@@ -4884,21 +4936,26 @@ function updateModelState(platform, model, partial) {
     since: null,
     status: "idle"
   };
-  state[platform][model] = { ...existing, ...partial };
-  writeSyncState(state);
+  writeModelFile(platform, model, { ...existing, ...partial });
 }
 function removeModelState(platform, model) {
-  const state = readSyncState();
-  if (!state[platform]) return;
+  migrateLegacyIfNeeded();
+  const platformDir = path9.join(STATE_DIR, platform);
   if (model) {
-    delete state[platform][model];
-    if (Object.keys(state[platform]).length === 0) {
-      delete state[platform];
+    try {
+      fs9.unlinkSync(modelFilePath(platform, model));
+    } catch {
+    }
+    try {
+      if (fs9.readdirSync(platformDir).length === 0) fs9.rmdirSync(platformDir);
+    } catch {
     }
   } else {
-    delete state[platform];
+    try {
+      fs9.rmSync(platformDir, { recursive: true, force: true });
+    } catch {
+    }
   }
-  writeSyncState(state);
 }
 
 // src/lib/sync/db.ts
@@ -5721,10 +5778,10 @@ async function syncModel(api, profile, options) {
   }
   const lock = options.dryRun ? null : acquireSyncLock(platform, model);
   const existingState = getModelState(platform, model);
-  if (existingState?.status === "syncing" && !options.force) {
-    if (lock) lock.release();
-    throw new Error(
-      `Sync state says ${platform}/${model} is already syncing. Use --force to override (this may happen if a previous sync crashed before cleanup).`
+  if (existingState?.status === "syncing" && !options.dryRun && !isAgentMode()) {
+    process.stderr.write(
+      `Recovered from crashed previous sync of ${platform}/${model} (state was 'syncing', no live owner)
+`
     );
   }
   if (!profile.dateFilter && !options.dryRun && !options.fullRefresh && !isAgentMode()) {
@@ -5733,13 +5790,28 @@ async function syncModel(api, profile, options) {
 `
     );
   }
-  if (!options.dryRun) {
-    updateModelState(platform, model, { status: "syncing" });
-  }
   let db = null;
   let totalRecords = 0;
   let pagesProcessed = 0;
   let lastCursor = null;
+  const signalCleanup = (signal) => {
+    try {
+      updateModelState(platform, model, { status: "failed", pagesProcessed, lastCursor });
+    } catch {
+    }
+    try {
+      if (lock) lock.release();
+    } catch {
+    }
+    process.exit(signal === "SIGINT" ? 130 : 143);
+  };
+  const onSigint = () => signalCleanup("SIGINT");
+  const onSigterm = () => signalCleanup("SIGTERM");
+  if (!options.dryRun) {
+    process.on("SIGINT", onSigint);
+    process.on("SIGTERM", onSigterm);
+    updateModelState(platform, model, { status: "syncing" });
+  }
   const seenIds = /* @__PURE__ */ new Set();
   let hooksInserted = 0;
   let hooksUpdated = 0;
@@ -6102,6 +6174,9 @@ async function syncModel(api, profile, options) {
     wrapped._recordsSynced = totalRecords;
     wrapped._pagesProcessed = pagesProcessed;
     throw wrapped;
+  } finally {
+    process.off("SIGINT", onSigint);
+    process.off("SIGTERM", onSigterm);
   }
 }
 
@@ -8676,7 +8751,7 @@ Fetches ALL records and deletes local rows whose IDs are no longer in the source
 .one/sync/
   profiles/{platform}_{model}.json    # sync profiles
   data/{platform}.db                  # SQLite databases (WAL mode)
-  sync_state.json                     # checkpoint tracking
+  state/{platform}/{model}.json       # per-model checkpoint tracking
   events/{platform}_{model}.jsonl     # change event logs (if onChange: "log")
   logs/{platform}.log                 # cron run logs
   locks/{platform}_{model}/           # cross-process sync locks

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@withone/cli",
-  "version": "1.37.1",
+  "version": "1.37.3",
   "description": "CLI for managing One",
   "type": "module",
   "files": [