openclaw-weiyuan-init 1.0.119 → 1.0.127

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

@@ -456,7 +456,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;
   }

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');
@@ -64,12 +65,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 +182,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;
@@ -151,7 +206,8 @@ async function createIdentityFile(identityPath, serverUrl, workspacePath) {
                   .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 +232,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;
@@ -200,7 +256,8 @@ async function createIdentityFile(identityPath, serverUrl, workspacePath) {
               .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 };
   } 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.127",
   "description": "OpenClaw Weiyuan Skill 一键初始化工具",
   "main": "bin/cli.js",
   "bin": {