openclaw-weiyuan-init 1.0.94 → 1.0.95

package/lib/commands.js

@@ -10,6 +10,12 @@ const { createIdentityFile } = require('./identity');
 const { checkServer, initSkill } = require('./server');
 const { printBanner } = require('./utils');
 const execFileAsync = promisify(execFile);
+const NPM_BIN = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+const NPX_BIN = process.platform === 'win32' ? 'npx.cmd' : 'npx';
+
+function cliExecOptions(cwd) {
+  return process.platform === 'win32' ? { cwd, shell: true } : { cwd };
+}
 
 const DEFAULT_CONFIG = {
   workspaceName: 'workspace-weiyuan',
@@ -89,23 +95,55 @@ function renderFixedMessage(template, vars = {}) {
 function printInitAccountWelcome(initInfo) {
   if (!initInfo || typeof initInfo !== 'object') return;
   const account = String(initInfo.account || '').trim();
-  if (!account) return;
   const defaultPassword = String(initInfo.defaultPassword || '').trim() || '123456';
   const rows = Array.isArray(initInfo.securityQuestions) ? initInfo.securityQuestions : [];
-  console.log(chalk.cyan('\n【已成功加入微元系统】'));
-  console.log(chalk.white(`你的默认账号为：${account}`));
-  console.log(chalk.white(`初始密码为：${defaultPassword}`));
-  if (rows.length) {
-    console.log(chalk.white('随机密保问题和答案：'));
-    rows.slice(0, 2).forEach((row, idx) => {
-      const q = String((row && row.question) || '').trim() || `问题${idx + 1}`;
-      const a = String((row && row.answer) || '').trim() || '-';
-      console.log(chalk.white(`${idx + 1}. ${q}：${a}`));
-    });
+  const recovered = Boolean(initInfo.recovered);
+  const contractText = String(initInfo.contractText || '').trim();
+  if (account) {
+    console.log(chalk.cyan('\n【已成功加入微元系统】'));
+    console.log(chalk.white(`你的默认账号为：${account}`));
+    if (!recovered || String(initInfo.defaultPassword || '').trim()) {
+      console.log(chalk.white(`初始密码为：${defaultPassword}`));
+    }
+    if (rows.length) {
+      console.log(chalk.white('随机密保问题和答案：'));
+      rows.slice(0, 2).forEach((row, idx) => {
+        const q = String((row && row.question) || '').trim() || `问题${idx + 1}`;
+        const a = String((row && row.answer) || '').trim() || '-';
+        console.log(chalk.white(`${idx + 1}. ${q}：${a}`));
+      });
+    }
+    console.log(chalk.white('请牢记这些内容，之后你可以通过官网直接登录微元系统以及更改你的账号名称和密码'));
+    console.log(chalk.white('微元系统官方网站为：https://app-ay9bunzcmltt.appmiaoda.com/'));
+    console.log(chalk.white('微元系统登录页面为：https://api.magon.com.cn/api/login'));
+  } else if (recovered) {
+    console.log(chalk.cyan('\n【微元身份已恢复】'));
+    console.log(chalk.white('系统已根据服务器中的绑定记录，重新恢复当前智能体对应的身份文件。'));
+  }
+  if (contractText) {
+    console.log(chalk.cyan('\n【主智能体行为约束】'));
+    for (const line of contractText.split(/\r?\n/)) {
+      console.log(line ? chalk.white(line) : '');
+    }
   }
-  console.log(chalk.white('请牢记这些内容，之后你可以通过官网直接登录微元系统以及更改你的账号名称和密码'));
-  console.log(chalk.white('微元系统官方网站为：https://app-ay9bunzcmltt.appmiaoda.com/'));
-  console.log(chalk.white('微元系统登录页面为：https://api.magon.com.cn/api/login'));
+}
+
+function describeInitErrorMessage(error) {
+  const msg = String(error && error.message || error || '').trim();
+  if (!msg) return 'unknown_error';
+  if (msg.includes('no_bound_account_for_repair')) {
+    return '当前智能体没有绑定任何微元账号，请先通过“邀请加入微元”的专用命令完成接入';
+  }
+  if (msg.includes('invite_registration_required')) {
+    return '普通 init 仅用于修复或恢复身份文件；首次注册请使用“邀请加入微元”复制出的专用命令';
+  }
+  if (msg.includes('agent_register_token_used') || msg.includes('agent_already_registered')) {
+    return '该智能体已完成接入，不能再次使用邀请专用命令重复注册新账号';
+  }
+  if (msg.includes('agent_register_token_expired')) {
+    return '邀请专用命令已过期，请重新从“邀请加入微元”复制新的专用命令';
+  }
+  return msg;
 }
 
 function printReleaseNotes(notes) {
@@ -367,16 +405,12 @@ async function runJoin(weiyuanPath, identityPath, projectId, code, fromInit = fa
   let lastError = null;
   for (let i = 0; i < maxAttempts; i++) {
     try {
-      await execFileAsync('npm', ['--prefix', weiyuanPath, 'run', 'weiyuan', '--', 'join', '--identity', identityPath, '--project', projectId, '--code', code, ...extra], {
-        cwd: weiyuanPath
-      });
+      await execFileAsync(NPM_BIN, ['--prefix', weiyuanPath, 'run', 'weiyuan', '--', 'join', '--identity', identityPath, '--project', projectId, '--code', code, ...extra], cliExecOptions(weiyuanPath));
       return;
     } catch (_) {
     }
     try {
-      await execFileAsync('npx', ['-y', '-p', 'tsx', '-p', 'tweetnacl', 'tsx', path.join(weiyuanPath, 'src', 'cliMain.ts'), 'join', '--identity', identityPath, '--project', projectId, '--code', code, ...extra], {
-        cwd: weiyuanPath
-      });
+      await execFileAsync(NPX_BIN, ['-y', '-p', 'tsx', '-p', 'tweetnacl', 'tsx', path.join(weiyuanPath, 'src', 'cliMain.ts'), 'join', '--identity', identityPath, '--project', projectId, '--code', code, ...extra], cliExecOptions(weiyuanPath));
       return;
     } catch (error) {
       lastError = error;
@@ -423,23 +457,19 @@ export const CAPABILITY_ACTION_ALLOWLIST = new Set<string>(Object.values(CAPABIL
       await fs.writeFile(file, capabilityCompatContent, 'utf8');
     }
   }
-  await execFileAsync('npm', ['--prefix', weiyuanPath, 'install'], { cwd: weiyuanPath });
+  await execFileAsync(NPM_BIN, ['--prefix', weiyuanPath, 'install'], cliExecOptions(weiyuanPath));
 }
 
 async function runCliInit(weiyuanPath, identityPath, serverUrl) {
   const maxAttempts = 3;
   for (let i = 0; i < maxAttempts; i++) {
     try {
-      await execFileAsync('npm', ['--prefix', weiyuanPath, 'run', 'weiyuan', '--', 'init', '--server', serverUrl, '--out', identityPath], {
-        cwd: weiyuanPath
-      });
+      await execFileAsync(NPM_BIN, ['--prefix', weiyuanPath, 'run', 'weiyuan', '--', 'init', '--server', serverUrl, '--out', identityPath], cliExecOptions(weiyuanPath));
       return true;
     } catch (_) {
     }
     try {
-      await execFileAsync('npx', ['-y', '-p', 'tsx', '-p', 'tweetnacl', 'tsx', path.join(weiyuanPath, 'src', 'cliMain.ts'), 'init', '--server', serverUrl, '--out', identityPath], {
-        cwd: weiyuanPath
-      });
+      await execFileAsync(NPX_BIN, ['-y', '-p', 'tsx', '-p', 'tweetnacl', 'tsx', path.join(weiyuanPath, 'src', 'cliMain.ts'), 'init', '--server', serverUrl, '--out', identityPath], cliExecOptions(weiyuanPath));
       return true;
     } catch (error) {
       if (i >= maxAttempts - 1 || !isRetryableGatewayError(error)) throw error;
@@ -474,10 +504,11 @@ async function runInit(options) {
   const workspaceExists = await fs.pathExists(workspacePath);
   const weiyuanExists = await fs.pathExists(weiyuanPath);
   const identityExists = await fs.pathExists(identityPath);
+  const coreReady = weiyuanExists && identityExists;
 
   // 检查是否已存在
   if (!force && workspaceExists) {
-    if (hasInviteJoin && weiyuanExists && identityExists) {
+    if (hasInviteJoin && coreReady) {
       let spinner = ora('检测到已接入微元系统，直接加入项目...').start();
       try {
         await runAcrossServerCandidates(serverCandidates, 'join_existing_workspace', async (candidate) => {
@@ -499,9 +530,12 @@ async function runInit(options) {
     if (hasInviteJoin) {
       console.log(chalk.yellow('\n⚠️  检测到已有工作目录，准备继续执行补齐流程（身份/入组）...\n'));
     } else {
-      console.log(chalk.yellow(`\n⚠️  工作目录已存在: ${workspacePath}`));
-      console.log(chalk.gray('   使用 --force 强制重新初始化\n'));
-      return;
+      if (coreReady) {
+        console.log(chalk.yellow(`\n⚠️  工作目录已存在且文件完整: ${workspacePath}`));
+        console.log(chalk.gray('   如需更新微元系统，请使用带 --force 的更新命令\n'));
+        return;
+      }
+      console.log(chalk.yellow('\n⚠️  检测到本地微元文件不完整，准备进入普通 init 修复流程...\n'));
     }
   }
 
@@ -591,13 +625,14 @@ async function runInit(options) {
     try {
       serverUrl = await runAcrossServerCandidates(serverCandidates, 'identity_init', async (candidate) => {
         const created = await createIdentityFile(identityPath, candidate, workspacePath);
-        if (!created || !created.created) throw new Error('identity_create_failed');
+        if (!created || !created.created) throw new Error(created && created.error ? created.error : 'identity_create_failed');
         initIdentityInfo = created.initInfo || null;
       });
       spinner.succeed(`身份文件: ${DEFAULT_CONFIG.identityFile}`);
     } catch (error) {
-      spinner.fail(`身份文件创建失败: ${error ? error.message : 'unknown_error'}`);
-      throw error;
+      const friendly = describeInitErrorMessage(error);
+      spinner.fail(`身份文件创建失败: ${friendly}`);
+      throw new Error(friendly);
     }
   }
 

package/lib/identity.js

@@ -32,11 +32,24 @@ function newKeyPair() {
   return { publicKeyBase64, secretKeyBase64, lobsterId };
 }
 
+function buildRecoveryHint(workspacePath) {
+  let username = '';
+  try {
+    username = String((os.userInfo && os.userInfo().username) || '').trim();
+  } catch (_) {
+    username = '';
+  }
+  const host = String(os.hostname() || '').trim().toLowerCase();
+  const workspace = String(workspacePath || '').trim().replace(/\\/g, '/').toLowerCase();
+  return `wrh_${sha256Hex([host, username.toLowerCase(), workspace].join('|'))}`;
+}
+
 async function registerIdentity(serverUrl, identity) {
   const body = {
     lobsterId: identity.lobsterId,
     publicKeyBase64: identity.publicKeyBase64,
-    identityHash: identity.identityHash
+    identityHash: identity.identityHash,
+    recoveryHint: identity && identity.meta ? identity.meta.recoveryHint : undefined
   };
   const timestampMs = String(Date.now());
   const nonce = `nonce_${Math.random().toString(16).slice(2)}`;
@@ -70,7 +83,9 @@ async function registerIdentity(serverUrl, identity) {
     break;
   }
   if (!res || res.status !== 200) {
-    throw new Error(`identity_register_failed_status_${lastStatus || 0}`);
+    const envelope = res && res.data && typeof res.data === 'object' ? res.data : {};
+    const msg = String((envelope && (envelope.msg || envelope.message)) || `identity_register_failed_status_${lastStatus || 0}`);
+    throw new Error(msg);
   }
   const envelope = res.data && typeof res.data === 'object' ? res.data : {};
   return envelope.data && typeof envelope.data === 'object' ? envelope.data : envelope;
@@ -100,7 +115,8 @@ async function createIdentityFile(identityPath, serverUrl, workspacePath) {
         device_name: os.hostname(),
         created_at: new Date().toISOString(),
         workspace: workspacePath,
-        skill_path: `${workspacePath}/weiyuan`
+        skill_path: `${workspacePath}/weiyuan`,
+        recoveryHint: buildRecoveryHint(workspacePath)
       }
     };
 
@@ -113,7 +129,7 @@ async function createIdentityFile(identityPath, serverUrl, workspacePath) {
     await fs.writeJson(identityPath, identity, { spaces: 2 });
     return { created: true, initInfo: initInfo || null };
   } catch (error) {
-    return { created: false, initInfo: null };
+    return { created: false, initInfo: null, error: error && error.message ? String(error.message) : 'identity_create_failed' };
   }
 }
 
@@ -128,4 +144,4 @@ async function readIdentityFile(identityPath) {
   }
 }
 
-module.exports = { createIdentityFile, readIdentityFile };
+module.exports = { createIdentityFile, readIdentityFile, buildRecoveryHint };

package/package.json

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