soulsync 1.0.11 → 1.0.13

package/src/main.py

@@ -61,7 +61,7 @@ class SoulSyncPlugin:
       
         cloud_url = self.config.get('cloud_url', '').strip()
         email = self.config.get('email', '').strip()
-        password = self.config.get('password', '').strip()
+        token = self.config.get('token', '').strip()
         
         if not cloud_url:
             self.config['cloud_url'] = 'https://soulsync.work'
@@ -92,9 +92,11 @@ class SoulSyncPlugin:
         except:
             config = {}
         
-        # 保存 email 和 password（如果 auth_result 包含）
-        if 'user' in auth_result:
+        # 保存 email（支持两种返回格式：authenticate 有 user 对象，register 只有一个字段）
+        if 'user' in auth_result and isinstance(auth_result.get('user'), dict):
             config['email'] = auth_result['user'].get('email', '')
+        elif 'email' in auth_result:
+            config['email'] = auth_result.get('email', '')
         
         # 保存 token
         if 'token' in auth_result:
@@ -132,7 +134,7 @@ class SoulSyncPlugin:
                     return result
             elif choice == '0':
                 print("[SoulSync] Goodbye! / 再见！")
-                sys.exit(0)
+                sys.exit(2)
             else:
                 print("[SoulSync] Invalid choice / 无效选择")
     
@@ -164,6 +166,8 @@ class SoulSyncPlugin:
             temp_client = OpenClawClient(self.config)
             result = temp_client.authenticate(email, password)
             if result:
+                result['email'] = email
+                result['password'] = password
                 print("\n[SoulSync] ✓ Login successful! / 登录成功!")
                 self._save_auth_to_config(result)
                 return True
@@ -176,7 +180,7 @@ class SoulSyncPlugin:
                 print("[SoulSync] Exiting... / 退出...")
                 sys.exit(0)
             
-            print(f"\n[SoulSync] ❌ Login failed: {e} / 登录失败: {e}")
+            print(f"\n[SoulSync] ❌ {e}")
             print("[SoulSync] Returning to menu... / 返回菜单...")
             return None
         
@@ -281,46 +285,32 @@ class SoulSyncPlugin:
                 profile = self.client.get_profile()
                 print(f"[SoulSync] Using existing token, user: {profile.get('email', 'unknown')}")
             except Exception as e:
+                error_str = str(e)
+                if '401' in error_str or 'Unauthorized' in error_str or 'token' in error_str.lower():
+                    print("[SoulSync] Token expired or invalid. Please re-login via chat: say 'login SoulSync'")
+                    print("[SoulSync] Token 已过期，请在聊天中说 'login SoulSync' 重新登录")
+                    return False
                 print(f"[SoulSync] Token invalid, re-authenticating: {e}")
                 token = None
 
         if not token:
-            email = self.config.get('email', '').strip()
-            password = self.config.get('password', '').strip()
-            
-            print("[SoulSync] No valid token, attempting auto-login...")
-            try:
-                result = self.client.authenticate(email, password)
-                if result:
-                    print("[SoulSync] Login successful! / 登录成功!")
-                    self._save_auth_to_config(result)
-                    token = self.client.token
-            except Exception as e:
-                error_msg = str(e)
-                print(f"[SoulSync] Login failed: {e}")
-                
-                if "429" in error_msg or "too many" in error_msg.lower():
-                    print("\n[SoulSync] ========================================")
-                    print("[SoulSync] Too many failed attempts. Please try again later / 登录失败次数过多，请稍后再试")
-                    print("[SoulSync] ========================================\n")
-                else:
-                    print("\n[SoulSync] ========================================")
-                    print("[SoulSync] Login failed: invalid email or password / 登录失败：邮箱或密码错误")
-                    print("[SoulSync] Please check your config file / 请检查配置文件:")
-                    print(f"           {os.path.normpath(os.path.join(PLUGIN_DIR, 'config.json'))}")
-                    print("[SoulSync] ========================================\n")
-                
-                sys.exit(0)
-
+            print("[SoulSync] Token expired or invalid. Please re-configure using 'openclaw soulsync:setup'")
+            print("[SoulSync] Token 已过期，请重新运行 'openclaw soulsync:setup' 配置")
+            return False
+        
         email = self.config.get('email')
-        password = self.config.get('password')
-
+        
         try:
             profile = self.client.get_profile()
             print(f"\n[SoulSync] Logged in as: {profile.get('email')}")
             subscription = profile.get('subscription', {})
             print(f"[SoulSync] Subscription: {subscription.get('status')} (days remaining: {subscription.get('daysRemaining', 0)})\n")
         except Exception as e:
+            error_str = str(e)
+            if '401' in error_str or 'Unauthorized' in error_str or 'token' in error_str.lower():
+                print("[SoulSync] Token expired or invalid. Please re-login via chat: say 'login SoulSync'")
+                print("[SoulSync] Token 已过期，请在聊天中说 'login SoulSync' 重新登录")
+                return False
             print(f"[SoulSync] Warning: Could not get profile: {e}")
       
         # 版本管理器
@@ -338,13 +328,13 @@ class SoulSyncPlugin:
             self.config.get('workspace')
         )
       
-        print("Pulling all profiles from cloud...")
+        print("[SoulSync] Pulling all profiles from cloud...")
         try:
             self.profile_sync.pull_all()
         except Exception as e:
-            print(f"Warning: Could not pull profiles: {e}")
+            print(f"[SoulSync] Warning: Could not pull profiles: {e}")
       
-        print("\nStarting file watcher...")
+        print("\n[SoulSync] Starting file watcher...")
         watch_files = self.config.get('watch_files', [])
         self.watcher = OpenClawMultiWatcher(
             self.config.get('workspace'),
@@ -353,55 +343,47 @@ class SoulSyncPlugin:
         )
         self.watcher.start()
       
-        print("\nConnecting to WebSocket...")
+        print("\n[SoulSync] Connecting to WebSocket...")
         try:
             self.client.connect_websocket(self.on_websocket_message)
         except Exception as e:
-            print(f"Warning: Could not connect WebSocket: {e}")
+            print(f"[SoulSync] Warning: Could not connect WebSocket: {e}")
       
         self.running = True
   
     def on_file_change(self, event_type: str, relative_path: str, absolute_path: str = None):
         """文件变化回调"""
-        print(f"\n[File {event_type}] {relative_path}")
+        print(f"\n[SoulSync] [File {event_type}] {relative_path}")
       
         if event_type in ['modified', 'created']:
             time.sleep(0.5)
           
             try:
                 self.profile_sync.push_file(relative_path)
-                print(f"Upload completed: {relative_path}")
+                print(f"[SoulSync] Upload completed: {relative_path}")
             except Exception as e:
-                print(f"Upload error: {e}")
+                print(f"[SoulSync] Upload error: {e}")
       
         elif event_type == 'deleted':
-            print(f"File deleted (not synced to cloud): {relative_path}")
+            print(f"[SoulSync] File deleted (not synced to cloud): {relative_path}")
   
     def on_websocket_message(self, data: dict):
         """WebSocket 消息回调"""
         event = data.get('event')
       
-        if event == 'file_updated':
-            file_path = data.get('file_path')
+        if event == 'profile:updated':
+            user_id = data.get('user_id')
             version = data.get('version')
-            print(f"\n[WebSocket] File updated: {file_path} (v{version})")
-            try:
-                self.profile_sync.on_remote_change(file_path, version)
-            except Exception as e:
-                print(f"Sync error: {e}")
-      
-        elif event == 'new_memory':
-            print(f"\n[WebSocket] New memory available!")
+            print(f"\n[SoulSync] [WebSocket] Profile updated (v{version})")
             try:
                 self.profile_sync.pull_all()
-                print("Memory synced from remote")
             except Exception as e:
-                print(f"Sync error: {e}")
+                print(f"[SoulSync] Sync error: {e}")
       
         elif data.get('type') == 'authenticated':
-            print(f"[WebSocket] Authenticated, socket_id: {data.get('socket_id')}")
+            print(f"[SoulSync] [WebSocket] Authenticated, socket_id: {data.get('socket_id')}")
         elif data.get('type') == 'error':
-            print(f"[WebSocket] Error: {data.get('message')}")
+            print(f"[SoulSync] [WebSocket] Error: {data.get('message')}")
   
     def run(self):
         """运行插件"""
@@ -413,17 +395,17 @@ class SoulSyncPlugin:
             self.load_config()
             self.initialize()
           
-            print("\n=== Plugin Running ===")
-            print("Press Ctrl+C to stop\n")
+            print("\n[SoulSync] === Plugin Running ===")
+            print("[SoulSync] Press Ctrl+C to stop\n")
           
             while self.running:
                 time.sleep(1)
               
         except KeyboardInterrupt:
-            print("\n\nShutting down...")
+            print("\n[SoulSync] Shutting down...")
             self.shutdown()
         except Exception as e:
-            print(f"\nError: {e}")
+            print(f"\n[SoulSync] Error: {e}")
             import traceback
             traceback.print_exc()
             self.shutdown()
@@ -431,24 +413,24 @@ class SoulSyncPlugin:
   
     def shutdown(self):
         """关闭插件"""
-        print("Shutting down SoulSync plugin...")
+        print("[SoulSync] Shutting down SoulSync plugin...")
         self.running = False
       
         if self.watcher:
             try:
                 self.watcher.stop()
-                print("File watcher stopped")
+                print("[SoulSync] File watcher stopped")
             except Exception as e:
-                print(f"Error stopping watcher: {e}")
+                print(f"[SoulSync] Error stopping watcher: {e}")
       
         if self.client:
             try:
                 self.client.close()
-                print("Client connection closed")
+                print("[SoulSync] Client connection closed")
             except Exception as e:
-                print(f"Error closing client: {e}")
+                print(f"[SoulSync] Error closing client: {e}")
       
-        print("Plugin shutdown complete")
+        print("[SoulSync] Plugin shutdown complete")
 def main():
     """主函数"""
     try:
@@ -463,19 +445,25 @@ def main():
         if args.setup:
             try:
                 plugin.load_config()
-                plugin.run_setup()
-                print("\n[SoulSync] ✓ Setup complete! Run 'openclaw soulsync:start' to begin syncing.")
-                print("[SoulSync] 设置完成！运行 'openclaw soulsync:start' 开始同步。")
+                result = plugin.run_setup()
+                if result:
+                    print("\n[SoulSync] ✓ Setup complete! Starting sync... / 设置完成！正在启动同步...")
+                    print("\n[SoulSync] ========================================")
+                    print("[SoulSync] Starting SoulSync sync service...")
+                    print("[SoulSync] ========================================\n")
+                    plugin.initialize()
+                    plugin.run()
+                    return
             except KeyboardInterrupt:
                 print("\n[SoulSync] Cancelled by user. Goodbye! / 已取消，再见！")
-            sys.exit(0)
+            sys.exit(2)
         
         plugin.load_config()
         
         email = plugin.config.get('email', '').strip()
-        password = plugin.config.get('password', '').strip()
+        token = plugin.config.get('token', '').strip()
         
-        if not email or not password:
+        if not email or not token:
             print("\n[SoulSync] ========================================")
             print("[SoulSync] Not configured. Run 'openclaw soulsync:setup' first.")
             print("[SoulSync] 尚未配置，请先运行 'openclaw soulsync:setup'")

package/src/profiles.py

@@ -1,12 +1,19 @@
 import requests
+import sys
+import os
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+from src.client import TLSAdapter
 
 
 class ProfilesClient:
-    """Profiles API 客户端"""
+    """Profiles API 客户端 - 统一同步接口"""
     
     def __init__(self, cloud_url: str, token: str = None):
         self.cloud_url = cloud_url.rstrip('/')
         self.token = token
+        self.session = requests.Session()
+        self.session.mount('https://', TLSAdapter())
     
     def _get_headers(self) -> dict:
         """获取请求头"""
@@ -19,57 +26,50 @@ class ProfilesClient:
         """设置 token"""
         self.token = token
     
-    def get_profiles(self, path: str = None) -> dict:
-        """获取 profiles
+    def get_profiles(self) -> dict:
+        """获取用户的完整 profiles
         
-        Args:
-            path: 可选的文件路径
-            
         Returns:
-            包含 files 列表的字典
+            包含 content (dict), version, updated_at 的字典
+            示例: {"content": {"SOUL.md": "...", "USER.md": "..."}, "version": 3, "updated_at": "..."}
         """
         url = f"{self.cloud_url}/api/profiles"
-        if path:
-            url += f"?path={path}"
         
-        response = requests.get(url, headers=self._get_headers())
+        response = self.session.get(url, headers=self._get_headers())
         
         if response.status_code == 200:
             return response.json()
-        elif response.status_code == 404:
-            return {'files': []}
         else:
             error = response.json().get('error', 'Unknown error')
             raise Exception(f"Get profiles failed: {error}")
     
-    def upload_profile(self, file_path: str, content: str, version: int) -> dict:
-        """上传 profile
+    def upload_profiles(self, content: dict, version: int) -> dict:
+        """整体替换用户的 profiles
         
         Args:
-            file_path: 文件路径
-            content: 文件内容
-            version: 当前版本号
+            content: 包含所有文件的 dict，key 是文件名，value 是内容
+                    示例: {"SOUL.md": "...", "USER.md": "...", "MEMORY.md": "..."}
+            version: 客户端当前持有的版本号
             
         Returns:
-            成功时返回 {file_path, version, updated_at}
-            冲突时抛出异常
+            成功时返回 {"content": {...}, "version": N, "updated_at": "..."}
+            冲突时抛出 ConflictError
         """
         url = f"{self.cloud_url}/api/profiles"
         data = {
-            'file_path': file_path,
             'content': content,
             'version': version
         }
         
-        response = requests.post(url, json=data, headers=self._get_headers())
+        response = self.session.put(url, json=data, headers=self._get_headers())
         
         if response.status_code == 200:
             return response.json()
         elif response.status_code == 409:
             result = response.json()
             raise ConflictError(
-                result.get('latest_content', ''),
-                result.get('latest_version', 0)
+                server_content=result.get('server_content', {}),
+                server_version=result.get('server_version', 0)
             )
         elif response.status_code == 403:
             error = response.json().get('error', 'Subscription required')
@@ -77,34 +77,12 @@ class ProfilesClient:
         else:
             error = response.json().get('error', 'Unknown error')
             raise Exception(f"Upload failed: {error}")
-    
-    def sync_profiles(self, since: str = '0') -> dict:
-        """增量同步 profiles
-        
-        Args:
-            since: 时间戳
-            
-        Returns:
-            包含 files 列表和 server_time 的字典
-        """
-        url = f"{self.cloud_url}/api/profiles/sync?since={since}"
-        
-        response = requests.get(url, headers=self._get_headers())
-        
-        if response.status_code == 200:
-            return response.json()
-        elif response.status_code == 403:
-            error = response.json().get('error', 'Subscription required')
-            raise Exception(f"Sync failed: {error}")
-        else:
-            error = response.json().get('error', 'Unknown error')
-            raise Exception(f"Sync failed: {error}")
 
 
 class ConflictError(Exception):
     """版本冲突异常"""
     
-    def __init__(self, latest_content: str, latest_version: int):
-        self.latest_content = latest_content
-        self.latest_version = latest_version
-        super().__init__(f"Version conflict: latest version is {latest_version}")
+    def __init__(self, server_content: dict, server_version: int):
+        self.server_content = server_content
+        self.server_version = server_version
+        super().__init__(f"Version conflict: server version is {server_version}")

package/src/sync.py

@@ -42,7 +42,7 @@ class ProfileSync:
                 with open(absolute_path, 'r', encoding='utf-8') as f:
                     return f.read()
             except Exception as e:
-                print(f"[Sync] Error reading local file {file_path}: {e}")
+                print(f"[SoulSync] Error reading local file {file_path}: {e}")
                 return None
         return None
   
@@ -57,7 +57,7 @@ class ProfileSync:
             with open(absolute_path, 'w', encoding='utf-8') as f:
                 f.write(content)
         except Exception as e:
-            print(f"[Sync] Error writing local file {file_path}: {e}")
+            print(f"[SoulSync] Error writing local file {file_path}: {e}")
   
     def _create_conflict_backup(self, file_path: str, local_content: str, server_content: str):
         """创建冲突备份文件"""
@@ -71,64 +71,51 @@ class ProfileSync:
                 f.write(local_content or "(empty)")
                 f.write("\n\n========== SERVER VERSION ==========\n")
                 f.write(server_content or "(empty)")
-            print(f"[Sync] Conflict backup created: {conflict_path}")
+            print(f"[SoulSync] Conflict backup created: {conflict_path}")
         except Exception as e:
-            print(f"[Sync] Error creating conflict backup: {e}")
+            print(f"[SoulSync] Error creating conflict backup: {e}")
   
     def pull_all(self):
         """Pull all profiles from cloud"""
-        print("[Sync] Pulling all profiles from cloud...")
+        print("[SoulSync] Pulling all profiles from cloud...")
         
         try:
             result = self.client.get_profiles()
-            cloud_files = result.get('files', [])
+            cloud_content = result.get('content', {})
+            cloud_version = result.get('version', 0)
         except Exception as e:
-            print(f"[Sync] Error fetching cloud profiles: {e}")
+            print(f"[SoulSync] Error fetching cloud profiles: {e}")
             return
         
-        if not cloud_files:
-            print("[Sync] No files on cloud")
+        if not cloud_content:
+            print("[SoulSync] No profiles on cloud")
             return
         
+        local_files = ['SOUL.md', 'USER.md', 'MEMORY.md']
         pulled_count = 0
-        pushed_count = 0
         skipped_count = 0
         
-        for cloud_file in cloud_files:
-            file_path = cloud_file.get('file_path')
-            cloud_version = cloud_file.get('version', 0)
-            cloud_content = cloud_file.get('content', '')
-            
-            if not file_path:
-                continue
-            
-            local_content = self._read_local_file(file_path)
-            local_version = self.version_manager.get_version(file_path)
+        for file_name in local_files:
+            cloud_file_content = cloud_content.get(file_name, '')
+            local_content = self._read_local_file(file_name)
+            local_version = self.version_manager.get_version(file_name)
             
             if cloud_version > local_version:
-                self._mark_syncing(file_path)
+                self._mark_syncing(file_name)
                 try:
-                    self._write_local_file(file_path, cloud_content)
-                    self.version_manager.set_version(file_path, cloud_version)
-                    pulled_count += 1
-                    print(f"[Sync] Pulled: {file_path} (v{cloud_version})")
+                    if cloud_file_content:
+                        self._write_local_file(file_name, cloud_file_content)
+                        self.version_manager.set_version(file_name, cloud_version)
+                        pulled_count += 1
+                        print(f"[SoulSync] Pulled: {file_name} (v{cloud_version})")
                 finally:
-                    self._unmark_syncing(file_path)
-            elif local_version > cloud_version and local_content is not None:
-                try:
-                    result = self.client.upload_profile(file_path, local_content, local_version)
-                    self.version_manager.set_version(file_path, result.get('version', local_version))
-                    pushed_count += 1
-                    print(f"[Sync] Pushed: {file_path} (v{local_version})")
-                except ConflictError as e:
-                    self._handle_conflict(file_path, local_content, e.server_content, e.server_version)
-                    pushed_count += 1
-                except Exception as e:
-                    print(f"[Sync] Error pushing {file_path}: {e}")
+                    self._unmark_syncing(file_name)
             else:
                 skipped_count += 1
         
-        print(f"[Sync] Sync complete: {pulled_count} pulled, {pushed_count} pushed, {skipped_count} skipped")
+        self.version_manager.set_version('__profiles__', cloud_version)
+        
+        print(f"[SoulSync] Sync complete: {pulled_count} pulled, {skipped_count} skipped")
   
     def push_file(self, file_path: str):
         """Push a file to cloud"""
@@ -140,64 +127,84 @@ class ProfileSync:
         try:
             local_content = self._read_local_file(file_path)
             if local_content is None:
-                print(f"[Sync] File not found locally: {file_path}")
+                print(f"[SoulSync] File not found locally: {file_path}")
                 return
             
             local_version = self.version_manager.get_version(file_path)
             
+            profiles_version = self.version_manager.get_version('__profiles__')
+            
+            current_profiles = {}
             try:
-                result = self.client.upload_profile(file_path, local_content, local_version)
-                new_version = result.get('version', local_version + 1)
+                result = self.client.get_profiles()
+                current_profiles = result.get('content', {})
+            except Exception:
+                pass
+            
+            current_profiles[file_path] = local_content
+            
+            try:
+                result = self.client.upload_profiles(current_profiles, profiles_version)
+                new_version = result.get('version', profiles_version + 1)
+                self.version_manager.set_version('__profiles__', new_version)
                 self.version_manager.set_version(file_path, new_version)
-                print(f"[Sync] Pushed: {file_path} (v{new_version})")
+                print(f"[SoulSync] Pushed: {file_path} (v{new_version})")
             except ConflictError as e:
                 self._handle_conflict(file_path, local_content, e.server_content, e.server_version)
             except Exception as e:
-                print(f"[Sync] Error pushing {file_path}: {e}")
+                print(f"[SoulSync] Error pushing {file_path}: {e}")
         finally:
             self._unmark_syncing(file_path)
   
     def on_remote_change(self, file_path: str, version: int):
         """Handle remote file change"""
-        local_version = self.version_manager.get_version(file_path)
+        local_version = self.version_manager.get_version('__profiles__')
         
         if version <= local_version:
-            print(f"[Sync] Remote version not newer, skipping: {file_path} (local: v{local_version}, remote: v{version})")
+            print(f"[SoulSync] Remote version not newer, skipping: {file_path} (local: v{local_version}, remote: v{version})")
             return
         
         self._mark_syncing(file_path)
         
         try:
-            result = self.client.get_profiles(file_path)
-            files = result.get('files', [])
-            if not files:
-                print(f"[Sync] File not found on cloud: {file_path}")
+            result = self.client.get_profiles()
+            cloud_content = result.get('content', {})
+            cloud_version = result.get('version', 0)
+            
+            if file_path not in cloud_content:
+                print(f"[SoulSync] File not found on cloud: {file_path}")
                 return
             
-            cloud_file = files[0]
-            cloud_content = cloud_file.get('content', '')
+            cloud_file_content = cloud_content.get(file_path, '')
             
             local_content = self._read_local_file(file_path)
             
-            if local_content is not None and local_content != cloud_content:
-                self._create_conflict_backup(file_path, local_content, cloud_content)
+            if local_content is not None and local_content != cloud_file_content:
+                self._create_conflict_backup(file_path, local_content, cloud_file_content)
             
-            self._write_local_file(file_path, cloud_content)
+            self._write_local_file(file_path, cloud_file_content)
+            self.version_manager.set_version('__profiles__', cloud_version)
             self.version_manager.set_version(file_path, version)
-            print(f"[Sync] Pulled remote change: {file_path} (v{version})")
+            print(f"[SoulSync] Pulled remote change: {file_path} (v{version})")
         except Exception as e:
-            print(f"[Sync] Error handling remote change for {file_path}: {e}")
+            print(f"[SoulSync] Error handling remote change for {file_path}: {e}")
         finally:
             self._unmark_syncing(file_path)
   
     def _handle_conflict(self, file_path: str, local_content: str, server_content: str, server_version: int):
         """Handle conflict when pushing file"""
-        print(f"[Sync] CONFLICT detected for {file_path}")
+        print(f"[SoulSync] CONFLICT detected for {file_path}")
         
         self._create_conflict_backup(file_path, local_content, server_content)
         
-        self._write_local_file(file_path, server_content)
+        if isinstance(server_content, dict):
+            server_file_content = server_content.get(file_path, '')
+        else:
+            server_file_content = server_content
+        
+        self._write_local_file(file_path, server_file_content)
+        self.version_manager.set_version('__profiles__', server_version)
         self.version_manager.set_version(file_path, server_version)
         
-        print(f"[Sync] Conflict resolved: server version used for {file_path}")
-        print(f"[Sync] Please manually merge the conflict backup file")
+        print(f"[SoulSync] Conflict resolved: server version used for {file_path}")
+        print(f"[SoulSync] Please manually merge the conflict backup file")