@aiyiran/myclaw 1.0.139 → 1.0.141

package/gateway.js

@@ -0,0 +1,170 @@
+#!/usr/bin/env node
+
+/**
+ * gateway.js
+ * 
+ * Gateway 生命周期管理（跨平台: Mac/Linux/Windows/容器）
+ * 
+ * 提供:
+ *   stop()    — 先礼后兵，确保彻底关闭
+ *   start()   — 后台启动 + 健康检查
+ *   restart() — stop + start
+ */
+
+const { execSync } = require('child_process');
+
+const PORT = 18789;
+const isWin = process.platform === 'win32';
+
+// ANSI 颜色
+const colors = {
+  green: '\x1b[32m',
+  yellow: '\x1b[33m',
+  red: '\x1b[31m',
+  nc: '\x1b[0m',
+};
+
+/**
+ * 彻底停止 Gateway（先礼后兵）
+ */
+function stop() {
+  // Step 1: 优雅关闭
+  console.log('[停止] Step 1 — 优雅关闭...');
+  try {
+    execSync('openclaw gateway stop', { stdio: 'pipe', timeout: 10000 });
+    console.log('[停止] ' + colors.green + 'Gateway 已发送停止信号' + colors.nc);
+  } catch {
+    console.log('[停止] Gateway 未在运行或已停止');
+  }
+
+  // 等 2 秒让优雅关闭执行
+  execSync(isWin ? 'timeout /t 2 /nobreak >nul' : 'sleep 2', { stdio: 'ignore' });
+
+  // Step 2: 检查残留进程并强杀
+  console.log('[停止] Step 2 — 清理残留进程...');
+
+  // 2a. 杀端口占用者
+  try {
+    if (isWin) {
+      const netstat = execSync('netstat -ano | findstr :' + PORT + ' | findstr LISTENING', {
+        encoding: 'utf8', stdio: 'pipe', timeout: 5000
+      }).trim();
+      const pids = [...new Set(netstat.split('\n').map(l => l.trim().split(/\s+/).pop()).filter(p => p && p !== '0'))];
+      for (const pid of pids) {
+        try {
+          execSync('taskkill /F /PID ' + pid, { stdio: 'pipe', timeout: 5000 });
+          console.log('[停止] 🔪 强杀端口占用进程 PID=' + pid);
+        } catch {}
+      }
+    } else {
+      const pids = execSync('lsof -i :' + PORT + ' -t 2>/dev/null', {
+        encoding: 'utf8', stdio: 'pipe', timeout: 5000
+      }).trim();
+      if (pids) {
+        for (const pid of pids.split('\n').filter(Boolean)) {
+          try {
+            execSync('kill -9 ' + pid, { stdio: 'pipe', timeout: 3000 });
+            console.log('[停止] 🔪 强杀端口占用进程 PID=' + pid);
+          } catch {}
+        }
+      }
+    }
+  } catch {
+    // 没有端口占用，正常
+  }
+
+  // 2b. 杀所有 openclaw 相关进程（防止僵尸进程）
+  try {
+    if (!isWin) {
+      const myPid = process.pid;
+      const procs = execSync('pgrep -f "openclaw" 2>/dev/null || true', {
+        encoding: 'utf8', stdio: 'pipe', timeout: 5000
+      }).trim();
+      if (procs) {
+        for (const pid of procs.split('\n').filter(Boolean)) {
+          if (pid === String(myPid)) continue;
+          try {
+            execSync('kill -9 ' + pid, { stdio: 'pipe', timeout: 3000 });
+            console.log('[停止] 🔪 清理残留 openclaw 进程 PID=' + pid);
+          } catch {}
+        }
+      }
+    }
+  } catch {}
+
+  console.log('[停止] ' + colors.green + '清理完成' + colors.nc);
+
+  // Step 3: 轮询等待端口释放
+  const MAX_WAIT = 10;
+  let portFree = false;
+
+  for (let i = 0; i < MAX_WAIT; i++) {
+    try {
+      if (isWin) {
+        execSync('netstat -ano | findstr :' + PORT + ' | findstr LISTENING', {
+          stdio: 'pipe', timeout: 2000
+        });
+      } else {
+        execSync('lsof -i :' + PORT + ' -t 2>/dev/null', { stdio: 'pipe', timeout: 2000 });
+      }
+      process.stdout.write('[等待] 端口 ' + PORT + ' 释放中... (' + (i + 1) + '/' + MAX_WAIT + 's)\r');
+      execSync(isWin ? 'timeout /t 1 /nobreak >nul' : 'sleep 1', { stdio: 'ignore' });
+    } catch {
+      portFree = true;
+      break;
+    }
+  }
+
+  if (portFree) {
+    console.log('[等待] ' + colors.green + '端口已释放' + colors.nc + '                    ');
+  } else {
+    console.log('[等待] ' + colors.yellow + '端口释放超时' + colors.nc);
+  }
+
+  return portFree;
+}
+
+/**
+ * 启动 Gateway（后台 + 健康检查）
+ */
+function start() {
+  console.log('[启动] 正在启动 Gateway...');
+
+  if (isWin) {
+    execSync('start /B openclaw gateway > %TEMP%\\openclaw-gateway.log 2>&1', {
+      stdio: 'ignore', shell: true,
+    });
+  } else {
+    execSync('nohup openclaw gateway > /tmp/openclaw-gateway.log 2>&1 &', {
+      stdio: 'ignore', shell: true,
+    });
+  }
+
+  // 等待启动完成
+  execSync(isWin ? 'timeout /t 3 /nobreak >nul' : 'sleep 3', { stdio: 'ignore' });
+
+  // 健康检查
+  try {
+    execSync('openclaw health', { stdio: 'pipe', timeout: 5000 });
+    console.log('[启动] ' + colors.green + 'Gateway 启动成功!' + colors.nc);
+    console.log('');
+    console.log('控制台: ' + colors.yellow + 'http://127.0.0.1:' + PORT + colors.nc);
+    return true;
+  } catch {
+    console.log('[启动] ' + colors.yellow + 'Gateway 正在启动中...' + colors.nc);
+    const logPath = isWin ? '%TEMP%\\openclaw-gateway.log' : '/tmp/openclaw-gateway.log';
+    console.log('日志: ' + colors.yellow + 'tail -f ' + logPath + colors.nc);
+    return false;
+  }
+}
+
+/**
+ * 重启 Gateway（stop + start）
+ */
+function restart() {
+  stop();
+  console.log('');
+  return start();
+}
+
+module.exports = { stop, start, restart, PORT };

package/index.js

@@ -776,6 +776,7 @@ function runUnpatch() {
 }
 
 function runRestart() {
+  const gateway = require('./gateway');
   const bar = '----------------------------------------';
 
   console.log('');
@@ -784,35 +785,7 @@ function runRestart() {
   console.log('');
 
   try {
-    console.log('[停止] 正在停止 Gateway...');
-    try {
-      execSync('openclaw gateway stop', { stdio: 'pipe', timeout: 10000 });
-      console.log('[停止] ' + colors.green + 'Gateway 已停止' + colors.nc);
-    } catch {
-      console.log('[停止] Gateway 未在运行或已停止');
-    }
-
-    console.log('');
-    console.log('[启动] 正在启动 Gateway...');
-    // 使用 nohup + 后台启动，避免阻塞当前进程
-    execSync('nohup openclaw gateway > /tmp/openclaw-gateway.log 2>&1 &', {
-      stdio: 'ignore',
-      shell: true,
-    });
-
-    // 等待 2 秒让 Gateway 启动
-    execSync('sleep 2', { stdio: 'ignore' });
-
-    // 检查是否启动成功
-    try {
-      execSync('openclaw health', { stdio: 'pipe', timeout: 5000 });
-      console.log('[启动] ' + colors.green + 'Gateway 启动成功!' + colors.nc);
-      console.log('');
-      console.log('控制台: ' + colors.yellow + 'http://127.0.0.1:18789' + colors.nc);
-    } catch {
-      console.log('[启动] ' + colors.yellow + 'Gateway 正在启动中...' + colors.nc);
-      console.log('日志: ' + colors.yellow + 'tail -f /tmp/openclaw-gateway.log' + colors.nc);
-    }
+    gateway.restart();
   } catch (err) {
     console.error('[' + colors.red + '错误' + colors.nc + '] 重启失败: ' + err.message);
   }
@@ -1060,6 +1033,10 @@ if (!command || command === 'help' || command === '--help' || command === '-h')
   runUpdate();
 } else if (command === 'up') {
   runUpdate();
+  // 更新后自动 patch，恢复 UI 注入和自定义配置
+  console.log('');
+  console.log('🔧 自动执行 patch 以恢复自定义配置...');
+  runPatch();
   if (detectPlatform() === 'windows') {
     runBat();
   }

package/package.json

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

package/patch-manifest.json

@@ -1,32 +1,35 @@
 {
-  "_doc": "MyClaw 注入清单 (auto-generated)。strategy: auto | on | off | delete",
-  "_generated": "2026-04-07T16:26:14.875Z",
-  "agents": [
+  "_doc": "MyClaw 注入清单 (手动维护)。strategy: auto | on | off | delete",
+  "_doc_order": "执行顺序: 1.UI注入(patch.js) → 2.skills → 3.agents → 4.config → 5.run",
+  "_doc_skills": "Step 2: 将 myclaw/skills/ 下的技能包复制到 ~/.openclaw/workspace/skills/",
+  "skills": [
     {
-      "id": "danci",
-      "workspace": "workspace-danci",
+      "name": "minimax-inject",
       "strategy": "off",
-      "description": "danci"
+      "description": "minimax-inject (agent 可调用的注入技能)"
     },
     {
-      "id": "kakaxi",
-      "workspace": "workspace-kakaxi",
+      "name": "tavily-search",
       "strategy": "off",
-      "description": "kakaxi"
+      "description": "tavily-search (Tavily 搜索技能包)"
     }
   ],
-  "skills": [
+  "_doc_agents": "Step 3: 将 agent-list/ 下的智能体分发到 ~/.openclaw/ 并注册到 openclaw.json",
+  "agents": [
     {
-      "name": "minimax-inject",
+      "id": "danci",
+      "workspace": "workspace-danci",
       "strategy": "off",
-      "description": "minimax-inject (agent 可调用的注入技能)"
+      "description": "danci"
     },
     {
-      "name": "tavily-search",
+      "id": "kakaxi",
+      "workspace": "workspace-kakaxi",
       "strategy": "off",
-      "description": "tavily-search (Tavily 搜索技能包)"
+      "description": "kakaxi"
     }
   ],
+  "_doc_config": "Step 4: 使用 dot-notation 补丁修改 openclaw.json 的系统配置，深度合并",
   "config": {
     "strategy": "on",
     "patches": {
@@ -35,10 +38,11 @@
       "tools.exec.ask": "off",
       "tools.exec.security": "full",
       "plugins.entries.tavily.enabled": true,
-      "plugins.entries.tavily.config.webSearch.apiKey": "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,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",
+      "plugins.entries.tavily.config.webSearch.apiKey": "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",
       "update.checkOnStart": false
     }
   },
+  "_doc_run": "Step 5: 按顺序 require(module).run([]) 执行自定义脚本，不触发 Gateway 重启",
   "run": [
     {
       "module": "./inject-image",
@@ -46,4 +50,4 @@
       "description": "图片模型注入 (vveai)"
     }
   ]
-}
+}

package/publish.sh

@@ -3,9 +3,7 @@ set -e # 遇到错误即停止
 
 echo "📦 准备发布新版本..."
 
-# 0. 自动构建 patch-manifest.json（从 agent-list/ 目录扫描）
-echo "📋 构建注入清单..."
-node build-manifest.js
+# patch-manifest.json 由手动维护，不再自动构建
 
 # 1. 添加所有变动
 git add .

package/build-manifest.js

@@ -1,141 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * ============================================================================
- * build-manifest.js - 自动构建 patch-manifest.json
- * ============================================================================
- * 
- * 扫描 agent-list/ 和 skills/ 目录，自动生成统一注入清单。
- * 已有的 strategy 设置会保留（不会被覆盖）。
- * 
- * 在 publish.sh 中自动调用，无需手动维护 manifest。
- * ============================================================================
- */
-
-const fs = require('fs');
-const path = require('path');
-
-const MANIFEST_PATH = path.join(__dirname, 'patch-manifest.json');
-const AGENT_LIST_DIR = path.join(__dirname, 'agent-list');
-const SKILLS_DIR = path.join(__dirname, 'skills');
-
-// 默认 config patches（硬编码，不从目录扫描）
-const DEFAULT_CONFIG = {
-  strategy: 'on',
-  patches: {
-    'session.reset.mode': 'idle',
-    'session.reset.idleMinutes': 90720,
-    'tools.exec.ask': 'off',
-    'tools.exec.security': 'full',
-    // 'gateway.auth.token': 'aiyiran',// 为了志新docker关闭掉
-    'plugins.entries.tavily.enabled': true,
-    'plugins.entries.tavily.config.webSearch.apiKey': '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,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',
-  },
-};
-
-function buildManifest() {
-  // 读取已有 manifest（保留手动设置的 strategy）
-  let existing = { agents: [], skills: [], config: DEFAULT_CONFIG };
-  if (fs.existsSync(MANIFEST_PATH)) {
-    try {
-      existing = JSON.parse(fs.readFileSync(MANIFEST_PATH, 'utf8'));
-    } catch { }
-  }
-
-  // 建立已有策略映射（保留手动覆盖）
-  const saved = {};
-  for (const list of [existing.agents || [], existing.skills || []]) {
-    for (const item of list) {
-      const key = item.id || item.name;
-      if (key && item.strategy) saved[key] = item.strategy;
-      if (key && item.description) saved[key + '_desc'] = item.description;
-    }
-  }
-
-  // === 1. 扫描 agent-list/ ===
-  const agents = [];
-  if (fs.existsSync(AGENT_LIST_DIR)) {
-    const dirs = fs.readdirSync(AGENT_LIST_DIR, { withFileTypes: true })
-      .filter(d => d.isDirectory() && d.name.startsWith('workspace-'))
-      .sort((a, b) => a.name.localeCompare(b.name));
-
-    for (const d of dirs) {
-      const agentId = d.name.replace(/^workspace-/, '');
-      agents.push({
-        id: agentId,
-        workspace: d.name,
-        strategy: saved[agentId] || 'auto',
-        description: saved[agentId + '_desc'] || agentId,
-      });
-    }
-  }
-
-  // === 2. 扫描 skills/ ===
-  const skills = [];
-  if (fs.existsSync(SKILLS_DIR)) {
-    const dirs = fs.readdirSync(SKILLS_DIR, { withFileTypes: true })
-      .filter(d => d.isDirectory())
-      .sort((a, b) => a.name.localeCompare(b.name));
-
-    for (const d of dirs) {
-      // 必须有 SKILL.md 才是合法 skill
-      const skillMd = path.join(SKILLS_DIR, d.name, 'SKILL.md');
-      if (!fs.existsSync(skillMd)) continue;
-
-      skills.push({
-        name: d.name,
-        strategy: saved[d.name] || 'auto',
-        description: saved[d.name + '_desc'] || d.name,
-      });
-    }
-  }
-
-  // === 3. 合并 config（以 DEFAULT_CONFIG 为基础，保留旧 manifest 中手动添加的） ===
-  const config = {
-    ...DEFAULT_CONFIG,
-    patches: {
-      ...DEFAULT_CONFIG.patches,
-      ...(existing.config?.patches || {}),
-    },
-  };
-  // 确保 DEFAULT_CONFIG 中的新字段一定存在（防止旧 manifest 覆盖丢失）
-  for (const [k, v] of Object.entries(DEFAULT_CONFIG.patches)) {
-    config.patches[k] = v;
-  }
-
-  // === 4. 合并 run 命令列表（保留已有的，或使用默认的） ===
-  const DEFAULT_RUN = [
-    {
-      "module": "./inject-image",
-      "strategy": "auto",
-      "description": "图片模型注入 (vveai)"
-    }
-  ];
-  const runItems = (existing.run && Array.isArray(existing.run) && existing.run.length > 0) 
-    ? existing.run 
-    : DEFAULT_RUN;
-
-  const manifest = {
-    _doc: 'MyClaw 注入清单 (auto-generated)。strategy: auto | on | off | delete',
-    _generated: new Date().toISOString(),
-    agents,
-    skills,
-    config,
-    run: runItems,
-  };
-
-  fs.writeFileSync(MANIFEST_PATH, JSON.stringify(manifest, null, 2) + '\n', 'utf8');
-
-  console.log('📋 patch-manifest.json 已生成');
-  console.log('   智能体: ' + agents.length + ' 个');
-  for (const a of agents) {
-    console.log('     • ' + a.id + ' [' + a.strategy + ']');
-  }
-  console.log('   技能:   ' + skills.length + ' 个');
-  for (const s of skills) {
-    console.log('     • ' + s.name + ' [' + s.strategy + ']');
-  }
-  console.log('   配置:   ' + Object.keys(config.patches || {}).length + ' 项 [' + (config.strategy || 'on') + ']');
-}
-
-buildManifest();