Update hf-sync-manager.mjs

hf-sync-manager.mjs

@@ -3,33 +3,34 @@
 //
 // TRACK 1 - Settings (openclaw.json):
 //   Boot:    repo/settings/openclaw.json -> local disk
-//   Upload:  local disk -> repo/settings/openclaw.json (overwrite, always single copy)
-//   Rule:    repo always has exactly ONE copy, no versioning
+//            ONLY if repo file passes JSON validation
+//            If invalid: keep local file, log warning
+//   Upload:  local disk -> repo/settings/openclaw.json
+//            ONLY if local file passes JSON validation
+//            Single copy, always overwrite, never accumulate
 //
 // TRACK 2 - Memory (conversations, history, context, agents, logs):
 //   Boot:    repo/data/* -> local disk (full restore, all sessions)
-//   Upload:  local disk -> repo/data/* every 3h (upload only, NEVER download mid-run)
-//   Rule:    runtime is write-only to prevent memory flooding
+//   Upload:  local disk -> repo/data/* every 3h
+//            Upload only, NEVER download during runtime
 // ============================================================
 
 import fs   from "node:fs";
 import path from "node:path";
 import { execSync } from "node:child_process";
 
-// -- config -----------------------------------
+// -- config ---------------------------------------------------
 
 var HOME            = process.env.OPENCLAW_HOME || process.env.HOME || "/home/user";
 var OPENCLAW_DIR    = path.join(HOME, ".openclaw");
 var HF_TOKEN        = (process.env.HF_TOKEN      || "").trim();
 var DATASET_ID      = (process.env.HF_DATASET_ID  || "").trim();
 var REPO_DIR        = "/tmp/hf-memory-sync";
-var UPLOAD_INTERVAL = 3 * 60 * 60 * 1000; // 3 hours
+var UPLOAD_INTERVAL = 3 * 60 * 60 * 1000;
 
-// Settings track: only this file
-var SETTINGS_FILE   = "openclaw.json";
-var REPO_SETTINGS   = "settings";   // repo subfolder
+var SETTINGS_FILE = "openclaw.json";
+var REPO_SETTINGS = "settings";
 
-// Memory track: these dirs/files inside OPENCLAW_DIR
 var MEMORY_TARGETS = [
   "memory",
   "history",
@@ -39,8 +40,8 @@ var MEMORY_TARGETS = [
   "agents"
 ];
 
-// Never touch these in either track
 var NEVER_SYNC = [
+  "openclaw.json",
   "openclaw.json.bak",
   ".sync-state.json",
   "settings.json",
@@ -52,7 +53,7 @@ var NEVER_SYNC = [
   "canvas"
 ];
 
-// -- helpers -----------------------------------
+// -- helpers --------------------------------------------------
 
 function log(msg) {
   console.log("[hf-sync] " + msg);
@@ -64,7 +65,7 @@ function sleep(ms) {
 
 function repoUrl() {
   return "https://user:" + HF_TOKEN +
-         "@huggingface.co/datasets/" + DATASET_ID;
+    "@huggingface.co/datasets/" + DATASET_ID;
 }
 
 function git(args) {
@@ -77,16 +78,40 @@ function git(args) {
 }
 
 function isMemoryTarget(name) {
-  for (let i = 0; i < NEVER_SYNC.length; i++) {
+  var i;
+  for (i = 0; i < NEVER_SYNC.length; i++) {
     if (name === NEVER_SYNC[i]) return false;
   }
-  for (let i = 0; i < MEMORY_TARGETS.length; i++) {
+  for (i = 0; i < MEMORY_TARGETS.length; i++) {
     if (name === MEMORY_TARGETS[i]) return true;
   }
   return false;
 }
 
-// -- git repo setup ----------------------------
+// FIX: validate JSON before any config file operation
+// Returns true if file exists and contains valid JSON
+function isValidJson(filePath) {
+  try {
+    if (!fs.existsSync(filePath)) return false;
+    var content = fs.readFileSync(filePath, "utf-8").trim();
+    if (!content) return false;
+    JSON.parse(content);
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+
+function copyItem(src, dst) {
+  if (fs.statSync(src).isDirectory()) {
+    execSync("cp -r " + src + " " + dst, { stdio: "pipe" });
+  } else {
+    fs.mkdirSync(path.dirname(dst), { recursive: true });
+    fs.copyFileSync(src, dst);
+  }
+}
+
+// -- git repo setup ------------------------------------------
 
 function ensureRepo() {
   if (fs.existsSync(path.join(REPO_DIR, ".git"))) return;
@@ -121,7 +146,6 @@ function pullLatest() {
   }
 }
 
-// Single commit+push for both tracks
 function commitAndPush(label) {
   try {
     git("add -A");
@@ -142,17 +166,6 @@ function commitAndPush(label) {
   }
 }
 
-// -- copy helper ------------------------------
-
-function copyItem(src, dst) {
-  if (fs.statSync(src).isDirectory()) {
-    execSync("cp -r " + src + " " + dst, { stdio: "pipe" });
-  } else {
-    fs.mkdirSync(path.dirname(dst), { recursive: true });
-    fs.copyFileSync(src, dst);
-  }
-}
-
 // ============================================================
 // TRACK 1: Settings
 // ============================================================
@@ -162,14 +175,25 @@ function settingsBootRestore() {
   var localFile = path.join(OPENCLAW_DIR, SETTINGS_FILE);
 
   if (!fs.existsSync(repoFile)) {
-    log("[settings] No settings in repo yet, using local defaults");
+    log("[settings] No settings in repo yet, keeping local defaults");
+    return false;
+  }
+
+  // FIX: validate repo file before overwriting local config
+  if (!isValidJson(repoFile)) {
+    log("[settings] WARN: repo openclaw.json is invalid JSON, skipping restore to protect local config");
+    log("[settings] Corrupted repo file will be overwritten on next upload");
     return false;
   }
 
   try {
     fs.mkdirSync(OPENCLAW_DIR, { recursive: true });
+    // Backup local before overwriting
+    if (fs.existsSync(localFile)) {
+      fs.copyFileSync(localFile, localFile + ".pre-restore-bak");
+    }
     fs.copyFileSync(repoFile, localFile);
-    log("[settings] Boot restore done: openclaw.json <- repo");
+    log("[settings] Boot restore done: openclaw.json <- repo (validated OK)");
     return true;
   } catch (e) {
     log("[settings] Boot restore failed: " + e.message);
@@ -179,8 +203,10 @@ function settingsBootRestore() {
 
 function settingsUpload() {
   var localFile = path.join(OPENCLAW_DIR, SETTINGS_FILE);
-  if (!fs.existsSync(localFile)) {
-    log("[settings] No local openclaw.json to upload");
+
+  // FIX: validate local file before uploading to repo
+  if (!isValidJson(localFile)) {
+    log("[settings] WARN: local openclaw.json is invalid JSON, skipping upload");
     return 0;
   }
 
@@ -188,7 +214,9 @@ function settingsUpload() {
   var repoFile = path.join(repoDir, SETTINGS_FILE);
 
   fs.mkdirSync(repoDir, { recursive: true });
+  // Single copy, direct overwrite - no version accumulation
   fs.copyFileSync(localFile, repoFile);
+  log("[settings] Uploaded openclaw.json -> repo (validated OK)");
   return 1;
 }
 
@@ -198,10 +226,7 @@ function settingsUpload() {
 
 function memoryBootRestore() {
   var src = path.join(REPO_DIR, "data");
-  if (!fs.existsSync(src)) {
-    log("[memory] No memory data in repo yet");
-    return 0;
-  }
+  if (!fs.existsSync(src)) return 0;
 
   var items  = fs.readdirSync(src);
   var copied = 0;
@@ -249,123 +274,4 @@ function memoryUpload() {
 function scanMemoryDisk() {
   if (!fs.existsSync(OPENCLAW_DIR)) return [];
   return fs.readdirSync(OPENCLAW_DIR).filter(isMemoryTarget);
-}
-
-// ============================================================
-// Boot sequence (runs once at startup)
-// ============================================================
-
-function bootRestore() {
-  if (!HF_TOKEN || !DATASET_ID) {
-    log("HF_TOKEN or HF_DATASET_ID not set, skipping all restore");
-    return;
-  }
-
-  log("Boot restore starting from " + DATASET_ID + "...");
-  try {
-    ensureRepo();
-    pullLatest();
-  } catch (e) {
-    log("Repo init failed (non-fatal): " + e.message);
-    return;
-  }
-
-  settingsBootRestore();
-  var restored = memoryBootRestore();
-  if (restored > 0) {
-    log("[memory] Boot restore done: " + restored + " item(s) -> " + OPENCLAW_DIR);
-  } else {
-    log("[memory] Boot restore: no memory data in repository yet");
-  }
-}
-
-// ============================================================
-// Upload cycle (runs every 3h, NEVER downloads)
-// ============================================================
-
-function runUploadCycle() {
-  if (!HF_TOKEN || !DATASET_ID) return;
-
-  var ts = new Date().toISOString().replace("T", " ").substring(0, 19);
-  log("Upload cycle starting at " + ts + "...");
-
-  try {
-    ensureRepo();
-    pullLatest(); // pull repo meta only, then we overwrite with our data
-
-    // Track 1: settings (overwrite single copy)
-    var sCopied = settingsUpload();
-    log("[settings] Copied " + sCopied + " file(s) to repo");
-
-    // Track 2: memory (upload from disk, never read back)
-    var targets = scanMemoryDisk();
-    if (targets.length > 0) {
-      var mCopied = memoryUpload();
-      log("[memory] Copied " + mCopied + " item(s) to repo: " + targets.join(", "));
-    } else {
-      log("[memory] No memory targets found on disk yet");
-    }
-
-    var changed = commitAndPush("sync");
-    if (changed > 0) {
-      log("Upload done: " + changed + " file(s) committed at " + ts);
-    } else {
-      log("Upload done: no changes since last sync");
-    }
-  } catch (e) {
-    log("Upload cycle failed (will retry in 3h): " + e.message);
-  }
-}
-
-// ============================================================
-// Upload loop
-// ============================================================
-
-async function startUploadLoop() {
-  log("First upload scheduled in 10 min...");
-  await sleep(10 * 60 * 1000);
-  runUploadCycle();
-
-  while (true) {
-    await sleep(UPLOAD_INTERVAL);
-    runUploadCycle();
-  }
-}
-
-// ============================================================
-// Main
-// ============================================================
-
-async function main() {
-  log("Starting...");
-  log("OPENCLAW_DIR    : " + OPENCLAW_DIR);
-  log("HF_DATASET_ID   : " + (DATASET_ID || "NOT SET"));
-  log("Settings target : " + SETTINGS_FILE + " (single copy, overwrite)");
-  log("Memory targets  : " + MEMORY_TARGETS.join(", "));
-  log("Upload every    : " + (UPLOAD_INTERVAL / 3600000) + "h");
-
-  fs.mkdirSync(OPENCLAW_DIR, { recursive: true });
-
-  try {
-    execSync("git config --global user.email openclaw@hf.space",   { stdio: "pipe" });
-    execSync("git config --global user.name OpenClaw-Memory-Sync", { stdio: "pipe" });
-    execSync("git config --global http.postBuffer 52428800",       { stdio: "pipe" });
-    execSync("git config --global pull.rebase false",              { stdio: "pipe" });
-  } catch (e) { /* non-fatal */ }
-
-  bootRestore();
-
-  if (HF_TOKEN && DATASET_ID) {
-    startUploadLoop().catch(function(e) {
-      log("Upload loop crashed: " + e.message);
-    });
-  } else {
-    log("Upload loop disabled: set HF_TOKEN and HF_DATASET_ID in Space Secrets");
-  }
-
-  log("Ready.");
-}
-
-main().catch(function(e) {
-  console.error("[hf-sync] Fatal: " + e.message);
-});
+}