@aiyiran/myclaw 1.0.62 → 1.0.64

package/find-config.js

@@ -0,0 +1,121 @@
+/**
+ * find-config.js — OpenClaw 配置文件定位 & 读写工具
+ * 
+ * 通用能力：跨平台自动查找 ~/.openclaw/openclaw.json
+ * 所有需要读写 openclaw.json 的模块都应该调用这个工具
+ * 
+ * 使用:
+ *   const { findConfig, readConfig, writeConfig, patchConfig } = require('./find-config');
+ *   
+ *   const configPath = findConfig();                    // 返回路径或 null
+ *   const config = readConfig();                        // 读取 JSON 对象
+ *   writeConfig(config);                                // 写回整个 JSON
+ *   patchConfig({ session: { reset: { mode: 'idle' } } }); // 深度合并局部字段
+ */
+
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+const CONFIG_FILENAME = 'openclaw.json';
+
+/**
+ * 查找 openclaw.json 的路径
+ * 按优先级尝试：
+ *   1. ~/.openclaw/openclaw.json（标准路径）
+ *   2. 环境变量 OPENCLAW_HOME 指定的目录
+ * 
+ * @returns {string|null} 配置文件路径，未找到返回 null
+ */
+function findConfig() {
+  const candidates = [];
+
+  // 1. 环境变量优先
+  if (process.env.OPENCLAW_HOME) {
+    candidates.push(path.join(process.env.OPENCLAW_HOME, CONFIG_FILENAME));
+  }
+
+  // 2. 标准路径 ~/.openclaw/
+  candidates.push(path.join(os.homedir(), '.openclaw', CONFIG_FILENAME));
+
+  // 3. Windows WSL 下 /root/.openclaw/
+  if (os.platform() === 'linux') {
+    candidates.push(path.join('/root', '.openclaw', CONFIG_FILENAME));
+  }
+
+  for (const p of candidates) {
+    try {
+      if (fs.existsSync(p)) {
+        return p;
+      }
+    } catch {}
+  }
+
+  return null;
+}
+
+/**
+ * 读取 openclaw.json 并解析为 JSON 对象
+ * @returns {{ config: object, configPath: string }}
+ * @throws {Error} 未找到或解析失败
+ */
+function readConfig() {
+  const configPath = findConfig();
+  if (!configPath) {
+    throw new Error('未找到 openclaw.json，请确认 OpenClaw 已安装');
+  }
+
+  const raw = fs.readFileSync(configPath, 'utf8');
+  const config = JSON.parse(raw);
+  return { config, configPath };
+}
+
+/**
+ * 写入完整的 config 对象到 openclaw.json
+ * @param {object} config - 完整的配置对象
+ * @param {string} [configPath] - 可选路径，不传则自动查找
+ */
+function writeConfig(config, configPath) {
+  if (!configPath) {
+    configPath = findConfig();
+    if (!configPath) {
+      throw new Error('未找到 openclaw.json，无法写入');
+    }
+  }
+
+  fs.writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n', 'utf8');
+}
+
+/**
+ * 深度合并 patch 到现有配置（只改指定字段，不影响其他）
+ * @param {object} patch - 要合并的局部配置
+ * @returns {{ config: object, configPath: string }} 合并后的结果
+ */
+function patchConfig(patch) {
+  const { config, configPath } = readConfig();
+  deepMerge(config, patch);
+  writeConfig(config, configPath);
+  return { config, configPath };
+}
+
+/**
+ * 深度合并 source 到 target（就地修改）
+ */
+function deepMerge(target, source) {
+  for (const key of Object.keys(source)) {
+    if (
+      source[key] !== null &&
+      typeof source[key] === 'object' &&
+      !Array.isArray(source[key]) &&
+      target[key] !== null &&
+      typeof target[key] === 'object' &&
+      !Array.isArray(target[key])
+    ) {
+      deepMerge(target[key], source[key]);
+    } else {
+      target[key] = source[key];
+    }
+  }
+}
+
+module.exports = { findConfig, readConfig, writeConfig, patchConfig, deepMerge };

package/index.js

@@ -355,31 +355,14 @@ echo [3/4] Gateway...
 wsl -d OpenClaw -- pgrep -f "openclaw" >nul 2>&1
 if not errorlevel 1 goto :gateway_running
 
-REM Gateway not running -> update myclaw first, then start
+REM Gateway not running -> update both sides, then launch
 echo       Starting...
 echo.
-echo  [update] checking...
-call npm install -g @aiyiran/myclaw@latest --prefer-online >nul 2>&1
-echo  [update] OK
+echo  [update] Windows...
+call myclaw up
 echo.
-
-REM ---- Step 4: Patch + Open browser ----
-echo [4/5] Patch...
-wsl -d OpenClaw -- myclaw patch
-echo       [OK]
-
-echo [5/5] Browser...
-call myclaw open
-echo       [OK]
-echo.
-echo  ============================================
-echo   Gateway starting...
-echo   Close this window = stop service
-echo  ============================================
-echo.
-wsl -d OpenClaw -- openclaw gateway
+wsl -d OpenClaw -- myclaw launch
 echo.
-echo  Gateway exited.
 pause
 exit /b
 
@@ -582,10 +565,11 @@ function runOpen() {
 function runPatch() {
   const { patch, status: patchStatus } = require('./patch');
   const { patchSkills } = require('./patch-skill');
+  const { patchConfig } = require('./find-config');
   const bar = '----------------------------------------';
 
   console.log('');
-  console.log('[' + colors.blue + 'MyClaw' + colors.nc + '] ' + colors.blue + 'Patch (UI + Skills)' + colors.nc);
+  console.log('[' + colors.blue + 'MyClaw' + colors.nc + '] ' + colors.blue + 'Patch (UI + Skills + Config)' + colors.nc);
   console.log(bar);
   console.log('');
 
@@ -596,6 +580,22 @@ function runPatch() {
   console.log('');
   const skillResult = patchSkills();
 
+  // 3. Config 补丁（修改 openclaw.json 的特定字段）
+  console.log('');
+  try {
+    const { config, configPath } = patchConfig({
+      session: {
+        reset: {
+          mode: "idle",
+          idleMinutes: 90720
+        }
+      }
+    });
+    console.log('[myclaw-config] ✅ session.reset → idle (90720 分钟)');
+  } catch (err) {
+    console.log('[myclaw-config] ⚠️ 配置补丁失败: ' + err.message);
+  }
+
   if (uiResult.success || skillResult.success) {
     console.log('');
     console.log(bar);

package/inject-minimax.js

@@ -4,7 +4,6 @@
  * inject-minimax.js
  * 
  * 将 openclaw.json 中的模型配置清空，注入为唯一的 MiniMax 模型。
- * 自动查找 ~/.openclaw/openclaw.json
  * 
  * 流程:
  *   1. 先执行 openclaw onboard（设置 API Key，会覆盖 JSON）
@@ -13,9 +12,7 @@
  * 入口: myclaw minimax [--key sk-xxx]
  */
 
-const fs = require('fs');
-const path = require('path');
-const os = require('os');
+const { readConfig, writeConfig } = require('./find-config');
 
 function run(cliArgs) {
   // 解析 --key 参数
@@ -27,18 +24,16 @@ function run(cliArgs) {
     }
   }
 
-  // 自动查找 openclaw.json
-  const openclawDir = path.join(os.homedir(), '.openclaw');
-  const targetPath = path.join(openclawDir, 'openclaw.json');
-
-  if (!fs.existsSync(targetPath)) {
-    console.error('❌ 未找到 openclaw.json');
-    console.error('   期望路径: ' + targetPath);
-    console.error('   请先安装 OpenClaw: myclaw install');
+  // 查找配置
+  let configPath;
+  try {
+    ({ configPath } = readConfig());
+  } catch (err) {
+    console.error('❌ ' + err.message);
     process.exit(1);
   }
 
-  console.log('📍 找到配置: ' + targetPath);
+  console.log('📍 找到配置: ' + configPath);
 
   // ============================================================
   // 第一步：先执行 onboard（它会覆盖 JSON，所以必须先跑）
@@ -75,8 +70,8 @@ function run(cliArgs) {
   console.log('');
   console.log('📝 [Step 2] 注入 MiniMax 模型配置...');
 
-  // 重新读取文件（onboard 可能已经改过了）
-  const config = JSON.parse(fs.readFileSync(targetPath, 'utf8'));
+  // 重新读取（onboard 可能已改过）
+  const { config } = readConfig();
 
   config.auth = {
     profiles: {
@@ -129,12 +124,12 @@ function run(cliArgs) {
     "minimax/MiniMax-M2.7-highspeed": {}
   };
 
-  fs.writeFileSync(targetPath, JSON.stringify(config, null, 2) + '\n', 'utf8');
+  writeConfig(config, configPath);
 
   // 验证写入
-  const verify = JSON.parse(fs.readFileSync(targetPath, 'utf8'));
-  const writtenModelId = verify.models?.providers?.minimax?.models?.[0]?.id || '???';
-  const writtenDefault = verify.agents?.defaults?.model?.primary || '???';
+  const verify = readConfig();
+  const writtenModelId = verify.config.models?.providers?.minimax?.models?.[0]?.id || '???';
+  const writtenDefault = verify.config.agents?.defaults?.model?.primary || '???';
 
   console.log('✅ 配置已注入');
   console.log('  [验证] model ID:  ' + writtenModelId);

package/launch.js

@@ -0,0 +1,152 @@
+#!/usr/bin/env node
+
+/**
+ * ============================================================================
+ * MyClaw Launch - 统一启动流程
+ * ============================================================================
+ *
+ * 使用: myclaw launch
+ *
+ * 统一的启动链条，被 bat 脚本和 wsl2 安装器共同复用：
+ *   Step 1: 更新 MyClaw（Linux 侧）
+ *   Step 2: 执行 Patch（UI + Skills + Config）
+ *   Step 3: 后台启动 OpenClaw Gateway
+ *   Step 4: 打开浏览器控制台
+ * ============================================================================
+ */
+
+const { execSync, spawn } = require('child_process');
+const os = require('os');
+const path = require('path');
+
+const isWindows = os.platform() === 'win32';
+const C = isWindows
+  ? { r: '', g: '', y: '', b: '', nc: '' }
+  : { r: '\x1b[31m', g: '\x1b[32m', y: '\x1b[33m', b: '\x1b[34m', nc: '\x1b[0m' };
+
+const BAR = '============================================';
+
+// ============================================================================
+// Step 1: 更新 MyClaw
+// ============================================================================
+
+function stepUpdate() {
+  console.log('[1/4] 更新 MyClaw...');
+
+  try {
+    const registry = 'https://registry.npmjs.org';
+    const pkg = '@aiyiran/myclaw';
+    const currentVersion = require('./package.json').version;
+
+    const latestVersion = execSync(
+      'npm view ' + pkg + ' version --registry ' + registry,
+      { encoding: 'utf8', timeout: 15000 }
+    ).trim();
+
+    if (currentVersion === latestVersion) {
+      console.log('      ' + C.g + '[OK]' + C.nc + ' 已是最新 v' + currentVersion);
+    } else {
+      console.log('      v' + currentVersion + ' → v' + latestVersion);
+      const tarball = execSync(
+        'npm view ' + pkg + ' dist.tarball --registry ' + registry,
+        { encoding: 'utf8', timeout: 15000 }
+      ).trim();
+      execSync('npm install -g ' + tarball, { stdio: 'pipe', timeout: 60000 });
+      console.log('      ' + C.g + '[OK]' + C.nc + ' 已升级到 v' + latestVersion);
+    }
+  } catch (err) {
+    console.log('      ' + C.y + '[跳过]' + C.nc + ' 更新失败 (非致命)');
+  }
+  console.log('');
+}
+
+// ============================================================================
+// Step 2: 执行 Patch
+// ============================================================================
+
+function stepPatch() {
+  console.log('[2/4] Patch...');
+
+  try {
+    const { patch } = require('./patch');
+    const { patchSkills } = require('./patch-skill');
+    const { patchConfig } = require('./find-config');
+
+    patch();
+    patchSkills();
+    patchConfig({
+      session: {
+        reset: {
+          mode: 'idle',
+          idleMinutes: 90720,
+        },
+      },
+    });
+
+    console.log('      ' + C.g + '[OK]' + C.nc);
+  } catch (err) {
+    console.log('      ' + C.y + '[跳过]' + C.nc + ' ' + err.message);
+  }
+  console.log('');
+}
+
+// ============================================================================
+// Step 3 & 4: 启动 Gateway + 打开浏览器
+// ============================================================================
+
+function stepGatewayAndOpen() {
+  console.log('[3/4] 启动 Gateway...');
+  console.log('');
+  console.log(BAR);
+  console.log('  Gateway starting...');
+  console.log('  关闭此窗口 = 停止服务');
+  console.log(BAR);
+  console.log('');
+
+  // 后台启动 gateway
+  const gateway = spawn('openclaw', ['gateway'], {
+    stdio: 'inherit',
+    detached: false,
+  });
+
+  // 打开浏览器（不阻塞）
+  console.log('[4/4] 打开浏览器...');
+  try {
+    execSync('node "' + path.join(__dirname, 'index.js') + '" open', {
+      stdio: 'pipe',
+      timeout: 10000,
+    });
+    console.log('      ' + C.g + '[OK]' + C.nc);
+  } catch {
+    console.log('      ' + C.y + '[跳过]' + C.nc);
+  }
+  console.log('');
+
+  // 等待 gateway 进程退出（关闭终端会终止）
+  return new Promise((resolve) => {
+    gateway.on('close', (code) => {
+      console.log('');
+      console.log('  Gateway 已退出。');
+      resolve(code);
+    });
+  });
+}
+
+// ============================================================================
+// 主入口
+// ============================================================================
+
+async function run() {
+  const bar = '----------------------------------------';
+
+  console.log('');
+  console.log('[' + C.b + 'MyClaw' + C.nc + '] ' + C.b + '启动流程' + C.nc);
+  console.log(bar);
+  console.log('');
+
+  stepUpdate();
+  stepPatch();
+  await stepGatewayAndOpen();
+}
+
+module.exports = { run };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiyiran/myclaw",
-  "version": "1.0.62",
+  "version": "1.0.64",
   "description": "",
   "main": "index.js",
   "bin": {

package/patch-reset.js

@@ -0,0 +1,59 @@
+/**
+ * patch-reset.js — 修改 openclaw.json 的 session.reset 字段
+ * 
+ * 使用 patchConfig 精准修改，不影响其他配置。
+ * 
+ * 入口: myclaw reset-idle [--minutes N]
+ */
+
+const { patchConfig, readConfig } = require('./find-config');
+
+/**
+ * 将 session.reset 设为 idle 模式，默认 90720 分钟（≈63 天）
+ * @param {number} [idleMinutes=90720] - idle 超时分钟数
+ */
+function run(cliArgs) {
+  // 解析 --minutes 参数
+  let idleMinutes = 90720;
+  if (cliArgs) {
+    for (let i = 0; i < cliArgs.length; i++) {
+      if (cliArgs[i] === '--minutes' && cliArgs[i + 1]) {
+        idleMinutes = parseInt(cliArgs[i + 1], 10);
+        if (isNaN(idleMinutes) || idleMinutes <= 0) {
+          console.error('❌ --minutes 必须是正整数');
+          process.exit(1);
+        }
+        i++;
+      }
+    }
+  }
+
+  console.log('📝 修改 session.reset...');
+  console.log('  mode:        idle');
+  console.log('  idleMinutes: ' + idleMinutes + ' (' + Math.round(idleMinutes / 1440) + ' 天)');
+  console.log('');
+
+  try {
+    const { config, configPath } = patchConfig({
+      session: {
+        reset: {
+          mode: "idle",
+          idleMinutes: idleMinutes
+        }
+      }
+    });
+
+    // 验证
+    const reset = config.session?.reset;
+    console.log('✅ 已修改: ' + configPath);
+    console.log('  [验证] session.reset.mode:        ' + (reset?.mode || '???'));
+    console.log('  [验证] session.reset.idleMinutes:  ' + (reset?.idleMinutes || '???'));
+  } catch (err) {
+    console.error('❌ ' + err.message);
+    process.exit(1);
+  }
+
+  console.log('');
+}
+
+module.exports = { run };

package/wsl2.js

@@ -13,7 +13,7 @@
  *
  * 自动检测安装状态，分两阶段完成：
  *   Phase 1: 启用底层 Windows 功能 + 安装 WSL → 需要重启
- *   Phase 2: 导入预制 Linux 环境 → 完成
+ *   Phase 2: 导入预制 Linux 环境 → 自动启动 Gateway
  * ============================================================================
  */
 
@@ -200,7 +200,7 @@ Write-Host '  MyClaw WSL2 安装 - 阶段 1/2'
 Write-Host '========================================'
 Write-Host ''
 
-$dir = "$env:LOCALAPPDATA\\myclaw"
+$dir = "$env:LOCALAPPDATA\\\\myclaw"
 New-Item -ItemType Directory -Force -Path $dir | Out-Null
 
 Write-Host '[1/4] 启用 Windows Subsystem for Linux...'
@@ -222,7 +222,7 @@ try {
 Write-Host ''
 
 Write-Host '[3/4] 获取 WSL 安装包...'
-$msi = "$dir\\wsl_full.msi"
+$msi = "$dir\\\\wsl_full.msi"
 $wslInstalled = $false
 try {
     $ver = wsl --version 2>&1 | Out-String
@@ -238,7 +238,7 @@ ${askMsi}
     Write-Host ''
     Write-Host '[4/4] 安装 WSL...'
     try {
-        Start-Process msiexec.exe -ArgumentList "/i \`"$msi\`" /quiet /norestart" -Wait -NoNewWindow
+        Start-Process msiexec.exe -ArgumentList "/i \\\`"$msi\\\`" /quiet /norestart" -Wait -NoNewWindow
         Write-Host '      [OK]'
     } catch {
         Write-Host '      [失败] 安装出错'
@@ -308,7 +308,7 @@ Write-Host '  导入预制 Linux 环境'
 Write-Host '========================================'
 Write-Host ''
 
-$dir = "$env:LOCALAPPDATA\\myclaw"
+$dir = "$env:LOCALAPPDATA\\\\myclaw"
 New-Item -ItemType Directory -Force -Path $dir | Out-Null
 
 Write-Host '[1/3] 设置 WSL2 为默认版本...'
@@ -317,9 +317,9 @@ Write-Host '      [OK]'
 Write-Host ''
 
 Write-Host '[2/3] 获取预制 Linux 环境...'
-$tarPath = "$dir\\openclaw-rootfs.tar"
+$tarPath = "$dir\\\\openclaw-rootfs.tar"
 $distroName = 'OpenClaw'
-$installDir = "$dir\\OpenClaw"
+$installDir = "$dir\\\\OpenClaw"
 $installed = $false
 
 ${askTar}
@@ -357,12 +357,15 @@ Write-Host ''
 Write-Host '========================================'
 if ($installed) {
     Write-Host '  [OK] WSL2 + OpenClaw Linux 安装完成!'
+    Write-Host '========================================'
     Write-Host ''
-    Write-Host '  输入 wsl 即可进入 Linux 环境'
+
+    # 统一启动流程：update + patch + gateway + open
+    wsl -d $distroName -- myclaw launch
 } else {
     Write-Host '  [失败] 请检查后重试: myclaw wsl2'
+    Write-Host '========================================'
 }
-Write-Host '========================================'
 
 } catch {
     Write-Host ''
@@ -380,7 +383,7 @@ Write-Host '========================================'
   if (launchElevatedPS(ps)) {
     console.log('[' + C.g + '已启动' + C.nc + '] 请查看新弹出的蓝色窗口');
     console.log('');
-    console.log('安装完成后，输入 ' + C.y + 'wsl' + C.nc + ' 即可进入 Linux');
+    console.log('安装完成后会自动启动 Gateway 并打开浏览器');
     console.log('');
   }
 }