@aiyiran/myclaw 1.0.154 → 1.0.156

package/index.js

@@ -1126,7 +1126,7 @@ function showHelp() {
   console.log('  up         升级 + 刷新桌面快捷方式 (= update + bat)');
   console.log('  open       打开浏览器控制台（自动带 token）');
   console.log('  fix        兜底修复（自动补装 WSL + Chrome，仅限 Windows）');
-  console.log('  wsl2       WSL2 一键安装/修复 (仅限 Windows)');
+  console.log('  wsl2       WSL2 一键安装/修复 (仅限 Windows, 可选: --cli)');
   console.log('  bat        在桌面生成一键启动脚本 (仅限 Windows)');
   console.log('  list       查看注入资源管理列表（智能体/技能/配置）');
   console.log('  pull       从 ~/.openclaw 拉取最新资源到源目录（开发用）');

package/package.json

@@ -1,22 +1,18 @@
 {
   "name": "@aiyiran/myclaw",
-  "version": "1.0.154",
+  "version": "1.0.156",
   "description": "",
   "main": "index.js",
   "bin": {
-    "myclaw": "index.js",
-    "mc": "index.js"
+    "mc": "index.js",
+    "myclaw": "index.js"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "keywords": [],
   "author": "",
   "license": "ISC",
   "dependencies": {
     "chalk": "^4.1.2"
-  },
-  "engines": {
-    "node": ">=16"
   }
 }

package/wsl2.js

@@ -36,6 +36,8 @@ const C = isWindows
 const STATE_FILE = path.join(os.homedir(), '.myclaw_wsl_state');
 const MARKER_PATH_PS = STATE_FILE.replace(/\\/g, '\\\\');
 
+const CONFIG_FILE = path.join(os.homedir(), '.myclaw_config');
+
 const WORK_DIR = path.join(os.homedir(), '.myclaw_tmp');
 try { fs.mkdirSync(WORK_DIR, { recursive: true }); } catch {}
 const WORK_DIR_PS = WORK_DIR.replace(/\\/g, '\\\\');
@@ -55,6 +57,22 @@ function setState(state) {
   fs.writeFileSync(STATE_FILE, state, 'utf8');
 }
 
+function getConfig() {
+  try {
+    if (fs.existsSync(CONFIG_FILE)) {
+      const content = fs.readFileSync(CONFIG_FILE, 'utf8');
+      return JSON.parse(content);
+    }
+  } catch {}
+  return {};
+}
+
+function setConfig(key, value) {
+  const config = getConfig();
+  config[key] = value;
+  fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2), 'utf8');
+}
+
 function launchElevatedPS(script) {
   const tmpDir = process.env.LOCALAPPDATA
     ? path.join(process.env.LOCALAPPDATA, 'myclaw')
@@ -80,7 +98,8 @@ function launchElevatedPS(script) {
 }
 
 function makeAskLocalOrCDN(prompt, destVar, cdnUrl, desc, fileName) {
-  const callerDir = process.cwd().replace(/\\/g, '\\\\');
+  const config = getConfig();
+  const callerDir = (config.installerDir || process.env.MYCLAW_INSTALLER_DIR || process.cwd()).replace(/\\/g, '\\\\');
   const cdnFilename = cdnUrl.split('/').pop();
   return `
 $callerDir = "${callerDir}"
@@ -436,6 +455,87 @@ if ($installed) {
   }
 }
 
+// ============================================================================
+// ============================================================================
+// CLI 模式
+// ============================================================================
+
+function runCliMode() {
+  const readline = require('readline');
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+
+  const question = (prompt) => new Promise(resolve => rl.question(prompt, resolve));
+
+  async function showMenu() {
+    console.log('');
+    console.log('========================================');
+    console.log('  MyClaw WSL2 CLI 控制面板');
+    console.log('========================================');
+    console.log('');
+
+    const config = getConfig();
+    const currentPath = config.installerDir || '(未设置)';
+
+    console.log('当前安装包路径: ' + C.y + currentPath + C.nc);
+    console.log('');
+    console.log('请选择操作:');
+    console.log('  1. 重新安装 Phase 1 (启用功能 + 下载)');
+    console.log('  2. 重新安装 Phase 2 (导入 Linux 环境)');
+    console.log('  3. 重新设置安装包路径');
+    console.log('  0. 退出');
+    console.log('');
+
+    const choice = await question('请输入选项 (0-3): ');
+
+    switch (choice.trim()) {
+      case '1':
+        console.log('');
+        console.log('[' + C.y + '执行' + C.nc + '] 开始 Phase 1 安装...');
+        setState('needs-features');
+        rl.close();
+        runPhase1();
+        break;
+
+      case '2':
+        console.log('');
+        console.log('[' + C.y + '执行' + C.nc + '] 开始 Phase 2 安装...');
+        setState('phase1-done');
+        rl.close();
+        runPhase2();
+        break;
+
+      case '3':
+        console.log('');
+        const newPath = await question('请输入安装包存放路径: ');
+        if (newPath.trim()) {
+          setConfig('installerDir', newPath.trim());
+          console.log('');
+          console.log('[' + C.g + 'OK' + C.nc + '] 路径已保存: ' + C.y + newPath.trim() + C.nc);
+          console.log('');
+          console.log('再次运行 ' + C.y + 'myclaw wsl2' + C.nc + ' 时将使用此路径。');
+        } else {
+          console.log('[' + C.r + '取消' + C.nc + '] 路径为空，未保存。');
+        }
+        rl.close();
+        break;
+
+      case '0':
+        console.log('');
+        console.log('已退出。');
+        rl.close();
+        break;
+
+      default:
+        console.log('');
+        console.log('[' + C.r + '错误' + C.nc + '] 无效选项，请重试。');
+        await showMenu();
+        break;
+    }
+  }
+
+  showMenu();
+}
+
 // ============================================================================
 // 主入口
 // ============================================================================
@@ -446,6 +546,12 @@ function run() {
     process.exit(0);
   }
 
+  // CLI 模式
+  if (process.argv.includes('--cli')) {
+    runCliMode();
+    return;
+  }
+
   // 隐藏的高级玩家后门
   if (process.argv.includes('--force-phase1')) {
     setState('needs-features');