soulsync 1.0.6 → 1.0.7

package/config.json.example

@@ -1,7 +1,7 @@
 {
   "cloud_url": "https://soulsync.work",
-  "email": "your-email@example.com",
-  "password": "your-password",
+  "email": "",
+  "password": "",
   "workspace": "./workspace",
   "memory_file": "MEMORY.md",
   "watch_files": [
@@ -13,5 +13,6 @@
     "skills.json",
     "memory/",
     "MEMORY.md"
-  ]
+  ],
+  "_comment": "Register at https://soulsync.work or use curl to call /api/auth/register endpoint"
 }

package/package.json

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

package/src/main.py

@@ -7,7 +7,6 @@ import json
 import os
 import sys
 import time
-import getpass
 
 # 获取插件根目录
 PLUGIN_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -22,8 +21,6 @@ from watcher import OpenClawMultiWatcher
 from version_manager import VersionManager
 from profiles import ProfilesClient
 from sync import ProfileSync
-from register import Register, Login
-from interactive_auth import prompt_for_missing_config, interactive_setup, check_existing_config
 
 
 class SoulSyncPlugin:
@@ -43,14 +40,14 @@ class SoulSyncPlugin:
         config_path = os.path.normpath(os.path.join(PLUGIN_DIR, 'config.json'))
         config_example_path = os.path.normpath(os.path.join(PLUGIN_DIR, 'config.json.example'))
       
-        print(f"Looking for config at: {config_path}")
+        print(f"[SoulSync] Looking for config at: {config_path}")
       
         if not os.path.exists(config_path):
             if os.path.exists(config_example_path):
-                print("Config file not found, copying from config.json.example...")
+                print("[SoulSync] Config file not found, copying from config.json.example...")
                 import shutil
                 shutil.copy(config_example_path, config_path)
-                print(f"Created config.json from template")
+                print("[SoulSync] Created config.json from template")
             else:
                 raise FileNotFoundError(f"Config file not found: {config_path}")
       
@@ -60,25 +57,24 @@ class SoulSyncPlugin:
         except json.JSONDecodeError as e:
             raise ValueError(f"Invalid JSON in config.json: {e}")
       
-        # 检查必要配置
         cloud_url = self.config.get('cloud_url', '').strip()
         email = self.config.get('email', '').strip()
         password = self.config.get('password', '').strip()
         
-        # 如果 cloud_url 为空，设置为默认值
         if not cloud_url:
             self.config['cloud_url'] = 'https://soulsync.work'
-            print("Cloud URL not set, using default: https://soulsync.work")
+            print("[SoulSync] Cloud URL not set, using default: https://soulsync.work")
         
-        # 如果 email 或 password 为空，需要交互式认证
-        if not email or not password:
-            print("\nEmail or password not configured, initiating interactive setup...")
-            self._interactive_setup()
-            # 重新加载配置
-            with open(config_path, 'r', encoding='utf-8') as f:
-                self.config = json.load(f)
+        if not email or not password or email == 'your-email@example.com' or password == 'your-password':
+            print("\n[SoulSync] ========================================")
+            print("[SoulSync] Please configure your account first / 请先配置账号")
+            print("[SoulSync] ========================================")
+            print("[SoulSync] Edit config file / 编辑配置文件:")
+            print(f"           {config_path}")
+            print("[SoulSync] Set your email and password, then restart / 填写邮箱和密码后重启")
+            print("[SoulSync] ========================================\n")
+            sys.exit(0)
         
-        # 处理 workspace 路径
         workspace = self.config.get('workspace', './workspace')
         if workspace.startswith('./'):
             workspace = workspace[2:]
@@ -89,167 +85,10 @@ class SoulSyncPlugin:
         self.config['workspace'] = workspace
         self.config['watch_files'] = watch_files
       
-        print(f"Config loaded:")
-        print(f"  Cloud URL: {self.config.get('cloud_url')}")
-        print(f"  Workspace: {workspace}")
-        print(f"  Watch files: {watch_files}")
-  
-    def _interactive_setup(self):
-        """交互式设置：引导用户登录或注册"""
-        from register import Register, Login
-        from interactive_auth import interactive_setup
-        
-        while True:
-            print("\n" + "=" * 50)
-            print("Welcome / 欢迎使用 SoulSync")
-            print("=" * 50)
-            print("1. Login / 登录（已有账号）")
-            print("2. Register / 注册（新用户）")
-            print("3. Exit / 退出")
-
-            choice = input("Choose / 选择 (1/2/3): ").strip()
-
-            if choice == '1':
-                success = self._interactive_login()
-                if success:
-                    return True
-            elif choice == '2':
-                success = self._interactive_register()
-                if success:
-                    return True
-            elif choice == '3':
-                print("Exiting... / 退出...")
-                sys.exit(0)
-            else:
-                print("Invalid choice / 无效选择")
-    
-    def _interactive_login(self):
-        """交互式登录（带重试）"""
-        max_retries = 5
-        retry_count = 0
-        
-        while retry_count < max_retries:
-            print("\n--- Login / 登录 ---")
-            email = input("Email / 邮箱: ").strip()
-            if not email:
-                print("Email cannot be empty / 邮箱不能为空")
-                continue
-            
-            password = getpass.getpass("Password / 密码: ")
-            if not password:
-                print("Password cannot be empty / 密码不能为空")
-                continue
-            
-            try:
-                temp_client = OpenClawClient(self.config)
-                result = temp_client.authenticate(email, password)
-                if result:
-                    print("\n✅ 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❌ {e}")
-                    print("\nToo many failed attempts / 登录失败次数过多")
-                    print("Exiting... / 退出...")
-                    sys.exit(0)
-                
-                if remaining > 0:
-                    print(f"\n❌ Login failed: {e} / 登录失败: {e}")
-                    print(f"Remaining attempts / 剩余尝试次数: {remaining}")
-                else:
-                    print(f"\n❌ Login failed: {e} / 登录失败: {e}")
-        
-        print("\n❌ Too many failed attempts. Please try again in 15 minutes. / 登录失败次数过多，请15分钟后再试")
-        print("Exiting... / 退出...")
-        sys.exit(0)
-    
-    def _interactive_register(self):
-        """交互式注册（带重试）"""
-        from register import Register
-        
-        max_retries = 5
-        retry_count = 0
-        
-        while retry_count < max_retries:
-            print("\n--- Register / 注册 ---")
-            email = input("Email / 邮箱: ").strip()
-            if not email or '@' not in email:
-                print("Invalid email / 无效邮箱")
-                continue
-            
-            password = getpass.getpass("Password / 密码: ")
-            if len(password) < 6:
-                print("Password must be at least 6 characters / 密码至少6位")
-                continue
-            
-            password2 = getpass.getpass("Confirm password / 确认密码: ")
-            if password != password2:
-                print("Passwords do not match / 两次密码不一致")
-                continue
-            
-            # 发送验证码
-            print(f"\nSending verification code to {email}...")
-            try:
-                temp_client = OpenClawClient(self.config)
-                temp_client.send_verification_code(email)
-                print("✅ Verification code sent! / 验证码已发送!")
-            except Exception as e:
-                print(f"❌ Failed to send code: {e}")
-                continue
-            
-            # 验证码输入（带重试）
-            code_retry = 0
-            while code_retry < max_retries:
-                code = input(f"Enter verification code / 请输入验证码 ({max_retries - code_retry} attempts left): ").strip()
-                if len(code) != 6 or not code.isdigit():
-                    code_retry += 1
-                    print("Invalid code format / 验证码格式错误")
-                    continue
-                
-                try:
-                    result = temp_client.register(email, password, code)
-                    print("\n✅ 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"❌ Invalid or expired code: {e}")
-                            print(f"Remaining attempts / 剩余尝试: {remaining_code}")
-                        else:
-                            print("❌ Too many code attempts / 验证码错误次数过多")
-                            break
-                    else:
-                        print(f"❌ Registration failed: {e}")
-                        break
-            
-            if code_retry >= max_retries:
-                print("\nToo many code verification failures. Would you like to:")
-                print("1. Resend code / 重新发送验证码")
-                print("2. Start over / 重新开始")
-                print("3. Exit / 退出")
-                
-                sub_choice = input("Choose / 选择 (1/2/3): ").strip()
-                if sub_choice == '1':
-                    retry_count = 0  # 重置主重试计数
-                    continue
-                elif sub_choice == '2':
-                    retry_count = 0
-                    break  # 跳出内层循环，继续外层循环
-                else:
-                    print("Exiting... / 退出...")
-                    sys.exit(0)
-        
-        print("\n❌ Too many registration attempts / 注册尝试次数过多")
-        print("Exiting... / 退出...")
-        sys.exit(0)
+        print(f"[SoulSync] Config loaded:")
+        print(f"           Cloud URL: {self.config.get('cloud_url')}")
+        print(f"           Workspace: {workspace}")
+        print(f"           Watch files: {watch_files}")
     
     def _save_auth_to_config(self, auth_result):
         """保存认证结果到 config.json"""
@@ -276,7 +115,9 @@ class SoulSyncPlugin:
   
     def initialize(self):
         """初始化组件"""
-        print("\n=== Initializing SoulSync Plugin ===\n")
+        print("\n[SoulSync] ========================================")
+        print("[SoulSync] Initializing SoulSync Plugin")
+        print("[SoulSync] ========================================\n")
       
         self.client = OpenClawClient(self.config)
 
@@ -284,38 +125,49 @@ class SoulSyncPlugin:
         if token:
             try:
                 profile = self.client.get_profile()
-                print(f"Using existing token, user: {profile.get('email', 'unknown')}")
+                print(f"[SoulSync] Using existing token, user: {profile.get('email', 'unknown')}")
             except Exception as e:
-                print(f"Token invalid / 令牌无效, re-authenticating: {e}")
+                print(f"[SoulSync] Token invalid, re-authenticating: {e}")
                 token = None
 
         if not token:
-            print("\n=== Token invalid - Please login or register / 令牌无效，请先登录或注册 ===\n")
-            print("1. Login / 登录（已有账号）")
-            print("2. Register / 注册（新用户）")
-
-            choice = input("Choose (1/2): ").strip()
-
-            if choice == '1':
-                login = Login(self.client)
-                result = login.run()
-            elif choice == '2':
-                register = Register(self.client)
-                result = register.run()
-            else:
-                print("Invalid choice / 无效选择")
-                sys.exit(1)
+            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)
 
         email = self.config.get('email')
         password = self.config.get('password')
 
         try:
             profile = self.client.get_profile()
-            print(f"\nLogged in as: {profile.get('email')}")
+            print(f"\n[SoulSync] Logged in as: {profile.get('email')}")
             subscription = profile.get('subscription', {})
-            print(f"Subscription: {subscription.get('status')} (days remaining: {subscription.get('daysRemaining', 0)})\n")
+            print(f"[SoulSync] Subscription: {subscription.get('status')} (days remaining: {subscription.get('daysRemaining', 0)})\n")
         except Exception as e:
-            print(f"Warning: Could not get profile: {e}")
+            print(f"[SoulSync] Warning: Could not get profile: {e}")
       
         # 版本管理器
         versions_file = os.path.normpath(os.path.join(PLUGIN_DIR, 'versions.json'))