Merge pull request #2 from anurag162008/hf-sync

iframe-fix.cjs

@@ -1,3 +1,7 @@
+process.on('uncaughtException', function(err) {
+  if (err.code === 'EPIPE') return;
+  throw err;
+});
 /**
  * iframe-fix.cjs — Node.js preload script
  *

openclaw-sync.py

@@ -87,20 +87,33 @@ def count_files(path: Path) -> int:
 def snapshot_state_into_workspace() -> None:
     try:
         STATE_DIR.mkdir(parents=True, exist_ok=True)
-        if OPENCLAW_STATE_BACKUP_DIR.exists():
-            shutil.rmtree(OPENCLAW_STATE_BACKUP_DIR, ignore_errors=True)
-        OPENCLAW_STATE_BACKUP_DIR.mkdir(parents=True, exist_ok=True)
+        # Atomic snapshot: copy to a staging dir first, then rename.
+        # This prevents a half-written (or empty) backup if we crash mid-copy,
+        # which would otherwise be uploaded and overwrite the real HF backup.
+        staging_dir = STATE_DIR / ".openclaw-staging"
+        if staging_dir.exists():
+            shutil.rmtree(staging_dir, ignore_errors=True)
+        staging_dir.mkdir(parents=True, exist_ok=True)
 
         for source_path in OPENCLAW_HOME.iterdir():
             if source_path.name in EXCLUDED_STATE_NAMES:
                 continue
 
-            backup_path = OPENCLAW_STATE_BACKUP_DIR / source_path.name
+            backup_path = staging_dir / source_path.name
             if source_path.is_dir():
                 shutil.copytree(source_path, backup_path)
             elif source_path.is_file():
                 shutil.copy2(source_path, backup_path)
+
+        # Atomically swap staging → real backup dir
+        if OPENCLAW_STATE_BACKUP_DIR.exists():
+            shutil.rmtree(OPENCLAW_STATE_BACKUP_DIR, ignore_errors=True)
+        staging_dir.rename(OPENCLAW_STATE_BACKUP_DIR)
     except Exception as exc:
+        # Clean up staging on failure so it doesn't interfere next time
+        staging_dir = STATE_DIR / ".openclaw-staging"
+        if staging_dir.exists():
+            shutil.rmtree(staging_dir, ignore_errors=True)
         print(f"Warning: could not snapshot OpenClaw state: {exc}")
 
     try:
@@ -135,6 +148,23 @@ def snapshot_state_into_workspace() -> None:
 
 def restore_embedded_state() -> None:
     state_backup_root = STATE_DIR / "openclaw"
+
+    # Migration fix: old backups stored state in ".huggingclaw-state/openclaw"
+    # (hidden dir). If new path doesn't exist but old hidden path does, use it
+    # and migrate it to the new path so future syncs write to the right place.
+    if not state_backup_root.is_dir():
+        legacy_state = WORKSPACE / ".huggingclaw-state" / "openclaw"
+        if legacy_state.is_dir():
+            print("Found legacy state backup at .huggingclaw-state/; migrating to huggingclaw-state/...")
+            try:
+                STATE_DIR.mkdir(parents=True, exist_ok=True)
+                shutil.copytree(legacy_state, state_backup_root)
+                legacy_root = WORKSPACE / ".huggingclaw-state"
+                shutil.rmtree(legacy_root, ignore_errors=True)
+                print("Legacy state migrated and .huggingclaw-state/ removed.")
+            except Exception as exc:
+                print(f"Warning: could not migrate legacy state: {exc}")
+
     if state_backup_root.is_dir():
         for source_path in state_backup_root.iterdir():
             name = source_path.name
@@ -398,12 +428,18 @@ def loop() -> int:
         print(f"Workspace sync error: {exc}")
         return 1
 
-    last_fingerprint = fingerprint_dir(WORKSPACE)
-    last_marker = metadata_marker(WORKSPACE)
-
     time.sleep(INITIAL_DELAY)
     print(f"Workspace sync started: every {INTERVAL}s -> {repo_id}")
 
+    # Take a fingerprint of the workspace AS RESTORED (after snapshotting state)
+    # so the first loop iteration only uploads if something genuinely changed.
+    # Previously this was None, which forced an unconditional upload every restart
+    # — even when restore had failed silently and the workspace was empty.
+    snapshot_state_into_workspace()
+    last_fingerprint = fingerprint_dir(WORKSPACE)
+    last_marker = metadata_marker(WORKSPACE)
+    print("Initial workspace fingerprint captured.")
+
     while not STOP_EVENT.is_set():
         try:
             last_fingerprint, last_marker = sync_once(last_fingerprint, last_marker)
@@ -416,7 +452,6 @@ def loop() -> int:
 
     return 0
 
-
 def main() -> int:
     WORKSPACE.mkdir(parents=True, exist_ok=True)
 

start.sh

@@ -536,6 +536,29 @@ if [ -n "${CLOUDFLARE_WORKERS_TOKEN:-}" ]; then
   python3 /home/node/app/cloudflare-keepalive-setup.py || true
 fi
 
+# ── Write shell capture wrappers to .bashrc ──
+STARTUP_FILE="/home/node/.openclaw/workspace/startup.sh"
+cat > /home/node/.bashrc << 'BASHRC'
+STARTUP_FILE="/home/node/.openclaw/workspace/startup.sh"
+_hc_append() {
+  local line="$*"
+  grep -qxF "$line" "$STARTUP_FILE" 2>/dev/null || echo "$line" >> "$STARTUP_FILE"
+}
+apt-get() {
+  command apt-get "$@"
+  [[ "$1" == "install" ]] && _hc_append "apt-get install -y ${@:2}"
+}
+apt() {
+  command apt "$@"
+  [[ "$1" == "install" ]] && _hc_append "apt-get install -y ${@:2}"
+}
+pip() { command pip "$@"; [[ "$1" == "install" ]] && _hc_append "pip install ${@:2}"; }
+pip3() { command pip3 "$@"; [[ "$1" == "install" ]] && _hc_append "pip3 install ${@:2}"; }
+npm() { command npm "$@"; [[ "$1" == "install" && "$2" == "-g" ]] && _hc_append "npm install -g ${@:3}"; }
+openclaw() { command openclaw "$@"; [[ "$1" == "plugins" && "$2" == "install" ]] && _hc_append "openclaw plugins install ${@:3}"; }
+BASHRC
+echo "Shell capture wrappers ready."
+
 # ── Re-install previously installed plugins ──
 EXISTING_CONFIG="/home/node/.openclaw/openclaw.json"
 if [ -f "$EXISTING_CONFIG" ]; then
@@ -557,6 +580,19 @@ if [ -f "$EXISTING_CONFIG" ]; then
   fi
 fi
 
+# ── Run workspace startup script ──
+STARTUP_FILE="/home/node/.openclaw/workspace/startup.sh"
+if [ ! -f "$STARTUP_FILE" ]; then
+  touch "$STARTUP_FILE"
+  chmod +x "$STARTUP_FILE"
+  echo "Created workspace/startup.sh"
+fi
+if [ -s "$STARTUP_FILE" ]; then
+  echo "Running workspace/startup.sh..."
+  bash "$STARTUP_FILE" || echo "Warning: startup.sh had errors, continuing..."
+  echo "Startup script complete."
+fi
+
 # ── Launch gateway ──
 echo "Launching OpenClaw gateway on port 7860..."