Update sync.py

sync.py

@@ -13,7 +13,6 @@ FILENAME = "latest_backup.tar.gz"
 OPENCLAW_DIR = "/root/.openclaw"
 
 def is_safe_path(base_dir: str, target_path: str) -> bool:
-    """严格防止路径穿越"""
     base_abs = os.path.abspath(base_dir)
     target_abs = os.path.abspath(target_path)
     return os.path.commonpath([base_abs]) == os.path.commonpath([base_abs, target_abs])
@@ -33,84 +32,68 @@ def restore():
             force_download=True
         )
 
-        if not os.path.exists(download_path):
-            print("[Restore] Download succeeded but file not found locally.")
-            return
-
-        print(f"[Restore] Download successful ({os.path.getsize(download_path)} bytes). Starting safe restore...")
+        print(f"[Restore] Download OK ({os.path.getsize(download_path)} bytes). Starting restore...")
 
-        # 创建目标目录（如果不存在）
         os.makedirs(OPENCLAW_DIR, exist_ok=True)
 
-        # 安全提取（逐成员处理 + 覆盖）
         extracted_count = 0
-        sessions_found = False
+        sessions_files = 0
 
         with tarfile.open(download_path, "r:gz") as tar:
             for member in tar.getmembers():
-                # 跳过不安全路径
                 member_path = os.path.join(OPENCLAW_DIR, member.name)
                 if not is_safe_path(OPENCLAW_DIR, member_path):
-                    print(f"[Restore] Warning: Skipping unsafe path: {member.name}")
+                    print(f"[Restore] Skipping unsafe path: {member.name}")
                     continue
 
-                # 提取（会覆盖已存在文件）
                 tar.extract(member, path=OPENCLAW_DIR)
                 extracted_count += 1
 
-                # 诊断：检查是否包含 sessions
-                if "sessions" in member.name.lower():
-                    sessions_found = True
+                if "sessions" in member.name and member.name.endswith((".json", ".jsonl")):
+                    sessions_files += 1
 
-        print(f"[Restore] ✅ Successfully extracted {extracted_count} items.")
-        if sessions_found:
-            print("[Restore] ✅ Sessions directory/files detected in backup.")
+        print(f"[Restore] ✅ Extracted {extracted_count} files, including {sessions_files} session files.")
 
-        # 恢复后诊断检查
-        print("\n[Restore] Post-restore diagnosis:")
-        for check_path in [
+        # 恢复后详细诊断（重点看 agents/main/sessions）
+        print("\n[Restore] Post-restore check:")
+        for p in [
             OPENCLAW_DIR,
-            os.path.join(OPENCLAW_DIR, "sessions"),
-            os.path.join(OPENCLAW_DIR, "agents", "main", "sessions")
+            os.path.join(OPENCLAW_DIR, "agents", "main", "sessions"),
+            os.path.join(OPENCLAW_DIR, "sessions")
         ]:
-            if os.path.exists(check_path):
-                items = len(os.listdir(check_path)) if os.listdir(check_path) else 0
-                print(f"   ✓ {check_path} exists → {items} items")
+            if os.path.exists(p):
+                files = list(os.listdir(p))
+                print(f"   ✓ {p} → {len(files)} items")
+                if "sessions" in p and any(f.endswith(".jsonl") for f in files[:10]):
+                    print(f"      (contains .jsonl transcripts)")
             else:
-                print(f"   ✗ {check_path} does NOT exist")
+                print(f"   ✗ {p} missing")
 
-        print("[Restore] Full restore completed. Chat history should now be available.")
+        print("[Restore] Restore finished. Now running openclaw doctor --fix...")
 
         return True
 
     except (RepositoryNotFoundError, EntryNotFoundError):
-        print("[Restore] Note: No backup file found in HF repo yet (normal for first run).")
-    except HfHubHTTPError as e:
-        print(f"[Restore] HTTP Error (network or repo issue): {e}")
-    except tarfile.TarError as e:
-        print(f"[Restore] Tar file error (possibly corrupted backup): {e}")
+        print("[Restore] No backup found yet (normal on first run).")
     except Exception as e:
-        print(f"[Restore] Unexpected error: {e}")
+        print(f"[Restore] Error: {e}")
     finally:
-        # 清理下载的临时文件
-        try:
-            if 'download_path' in locals() and os.path.exists(download_path):
+        if 'download_path' in locals() and os.path.exists(download_path):
+            try:
                 os.remove(download_path)
-        except:
-            pass
+            except:
+                pass
 
 def backup():
     try:
         if not repo_id or not token:
-            print("Skip Backup: HF_DATASET or HF_TOKEN not set")
+            print("Skip Backup")
             return
-
-        if not os.path.exists(OPENCLAW_DIR) or not os.listdir(OPENCLAW_DIR):
-            print(f"No data in {OPENCLAW_DIR} to backup.")
+        if not os.path.exists(OPENCLAW_DIR):
+            print("No data to backup")
             return
 
-        print(f"[Backup] Creating full backup of {OPENCLAW_DIR}...")
-
+        print(f"[Backup] Backing up entire {OPENCLAW_DIR}...")
         with tarfile.open(FILENAME, "w:gz") as tar:
             tar.add(OPENCLAW_DIR, arcname=os.path.basename(OPENCLAW_DIR))
 
@@ -121,8 +104,7 @@ def backup():
             repo_type="dataset",
             token=token
         )
-        print(f"[Backup] ✅ Success: latest_backup.tar.gz uploaded.")
-
+        print("[Backup] ✅ Success")
     except Exception as e:
         print(f"[Backup] Error: {e}")
     finally: