openclaw-weiyuan-init 1.0.75 → 1.0.77

package/lib/commands.js

@@ -102,9 +102,20 @@ function decodeInviteToken(token) {
     const pad = normalized.length % 4 === 0 ? '' : '='.repeat(4 - (normalized.length % 4));
     const raw = Buffer.from(normalized + pad, 'base64').toString('utf8');
     const parsed = JSON.parse(raw);
-    if (!parsed || parsed.v !== 1) return null;
-    if (!parsed.api || !parsed.upgrade || !parsed.projectId || !parsed.code) return null;
-    return parsed;
+    if (!parsed || (parsed.v !== 1 && parsed.v !== 2)) return null;
+    const api = String(parsed.api || parsed.a || '');
+    const upgrade = String(parsed.upgrade || parsed.u || '');
+    const projectId = String(parsed.projectId || parsed.p || '');
+    const code = String(parsed.code || parsed.c || '');
+    if (!api || !upgrade || !projectId || !code) return null;
+    return {
+      v: parsed.v,
+      api,
+      upgrade,
+      projectId,
+      code,
+      apis: Array.isArray(parsed.apis || parsed.s) ? (parsed.apis || parsed.s).map((x) => String(x)).filter(Boolean) : undefined
+    };
   } catch (_) {
     return null;
   }
@@ -155,6 +166,29 @@ async function sleep(ms) {
   await new Promise((resolve) => setTimeout(resolve, ms));
 }
 
+async function runAcrossServerCandidates(candidates, action, runner) {
+  const retryWindowMs = Math.max(30_000, Number(process.env.WEIYUAN_JOIN_RETRY_WINDOW_MS || 180_000));
+  const deadline = Date.now() + retryWindowMs;
+  let lastError = null;
+  let round = 0;
+  while (Date.now() < deadline) {
+    round += 1;
+    for (const candidate of candidates) {
+      try {
+        await runner(candidate);
+        return candidate;
+      } catch (error) {
+        lastError = error;
+        if (!isRetryableGatewayError(error)) throw error;
+      }
+    }
+    await sleep(Math.min(1500 * round, 10000));
+  }
+  const timeoutError = new Error(`${action}_retry_window_exhausted`);
+  timeoutError.cause = lastError || undefined;
+  throw (lastError || timeoutError);
+}
+
 async function runJoin(weiyuanPath, identityPath, projectId, code, fromInit = false) {
   const extra = fromInit ? ['--fromInit'] : [];
   const maxAttempts = 3;
@@ -237,24 +271,36 @@ async function runInit(options) {
   const force = options.force || false;
   const hasInviteJoin = Boolean(options.project && options.code);
   const identityPath = path.join(workspacePath, DEFAULT_CONFIG.identityFile);
+  const workspaceExists = await fs.pathExists(workspacePath);
+  const weiyuanExists = await fs.pathExists(weiyuanPath);
+  const identityExists = await fs.pathExists(identityPath);
 
   // 检查是否已存在
-  if (!force && await fs.pathExists(workspacePath)) {
-    if (hasInviteJoin && await fs.pathExists(weiyuanPath) && await fs.pathExists(identityPath)) {
+  if (!force && workspaceExists) {
+    if (hasInviteJoin && weiyuanExists && identityExists) {
       let spinner = ora('检测到已接入微元系统，直接加入项目...').start();
       try {
-        await runJoin(weiyuanPath, identityPath, options.project, options.code, false);
+        await runAcrossServerCandidates(serverCandidates, 'join_existing_workspace', async (candidate) => {
+          const identity = await fs.readJson(identityPath);
+          identity.serverBaseUrl = candidate;
+          await fs.writeJson(identityPath, identity, { spaces: 2 });
+          await runJoin(weiyuanPath, identityPath, options.project, options.code, false);
+        });
         spinner.succeed(`已加入项目: ${options.project}`);
         console.log(renderFixedMessage(fixedMessages.sceneC, { projectId: options.project }));
         return;
       } catch (error) {
-        spinner.fail(`自动入组失败: ${error.message}`);
+        spinner.fail(`自动入组失败: ${error ? error.message : 'unknown_error'}`);
         throw error;
       }
     }
-    console.log(chalk.yellow(`\n⚠️  工作目录已存在: ${workspacePath}`));
-    console.log(chalk.gray('   使用 --force 强制重新初始化\n'));
-    return;
+    if (hasInviteJoin) {
+      console.log(chalk.yellow('\n⚠️  检测到已有工作目录，准备继续执行补齐流程（身份/入组）...\n'));
+    } else {
+      console.log(chalk.yellow(`\n⚠️  工作目录已存在: ${workspacePath}`));
+      console.log(chalk.gray('   使用 --force 强制重新初始化\n'));
+      return;
+    }
   }
 
   // 1. 创建工作目录
@@ -282,39 +328,44 @@ async function runInit(options) {
   }
 
   // 3. 下载文件
-  spinner = ora('解析下载包...').start();
-  const source = await resolvePackageSource({
-    downloadUrl: requestedDownloadUrl,
-    upgradeBaseUrl,
-    spinner
-  });
-  spinner.succeed(`下载源: ${source.downloadUrl}`);
-
-  spinner = ora('下载 weiyuan skill...').start();
-  const zipPath = path.join(weiyuanPath, source.zipFilename);
-  const downloadSuccess = await downloadFile(source.downloadUrl, zipPath, spinner);
-  if (!downloadSuccess) {
-    spinner.fail('下载失败');
-    throw new Error('下载失败');
-  }
-  spinner.succeed(`下载完成: ${source.zipFilename}`);
-
-  // 4. 解压
-  spinner = ora('解压文件...').start();
-  const extractSuccess = await extractZip(zipPath, weiyuanPath);
-  if (!extractSuccess) {
-    spinner.fail('解压失败');
-    throw new Error('解压失败');
-  }
-  spinner.succeed('解压完成');
+  if (!force && weiyuanExists) {
+    spinner = ora('检测到已有 weiyuan 运行目录，跳过下载与解压...').start();
+    spinner.succeed('已复用现有 weiyuan 目录');
+  } else {
+    spinner = ora('解析下载包...').start();
+    const source = await resolvePackageSource({
+      downloadUrl: requestedDownloadUrl,
+      upgradeBaseUrl,
+      spinner
+    });
+    spinner.succeed(`下载源: ${source.downloadUrl}`);
+
+    spinner = ora('下载 weiyuan skill...').start();
+    const zipPath = path.join(weiyuanPath, source.zipFilename);
+    const downloadSuccess = await downloadFile(source.downloadUrl, zipPath, spinner);
+    if (!downloadSuccess) {
+      spinner.fail('下载失败');
+      throw new Error('下载失败');
+    }
+    spinner.succeed(`下载完成: ${source.zipFilename}`);
+
+    // 4. 解压
+    spinner = ora('解压文件...').start();
+    const extractSuccess = await extractZip(zipPath, weiyuanPath);
+    if (!extractSuccess) {
+      spinner.fail('解压失败');
+      throw new Error('解压失败');
+    }
+    spinner.succeed('解压完成');
 
-  // 5. 清理
-  spinner = ora('清理临时文件...').start();
-  try {
-    await fs.remove(zipPath);
-    spinner.succeed('清理完成');
-  } catch (error) {
-    spinner.warn('清理失败，可手动删除');
+    // 5. 清理
+    spinner = ora('清理临时文件...').start();
+    try {
+      await fs.remove(zipPath);
+      spinner.succeed('清理完成');
+    } catch (error) {
+      spinner.warn('清理失败，可手动删除');
+    }
   }
 
   // 6. 准备 CLI 运行时
@@ -329,29 +380,26 @@ async function runInit(options) {
 
   // 7. 创建身份文件
   spinner = ora('创建身份文件...').start();
-  let identityCreated = false;
-  let initError = null;
-  for (const candidate of serverCandidates) {
-    serverUrl = candidate;
+  if (identityExists && !force) {
+    spinner.succeed(`身份文件已存在: ${DEFAULT_CONFIG.identityFile}`);
+  } else {
     try {
-      identityCreated = await runCliInit(weiyuanPath, identityPath, serverUrl);
-      if (identityCreated) break;
+      serverUrl = await runAcrossServerCandidates(serverCandidates, 'identity_init', async (candidate) => {
+        try {
+          await runCliInit(weiyuanPath, identityPath, candidate);
+          return;
+        } catch (error) {
+          const created = await createIdentityFile(identityPath, candidate, workspacePath);
+          if (created) return;
+          throw error;
+        }
+      });
+      spinner.succeed(`身份文件: ${DEFAULT_CONFIG.identityFile}`);
     } catch (error) {
-      initError = error;
-      identityCreated = await createIdentityFile(identityPath, serverUrl, workspacePath);
-      if (identityCreated) break;
+      spinner.fail(`身份文件创建失败: ${error ? error.message : 'unknown_error'}`);
+      throw error;
     }
   }
-  if (!identityCreated && initError) {
-    spinner.fail(`身份文件创建失败: ${initError.message}`);
-    throw initError;
-  }
-  if (identityCreated) {
-    spinner.succeed(`身份文件: ${DEFAULT_CONFIG.identityFile}`);
-  } else {
-    spinner.fail('身份文件创建失败，请检查 /v1/init 可用性');
-    throw new Error('identity_create_failed');
-  }
 
   // 8. 初始化 skill
   spinner = ora('初始化 weiyuan skill...').start();
@@ -364,24 +412,16 @@ async function runInit(options) {
 
   if (options.project && options.code) {
     spinner = ora('自动加入微元项目...').start();
-    let joined = false;
-    let joinErr = null;
-    for (const candidate of serverCandidates) {
-      try {
+    try {
+      serverUrl = await runAcrossServerCandidates(serverCandidates, 'join_after_init', async (candidate) => {
         const identity = await fs.readJson(identityPath);
         identity.serverBaseUrl = candidate;
         await fs.writeJson(identityPath, identity, { spaces: 2 });
         await runJoin(weiyuanPath, identityPath, options.project, options.code, true);
-        joined = true;
-        serverUrl = candidate;
-        break;
-      } catch (error) {
-        joinErr = error;
-      }
-    }
-    if (!joined) {
-      spinner.fail(`自动入组失败: ${joinErr ? joinErr.message : 'unknown_error'}`);
-      throw (joinErr || new Error('join_failed'));
+      });
+    } catch (error) {
+      spinner.fail(`自动入组失败: ${error ? error.message : 'unknown_error'}`);
+      throw error;
     }
     spinner.succeed(`已加入项目: ${options.project}`);
     console.log(renderFixedMessage(fixedMessages.sceneB, { projectId: options.project }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-weiyuan-init",
-  "version": "1.0.75",
+  "version": "1.0.77",
   "description": "OpenClaw Weiyuan Skill 一键初始化工具",
   "main": "bin/cli.js",
   "bin": {