openclaw-weiyuan-init 1.0.55 → 1.0.57

package/lib/commands.js

@@ -8,7 +8,7 @@ const { downloadFile, resolvePackageSource } = require('./downloader');
 const { extractZip } = require('./extractor');
 const { createIdentityFile } = require('./identity');
 const { checkServer, initSkill } = require('./server');
-const { printBanner, printSummary, listDirectory } = require('./utils');
+const { printBanner } = require('./utils');
 const execFileAsync = promisify(execFile);
 
 const DEFAULT_CONFIG = {
@@ -51,6 +51,40 @@ const DEFAULT_SKILL_TSCONFIG = {
   include: ['src']
 };
 
+const DEFAULT_FIXED_MESSAGES = {
+  sceneA: "【微元协作】✨ 已为你接入微元系统～\n让协作自然发生，Let collaboration happen naturally 💫\n💡 对话框输入「微元帮助」即可查看使用指南",
+  sceneB: "【微元协作】✨ 已为你接入微元系统～  并已加入对应项目~\n项目ID：{projectId}\n\n让协作自然发生，Let collaboration happen naturally 💫",
+  sceneC: "【微元协作】✨ 已加入对应项目~\n项目ID：{projectId}\n\n让协作自然发生，Let collaboration happen naturally 💫"
+};
+
+let fixedMessagesCache = null;
+
+function getFixedMessages() {
+  if (fixedMessagesCache) return fixedMessagesCache;
+  const candidates = [
+    path.resolve(__dirname, '..', 'fixed-scene-messages.json'),
+    path.resolve(__dirname, '..', '..', 'fixed-scene-messages.json')
+  ];
+  for (const filePath of candidates) {
+    try {
+      const obj = fs.readJsonSync(filePath);
+      fixedMessagesCache = {
+        sceneA: String(obj.sceneA || DEFAULT_FIXED_MESSAGES.sceneA),
+        sceneB: String(obj.sceneB || DEFAULT_FIXED_MESSAGES.sceneB),
+        sceneC: String(obj.sceneC || DEFAULT_FIXED_MESSAGES.sceneC)
+      };
+      return fixedMessagesCache;
+    } catch (_) {
+    }
+  }
+  fixedMessagesCache = DEFAULT_FIXED_MESSAGES;
+  return fixedMessagesCache;
+}
+
+function renderFixedMessage(template, vars = {}) {
+  return String(template).replace(/\{(\w+)\}/g, (_, k) => (vars[k] !== undefined ? String(vars[k]) : ""));
+}
+
 function resolveWorkspacePath(workspaceOption) {
   const raw = (workspaceOption || DEFAULT_CONFIG.workspaceName).trim();
   const target = path.isAbsolute(raw) ? raw : path.join(process.cwd(), raw);
@@ -117,6 +151,7 @@ async function runCliInit(weiyuanPath, identityPath, serverUrl) {
 
 async function runInit(options) {
   printBanner();
+  const fixedMessages = getFixedMessages();
 
   const invite = decodeInviteToken(options.invite);
   if (invite) {
@@ -132,9 +167,23 @@ async function runInit(options) {
   const requestedDownloadUrl = options.download || DEFAULT_CONFIG.downloadUrl;
   const serverUrl = options.server || DEFAULT_CONFIG.serverUrl;
   const force = options.force || false;
+  const hasInviteJoin = Boolean(options.project && options.code);
+  const identityPath = path.join(workspacePath, DEFAULT_CONFIG.identityFile);
 
   // 检查是否已存在
   if (!force && await fs.pathExists(workspacePath)) {
+    if (hasInviteJoin && await fs.pathExists(weiyuanPath) && await fs.pathExists(identityPath)) {
+      let spinner = ora('检测到已接入微元系统，直接加入项目...').start();
+      try {
+        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}`);
+        throw error;
+      }
+    }
     console.log(chalk.yellow(`\n⚠️  工作目录已存在: ${workspacePath}`));
     console.log(chalk.gray('   使用 --force 强制重新初始化\n'));
     return;
@@ -207,7 +256,6 @@ async function runInit(options) {
 
   // 7. 创建身份文件
   spinner = ora('创建身份文件...').start();
-  const identityPath = path.join(workspacePath, DEFAULT_CONFIG.identityFile);
   let identityCreated = false;
   try {
     identityCreated = await runCliInit(weiyuanPath, identityPath, serverUrl);
@@ -221,11 +269,7 @@ async function runInit(options) {
     throw new Error('identity_create_failed');
   }
 
-  // 8. 列出目录内容
-  console.log(chalk.yellow('\n📁 weiyuan 文件夹内容:'));
-  await listDirectory(weiyuanPath, 10);
-
-  // 9. 初始化 skill
+  // 8. 初始化 skill
   spinner = ora('初始化 weiyuan skill...').start();
   const initResult = await initSkill(serverUrl, identityPath, workspacePath);
   if (initResult) {
@@ -239,14 +283,14 @@ async function runInit(options) {
     try {
       await runJoin(weiyuanPath, identityPath, options.project, options.code, true);
       spinner.succeed(`已加入项目: ${options.project}`);
+      console.log(renderFixedMessage(fixedMessages.sceneB, { projectId: options.project }));
     } catch (error) {
       spinner.fail(`自动入组失败: ${error.message}`);
       throw error;
     }
+    return;
   }
-
-  // 打印总结
-  printSummary(workspacePath, serverUrl, source.downloadUrl);
+  console.log(fixedMessages.sceneA);
 }
 
 async function runClean(options) {

package/package.json

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