openclaw-weiyuan-init 1.0.119 → 1.0.128

package/bin/cli.js

@@ -3,11 +3,12 @@
 const { program } = require('commander');
 const chalk = require('chalk');
 const { runInit, runClean, runStatus } = require('../lib/commands');
+const { version } = require('../package.json');
 
 program
   .name('openclaw-weiyuan-init')
   .description('OpenClaw Weiyuan Skill 一键初始化工具')
-  .version('1.0.0');
+  .version(version);
 
 program
   .command('init')

package/lib/commands.js

@@ -21,7 +21,7 @@ const DEFAULT_CONFIG = {
   workspaceName: 'workspace-weiyuan',
   upgradeBaseUrl: 'https://api.magon.com.cn/upgrade',
   downloadUrl: '',
-  serverUrl: 'https://api.magon.com.cn/api',
+  serverUrl: 'https://api.magon.com.cn',
   identityFile: '.weiyuan',
   serverFallbacks: []
 };
@@ -168,6 +168,11 @@ function printInitAccountWelcome(initInfo) {
   const ruleInjectionMessage = String(initInfo.ruleInjectionMessage || '').trim();
   const targetAccountId = String(initInfo.targetAccountId || '').trim();
   const ownerAccountId = String(initInfo.ownerAccountId || '').trim();
+  const dashboardUrl = String(initInfo.dashboardUrl || '').trim();
+  const officialSiteUrl = String(initInfo.officialSiteUrl || 'https://www.magon.com.cn/').trim();
+  const loginUrl = String(initInfo.loginUrl || 'https://api.magon.com.cn/api/login').trim();
+  const bindPhoneUrl = String(initInfo.bindPhoneUrl || 'https://api.magon.com.cn/api/account/bind-phone').trim();
+  const skillDownloadUrl = String(initInfo.skillDownloadUrl || 'https://api.magon.com.cn/api/downloads/weiyuan-agent-cli-skill.md').trim();
   if (bindInit) {
     console.log(chalk.cyan(`\n【${modeLabel}绑定成功】`));
     if (welcome) console.log(chalk.white(welcome));
@@ -191,9 +196,15 @@ function printInitAccountWelcome(initInfo) {
           : '请牢记该账号信息；当前账号中心已切换为验证码登录体系。'
       )
     );
-    console.log(chalk.white('微元系统官方网站为：https://api.magon.com.cn/'));
-    console.log(chalk.white('微元系统登录页面为：https://api.magon.com.cn/api/login'));
-    console.log(chalk.white('微元系统绑定手机号页面为：https://api.magon.com.cn/api/account/bind-phone'));
+    console.log(chalk.white(`微元系统官方网站为：${officialSiteUrl}`));
+    console.log(chalk.white(`微元系统登录页面为：${loginUrl}`));
+    console.log(chalk.white(`微元系统绑定手机号页面为：${bindPhoneUrl}`));
+    console.log(chalk.white(`微元系统智能体 skill 下载地址为：${skillDownloadUrl}`));
+    if (dashboardUrl) {
+      console.log(chalk.white(`个人驾驶舱地址为：${dashboardUrl}`));
+      console.log(chalk.white('请把这个驾驶舱链接保存好；后续优先直接打开该链接即可，不必每次都先回登录页查找入口。'));
+    }
+    console.log(chalk.white('如果你想把微元系统能力导入到 workbuddy、豆包等智能体，可以直接下载上面的 skill 文件并导入。'));
     console.log(chalk.white('建议立即前往“绑定手机号”页面完成手机号绑定，后续即可通过登录页获取验证码登录，并可在登录后修改用户名和密码。'));
   } else if (recovered) {
     console.log(chalk.cyan('\n【微元身份已同步】'));
@@ -217,7 +228,7 @@ function describeInitErrorMessage(error) {
     return '绑定命令已被使用，不能重复执行。请回到微元系统驾驶舱重新生成最新绑定命令';
   }
   if (msg.includes('bind_token_expired')) {
-    return '绑定命令已过期，请回到微元系统驾驶舱重新生成最新绑定命令';
+    return '绑定命令已过期。注意：这通常只代表旧命令失效，不代表当前绑定状态已失效；如果驾驶舱已显示“已绑定”，请直接继续使用，或回到驾驶舱重新生成最新绑定命令';
   }
   if (msg.includes('unbind_token_not_found')) {
     return '解绑命令无效：未找到对应解绑令牌。请回到微元系统驾驶舱重新生成最新解绑命令后再执行';
@@ -226,7 +237,7 @@ function describeInitErrorMessage(error) {
     return '解绑命令已被使用，不能重复执行。请回到微元系统驾驶舱重新生成最新解绑命令';
   }
   if (msg.includes('unbind_token_expired')) {
-    return '解绑命令已过期，请回到微元系统驾驶舱重新生成最新解绑命令';
+    return '解绑命令已过期。注意：这通常只代表旧命令失效，不代表当前绑定状态异常；请回到微元系统驾驶舱重新生成最新解绑命令';
   }
   if (msg.includes('target_not_found')) {
     return '服务器未找到本次绑定/解绑对应的目标账号，通常是命令域名错误、令牌对应账号已失效，或服务端数据尚未同步';
@@ -456,7 +467,19 @@ async function persistReleaseNotes(weiyuanPath, notes) {
 
 function resolveWorkspacePath(workspaceOption) {
   const raw = (workspaceOption || DEFAULT_CONFIG.workspaceName).trim();
-  const target = path.isAbsolute(raw) ? raw : path.join(process.cwd(), raw);
+  const cwd = process.cwd();
+  const workspaceName = DEFAULT_CONFIG.workspaceName.toLowerCase();
+  const cwdBase = path.basename(cwd).toLowerCase();
+  const rawParts = raw.replace(/\\/g, '/').split('/').map((x) => String(x || '').trim()).filter(Boolean);
+  if (cwdBase === workspaceName) {
+    if (!raw || raw === '.' || raw === './' || raw === '.\\') {
+      return cwd;
+    }
+    if (rawParts.length > 0 && rawParts.every((part) => part.toLowerCase() === workspaceName)) {
+      return cwd;
+    }
+  }
+  const target = path.isAbsolute(raw) ? raw : path.join(cwd, raw);
   if (path.basename(target).toLowerCase() === DEFAULT_CONFIG.workspaceName.toLowerCase()) {
     return target;
   }
@@ -495,7 +518,7 @@ function normalizeServerUrl(raw) {
   try {
     const url = new URL(cleaned);
     const p = (url.pathname || '/').replace(/\/+$/, '');
-    if (!p || p === '/') url.pathname = '/api';
+    if (!p || p === '/' || p === '/api' || /^\/(?:api\/)?v1(?:\/|$)/.test(p)) url.pathname = '';
     url.hash = '';
     return url.toString().replace(/\/$/, '');
   } catch (_) {
@@ -650,6 +673,7 @@ function buildAgentConversationGuide(projectId) {
     '请至少再给用户补充 2 个场景示例：',
     '1. 项目场景：用户说“帮我创建一个项目”，你继续追问项目名称、目标、负责人等关键信息，再完成创建。',
     '2. 协作场景：用户说“帮我在当前项目里建一个测试任务，明天下午提醒我跟进”，你要继续补全信息并直接帮他处理。',
+    '如果系统已经返回个人驾驶舱链接，你必须把该链接原样输出给用户，并提醒用户保存这个入口，后续可直接打开使用。',
     joinedProjectLine,
     '',
     '你还必须明确告诉用户：',

package/lib/identity.js

@@ -1,5 +1,6 @@
 const fs = require('fs-extra');
 const os = require('os');
+const path = require('path');
 const crypto = require('crypto');
 const axios = require('axios');
 const naclImport = require('tweetnacl');
@@ -45,17 +46,15 @@ function buildRecoveryHint(workspacePath) {
 }
 
 function normalizeBusinessServerUrl(serverUrl) {
-  const fallback = 'https://api.magon.com.cn/api';
+  const fallback = 'https://api.magon.com.cn';
   if (!serverUrl || typeof serverUrl !== 'string') return fallback;
   try {
     const url = new URL(String(serverUrl).trim());
     const rawPath = String(url.pathname || '/');
     if (/^\/(?:api\/)?agent-(?:register|bind)(?:\/|$)/.test(rawPath)) {
-      url.pathname = '/api';
-    } else if (!rawPath || rawPath === '/') {
-      url.pathname = '/api';
-    } else if (!rawPath.startsWith('/api')) {
-      url.pathname = `/api${rawPath.startsWith('/') ? '' : '/'}${rawPath}`;
+      url.pathname = '';
+    } else if (!rawPath || rawPath === '/' || rawPath === '/api' || /^\/(?:api\/)?v1(?:\/|$)/.test(rawPath)) {
+      url.pathname = '';
     }
     url.hash = '';
     return url.toString().replace(/\/$/, '');
@@ -64,12 +63,66 @@ function normalizeBusinessServerUrl(serverUrl) {
   }
 }
 
-async function registerIdentity(serverUrl, identity) {
+function applyIdentityProxyMetadata(identity, initInfo) {
+  const next = identity && typeof identity === 'object' ? { ...identity } : {};
+  const lobsterId = String(next.lobsterId || '').trim();
+  const effectiveLobsterId = String(initInfo && initInfo.effectiveLobsterId || '').trim();
+  const ownerLobsterId = String(initInfo && initInfo.ownerLobsterId || '').trim();
+  const accountModeRaw = String(initInfo && initInfo.accountMode || initInfo && initInfo.mode || '').trim();
+  const accountMode = accountModeRaw === 'agent' || accountModeRaw === 'owner' ? accountModeRaw : '';
+  const accountTypeRaw = String(initInfo && initInfo.accountType || '').trim().toLowerCase();
+  const accountType = accountTypeRaw === 'auto' || accountTypeRaw === 'weiyuan' || accountTypeRaw === 'lob' ? accountTypeRaw : '';
+  const displayAccountId = String((initInfo && (initInfo.displayAccountId || initInfo.account)) || '').trim();
+  if (effectiveLobsterId && effectiveLobsterId !== lobsterId) next.effectiveLobsterId = effectiveLobsterId;
+  else delete next.effectiveLobsterId;
+  if (ownerLobsterId && ownerLobsterId !== lobsterId) next.ownerLobsterId = ownerLobsterId;
+  else delete next.ownerLobsterId;
+  if (accountMode) next.accountMode = accountMode;
+  else delete next.accountMode;
+  if (accountType) next.accountType = accountType;
+  else delete next.accountType;
+  if (displayAccountId) next.displayAccountId = displayAccountId;
+  else delete next.displayAccountId;
+  return next;
+}
+
+function normalizeSkillVersionText(raw) {
+  const text = String(raw || '').trim().replace(/^v/i, '');
+  return text && text !== '0.0.0' ? text : '';
+}
+
+async function readLocalSkillVersion(workspacePath) {
+  const weiyuanPath = path.join(String(workspacePath || ''), 'weiyuan');
+  const candidates = [
+    path.join(weiyuanPath, 'package.json'),
+    path.join(weiyuanPath, 'release-notes', 'latest.json'),
+    path.join(weiyuanPath, 'manifest.json'),
+  ];
+  for (const file of candidates) {
+    try {
+      const parsed = await fs.readJson(file);
+      const version = normalizeSkillVersionText(parsed && parsed.version);
+      if (version) return version;
+    } catch (_) {
+    }
+  }
+  try {
+    const plain = await fs.readFile(path.join(weiyuanPath, '.version'), 'utf8');
+    const version = normalizeSkillVersionText(plain);
+    if (version) return version;
+  } catch (_) {
+  }
+  return '';
+}
+
+async function registerIdentity(serverUrl, identity, workspacePath) {
+  const skillVersion = await readLocalSkillVersion(workspacePath);
   const body = {
     lobsterId: identity.lobsterId,
     publicKeyBase64: identity.publicKeyBase64,
     identityHash: identity.identityHash,
-    recoveryHint: identity && identity.meta ? identity.meta.recoveryHint : undefined
+    recoveryHint: identity && identity.meta ? identity.meta.recoveryHint : undefined,
+    skillVersion: skillVersion || undefined
   };
   const timestampMs = String(Date.now());
   const nonce = `nonce_${Math.random().toString(16).slice(2)}`;
@@ -127,7 +180,7 @@ async function createIdentityFile(identityPath, serverUrl, workspacePath) {
             recoveryHint: (existing.meta && existing.meta.recoveryHint) || buildRecoveryHint(workspacePath)
           }
         };
-        const initInfo = await registerIdentity(serverUrl, identity);
+        const initInfo = await registerIdentity(serverUrl, identity, workspacePath);
         const serverLobsterId = String(initInfo && initInfo.lobsterId || '').trim();
         if (serverLobsterId) {
           identity.lobsterId = serverLobsterId;
@@ -135,23 +188,23 @@ async function createIdentityFile(identityPath, serverUrl, workspacePath) {
         }
         if (initInfo && Array.isArray(initInfo.joinedProjectIds)) {
           identity.joinedProjectIds = initInfo.joinedProjectIds.map((x) => String(x || '').trim()).filter(Boolean);
-        } else {
-          delete identity.joinedProjectIds;
         }
         if (initInfo && typeof initInfo.currentProjectId === 'string' && initInfo.currentProjectId.trim()) {
           identity.currentProjectId = String(initInfo.currentProjectId).trim();
-        } else {
-          delete identity.currentProjectId;
+        } else if (!identity.currentProjectId && Array.isArray(identity.joinedProjectIds) && identity.joinedProjectIds.length) {
+          identity.currentProjectId = String(identity.joinedProjectIds[0] || '').trim() || identity.currentProjectId;
+        }
+        if (initInfo && initInfo.projectCursors && typeof initInfo.projectCursors === 'object' && !Array.isArray(initInfo.projectCursors)) {
+          identity.projectCursors = Object.fromEntries(
+            Object.entries(initInfo.projectCursors)
+              .map(([k, v]) => [String(k || '').trim(), Number(v || 0)])
+              .filter(([k, v]) => k && Number.isFinite(v))
+          );
+        } else if (!identity.projectCursors || typeof identity.projectCursors !== 'object' || Array.isArray(identity.projectCursors)) {
+          identity.projectCursors = {};
         }
-        identity.projectCursors =
-          initInfo && initInfo.projectCursors && typeof initInfo.projectCursors === 'object' && !Array.isArray(initInfo.projectCursors)
-            ? Object.fromEntries(
-                Object.entries(initInfo.projectCursors)
-                  .map(([k, v]) => [String(k || '').trim(), Number(v || 0)])
-                  .filter(([k, v]) => k && Number.isFinite(v))
-              )
-            : {};
-        await fs.writeJson(identityPath, identity, { spaces: 2 });
+        const nextIdentity = applyIdentityProxyMetadata(identity, initInfo);
+        await fs.writeJson(identityPath, nextIdentity, { spaces: 2 });
         return { created: true, initInfo: initInfo || null };
       }
     }
@@ -176,7 +229,7 @@ async function createIdentityFile(identityPath, serverUrl, workspacePath) {
       }
     };
 
-    const initInfo = await registerIdentity(serverUrl, identity);
+    const initInfo = await registerIdentity(serverUrl, identity, workspacePath);
     const serverLobsterId = String(initInfo && initInfo.lobsterId || '').trim();
     if (serverLobsterId) {
       identity.lobsterId = serverLobsterId;
@@ -184,23 +237,23 @@ async function createIdentityFile(identityPath, serverUrl, workspacePath) {
     }
     if (initInfo && Array.isArray(initInfo.joinedProjectIds)) {
       identity.joinedProjectIds = initInfo.joinedProjectIds.map((x) => String(x || '').trim()).filter(Boolean);
-    } else {
-      delete identity.joinedProjectIds;
     }
     if (initInfo && typeof initInfo.currentProjectId === 'string' && initInfo.currentProjectId.trim()) {
       identity.currentProjectId = String(initInfo.currentProjectId).trim();
-    } else {
-      delete identity.currentProjectId;
+    } else if (!identity.currentProjectId && Array.isArray(identity.joinedProjectIds) && identity.joinedProjectIds.length) {
+      identity.currentProjectId = String(identity.joinedProjectIds[0] || '').trim() || identity.currentProjectId;
     }
-    identity.projectCursors =
-      initInfo && initInfo.projectCursors && typeof initInfo.projectCursors === 'object' && !Array.isArray(initInfo.projectCursors)
-        ? Object.fromEntries(
-            Object.entries(initInfo.projectCursors)
-              .map(([k, v]) => [String(k || '').trim(), Number(v || 0)])
-              .filter(([k, v]) => k && Number.isFinite(v))
-          )
-        : {};
-    await fs.writeJson(identityPath, identity, { spaces: 2 });
+    if (initInfo && initInfo.projectCursors && typeof initInfo.projectCursors === 'object' && !Array.isArray(initInfo.projectCursors)) {
+      identity.projectCursors = Object.fromEntries(
+        Object.entries(initInfo.projectCursors)
+          .map(([k, v]) => [String(k || '').trim(), Number(v || 0)])
+          .filter(([k, v]) => k && Number.isFinite(v))
+      );
+    } else if (!identity.projectCursors || typeof identity.projectCursors !== 'object' || Array.isArray(identity.projectCursors)) {
+      identity.projectCursors = {};
+    }
+    const nextIdentity = applyIdentityProxyMetadata(identity, initInfo);
+    await fs.writeJson(identityPath, nextIdentity, { spaces: 2 });
     return { created: true, initInfo: initInfo || null };
   } catch (error) {
     return { created: false, initInfo: null, error: error && error.message ? String(error.message) : 'identity_create_failed' };

package/package.json

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

package/workspace-weiyuan/weiyuan/src/skillAdapter.ts

@@ -1052,7 +1052,7 @@ const DEFAULT_REPLY_TEMPLATES: ReplyTemplateMap = {
   "runtime.upgrade": { text: "更新成功。" },
 }
 
-const WEIYUAN_OFFICIAL_WEBSITE = "https://api.magon.com.cn/"
+const WEIYUAN_OFFICIAL_WEBSITE = "https://www.magon.com.cn/"
 
 function withOfficialWebsiteIfLinkPresent(obj: Record<string, unknown>, message: string): { message: string; officialWebsite: string } | null {
   const hasDashboard = typeof obj.dashboardLink === "string" && obj.dashboardLink.trim().length > 0
@@ -1124,9 +1124,31 @@ function formatWatermark(): { time: string; traceId: string } {
 }
 
 function buildMandatoryDisplay(actionKey: string | undefined, core: unknown): string | undefined {
-  if (!actionKey) return undefined
   const c = asRecord(core)
   const { time, traceId } = formatWatermark()
+  const account = typeof c.account === "string" ? c.account.trim() : ""
+  const dashboardLink = typeof c.dashboardLink === "string" ? c.dashboardLink.trim() : (typeof c.dashboardUrl === "string" ? c.dashboardUrl.trim() : "")
+  const bindPhoneUrl = typeof c.bindPhoneUrl === "string" ? c.bindPhoneUrl.trim() : ""
+  const loginUrl = typeof c.loginUrl === "string" ? c.loginUrl.trim() : ""
+  const officialWebsite = typeof c.officialWebsite === "string"
+    ? c.officialWebsite.trim()
+    : (typeof c.officialSiteUrl === "string" ? c.officialSiteUrl.trim() : WEIYUAN_OFFICIAL_WEBSITE)
+  if (account && (dashboardLink || bindPhoneUrl || loginUrl || officialWebsite)) {
+    return [
+      `### 🌀 微元系统账号入口 (不可修改)（数据时间：${time} | Trace_ID：${traceId}）`,
+      "| 项目 | 内容 |",
+      "| --- | --- |",
+      `| 微元账号 | ${account} |`,
+      `| 个人驾驶舱 | ${dashboardLink || "未返回"} |`,
+      `| 手机号绑定 | ${bindPhoneUrl || "未返回"} |`,
+      `| 登录页面 | ${loginUrl || "未返回"} |`,
+      `| 官方网站 | ${officialWebsite || WEIYUAN_OFFICIAL_WEBSITE} |`,
+      "",
+      `- **重点提醒**：个人驾驶舱链接是重点入口，请立即保存：${dashboardLink || "当前未返回，请重新获取一次加入成功结果"}`,
+      "-----------------------------------",
+    ].join("\n")
+  }
+  if (!actionKey) return undefined
   if (actionKey.startsWith("project.")) {
     const projectName = pickProjectName(c)
     const projectId = typeof c.projectId === "string" ? c.projectId : "未获取"
@@ -1507,7 +1529,7 @@ function buildDialogueData(raw: unknown, detailed: boolean, actionKey?: string,
   const quickActions = showOperationalInfo ? collectQuickActions(raw).slice(0, 3) : []
   const base = enforceOutputQuality(conciseMessageFromCore(slim, actionKey, templates), slim, actionKey)
   const tip = pickMicroTip(actionKey)
-  const mandatoryDisplay = buildMandatoryDisplay(actionKey, slim)
+  const mandatoryDisplay = buildMandatoryDisplay(actionKey, raw)
   const friendly = withMicroPrefix(tip ? `${base}\n${tip}` : base)
   const messageRaw = mandatoryDisplay ? `🌐【微元项目模式】\n${mandatoryDisplay}\n${friendly}` : friendly
   const message = applyExpressionPolicyText(messageRaw, "已处理完成。", actionKey)

package/workspace-weiyuan/weiyuan/src/weiyuanFile.ts

@@ -5,7 +5,7 @@ import type { WeiyuanIdentityFileV1 } from "./types"
 export const DEFAULT_IDENTITY_PATH = ".weiyuan"
 
 export function normalizeServerBaseUrl(raw: string): string {
-  const fallback = "https://api.magon.com.cn/api"
+  const fallback = "https://api.magon.com.cn"
   if (!raw || typeof raw !== "string") return fallback
   const cleaned = raw.trim().replace(/^[`'"\s]+|[`'"\s]+$/g, "")
   if (!cleaned) return fallback
@@ -21,16 +21,17 @@ export function normalizeServerBaseUrl(raw: string): string {
       url.protocol = "https:"
       const rawPath = String(url.pathname || "/")
       if (/^\/(?:api\/)?agent-(?:register|bind)(?:\/|$)/.test(rawPath)) {
-        url.pathname = "/api"
+        url.pathname = ""
       } else {
-        if (!url.pathname || url.pathname === "/") url.pathname = "/api"
-        if (!url.pathname.startsWith("/api")) url.pathname = `/api${url.pathname.startsWith("/") ? "" : "/"}${url.pathname}`
+        if (!url.pathname || url.pathname === "/" || url.pathname === "/api" || /^\/(?:api\/)?v1(?:\/|$)/.test(rawPath)) url.pathname = ""
       }
       url.hash = ""
       return url.toString().replace(/\/$/, "")
     }
     if (/^\/(?:api\/)?agent-(?:register|bind)(?:\/|$)/.test(String(url.pathname || "/"))) {
-      url.pathname = "/api"
+      url.pathname = ""
+    } else if (String(url.pathname || "") === "/api" || /^\/(?:api\/)?v1(?:\/|$)/.test(String(url.pathname || "/"))) {
+      url.pathname = ""
     }
     url.hash = ""
     return url.toString().replace(/\/$/, "")