soulsync 1.0.10 → 1.0.12

package/index.js

@@ -49,6 +49,12 @@ function startPythonService(mode = '--start') {
   pythonProcess.on('close', (code) => {
     console.log(`[SoulSync] Python process exited with code ${code}`);
     pythonProcess = null;
+    
+    // If setup succeeded (code 0), auto-start sync
+    if (mode === '--setup' && code === 0) {
+      console.log('[SoulSync] Setup completed, starting sync service...');
+      startPythonService('--start');
+    }
   });
   
   pythonProcess.on('error', (err) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soulsync",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "SoulSync plugin for OpenClaw - cross-bot memory synchronization",
   "main": "index.js",
   "repository": {

package/src/client.py

@@ -48,8 +48,6 @@ class OpenClawClient:
         new_device_id = str(uuid.uuid4())
         with open(device_id_file, 'w') as f:
             f.write(new_device_id)
-        
-        print(f"Generated new device_id: {new_device_id}")
         return new_device_id
     
     def _save_token(self, token: str):

package/src/main.py

@@ -92,9 +92,16 @@ 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', '')
+        
+        # 保存 password（注册时输入的密码，需要保存以便自动登录）
+        # 注意：登录时我们只有从 config 读取的 password
+        if 'password' in auth_result:
+            config['password'] = auth_result.get('password', '')
         
         # 保存 token
         if 'token' in auth_result:
@@ -106,151 +113,168 @@ class SoulSyncPlugin:
         print("[SoulSync] Auth info saved to config.json")
     
     def run_setup(self):
-        """交互式设置：注册或登录"""
-        print("\n[SoulSync] ========================================")
-        print("[SoulSync] Welcome to SoulSync! / 欢迎使用 SoulSync!")
-        print("[SoulSync] ========================================")
-        print("[SoulSync] 1. Register / 注册")
-        print("[SoulSync] 2. Login / 登录")
-        print("[SoulSync] ========================================")
-        
-        choice = input("[SoulSync] Choose / 选择 (1/2): ").strip()
-        
-        if choice == '1':
-            return self._interactive_register()
-        elif choice == '2':
-            return self._interactive_login()
-        else:
-            print("[SoulSync] Invalid choice / 无效选择")
-            sys.exit(0)
+        """交互式设置：注册或登录（带循环）"""
+        while True:
+            print("\n[SoulSync] ========================================")
+            print("[SoulSync] Welcome to SoulSync! / 欢迎使用 SoulSync!")
+            print("[SoulSync] ========================================")
+            print("[SoulSync] 1. Register / 注册")
+            print("[SoulSync] 2. Login / 登录")
+            print("[SoulSync] 0. Exit / 退出")
+            print("[SoulSync] ========================================")
+            
+            try:
+                choice = input("[SoulSync] Choose / 选择 (0/1/2): ").strip()
+            except KeyboardInterrupt:
+                print("\n[SoulSync] Cancelled by user. Goodbye! / 已取消，再见！")
+                sys.exit(0)
+            
+            if choice == '1':
+                result = self._interactive_register()
+                if result:
+                    return result
+            elif choice == '2':
+                result = self._interactive_login()
+                if result:
+                    return result
+            elif choice == '0':
+                print("[SoulSync] Goodbye! / 再见！")
+                sys.exit(2)
+            else:
+                print("[SoulSync] Invalid choice / 无效选择")
     
     def _interactive_login(self):
-        """交互式登录（带重试）"""
+        """交互式登录（失败返回 None，由主循环处理）"""
         from client import OpenClawClient
         
-        max_retries = 5
-        retry_count = 0
+        print("\n--- Login / 登录 ---")
         
-        while retry_count < max_retries:
-            print("\n--- Login / 登录 ---")
+        try:
             email = input("[SoulSync] Email / 邮箱: ").strip()
             if not email:
                 print("[SoulSync] Email cannot be empty / 邮箱不能为空")
-                continue
-            
+                return None
+        except KeyboardInterrupt:
+            print("\n[SoulSync] Cancelled. Returning to menu... / 已取消，返回菜单...")
+            return None
+        
+        try:
             password = getpass.getpass("[SoulSync] Password / 密码: ")
             if not password:
                 print("[SoulSync] Password cannot be empty / 密码不能为空")
-                continue
+                return None
+        except KeyboardInterrupt:
+            print("\n[SoulSync] Cancelled. Returning to menu... / 已取消，返回菜单...")
+            return None
+        
+        try:
+            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
+        except Exception as e:
+            error_msg = str(e)
             
-            try:
-                temp_client = OpenClawClient(self.config)
-                result = temp_client.authenticate(email, password)
-                if result:
-                    print("\n[SoulSync] ✓ Login successful! / 登录成功!")
-                    self._save_auth_to_config(result)
-                    return True
-            except Exception as e:
-                retry_count += 1
-                remaining = max_retries - retry_count
-                error_msg = str(e)
-                
-                if "429" in error_msg or "too many" in error_msg.lower():
-                    print(f"\n[SoulSync] ❌ {e}")
-                    print("\n[SoulSync] Too many failed attempts / 登录失败次数过多")
-                    print("[SoulSync] Exiting... / 退出...")
-                    sys.exit(0)
-                
-                if remaining > 0:
-                    print(f"\n[SoulSync] ❌ Login failed: {e} / 登录失败: {e}")
-                    print(f"[SoulSync] Remaining attempts / 剩余尝试次数: {remaining}")
-                else:
-                    print(f"\n[SoulSync] ❌ Login failed: {e} / 登录失败: {e}")
+            if "429" in error_msg or "too many" in error_msg.lower():
+                print(f"\n[SoulSync] ❌ {e}")
+                print("\n[SoulSync] Too many failed attempts. Please try again later / 登录失败次数过多，请稍后再试")
+                print("[SoulSync] Exiting... / 退出...")
+                sys.exit(0)
+            
+            print(f"\n[SoulSync] ❌ {e}")
+            print("[SoulSync] Returning to menu... / 返回菜单...")
+            return None
         
-        print("\n[SoulSync] ❌ Too many failed attempts. Please try again in 15 minutes. / 登录失败次数过多，请15分钟后再试")
-        print("[SoulSync] Exiting... / 退出...")
-        sys.exit(0)
+        print("[SoulSync] ❌ Login failed / 登录失败")
+        print("[SoulSync] Returning to menu... / 返回菜单...")
+        return None
     
     def _interactive_register(self):
-        """交互式注册（带重试）"""
+        """交互式注册（失败返回 None）"""
         from client import OpenClawClient
         
-        max_retries = 5
-        retry_count = 0
+        print("\n--- Register / 注册 ---")
         
-        while retry_count < max_retries:
-            print("\n--- Register / 注册 ---")
+        try:
             email = input("[SoulSync] Email / 邮箱: ").strip()
             if not email or '@' not in email:
                 print("[SoulSync] Invalid email / 无效邮箱")
-                continue
+                return None
+        except KeyboardInterrupt:
+            print("\n[SoulSync] Cancelled. Returning to menu... / 已取消，返回菜单...")
+            return None
+        
+        password = None
+        while password is None:
+            try:
+                password = getpass.getpass("[SoulSync] Password / 密码: ")
+                if len(password) < 6:
+                    print("[SoulSync] Password must be at least 6 characters / 密码至少6位")
+                    password = None
+                    continue
+            except KeyboardInterrupt:
+                print("\n[SoulSync] Cancelled. Returning to menu... / 已取消，返回菜单...")
+                return None
             
-            password = getpass.getpass("[SoulSync] Password / 密码: ")
-            if len(password) < 6:
-                print("[SoulSync] Password must be at least 6 characters / 密码至少6位")
-                continue
+            try:
+                password2 = getpass.getpass("[SoulSync] Confirm password / 确认密码: ")
+            except KeyboardInterrupt:
+                print("\n[SoulSync] Cancelled. Returning to menu... / 已取消，返回菜单...")
+                return None
             
-            password2 = getpass.getpass("[SoulSync] Confirm password / 确认密码: ")
             if password != password2:
                 print("[SoulSync] Passwords do not match / 两次密码不一致")
+                password = None
+        
+        print(f"\n[SoulSync] Sending verification code to {email}...")
+        try:
+            temp_client = OpenClawClient(self.config)
+            temp_client.send_verification_code(email)
+            print("[SoulSync] ✓ Verification code sent! / 验证码已发送!")
+        except Exception as e:
+            print(f"[SoulSync] ❌ Failed to send code: {e}")
+            print("[SoulSync] Returning to menu... / 返回菜单...")
+            return None
+        
+        code_success = False
+        code_retry = 0
+        max_code_retries = 3
+        
+        while code_retry < max_code_retries and not code_success:
+            try:
+                code = input(f"[SoulSync] Enter code / 输入验证码 ({max_code_retries - code_retry} left): ").strip()
+            except KeyboardInterrupt:
+                print("\n[SoulSync] Cancelled. Returning to menu... / 已取消，返回菜单...")
+                return None
+            
+            if len(code) != 6 or not code.isdigit():
+                code_retry += 1
+                print("[SoulSync] Invalid code format / 验证码格式错误")
                 continue
             
-            print(f"\n[SoulSync] Sending verification code to {email}...")
             try:
-                temp_client = OpenClawClient(self.config)
-                temp_client.send_verification_code(email)
-                print("[SoulSync] ✓ Verification code sent! / 验证码已发送!")
+                result = temp_client.register(email, password, code)
+                print("\n[SoulSync] ✓ Registration successful! / 注册成功!")
+                self._save_auth_to_config(result)
+                return True
             except Exception as e:
-                print(f"[SoulSync] ❌ Failed to send code: {e}")
-                continue
-            
-            code_retry = 0
-            while code_retry < max_retries:
-                code = input(f"[SoulSync] Enter code / 输入验证码 ({max_retries - code_retry} attempts left): ").strip()
-                if len(code) != 6 or not code.isdigit():
-                    code_retry += 1
-                    print("[SoulSync] Invalid code format / 验证码格式错误")
-                    continue
-                
-                try:
-                    result = temp_client.register(email, password, code)
-                    print("\n[SoulSync] ✓ Registration successful! / 注册成功!")
-                    self._save_auth_to_config(result)
-                    return True
-                except Exception as e:
-                    code_retry += 1
-                    remaining_code = max_retries - code_retry
-                    if "invalid" in str(e).lower() or "expired" in str(e).lower():
-                        if remaining_code > 0:
-                            print(f"[SoulSync] ❌ Invalid or expired code: {e}")
-                            print(f"[SoulSync] Remaining attempts / 剩余尝试: {remaining_code}")
-                        else:
-                            print("[SoulSync] ❌ Too many code attempts / 验证码错误次数过多")
-                            break
+                code_retry += 1
+                if "invalid" in str(e).lower() or "expired" in str(e).lower():
+                    if code_retry < max_code_retries:
+                        print(f"[SoulSync] ❌ Invalid or expired code: {e}")
+                        print(f"[SoulSync] Remaining attempts / 剩余尝试: {max_code_retries - code_retry}")
                     else:
-                        print(f"[SoulSync] ❌ Registration failed: {e}")
-                        break
-            
-            if code_retry >= max_retries:
-                print("\n[SoulSync] Too many code verification failures.")
-                print("[SoulSync] 1. Resend code / 重新发送验证码")
-                print("[SoulSync] 2. Start over / 重新开始")
-                print("[SoulSync] 3. Exit / 退出")
-                
-                sub_choice = input("[SoulSync] Choose / 选择 (1/2/3): ").strip()
-                if sub_choice == '1':
-                    retry_count = 0
-                    continue
-                elif sub_choice == '2':
-                    retry_count = 0
-                    break
+                        print("[SoulSync] ❌ Too many code attempts / 验证码错误次数过多")
                 else:
-                    print("[SoulSync] Exiting... / 退出...")
-                    sys.exit(0)
+                    print(f"[SoulSync] ❌ Registration failed: {e}")
         
-        print("\n[SoulSync] ❌ Too many registration attempts / 注册尝试次数过多")
-        print("[SoulSync] Exiting... / 退出...")
-        sys.exit(0)
+        print("\n[SoulSync] Too many code verification failures.")
+        print("[SoulSync] Returning to menu... / 返回菜单...")
+        return None
     
     def initialize(self):
         """初始化组件"""
@@ -277,22 +301,23 @@ class SoulSyncPlugin:
             try:
                 result = self.client.authenticate(email, password)
                 if result:
+                    result['email'] = email
+                    result['password'] = password
                     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(f"[SoulSync] ❌ {e}")
                     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(f"[SoulSync] ❌ {e}")
+                    print("[SoulSync] Please run 'openclaw soulsync:setup' to reconfigure / 请运行 'openclaw soulsync:setup' 重新配置")
                     print("[SoulSync] ========================================\n")
                 
                 sys.exit(0)
@@ -323,13 +348,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'),
@@ -338,29 +363,29 @@ 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 消息回调"""
@@ -369,24 +394,24 @@ class SoulSyncPlugin:
         if event == 'file_updated':
             file_path = data.get('file_path')
             version = data.get('version')
-            print(f"\n[WebSocket] File updated: {file_path} (v{version})")
+            print(f"\n[SoulSync] [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}")
+                print(f"[SoulSync] Sync error: {e}")
       
         elif event == 'new_memory':
-            print(f"\n[WebSocket] New memory available!")
+            print(f"\n[SoulSync] [WebSocket] New memory available!")
             try:
                 self.profile_sync.pull_all()
-                print("Memory synced from remote")
+                print("[SoulSync] 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):
         """运行插件"""
@@ -398,17 +423,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()
@@ -416,54 +441,67 @@ 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():
     """主函数"""
-    parser = argparse.ArgumentParser(description='SoulSync Plugin')
-    parser.add_argument('--setup', action='store_true', help='Run interactive setup (register/login)')
-    parser.add_argument('--start', action='store_true', help='Start sync service (auto-login from config)')
-    
-    args = parser.parse_args()
-    
-    plugin = SoulSyncPlugin()
-    
-    if args.setup:
+    try:
+        parser = argparse.ArgumentParser(description='SoulSync Plugin')
+        parser.add_argument('--setup', action='store_true', help='Run interactive setup (register/login)')
+        parser.add_argument('--start', action='store_true', help='Start sync service (auto-login from config)')
+        
+        args = parser.parse_args()
+        
+        plugin = SoulSyncPlugin()
+        
+        if args.setup:
+            try:
+                plugin.load_config()
+                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(2)
+        
         plugin.load_config()
-        plugin.run_setup()
-        print("\n[SoulSync] ✓ Setup complete! Run 'openclaw soulsync:start' to begin syncing.")
-        print("[SoulSync] 设置完成！运行 'openclaw soulsync:start' 开始同步。")
-        sys.exit(0)
-    
-    plugin.load_config()
-    
-    email = plugin.config.get('email', '').strip()
-    password = plugin.config.get('password', '').strip()
-    
-    if not email or not password:
-        print("\n[SoulSync] ========================================")
-        print("[SoulSync] Not configured. Run 'openclaw soulsync:setup' first.")
-        print("[SoulSync] 尚未配置，请先运行 'openclaw soulsync:setup'")
-        print("[SoulSync] ========================================\n")
+        
+        email = plugin.config.get('email', '').strip()
+        password = plugin.config.get('password', '').strip()
+        
+        if not email or not password:
+            print("\n[SoulSync] ========================================")
+            print("[SoulSync] Not configured. Run 'openclaw soulsync:setup' first.")
+            print("[SoulSync] 尚未配置，请先运行 'openclaw soulsync:setup'")
+            print("[SoulSync] ========================================\n")
+            sys.exit(0)
+        
+        plugin.initialize()
+        plugin.run()
+    except KeyboardInterrupt:
+        print("\n[SoulSync] Cancelled by user. Goodbye! / 已取消，再见！")
         sys.exit(0)
-    
-    plugin.initialize()
-    plugin.run()
 if __name__ == '__main__':
     main()