@aiyiran/myclaw 1.0.200 → 1.0.202

package/index.js

@@ -682,8 +682,8 @@ function runOpen() {
 // ============================================================================
 
 function runPatch() {
-  const { patch, status: patchStatus } = require('./patch');
-  const { patchSkills } = require('./patch-skill');
+  const { patch, status: patchStatus } = require('./patches/patch');
+  const { patchSkills } = require('./patches/patch-skill');
   const { patchConfig } = require('./find-config');
   const bar = '----------------------------------------';
 
@@ -701,13 +701,13 @@ function runPatch() {
 
   // 3. 智能体上传（从 agent-list/ 复制到 ~/.openclaw/）
   console.log('');
-  const { patchAgents } = require('./patch-agent');
+  const { patchAgents } = require('./patches/patch-agent');
   const agentResult = patchAgents();
 
   // 4. Config 补丁（从 manifest 读取，修改 openclaw.json）
   console.log('');
   try {
-    const { loadManifest } = require('./patch-agent');
+    const { loadManifest } = require('./patches/patch-agent');
     const manifest = loadManifest();
     if (manifest && manifest.config && manifest.config.patches) {
       const configStrategy = manifest.config.strategy || 'on';
@@ -757,7 +757,7 @@ function runPatch() {
   // 通过修改 manifest 即可控制额外脚本（如 inject-image, inject-search）是否跟随 patch 自动执行，
   // 从而避免硬编码具体要注入哪些模块。
   try {
-    const { loadManifest } = require('./patch-agent');
+    const { loadManifest } = require('./patches/patch-agent');
     const m = loadManifest();
     if (m && Array.isArray(m.run) && m.run.length > 0) {
       console.log('');
@@ -791,7 +791,7 @@ function runPatch() {
 }
 
 function runUnpatch() {
-  const { unpatch } = require('./patch');
+  const { unpatch } = require('./patches/patch');
   const bar = '----------------------------------------';
 
   console.log('');
@@ -959,7 +959,7 @@ function runUpdate() {
 // ============================================================================
 
 function runList() {
-  const { loadManifest } = require('./patch-agent');
+  const { loadManifest } = require('./patches/patch-agent');
   const bar = '----------------------------------------';
 
   console.log('');
@@ -1166,6 +1166,84 @@ function runInteractiveMenu() {
 // 帮助信息
 // ============================================================================
 
+// ============================================================================
+// inject 交互菜单
+// ============================================================================
+
+const INJECT_MENU = [
+  { key: '1', cmd: 'inject-minimax',          desc: '注入 MiniMax 模型配置' },
+  { key: '2', cmd: 'inject-zai',              desc: '注入智谱 GLM 模型配置' },
+  { key: '3', cmd: 'inject-image',            desc: '注入图像生成模型配置 (vveai)' },
+  { key: '4', cmd: 'inject-search',           desc: '注入 Tavily 搜索插件配置' },
+  { key: '5', cmd: 'inject-token',            desc: '设置 Gateway Token 为 aiyiran' },
+  { key: '6', cmd: 'inject-workspaceAndSoul', desc: '替换默认 workspace 的 SOUL.md' },
+  { key: '7', cmd: 'inject-tooldeny',         desc: 'deny image_generate + music_generate 内置工具' },
+  { key: 'a', cmd: 'all',                     desc: '执行以上全部注入' },
+];
+
+function runInjectCommand(cmd, extraArgs) {
+  const modules = {
+    'inject-minimax':          './inject-minimax',
+    'inject-zai':              './inject-zai',
+    'inject-image':            './inject-image',
+    'inject-search':           './inject-search',
+    'inject-token':            './inject-token',
+    'inject-workspaceAndSoul': './inject-workspaceAndSoul',
+    'inject-tooldeny':         './inject-tooldeny',
+  };
+  const mod = require(modules[cmd]);
+  mod.run(extraArgs || []);
+  console.log('🔄 正在重启 Gateway 使配置生效...');
+  console.log('');
+}
+
+function showInjectMenu() {
+  console.log('');
+  console.log(colors.blue + '📦 注入脚本选择' + colors.nc);
+  console.log('----------------------------------------');
+  console.log('');
+  for (const item of INJECT_MENU) {
+    console.log('  ' + colors.cyan + item.key + colors.nc + ') ' + item.desc);
+  }
+  console.log('  ' + colors.cyan + '0' + colors.nc + ') 返回');
+  console.log('');
+
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  rl.question('请选择 [0-' + INJECT_MENU.length + '/a]: ', function (answer) {
+    rl.close();
+    const choice = answer.trim().toLowerCase();
+
+    if (choice === '0' || choice === '') {
+      return;
+    }
+
+    if (choice === 'a') {
+      for (const item of INJECT_MENU) {
+        if (item.cmd !== 'all') {
+          try {
+            console.log('');
+            console.log('→ ' + item.desc + '...');
+            runInjectCommand(item.cmd);
+          } catch (err) {
+            console.log('  ❌ 失败: ' + err.message);
+          }
+        }
+      }
+      runRestart();
+      return;
+    }
+
+    const found = INJECT_MENU.find(m => m.key === choice);
+    if (!found) {
+      console.log('[' + colors.red + '错误' + colors.nc + '] 无效选择: ' + choice);
+      return;
+    }
+
+    runInjectCommand(found.cmd, args.slice(1));
+    runRestart();
+  });
+}
+
 function showHelp() {
   console.log('');
   console.log('MyClaw - 学生友好的 OpenClaw 工具');
@@ -1197,12 +1275,14 @@ function showHelp() {
   console.log('  pull       从 ~/.openclaw 拉取最新资源到源目录（开发用）');
   console.log('  patch      注入 MyClaw UI + 技能 + 智能体 + 配置');
   console.log('  unpatch    回滚 UI 注入（恢复原版）');
-  console.log('  minimax    注入 MiniMax 模型配置 (可选: --key sk-xxx, -f 强制清理其他模型)');
-  console.log('  zai        注入智谱 GLM 模型配置 (可选: --key xxx, -f 强制清理其他模型)');
-  console.log('  image      注入图像生成模型配置 (基于 vveai)');
-  console.log('  token      设置 Gateway Token 为 aiyiran');
-  console.log('  websearch  注入 Tavily 搜索插件配置');
-  console.log('  soul       替换默认 workspace 的 SOUL.md 提示词');
+  console.log('  inject     交互选择要执行的注入脚本');
+  console.log('  inject-minimax          注入 MiniMax 模型配置 (可选: --key sk-xxx, -f 强制清理其他模型)');
+  console.log('  inject-zai              注入智谱 GLM 模型配置 (可选: --key xxx, -f 强制清理其他模型)');
+  console.log('  inject-image            注入图像生成模型配置 (基于 vveai)');
+  console.log('  inject-token            设置 Gateway Token 为 aiyiran');
+  console.log('  inject-search           注入 Tavily 搜索插件配置');
+  console.log('  inject-workspaceAndSoul 替换默认 workspace 的 SOUL.md 提示词');
+  console.log('  inject-tooldeny         deny image_generate + music_generate 内置工具');
   console.log('  restart    重启 OpenClaw Gateway');
   console.log('  help       显示帮助信息');
   console.log('');
@@ -1286,43 +1366,51 @@ if (!command) {
   runUninstall();
 } else if (command === 'restart') {
   runRestart();
-} else if (command === 'minimax') {
-  const minimax = require('./inject-minimax');
+} else if (command === 'inject') {
+  showInjectMenu();
+} else if (command === 'inject-minimax') {
+  const minimax = require('./injects/inject-minimax');
   minimax.run(args.slice(1));
   // 注入完成后自动重启 Gateway
   console.log('🔄 正在重启 Gateway 使配置生效...');
   console.log('');
   runRestart();
-} else if (command === 'zai') {
-  const zai = require('./inject-zai');
+} else if (command === 'inject-zai') {
+  const zai = require('./injects/inject-zai');
   zai.run(args.slice(1));
   console.log('🔄 正在重启 Gateway 使配置生效...');
   console.log('');
   runRestart();
-} else if (command === 'image') {
-  const image = require('./inject-image');
+} else if (command === 'inject-image') {
+  const image = require('./injects/inject-image');
   image.run(args.slice(1));
   console.log('🔄 正在重启 Gateway 使配置生效...');
   console.log('');
   runRestart();
-} else if (command === 'token') {
-  const token = require('./inject-token');
+} else if (command === 'inject-token') {
+  const token = require('./injects/inject-token');
   token.run(args.slice(1));
   console.log('🔄 正在重启 Gateway 使配置生效...');
   console.log('');
   runRestart();
-} else if (command === 'websearch') {
-  const search = require('./inject-search');
+} else if (command === 'inject-search') {
+  const search = require('./injects/inject-search');
   search.run(args.slice(1));
   console.log('🔄 正在重启 Gateway 使配置生效...');
   console.log('');
   runRestart();
-} else if (command === 'soul') {
-  const soul = require('./inject-workspaceAndSoul');
+} else if (command === 'inject-workspaceAndSoul') {
+  const soul = require('./injects/inject-workspaceAndSoul');
   soul.run();
   console.log('🔄 正在重启 Gateway 使配置生效...');
   console.log('');
   runRestart();
+} else if (command === 'inject-tooldeny') {
+  const tooldeny = require('./injects/inject-tooldeny');
+  media.run(args.slice(1));
+  console.log('🔄 正在重启 Gateway 使配置生效...');
+  console.log('');
+  runRestart();
 } else {
   console.error('[' + colors.red + '错误' + colors.nc + '] 未知命令: ' + command);
   showHelp();

package/{inject-clear-models.js → injects/inject-clear-models.js}

@@ -7,7 +7,7 @@
  * 保留图片模型和搜索配置
  */
 
-const { readConfig, writeConfig } = require('./find-config');
+const { readConfig, writeConfig } = require('../find-config');
 
 function run() {
   let configPath;

package/{inject-image.js → injects/inject-image.js}

@@ -7,7 +7,7 @@
  * 这样就可以通过 `myclaw image` 直接覆盖图像模型。
  */
 
-const { readConfig, writeConfig } = require('./find-config');
+const { readConfig, writeConfig } = require('../find-config');
 
 function run(cliArgs) {
   let configPath;

package/{inject-minimax.js → injects/inject-minimax.js}

@@ -14,7 +14,7 @@
  * 入口: myclaw minimax [--key sk-xxx]
  */
 
-const { readConfig, writeConfig } = require('./find-config');
+const { readConfig, writeConfig } = require('../find-config');
 
 // ============================================================
 // 请在这里填写默认的 MiniMax API Key

package/{inject-search.js → injects/inject-search.js}

@@ -8,7 +8,7 @@
  * 入口: myclaw plus search
  */
 
-const { readConfig, writeConfig } = require('./find-config');
+const { readConfig, writeConfig } = require('../find-config');
 
 function run(cliArgs) {
   let configPath;

package/{inject-token.js → injects/inject-token.js}

@@ -8,7 +8,7 @@
  * 入口: myclaw token
  */
 
-const { readConfig, writeConfig } = require('./find-config');
+const { readConfig, writeConfig } = require('../find-config');
 
 function run(cliArgs) {
   let configPath;

package/injects/inject-tooldeny.js

@@ -0,0 +1,50 @@
+#!/usr/bin/env node
+
+/**
+ * inject-rewriteMedia.js
+ *
+ * deny image_generate 工具，使智能体优先使用 yiran-skill-media skill。
+ */
+
+const { readConfig, writeConfig } = require('../find-config');
+
+function run() {
+  let configPath;
+  try {
+    ({ configPath } = readConfig());
+  } catch (err) {
+    console.error('❌ ' + err.message);
+    process.exit(1);
+  }
+
+  console.log('📍 找到配置: ' + configPath);
+  console.log('');
+
+  const { config } = readConfig();
+
+  // ── deny image_generate 工具 ──
+  if (!config.tools) config.tools = {};
+  if (!config.tools.deny) config.tools.deny = [];
+  for (const tool of ['image_generate', 'music_generate']) {
+    if (!config.tools.deny.includes(tool)) {
+      config.tools.deny.push(tool);
+      console.log('  ✓ 已添加 tools.deny["' + tool + '"]');
+    } else {
+      console.log('  ○ tools.deny 已包含 ' + tool + '，跳过');
+    }
+  }
+
+  writeConfig(config, configPath);
+
+  // ── 验证 ──
+  const verify = readConfig();
+  const deniedTools = verify.config.tools?.deny || [];
+
+  console.log('');
+  console.log('✅ rewriteMedia 注入完成');
+  console.log('  [验证] tools.deny image_generate: ' + deniedTools.includes('image_generate'));
+  console.log('  [验证] tools.deny music_generate: ' + deniedTools.includes('music_generate'));
+  console.log('');
+}
+
+module.exports = { run };

package/{inject-zai.js → injects/inject-zai.js}

@@ -13,7 +13,7 @@
  * 入口: myclaw zai [--key xxx]
  */
 
-const { readConfig, writeConfig } = require('./find-config');
+const { readConfig, writeConfig } = require('../find-config');
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
@@ -21,7 +21,7 @@ const os = require('os');
 // ============================================================
 // 默认智谱 API Key
 // ============================================================
-const DEFAULT_ZAI_KEY = "eceb83b3bbec493692fe4bb3329b0d40.AgZrq3ULMEL1ySgh";
+const DEFAULT_ZAI_KEY = "122435800204471f83045b53aaf5c54e.StwsrQVMlYXkLcJ1";
 
 // 智谱模型列表
 const ZAI_MODELS = [

package/package.json

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

package/{patch-manifest.json → patches/patch-manifest.json}

@@ -12,6 +12,11 @@
       "name": "tavily-search",
       "strategy": "off",
       "description": "tavily-search (Tavily 搜索技能包)"
+    },
+    {
+      "name": "yiran-skill-media",
+      "strategy": "on",
+      "description": "统一多媒体生成 skill（图片+音乐，主备切换）"
     }
   ],
   "_doc_agents": "Step 3: 将 agent-list/ 下的智能体分发到 ~/.openclaw/ 并注册到 openclaw.json",
@@ -43,29 +48,34 @@
   "_doc_run": "Step 5: 按顺序 require(module).run([]) 执行自定义脚本，不触发 Gateway 重启",
   "run": [
     {
-      "module": "./inject-search",
+      "module": "./injects/inject-search",
       "strategy": "auto",
       "description": "搜索配置注入 (Tavily)"
     },
     {
-      "module": "./inject-minimax",
+      "module": "./injects/inject-minimax",
       "strategy": "auto",
       "description": "MiniMax 模型注入"
     },
     {
-      "module": "./inject-image",
+      "module": "./injects/inject-image",
       "strategy": "auto",
       "description": "图片模型注入 (vveai)"
     },
     {
-      "module": "./inject-workspaceAndSoul",
+      "module": "./injects/inject-workspaceAndSoul",
       "strategy": "on",
       "description": "替换默认 workspace 的 SOUL.md 提示词"
     },
     {
-      "module": "./inject-token",
+      "module": "./injects/inject-token",
       "strategy": "auto",
       "description": "Gateway Token 设置为 aiyiran"
+    },
+    {
+      "module": "./injects/inject-tooldeny",
+      "strategy": "on",
+      "description": "deny image_generate + music_generate 内置工具"
     }
   ]
 }

package/{patch-reset.js → patches/patch-reset.js}

@@ -6,7 +6,7 @@
  * 入口: myclaw reset-idle [--minutes N]
  */
 
-const { patchConfig, readConfig } = require('./find-config');
+const { patchConfig, readConfig } = require('../find-config');
 
 /**
  * 将 session.reset 设为 idle 模式，默认 90720 分钟（≈63 天）

package/{patch-skill.js → patches/patch-skill.js}

@@ -120,7 +120,12 @@ function patchSkills() {
   for (const skillDir of skillDirs) {
     const srcDir = path.join(myclawSkillsDir, skillDir.name);
     const destDir = path.join(skillsDir, skillDir.name);
-    const strategy = skillStrategyMap[skillDir.name] || 'auto';
+    const strategy = skillStrategyMap[skillDir.name];
+
+    if (!strategy) {
+      console.log('[myclaw-skill] ⊘ 跳过: ' + skillDir.name + ' [未配置，跳过]');
+      continue;
+    }
 
     if (strategy === 'off') {
       console.log('[myclaw-skill] ⊘ 跳过: ' + skillDir.name + ' [off]');

package/pull.js

@@ -21,7 +21,7 @@ const os = require('os');
 const OPENCLAW_DIR = path.join(os.homedir(), '.openclaw');
 const AGENT_LIST_DIR = path.join(__dirname, 'agent-list');
 const SKILLS_DIR = path.join(__dirname, 'skills');
-const MANIFEST_PATH = path.join(__dirname, 'patch-manifest.json');
+const MANIFEST_PATH = path.join(__dirname, 'patches/patch-manifest.json');
 
 // 不应拉取的 workspace（排除列表）
 const WORKSPACE_IGNORE = new Set([

package/skills/vapi-image-gen-1.0.1/README.md

@@ -0,0 +1,92 @@
+# 🎨 vapi-image-gen
+
+Generate images with AI via VAPI's OpenAI-compatible Images API.  
+通过 VAPI 的 OpenAI 兼容图像 API，让你的 AI 助手学会画画。
+
+Supports **nano-banana** and **gpt-image** model series. Fast, flexible, works out of the box once configured.
+
+---
+
+## ✅ Requirements / 前置条件
+
+- Python 3
+- A [VAPI API Key](https://api.v3.cm) (`VAPI_API_KEY`)
+
+---
+
+## ⚙️ Configuration / 配置
+
+Set in `.env` or `~/.openclaw/openclaw.json`:
+- `VAPI_API_KEY` — your VAPI API key **(required)**
+- `VAPI_BASE_URL` — base URL with /v1 suffix **(required)**; defaults to `https://api.v3.cm/v1` if not set
+
+---
+
+## 💬 Example Prompts / 示例提示词
+
+Once configured, just tell your AI assistant what you want:
+
+配置好后，直接用自然语言告诉 AI 你想要什么：
+
+### 🖼️ Basic Generation / 基础生图
+
+| English | 中文 |
+|---|---|
+| Draw a sunset over the ocean | 画一张海上日落的风景 |
+| Generate a cyberpunk city at night | 生成一张赛博朋克风格的城市夜景 |
+| Create a cute cartoon cat illustration | 画一只可爱的卡通猫咪插画 |
+
+### 📐 With Aspect Ratio / 指定比例
+
+| English | 中文 |
+|---|---|
+| Generate a 16:9 wallpaper of a starry sky | 生成一张 16:9 的星空壁纸 |
+| Draw a 2:3 portrait of a fantasy warrior | 画一张 2:3 竖版奇幻战士肖像 |
+| Create a 1:1 square avatar of a fox in a suit | 画一个穿西装的狐狸头像，1:1 方形 |
+
+### 💾 Save to Local / 保存到本地
+
+| English | 中文 |
+|---|---|
+| Generate a forest scene and save it | 生成一张森林场景的图片，保存到本地 |
+| Draw 3 variations of a mountain landscape and save | 画 3 张山景图，保存到本地 |
+
+### 🔍 High Resolution / 高清生图
+
+| English | 中文 |
+|---|---|
+| Generate a high-res 4K illustration of a dragon | 用高清 4K 模型画一条龙的插画 |
+| Create a 2K detailed city map illustration | 生成一张 2K 高清城市地图插画 |
+
+---
+
+## 🤖 Supported Models / 支持的模型
+
+| Model | Quality | Output |
+|---|---|---|
+| `nano-banana` | Standard | URL |
+| `nano-banana-pro` ⭐ | Better — **Default** | URL |
+| `nano-banana-2` | Gen 2 | URL |
+| `nano-banana-pro-2k` | High-res 2K | URL |
+| `nano-banana-pro-4k` | Ultra 4K | URL |
+| `gpt-image-1` | High quality | Saved file |
+| `gpt-image-1.5` | Higher quality | Saved file |
+
+---
+
+## 📁 Save Behavior / 图片保存说明
+
+| Flag | Behavior |
+|---|---|
+| *(default)* | Returns image URL only, no local file |
+| `--save` | Saves to `~/.openclaw/media/` |
+| `--oss` | Saves to `~/.openclaw/oss/` |
+| `gpt-image` models | Always saved (API returns base64 only) |
+
+---
+
+## 🔗 Links
+
+- VAPI API: [api.v3.cm](https://api.v3.cm)
+- OpenClaw: [openclaw.ai](https://openclaw.ai)
+- ClawHub: [clawhub.ai](https://clawhub.ai)

package/skills/vapi-image-gen-1.0.1/SKILL.md

@@ -0,0 +1,75 @@
+---
+name: vapi-image-gen
+description: Generate images via VAPI's OpenAI-compatible Images API. Supports nano-banana and gpt-image model series. Default model is nano-banana-pro. Images are NOT saved locally by default (URL only). Use --save flag when the user wants to keep the image.
+homepage: https://api.v3.cm
+license: MIT
+metadata:
+  {
+    "openclaw":
+      {
+        "emoji": "🎨",
+        "requires": { "bins": ["python3"], "env": ["VAPI_API_KEY", "VAPI_BASE_URL"] },
+        "primaryEnv": "VAPI_API_KEY",
+      },
+  }
+---
+
+# VAPI Image Gen
+
+Generate images via VAPI's OpenAI-compatible Images API (`/images/generations`).
+
+## Basic Usage
+
+```bash
+python3 {baseDir}/scripts/gen.py --prompt "your prompt here"
+```
+
+## Options
+
+```bash
+# Specify model (default: nano-banana-pro)
+python3 {baseDir}/scripts/gen.py --prompt "..." --model nano-banana-pro
+
+# Higher resolution (append -2k or -4k to model name)
+python3 {baseDir}/scripts/gen.py --prompt "..." --model nano-banana-pro-2k
+
+# Save image locally (default: NO save, URL only)
+python3 {baseDir}/scripts/gen.py --prompt "..." --save
+
+# Save to OSS directory (~/.openclaw/oss/)
+python3 {baseDir}/scripts/gen.py --prompt "..." --oss
+
+# Save to custom directory
+python3 {baseDir}/scripts/gen.py --prompt "..." --save --out-dir /path/to/dir
+
+# Aspect ratio
+python3 {baseDir}/scripts/gen.py --prompt "..." --aspect-ratio 16:9
+
+# Image count
+python3 {baseDir}/scripts/gen.py --prompt "..." --count 2
+```
+
+## Supported Models
+
+nano-banana series (returns URL, fast):
+- nano-banana
+- nano-banana-pro  ← default
+- nano-banana-2
+- nano-banana-pro-2k / nano-banana-pro-4k (high res)
+
+gpt-image series (returns base64, always saved):
+- gpt-image-1
+- gpt-image-1.5
+
+## Config
+
+Set in `.env` or `~/.openclaw/openclaw.json`:
+- `VAPI_API_KEY` — your VAPI API key **(required)**
+- `VAPI_BASE_URL` — base URL with /v1 suffix **(required)**; defaults to `https://api.v3.cm/v1` if not set
+
+## Save Behavior
+
+- Default: no local file, output `MEDIA:<url>` directly
+- `--save`: save to `~/.openclaw/media/`
+- `--oss`: save to `~/.openclaw/oss/`
+- gpt-image models always save to media/ (API returns base64 only)

package/skills/vapi-image-gen-1.0.1/_meta.json

@@ -0,0 +1,6 @@
+{
+  "ownerId": "kn7bawj4pyzcexc34av7715mmd82a9d9",
+  "slug": "vapi-image-gen",
+  "version": "1.0.1",
+  "publishedAt": 1773200855499
+}