openclaw-weiyuan-init 1.0.99 → 1.0.101

package/lib/commands.js

@@ -6,7 +6,7 @@ const { execFile } = require('child_process');
 const { promisify } = require('util');
 const { downloadFile, resolvePackageSource } = require('./downloader');
 const { extractZip } = require('./extractor');
-const { createIdentityFile } = require('./identity');
+const { createIdentityFile, normalizeBusinessServerUrl } = require('./identity');
 const { checkServer, initSkill } = require('./server');
 const { printBanner } = require('./utils');
 const execFileAsync = promisify(execFile);
@@ -163,10 +163,10 @@ 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 '当前智能体没有绑定任何微元账号，请先通过“邀请加入微元”的专用命令完成接入';
+    return '当前智能体没有绑定任何微元账号，请先使用官网固定加入命令，或执行“邀请加入微元”的专用命令完成首次接入';
   }
   if (msg.includes('invite_registration_required')) {
-    return '普通 init 仅用于修复或恢复身份文件；首次注册请使用“邀请加入微元”复制出的专用命令';
+    return '普通 init 仅用于修复或恢复身份文件；首次注册请使用官网固定加入命令，或使用“邀请加入微元”复制出的专用命令';
   }
   if (msg.includes('agent_register_token_used') || msg.includes('agent_already_registered')) {
     return '该智能体已完成接入，不能再次使用邀请专用命令重复注册新账号；如需补全或找回微元系统文件，请改用普通 init 命令';
@@ -400,6 +400,16 @@ function normalizeServerUrl(raw) {
   }
 }
 
+function isAgentRegisterServerUrl(raw) {
+  if (!raw || typeof raw !== 'string') return false;
+  try {
+    const url = new URL(raw.trim());
+    return /^\/(?:api\/)?agent-register(?:\/|$)/.test(String(url.pathname || '/'));
+  } catch (_) {
+    return false;
+  }
+}
+
 function parseServerFallbacks(raw) {
   if (!raw || typeof raw !== 'string') return [];
   return raw
@@ -608,6 +618,7 @@ async function runInit(options) {
   let serverUrl = serverCandidates[0] || DEFAULT_CONFIG.serverUrl;
   const force = options.force || false;
   const hasInviteJoin = Boolean(options.project && options.code);
+  const hasRegisterInitServer = serverCandidates.some((candidate) => isAgentRegisterServerUrl(candidate));
   const identityPath = path.join(workspacePath, DEFAULT_CONFIG.identityFile);
   const workspaceExists = await fs.pathExists(workspacePath);
   const weiyuanExists = await fs.pathExists(weiyuanPath);
@@ -621,7 +632,7 @@ async function runInit(options) {
       try {
         await runAcrossServerCandidates(serverCandidates, 'join_existing_workspace', async (candidate) => {
           const identity = await fs.readJson(identityPath);
-          identity.serverBaseUrl = candidate;
+          identity.serverBaseUrl = normalizeBusinessServerUrl(candidate);
           await fs.writeJson(identityPath, identity, { spaces: 2 });
           await runJoin(weiyuanPath, identityPath, options.project, options.code, false);
         });
@@ -640,6 +651,12 @@ async function runInit(options) {
       console.log(chalk.yellow('\n⚠️  检测到已有工作目录，准备继续执行补齐流程（身份/入组）...\n'));
     } else {
       if (coreReady) {
+        if (hasRegisterInitServer) {
+          console.log(chalk.cyan('\n✅ 已检测到该智能体已接入微元系统。'));
+          console.log(chalk.white('本次不会重新初始化，也不建议使用 --force 进行覆盖更新。'));
+          console.log(chalk.gray('如需补全或恢复当前绑定身份，请直接使用普通 init；如需加入项目，请执行项目邀请命令。\n'));
+          return;
+        }
         console.log(chalk.yellow(`\n⚠️  工作目录已存在且文件完整: ${workspacePath}`));
         console.log(chalk.gray('   如需更新微元系统，请使用带 --force 的更新命令\n'));
         return;
@@ -759,7 +776,7 @@ async function runInit(options) {
     try {
       serverUrl = await runAcrossServerCandidates(serverCandidates, 'join_after_init', async (candidate) => {
         const identity = await fs.readJson(identityPath);
-        identity.serverBaseUrl = candidate;
+        identity.serverBaseUrl = normalizeBusinessServerUrl(candidate);
         await fs.writeJson(identityPath, identity, { spaces: 2 });
         await runJoin(weiyuanPath, identityPath, options.project, options.code, true);
       });

package/lib/identity.js

@@ -44,6 +44,26 @@ function buildRecoveryHint(workspacePath) {
   return `wrh_${sha256Hex([host, username.toLowerCase(), workspace].join('|'))}`;
 }
 
+function normalizeBusinessServerUrl(serverUrl) {
+  const fallback = 'https://api.magon.com.cn/api';
+  if (!serverUrl || typeof serverUrl !== 'string') return fallback;
+  try {
+    const url = new URL(String(serverUrl).trim());
+    const rawPath = String(url.pathname || '/');
+    if (/^\/(?:api\/)?agent-register(?:\/|$)/.test(rawPath)) {
+      url.pathname = '/api';
+    } else if (!rawPath || rawPath === '/') {
+      url.pathname = '/api';
+    } else if (!rawPath.startsWith('/api')) {
+      url.pathname = `/api${rawPath.startsWith('/') ? '' : '/'}${rawPath}`;
+    }
+    url.hash = '';
+    return url.toString().replace(/\/$/, '');
+  } catch (_) {
+    return fallback;
+  }
+}
+
 async function registerIdentity(serverUrl, identity) {
   const body = {
     lobsterId: identity.lobsterId,
@@ -93,12 +113,13 @@ async function registerIdentity(serverUrl, identity) {
 
 async function createIdentityFile(identityPath, serverUrl, workspacePath) {
   try {
+    const businessServerUrl = normalizeBusinessServerUrl(serverUrl);
     if (await fs.pathExists(identityPath)) {
       const existing = await fs.readJson(identityPath).catch(() => ({}));
       if (existing && existing.version === 1 && existing.lobsterId && existing.secretKeyBase64 && existing.publicKeyBase64) {
         const identity = {
           ...existing,
-          serverBaseUrl: serverUrl,
+          serverBaseUrl: businessServerUrl,
           meta: {
             ...(existing.meta && typeof existing.meta === 'object' ? existing.meta : {}),
             workspace: workspacePath,
@@ -121,7 +142,7 @@ async function createIdentityFile(identityPath, serverUrl, workspacePath) {
     const identityHash = sha256Hex(JSON.stringify({ lobsterId: kp.lobsterId, publicKeyBase64: kp.publicKeyBase64 }));
     const identity = {
       version: 1,
-      serverBaseUrl: serverUrl,
+      serverBaseUrl: businessServerUrl,
       lobsterId: kp.lobsterId,
       publicKeyBase64: kp.publicKeyBase64,
       secretKeyBase64: kp.secretKeyBase64,
@@ -161,4 +182,4 @@ async function readIdentityFile(identityPath) {
   }
 }
 
-module.exports = { createIdentityFile, readIdentityFile, buildRecoveryHint };
+module.exports = { createIdentityFile, readIdentityFile, buildRecoveryHint, normalizeBusinessServerUrl };

package/package.json

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