soulsync 1.0.6 → 1.0.8

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/index.js

@@ -1,59 +1,106 @@
 const { spawn } = require('child_process');
 const path = require('path');
+const fs = require('fs');
 
 let pythonProcess = null;
 
-// 函数形式导出（推荐）
+function getPluginDir() {
+  return path.dirname(__filename);
+}
+
+function checkConfigExists(pluginDir) {
+  const configPath = path.join(pluginDir, 'config.json');
+  if (!fs.existsSync(configPath)) {
+    const examplePath = path.join(pluginDir, 'config.json.example');
+    if (fs.existsSync(examplePath)) {
+      fs.copyFileSync(examplePath, configPath);
+      console.log('[SoulSync] Created config.json from template');
+    }
+    return false;
+  }
+  
+  try {
+    const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+    const email = (config.email || '').trim();
+    const password = (config.password || '').trim();
+    return email && password && email !== 'your-email@example.com' && password !== 'your-password';
+  } catch (e) {
+    return false;
+  }
+}
+
+function startPythonService(mode = '--start') {
+  const pluginDir = getPluginDir();
+  const pythonScript = path.join(pluginDir, 'src', 'main.py');
+  const pythonPath = process.env.PYTHON_PATH || 'python3';
+  
+  console.log(`[SoulSync] Starting Python service (${mode})...`);
+  
+  pythonProcess = spawn(pythonPath, [pythonScript, mode], {
+    cwd: pluginDir,
+    env: {
+      ...process.env,
+      OPENCLAW_PLUGIN: 'true',
+      PLUGIN_DIR: pluginDir
+    },
+    stdio: 'inherit'
+  });
+
+  pythonProcess.on('close', (code) => {
+    console.log(`[SoulSync] Python process exited with code ${code}`);
+    pythonProcess = null;
+  });
+  
+  pythonProcess.on('error', (err) => {
+    console.error(`[SoulSync] Failed to start Python process: ${err}`);
+    pythonProcess = null;
+  });
+  
+  return pythonProcess;
+}
+
 module.exports = function register(api) {
   console.log('[SoulSync] Registering plugin...');
 
-  // 自动启动 Python 服务
-  function startPythonService() {
-    const pluginDir = path.dirname(__filename);
-    const pythonScript = path.join(pluginDir, 'src', 'main.py');
-    const pythonPath = process.env.PYTHON_PATH || 'python3';
-    
-    console.log('[SoulSync] Auto-starting Python service...');
-    
-    pythonProcess = spawn(pythonPath, [pythonScript], {
-      cwd: pluginDir,
-      env: {
-        ...process.env,
-        OPENCLAW_PLUGIN: 'true',
-        PLUGIN_DIR: pluginDir
-      },
-      stdio: 'inherit'
-    });
-
-    pythonProcess.on('close', (code) => {
-      console.log(`[SoulSync] Python process exited with code ${code}`);
-      pythonProcess = null;
-    });
-    
-    pythonProcess.on('error', (err) => {
-      console.error(`[SoulSync] Failed to start Python process: ${err}`);
-      pythonProcess = null;
-    });
-  }
+  api.registerCli(
+    ({ program }) => {
+      program
+        .command('soulsync:setup')
+        .description('首次配置：注册或登录 SoulSync 账号')
+        .action(() => {
+          console.log('[SoulSync] Starting setup...');
+          startPythonService('--setup');
+        });
+    },
+    { commands: ['soulsync:setup'] }
+  );
 
-  // 注册CLI命令：启动 SoulSync
   api.registerCli(
     ({ program }) => {
       program
         .command('soulsync:start')
         .description('启动 SoulSync 同步服务')
         .action(() => {
+          const pluginDir = getPluginDir();
+          const configPath = path.join(pluginDir, 'config.json');
+          
+          if (!checkConfigExists(pluginDir)) {
+            console.log('[SoulSync] Not configured. Starting setup...');
+            startPythonService('--setup');
+            return;
+          }
+          
           if (pythonProcess) {
             console.log('[SoulSync] Service already running');
             return;
           }
-          startPythonService();
+          
+          startPythonService('--start');
         });
     },
     { commands: ['soulsync:start'] }
   );
 
-  // 注册CLI命令：停止 SoulSync
   api.registerCli(
     ({ program }) => {
       program
@@ -72,8 +119,6 @@ module.exports = function register(api) {
     { commands: ['soulsync:stop'] }
   );
 
-  // 自动启动服务
-  startPythonService();
-
+  console.log('[SoulSync] Plugin loaded. Run "openclaw soulsync:start" to begin.');
   console.log('[SoulSync] Plugin registered successfully');
 };

package/package.json

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

package/src/main.py

@@ -8,6 +8,7 @@ import os
 import sys
 import time
 import getpass
+import argparse
 
 # 获取插件根目录
 PLUGIN_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -22,8 +23,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 +42,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 +59,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,62 +87,77 @@ 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
+        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"""
+        config_path = os.path.normpath(os.path.join(PLUGIN_DIR, 'config.json'))
         
-        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 / 无效选择")
+        try:
+            with open(config_path, 'r', encoding='utf-8') as f:
+                config = json.load(f)
+        except:
+            config = {}
+        
+        # 保存 email 和 password（如果 auth_result 包含）
+        if 'user' in auth_result:
+            config['email'] = auth_result['user'].get('email', '')
+        
+        # 保存 token
+        if 'token' in auth_result:
+            config['token'] = auth_result['token']
+        
+        with open(config_path, 'w', encoding='utf-8') as f:
+            json.dump(config, f, indent=2, ensure_ascii=False)
+        
+        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)
     
     def _interactive_login(self):
         """交互式登录（带重试）"""
+        from client import OpenClawClient
+        
         max_retries = 5
         retry_count = 0
         
         while retry_count < max_retries:
             print("\n--- Login / 登录 ---")
-            email = input("Email / 邮箱: ").strip()
+            email = input("[SoulSync] Email / 邮箱: ").strip()
             if not email:
-                print("Email cannot be empty / 邮箱不能为空")
+                print("[SoulSync] Email cannot be empty / 邮箱不能为空")
                 continue
             
-            password = getpass.getpass("Password / 密码: ")
+            password = getpass.getpass("[SoulSync] Password / 密码: ")
             if not password:
-                print("Password cannot be empty / 密码不能为空")
+                print("[SoulSync] Password cannot be empty / 密码不能为空")
                 continue
             
             try:
                 temp_client = OpenClawClient(self.config)
                 result = temp_client.authenticate(email, password)
                 if result:
-                    print("\n✅ Login successful! / 登录成功!")
+                    print("\n[SoulSync] ✓ Login successful! / 登录成功!")
                     self._save_auth_to_config(result)
                     return True
             except Exception as e:
@@ -153,67 +166,65 @@ class SoulSyncPlugin:
                 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... / 退出...")
+                    print(f"\n[SoulSync] ❌ {e}")
+                    print("\n[SoulSync] Too many failed attempts / 登录失败次数过多")
+                    print("[SoulSync] Exiting... / 退出...")
                     sys.exit(0)
                 
                 if remaining > 0:
-                    print(f"\n❌ Login failed: {e} / 登录失败: {e}")
-                    print(f"Remaining attempts / 剩余尝试次数: {remaining}")
+                    print(f"\n[SoulSync] ❌ Login failed: {e} / 登录失败: {e}")
+                    print(f"[SoulSync] Remaining attempts / 剩余尝试次数: {remaining}")
                 else:
-                    print(f"\n❌ Login failed: {e} / 登录失败: {e}")
+                    print(f"\n[SoulSync] ❌ Login failed: {e} / 登录失败: {e}")
         
-        print("\n❌ Too many failed attempts. Please try again in 15 minutes. / 登录失败次数过多，请15分钟后再试")
-        print("Exiting... / 退出...")
+        print("\n[SoulSync] ❌ Too many failed attempts. Please try again in 15 minutes. / 登录失败次数过多，请15分钟后再试")
+        print("[SoulSync] Exiting... / 退出...")
         sys.exit(0)
     
     def _interactive_register(self):
         """交互式注册（带重试）"""
-        from register import Register
+        from client import OpenClawClient
         
         max_retries = 5
         retry_count = 0
         
         while retry_count < max_retries:
             print("\n--- Register / 注册 ---")
-            email = input("Email / 邮箱: ").strip()
+            email = input("[SoulSync] Email / 邮箱: ").strip()
             if not email or '@' not in email:
-                print("Invalid email / 无效邮箱")
+                print("[SoulSync] Invalid email / 无效邮箱")
                 continue
             
-            password = getpass.getpass("Password / 密码: ")
+            password = getpass.getpass("[SoulSync] Password / 密码: ")
             if len(password) < 6:
-                print("Password must be at least 6 characters / 密码至少6位")
+                print("[SoulSync] Password must be at least 6 characters / 密码至少6位")
                 continue
             
-            password2 = getpass.getpass("Confirm password / 确认密码: ")
+            password2 = getpass.getpass("[SoulSync] Confirm password / 确认密码: ")
             if password != password2:
-                print("Passwords do not match / 两次密码不一致")
+                print("[SoulSync] Passwords do not match / 两次密码不一致")
                 continue
             
-            # 发送验证码
-            print(f"\nSending verification code to {email}...")
+            print(f"\n[SoulSync] Sending verification code to {email}...")
             try:
                 temp_client = OpenClawClient(self.config)
                 temp_client.send_verification_code(email)
-                print("✅ Verification code sent! / 验证码已发送!")
+                print("[SoulSync] ✓ Verification code sent! / 验证码已发送!")
             except Exception as e:
-                print(f"❌ Failed to send code: {e}")
+                print(f"[SoulSync] ❌ 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()
+                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("Invalid code format / 验证码格式错误")
+                    print("[SoulSync] Invalid code format / 验证码格式错误")
                     continue
                 
                 try:
                     result = temp_client.register(email, password, code)
-                    print("\n✅ Registration successful! / 注册成功!")
+                    print("\n[SoulSync] ✓ Registration successful! / 注册成功!")
                     self._save_auth_to_config(result)
                     return True
                 except Exception as e:
@@ -221,62 +232,41 @@ class SoulSyncPlugin:
                     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}")
+                            print(f"[SoulSync] ❌ Invalid or expired code: {e}")
+                            print(f"[SoulSync] Remaining attempts / 剩余尝试: {remaining_code}")
                         else:
-                            print("❌ Too many code attempts / 验证码错误次数过多")
+                            print("[SoulSync] ❌ Too many code attempts / 验证码错误次数过多")
                             break
                     else:
-                        print(f"❌ Registration failed: {e}")
+                        print(f"[SoulSync] ❌ 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 / 退出")
+                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("Choose / 选择 (1/2/3): ").strip()
+                sub_choice = input("[SoulSync] Choose / 选择 (1/2/3): ").strip()
                 if sub_choice == '1':
-                    retry_count = 0  # 重置主重试计数
+                    retry_count = 0
                     continue
                 elif sub_choice == '2':
                     retry_count = 0
-                    break  # 跳出内层循环，继续外层循环
+                    break
                 else:
-                    print("Exiting... / 退出...")
+                    print("[SoulSync] Exiting... / 退出...")
                     sys.exit(0)
         
-        print("\n❌ Too many registration attempts / 注册尝试次数过多")
-        print("Exiting... / 退出...")
-        sys.exit(0)
+        print("\n[SoulSync] ❌ Too many registration attempts / 注册尝试次数过多")
+         print("[SoulSync] Exiting... / 退出...")
+         sys.exit(0)
     
-    def _save_auth_to_config(self, auth_result):
-        """保存认证结果到 config.json"""
-        config_path = os.path.normpath(os.path.join(PLUGIN_DIR, 'config.json'))
-        
-        try:
-            with open(config_path, 'r', encoding='utf-8') as f:
-                config = json.load(f)
-        except:
-            config = {}
-        
-        # 保存 email 和 password（如果 auth_result 包含）
-        if 'user' in auth_result:
-            config['email'] = auth_result['user'].get('email', '')
-        
-        # 保存 token
-        if 'token' in auth_result:
-            config['token'] = auth_result['token']
-        
-        with open(config_path, 'w', encoding='utf-8') as f:
-            json.dump(config, f, indent=2, ensure_ascii=False)
-        
-        print("Auth info saved to config.json")
-  
     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 +274,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'))
@@ -445,7 +446,34 @@ class SoulSyncPlugin:
         print("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:
+        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")
+        sys.exit(0)
+    
+    plugin.initialize()
     plugin.run()
 if __name__ == '__main__':
     main()