metame-cli 1.4.33 → 1.5.0

package/index.js

@@ -88,7 +88,7 @@ function syncDirFiles(srcDir, destDir, { fileList, chmod } = {}) {
 // Auto-deploy bundled scripts to ~/.metame/
 // IMPORTANT: daemon.yaml is USER CONFIG — never overwrite it. Only daemon-default.yaml (template) is synced.
 const scriptsDir = path.join(__dirname, 'scripts');
-const BUNDLED_BASE_SCRIPTS = ['platform.js', 'signal-capture.js', 'distill.js', 'schema.js', 'pending-traits.js', 'migrate-v2.js', 'daemon.js', 'telegram-adapter.js', 'feishu-adapter.js', 'daemon-default.yaml', 'providers.js', 'session-analytics.js', 'resolve-yaml.js', 'utils.js', 'skill-evolution.js', 'memory.js', 'memory-extract.js', 'memory-search.js', 'memory-gc.js', 'qmd-client.js', 'session-summarize.js', 'check-macos-control-capabilities.sh', 'usage-classifier.js', 'task-board.js', 'memory-nightly-reflect.js', 'memory-index.js'];
+const BUNDLED_BASE_SCRIPTS = ['platform.js', 'signal-capture.js', 'distill.js', 'schema.js', 'pending-traits.js', 'daemon.js', 'telegram-adapter.js', 'feishu-adapter.js', 'daemon-default.yaml', 'providers.js', 'session-analytics.js', 'resolve-yaml.js', 'utils.js', 'skill-evolution.js', 'memory.js', 'memory-extract.js', 'memory-search.js', 'memory-write.js', 'memory-gc.js', 'qmd-client.js', 'session-summarize.js', 'mentor-engine.js', 'check-macos-control-capabilities.sh', 'usage-classifier.js', 'task-board.js', 'memory-nightly-reflect.js', 'memory-index.js', 'skill-changelog.js'];
 const DAEMON_MODULE_SCRIPTS = (() => {
   try {
     return fs.readdirSync(scriptsDir).filter((f) => /^daemon-[\w-]+\.js$/.test(f));
@@ -124,6 +124,8 @@ if (scriptsUpdated) {
 syncDirFiles(path.join(__dirname, 'scripts', 'docs'), path.join(METAME_DIR, 'docs'));
 // Bin: CLI tools (dispatch_to etc.)
 syncDirFiles(path.join(__dirname, 'scripts', 'bin'), path.join(METAME_DIR, 'bin'), { chmod: 0o755 });
+// Hooks: Claude Code event hooks (Stop, PostToolUse, etc.)
+syncDirFiles(path.join(__dirname, 'scripts', 'hooks'), path.join(METAME_DIR, 'hooks'));
 
 // ---------------------------------------------------------
 // Deploy bundled skills to ~/.claude/skills/
@@ -163,6 +165,29 @@ if (fs.existsSync(bundledSkillsDir)) {
   }
 }
 
+// Ensure ~/.codex/skills and ~/.agents/skills are symlinks to ~/.claude/skills
+// This keeps skill evolution unified across all engines.
+for (const altDir of [
+  path.join(HOME_DIR, '.codex', 'skills'),
+  path.join(HOME_DIR, '.agents', 'skills'),
+]) {
+  try {
+    const parentDir = path.dirname(altDir);
+    if (!fs.existsSync(parentDir)) continue; // engine not installed, skip
+    const stat = fs.lstatSync(altDir);
+    if (stat.isSymbolicLink()) continue; // already a symlink, good
+    // Physical directory exists — replace with symlink
+    fs.rmSync(altDir, { recursive: true, force: true });
+    fs.symlinkSync(CLAUDE_SKILLS_DIR, altDir);
+  } catch (e) {
+    if (e.code === 'ENOENT') {
+      // Directory doesn't exist — create symlink
+      try { fs.symlinkSync(CLAUDE_SKILLS_DIR, altDir); } catch { /* non-fatal */ }
+    }
+    // Other errors: non-fatal, skip
+  }
+}
+
 // Load daemon config for local launch flags
 let daemonCfg = {};
 try {
@@ -231,6 +256,8 @@ function ensureHookInstalled() {
       entry.hooks?.some(h => h.command && h.command.includes('signal-capture.js'))
     );
 
+    let modified = false;
+
     if (!stillInstalled) {
       if (!settings.hooks) settings.hooks = {};
       if (!settings.hooks.UserPromptSubmit) settings.hooks.UserPromptSubmit = [];
@@ -241,9 +268,33 @@ function ensureHookInstalled() {
           command: hookCommand
         }]
       });
+      modified = true;
+      console.log(`${icon("hook")} MetaMe: Signal capture hook installed.`);
+    }
+
+    // Ensure Stop hook (session-logger + tool-failure capture) is installed
+    const stopHookScript = path.join(METAME_DIR, 'hooks', 'stop-session-capture.js').replace(/\\/g, '/');
+    const stopHookCommand = `node "${stopHookScript}"`;
+    const stopHookInstalled = (settings.hooks?.Stop || []).some(entry =>
+      entry.hooks?.some(h => h.command && h.command.includes('stop-session-capture.js'))
+    );
+
+    if (!stopHookInstalled) {
+      if (!settings.hooks) settings.hooks = {};
+      if (!settings.hooks.Stop) settings.hooks.Stop = [];
+
+      settings.hooks.Stop.push({
+        hooks: [{
+          type: 'command',
+          command: stopHookCommand
+        }]
+      });
+      modified = true;
+      console.log(`${icon("hook")} MetaMe: Stop session capture hook installed.`);
+    }
 
+    if (modified) {
       fs.writeFileSync(CLAUDE_SETTINGS, JSON.stringify(settings, null, 2), 'utf8');
-      console.log(`${icon("hook")} MetaMe: Signal capture hook installed.`);
     }
   } catch (e) {
     // Non-fatal: hook install failure shouldn't block launch
@@ -743,7 +794,8 @@ const GLOBAL_MARKER_END = '<!-- METAME-GLOBAL:END -->';
 // Build dynamic Agent dispatch table from daemon.yaml projects.
 // Only include agents whose cwd actually exists on disk — test/stale agents
 // with deleted paths are automatically excluded, no manual cleanup needed.
-let dispatchTable = '';
+// The table is written to ~/.metame/docs/dispatch-table.md (NOT inlined into CLAUDE.md).
+const DISPATCH_TABLE_PATH = path.join(METAME_DIR, 'docs', 'dispatch-table.md');
 try {
   const daemonYamlPath = path.join(os.homedir(), '.metame', 'daemon.yaml');
   if (fs.existsSync(daemonYamlPath)) {
@@ -752,13 +804,29 @@ try {
     const rows = Object.entries(projects)
       .filter(([, p]) => {
         if (!p || !p.name || !p.cwd) return false;
-        // Expand ~ to home directory
         const expandedCwd = String(p.cwd).replace(/^~/, os.homedir());
         return fs.existsSync(expandedCwd);
       })
       .map(([key, p]) => `| \`${key}\` | ${p.name} |`);
     if (rows.length > 0) {
-      dispatchTable = '\n\n| project_key | 昵称 |\n|-------------|------|\n' + rows.join('\n') + '\n\n`--new` 强制新建会话（用户说"新开会话"时加此参数）。';
+      const tableContent = [
+        '# Agent Dispatch 路由表',
+        '',
+        '> 自动生成，来源：daemon.yaml。勿手动编辑。',
+        '',
+        '| project_key | 昵称 |',
+        '|-------------|------|',
+        ...rows,
+        '',
+        '## 使用方法',
+        '```bash',
+        '~/.metame/bin/dispatch_to [--new] <project_key> "内容"',
+        '```',
+        '`--new` 强制新建会话（用户说"新开会话"时加此参数）。',
+        '新增 Agent：`/agent bind <名称> <工作目录>`',
+      ].join('\n') + '\n';
+      fs.mkdirSync(path.dirname(DISPATCH_TABLE_PATH), { recursive: true });
+      fs.writeFileSync(DISPATCH_TABLE_PATH, tableContent);
     }
   }
 } catch { /* daemon.yaml missing or invalid — skip dispatch table */ }
@@ -771,11 +839,11 @@ const KERNEL_BODY = PROTOCOL_NORMAL
 
 const CAPABILITY_SECTIONS = [
   '## Agent Dispatch',
-  `"告诉X/让X" → \`~/.metame/bin/dispatch_to <project_key> "内容"\`，手机端 \`/dispatch to <key> <消息>\`。` + dispatchTable,
-  '新增 Agent：`/agent bind <名称> <工作目录>`',
+  '识别到"告诉X/让X/通知X"等转发意图时 → 先 `cat ~/.metame/docs/dispatch-table.md` 获取路由表（昵称→project_key），再执行转发。不要凭记忆猜测昵称对应关系。',
   '',
   '## Agent 创建与管理',
   '用户问创建/管理/绑定 Agent 时 → 先 `cat ~/.metame/docs/agent-guide.md` 再回答。',
+  '用户问代码结构/升级进度/脚本入口时 → 先 `cat ~/.metame/docs/pointer-map.md` 再回答。',
   '',
   '## 手机端文件交互',
   '用户要文件（"发给我"/"发过来"/"导出"）→ 先 `cat ~/.metame/docs/file-transfer.md` 再执行。',
@@ -882,7 +950,37 @@ try {
   }
 } catch { /* non-fatal */ }
 
+// Skill evolution status
+try {
+  const skillChangelog = require('./scripts/skill-changelog');
+  const skillCount = skillChangelog.countInstalledSkills();
+  const lastSession = skillChangelog.getLastSessionStart();
+  const recentChanges = skillChangelog.getRecentChanges(lastSession);
+
+  if (recentChanges.length === 0) {
+    console.log(`${icon("tool")} Skills: ${skillCount} installed · 无新变更`);
+  } else {
+    const evolved = recentChanges.filter(c => c.action === 'evolved');
+    const others = recentChanges.filter(c => c.action !== 'evolved');
+    const parts = [`${skillCount} installed`];
+    if (evolved.length > 0) parts.push(`${evolved.length} evolved since last session`);
+    if (others.length > 0) parts.push(`${others.length} other event${others.length > 1 ? 's' : ''}`);
+    console.log(`${icon("tool")} Skills: ${parts.join(' · ')}`);
+
+    // Show up to 3 details
+    const shown = recentChanges.slice(0, 3);
+    for (const c of shown) {
+      const actionIcon = skillChangelog.getActionIcon(c.action);
+      console.log(`   ${actionIcon} ${c.skill || 'system'}: ${c.summary}`);
+    }
+    if (recentChanges.length > 3) {
+      console.log(`   +${recentChanges.length - 3} more`);
+    }
+  }
 
+  // Write session start marker for next time
+  skillChangelog.writeSessionStart();
+} catch { /* non-fatal */ }
 
 // ---------------------------------------------------------
 // 4.9 AUTO-UPDATE CHECK (non-blocking)
@@ -1806,7 +1904,12 @@ WantedBy=default.target
   }
 
   // Unknown subcommand
-  console.log(`${icon("book")} MetaMe Daemon Commands:`);
+  console.log(`${icon("book")} MetaMe Commands:`);
+  console.log("   metame                        — launch Claude with MetaMe init");
+  console.log("   metame codex [args]           — launch Codex with MetaMe init");
+  console.log("   metame continue               — resume latest session");
+  console.log("");
+  console.log(`${icon("book")} Daemon Commands:`);
   console.log("   metame start                  — start background daemon");
   console.log("   metame stop                   — stop daemon");
   console.log("   metame status                 — show status & budget");
@@ -1824,7 +1927,43 @@ WantedBy=default.target
 }
 
 // ---------------------------------------------------------
-// 5.8 CONTINUE/SYNC — resume latest session from terminal
+// 5.8 CODEX — launch Codex with MetaMe initialization
+// ---------------------------------------------------------
+const isCodex = process.argv[2] === 'codex';
+if (isCodex) {
+  // spawn() resolves PATH automatically; error event handles missing binary
+  const codexBin = 'codex';
+
+  // Build codex args: remaining user args after 'codex'
+  const codexUserArgs = process.argv.slice(3);
+  let codexArgs;
+  if (codexUserArgs.length === 0) {
+    // Interactive mode: `codex --full-auto`
+    codexArgs = ['--full-auto'];
+  } else {
+    // Non-interactive: `codex exec --full-auto <user args>`
+    codexArgs = ['exec', '--full-auto', ...codexUserArgs];
+  }
+
+  const codexChild = spawn(codexBin, codexArgs, {
+    stdio: 'inherit',
+    cwd: process.cwd(),
+    env: { ...process.env, METAME_ACTIVE_SESSION: 'true' },
+  });
+
+  codexChild.on('error', () => {
+    console.error(`\n${icon("fail")} Error: Could not launch 'codex'.`);
+    console.error("   Please install: npm install -g @openai/codex");
+  });
+  codexChild.on('close', (code) => process.exit(code || 0));
+
+  // Background distillation
+  spawnDistillBackground();
+  return;
+}
+
+// ---------------------------------------------------------
+// 5.9 CONTINUE/SYNC — resume latest session from terminal
 // ---------------------------------------------------------
 // Usage: exit Claude first, then run `metame continue` from terminal.
 // Finds the most recent session and launches Claude with --resume.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "metame-cli",
-    "version": "1.4.33",
+    "version": "1.5.0",
     "description": "The Cognitive Profile Layer for Claude Code. Knows how you think, not just what you said.",
     "main": "index.js",
     "bin": {
@@ -8,12 +8,15 @@
     },
     "files": [
         "index.js",
-        "scripts/"
+        "scripts/",
+        "!scripts/*.test.js",
+        "!scripts/test_daemon.js",
+        "!scripts/hooks/test-*.js"
     ],
     "scripts": {
         "test": "node --test scripts/*.test.js",
         "start": "node index.js",
-        "sync:plugin": "cp scripts/platform.js scripts/schema.js scripts/pending-traits.js scripts/signal-capture.js scripts/distill.js scripts/daemon.js scripts/daemon-agent-commands.js scripts/daemon-session-commands.js scripts/daemon-admin-commands.js scripts/daemon-exec-commands.js scripts/daemon-ops-commands.js scripts/daemon-session-store.js scripts/daemon-checkpoints.js scripts/daemon-bridges.js scripts/daemon-file-browser.js scripts/daemon-runtime-lifecycle.js scripts/daemon-notify.js scripts/daemon-claude-engine.js scripts/daemon-command-router.js scripts/daemon-user-acl.js scripts/daemon-agent-tools.js scripts/daemon-task-scheduler.js scripts/daemon-task-envelope.js scripts/task-board.js scripts/telegram-adapter.js scripts/feishu-adapter.js scripts/daemon-default.yaml scripts/providers.js scripts/utils.js scripts/usage-classifier.js scripts/resolve-yaml.js scripts/memory.js scripts/memory-extract.js scripts/qmd-client.js scripts/session-summarize.js scripts/session-analytics.js scripts/skill-evolution.js scripts/check-macos-control-capabilities.sh plugin/scripts/ && echo '✅ Plugin scripts synced'",
+        "sync:plugin": "cp scripts/platform.js scripts/schema.js scripts/pending-traits.js scripts/signal-capture.js scripts/distill.js scripts/daemon.js scripts/daemon-agent-commands.js scripts/daemon-session-commands.js scripts/daemon-admin-commands.js scripts/daemon-exec-commands.js scripts/daemon-ops-commands.js scripts/daemon-session-store.js scripts/daemon-checkpoints.js scripts/daemon-bridges.js scripts/daemon-file-browser.js scripts/daemon-runtime-lifecycle.js scripts/daemon-notify.js scripts/daemon-claude-engine.js scripts/daemon-engine-runtime.js scripts/daemon-command-router.js scripts/daemon-user-acl.js scripts/daemon-agent-tools.js scripts/daemon-task-scheduler.js scripts/daemon-task-envelope.js scripts/task-board.js scripts/telegram-adapter.js scripts/feishu-adapter.js scripts/daemon-default.yaml scripts/providers.js scripts/utils.js scripts/usage-classifier.js scripts/resolve-yaml.js scripts/memory.js scripts/memory-write.js scripts/memory-extract.js scripts/memory-search.js scripts/memory-gc.js scripts/memory-nightly-reflect.js scripts/memory-index.js scripts/qmd-client.js scripts/session-summarize.js scripts/session-analytics.js scripts/mentor-engine.js scripts/skill-evolution.js scripts/skill-changelog.js scripts/check-macos-control-capabilities.sh plugin/scripts/ && echo '✅ Plugin scripts synced'",
         "sync:readme": "node scripts/sync-readme.js",
         "restart:daemon": "node index.js stop 2>/dev/null; sleep 1; node index.js start 2>/dev/null || echo '⚠️  Daemon not running or restart failed'",
         "precommit": "npm run sync:plugin && npm run restart:daemon"

package/scripts/daemon-admin-commands.js

@@ -5,6 +5,9 @@ const {
   CORE_USAGE_CATEGORIES,
   USAGE_CATEGORY_LABEL,
 } = require('./usage-classifier');
+const { IS_WIN } = require('./platform');
+let mentorEngine = null;
+try { mentorEngine = require('./mentor-engine'); } catch { /* optional */ }
 
 function createAdminCommandHandler(deps) {
   const {
@@ -30,6 +33,8 @@ function createAdminCommandHandler(deps) {
     getMessageQueue,
     loadState,
     saveState,
+    getDefaultEngine = () => 'claude',
+    setDefaultEngine = () => {},
   } = deps;
 
   function resolveProjectKey(targetName, projects) {
@@ -92,6 +97,61 @@ function createAdminCommandHandler(deps) {
     return 'unspecified';
   }
 
+  function modeFromLevel(level) {
+    const n = Number(level);
+    if (!Number.isFinite(n)) return 'gentle';
+    if (n >= 8) return 'intense';
+    if (n >= 4) return 'active';
+    return 'gentle';
+  }
+
+  function parseDistillModelIntent(input) {
+    const text = String(input || '').trim();
+    if (!text || text.startsWith('/')) return null;
+    if (!/(蒸馏|distill|提炼|提纯)/i.test(text)) return null;
+    const setVerb = '(?:改成|改为|设为|设置|切到|切换到|换成|改用|使用|用|set|switch|use)';
+    if (!(new RegExp(setVerb, 'i')).test(text)) return null;
+
+    const explicitModel = text.match(new RegExp(`(?:蒸馏模型|模型|distill\\s*model|model)\\s*(?:${setVerb}|to|is)?\\s*[:：]?\\s*([a-zA-Z0-9._-]{2,80})`, 'i'));
+    if (explicitModel) return { model: explicitModel[1] };
+
+    if (/(蒸馏模型|模型|distill\s*model|model)/i.test(text)) {
+      const quotedModel = text.match(/[“"'「]([a-zA-Z0-9._-]{2,80})[”"'」]/);
+      if (quotedModel) return { model: quotedModel[1] };
+    }
+
+    const knownToken = text.match(new RegExp(`${setVerb}\\s*(?:为|成|到|to)?\\s*[:：]?\\s*(gpt-5\\.1-codex-mini|gpt-5-mini|haiku|sonnet|opus|5\\.1mini|5mini|codex-mini)\\b`, 'i'));
+    if (knownToken) return { model: knownToken[1] };
+
+    return null;
+  }
+
+  function ensureMentorConfig(cfg) {
+    if (!cfg.daemon) cfg.daemon = {};
+    if (!cfg.daemon.mentor || typeof cfg.daemon.mentor !== 'object') {
+      cfg.daemon.mentor = {};
+    }
+    const mentor = cfg.daemon.mentor;
+    if (typeof mentor.enabled !== 'boolean') mentor.enabled = false;
+    if (!Number.isFinite(Number(mentor.friction_level))) mentor.friction_level = 3;
+    if (!mentor.mode || !['gentle', 'active', 'intense'].includes(String(mentor.mode))) {
+      mentor.mode = modeFromLevel(mentor.friction_level);
+    }
+    if (!Array.isArray(mentor.exclude_agents)) mentor.exclude_agents = ['personal', 'xianyu'];
+    if (!Array.isArray(mentor.emotion_keywords_extra)) mentor.emotion_keywords_extra = [];
+    return mentor;
+  }
+
+  function hasCli(execSyncFn, bin) {
+    try {
+      const cmd = process.platform === 'win32' ? `where ${bin}` : `which ${bin}`;
+      execSyncFn(cmd, { encoding: 'utf8' });
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
   async function handleAdminCommand(ctx) {
     const { bot, chatId, text } = ctx;
     const state = ctx.state || {};
@@ -195,17 +255,69 @@ function createAdminCommandHandler(deps) {
         return { handled: true, config };
       }
 
+      // /skill-evo approve <id> — approve a workflow_proposal and dispatch skill creation
+      const approveMatch = arg.match(/^approve\s+(\S+)$/i);
+      if (approveMatch) {
+        const id = approveMatch[1];
+        // Find the queue item (search both pending and notified states)
+        const item = skillEvolution.listQueueItems({ status: ['pending', 'notified'], limit: 200 })
+          .find(i => i.id === id && i.type === 'workflow_proposal');
+        if (!item) {
+          await bot.sendMessage(chatId, `❌ 未找到 workflow_proposal: ${id}`);
+          return { handled: true, config };
+        }
+        // Build skill-creator prefilled prompt
+        const toolsSig = (item.tools_signature || []).join(', ');
+        const prefilledPrompt = [
+          '/skill-creator',
+          `创建一个新技能，自动化以下工作流：`,
+          `工作流模式: ${item.search_hint || item.reason}`,
+          toolsSig ? `常用工具: ${toolsSig}` : '',
+          item.example_prompt ? `用户示例: "${item.example_prompt}"` : '',
+          `该技能应封装这个多步工作流为单一可调用技能。`,
+        ].filter(Boolean).join('\n');
+        // Dispatch to metame agent for skill creation (async — must not block event loop)
+        try {
+          const HOME = require('os').homedir();
+          const dispatchBin = require('path').join(HOME, '.metame', 'bin', 'dispatch_to');
+          const { execFile } = require('child_process');
+          const { promisify } = require('util');
+          const execFileAsync = promisify(execFile);
+          // dispatch_to is a Node.js script; on Windows shebang resolution is unavailable,
+          // so invoke via node explicitly for cross-platform safety
+          const cmd = IS_WIN ? process.execPath : dispatchBin;
+          const cmdArgs = IS_WIN ? [dispatchBin, 'metame', prefilledPrompt] : ['metame', prefilledPrompt];
+          await execFileAsync(cmd, cmdArgs, { encoding: 'utf8', timeout: 15000 });
+          // Mark installed only after successful dispatch
+          skillEvolution.resolveQueueItemById(id, 'installed');
+          await bot.sendMessage(chatId, `✅ 已派发给 Jarvis 创建技能，完成后会通知你\n工作流: ${item.search_hint || item.reason}`);
+        } catch (e) {
+          // Dispatch failed — don't mark installed, keep in queue
+          await bot.sendMessage(chatId, `⚠️ 自动派发失败: ${e.message}\n提案仍在队列中，可重试: /skill-evo approve ${id}`);
+        }
+        return { handled: true, config };
+      }
+
       const dismissMatch = arg.match(/^(?:dismiss|skip|ignored?)\s+(\S+)$/i);
       if (dismissMatch) {
         const id = dismissMatch[1];
+        // Check if this is a workflow_proposal — if so, reset the sketch
+        const item = skillEvolution.listQueueItems({ status: ['pending', 'notified'], limit: 200 })
+          .find(i => i.id === id);
         const ok = skillEvolution.resolveQueueItemById
           ? skillEvolution.resolveQueueItemById(id, 'dismissed')
           : false;
+        // Reset workflow sketch so it can re-accumulate
+        if (ok && item && item.type === 'workflow_proposal' && item.workflow_sketch_id) {
+          if (skillEvolution.resetWorkflowSketch) {
+            skillEvolution.resetWorkflowSketch(item.workflow_sketch_id);
+          }
+        }
         await bot.sendMessage(chatId, ok ? `✅ 已标记 dismissed: ${id}` : `❌ 未找到可处理项: ${id}`);
         return { handled: true, config };
       }
 
-      await bot.sendMessage(chatId, '用法: /skill-evo list | /skill-evo done <id> | /skill-evo dismiss <id>');
+      await bot.sendMessage(chatId, '用法: /skill-evo list | /skill-evo done <id> | /skill-evo dismiss <id> | /skill-evo approve <id>');
       return { handled: true, config };
     }
 
@@ -635,6 +747,68 @@ function createAdminCommandHandler(deps) {
       return { handled: true, config };
     }
 
+    if (text === '/mentor' || text.startsWith('/mentor ')) {
+      try {
+        backupConfig();
+        const cfg = yaml.load(fs.readFileSync(CONFIG_FILE, 'utf8')) || {};
+        const mentorCfg = ensureMentorConfig(cfg);
+        const arg = text.slice('/mentor'.length).trim();
+
+        if (!arg || arg === 'status') {
+          const status = mentorEngine && typeof mentorEngine.getRuntimeStatus === 'function'
+            ? mentorEngine.getRuntimeStatus()
+            : { debt_count: 0, cooldown_remaining_ms: 0 };
+          const mode = String(mentorCfg.mode || modeFromLevel(mentorCfg.friction_level));
+          const level = Number(mentorCfg.friction_level || 0);
+          const cooldownSec = Math.ceil((Number(status.cooldown_remaining_ms) || 0) / 1000);
+          const lines = [
+            `Mentor: ${mentorCfg.enabled ? 'ON' : 'OFF'}`,
+            `Mode: ${mode}`,
+            `Friction level: ${level}`,
+            `Debts: ${status.debt_count || 0}`,
+            `Emotion cooldown: ${cooldownSec > 0 ? `${cooldownSec}s` : '0s'}`,
+            'Zone: n/a (runtime)',
+          ];
+          await bot.sendMessage(chatId, lines.join('\n'));
+          return { handled: true, config };
+        }
+
+        if (arg === 'on' || arg === 'off') {
+          mentorCfg.enabled = arg === 'on';
+          writeConfigSafe(cfg);
+          config = loadConfig();
+          await bot.sendMessage(chatId, mentorCfg.enabled
+            ? '✅ Mentor mode enabled.'
+            : '✅ Mentor mode disabled.');
+          return { handled: true, config };
+        }
+
+        const mLevel = arg.match(/^level\s+(-?\d{1,2})$/i);
+        if (mLevel) {
+          let level = Number(mLevel[1]);
+          if (!Number.isFinite(level)) level = 3;
+          level = Math.max(0, Math.min(10, Math.floor(level)));
+          mentorCfg.friction_level = level;
+          mentorCfg.mode = modeFromLevel(level);
+          writeConfigSafe(cfg);
+          config = loadConfig();
+          await bot.sendMessage(chatId, `✅ Mentor level set to ${level} (${mentorCfg.mode}).`);
+          return { handled: true, config };
+        }
+
+        await bot.sendMessage(chatId, [
+          '用法:',
+          '/mentor on',
+          '/mentor off',
+          '/mentor level <0-10>',
+          '/mentor status',
+        ].join('\n'));
+      } catch (e) {
+        await bot.sendMessage(chatId, `❌ Mentor command failed: ${e.message}`);
+      }
+      return { handled: true, config };
+    }
+
     if (text === '/reload') {
       if (global._metameReload) {
         const r = global._metameReload();
@@ -727,6 +901,10 @@ function createAdminCommandHandler(deps) {
       const validModels = ['sonnet', 'opus', 'haiku'];
       const checks = [];
       let issues = 0;
+      const activeProvider = providerMod && typeof providerMod.getActiveName === 'function'
+        ? providerMod.getActiveName()
+        : 'anthropic';
+      const isCustomProvider = activeProvider !== 'anthropic';
 
       let cfg = null;
       try {
@@ -738,21 +916,34 @@ function createAdminCommandHandler(deps) {
       }
 
       const m = (cfg && cfg.daemon && cfg.daemon.model) || 'opus';
-      if (validModels.includes(m)) {
+      const modelOk = isCustomProvider
+        ? /^[a-zA-Z0-9._-]{2,80}$/.test(String(m || '').trim())
+        : validModels.includes(m);
+      if (modelOk) {
         checks.push(`✅ 模型: ${m}`);
       } else {
-        checks.push(`❌ 模型: ${m} (无效)`);
+        checks.push(`❌ 模型: ${m} (${isCustomProvider ? '格式无效' : '无效'})`);
         issues++;
       }
 
-      try {
-        execSync(process.platform === 'win32' ? 'where claude' : 'which claude', { encoding: 'utf8' });
-        checks.push('✅ Claude CLI');
-      } catch {
-        checks.push('❌ Claude CLI 未找到');
+      const hasClaude = hasCli(execSync, 'claude');
+      const hasCodex = hasCli(execSync, 'codex');
+      checks.push(hasClaude ? '✅ Claude CLI' : '⚠️ Claude CLI 未找到');
+      checks.push(hasCodex ? '✅ Codex CLI' : '⚠️ Codex CLI 未找到');
+
+      const currentEngine = getDefaultEngine() === 'codex' ? 'codex' : 'claude';
+      if (currentEngine === 'claude' && !hasClaude) {
+        checks.push('❌ 当前默认引擎是 claude，但 Claude CLI 不可用');
+        issues++;
+      }
+      if (currentEngine === 'codex' && !hasCodex) {
+        checks.push('❌ 当前默认引擎是 codex，但 Codex CLI 不可用');
         issues++;
       }
 
+      checks.push(`✅ 默认引擎: ${currentEngine}`);
+      checks.push(`✅ Provider: ${activeProvider}${isCustomProvider ? ' (custom)' : ''}`);
+
       const bakFile = CONFIG_FILE + '.bak';
       const hasBak = fs.existsSync(bakFile);
       checks.push(hasBak ? '✅ 有备份' : '⚠️ 无备份');
@@ -867,10 +1058,64 @@ function createAdminCommandHandler(deps) {
       return { handled: true, config };
     }
 
+    // /engine [name] — show or switch default engine (claude/codex)
+    if (text === '/engine' || text.startsWith('/engine ')) {
+      const arg = text.slice('/engine'.length).trim().toLowerCase();
+      if (!arg) {
+        const cur = getDefaultEngine();
+        const distill = providerMod ? providerMod.getDistillModel() : '(unknown)';
+        await bot.sendMessage(chatId, `🔧 当前引擎: ${cur}\n🧪 蒸馏模型: ${distill}\n\n用法: /engine claude 或 /engine codex`);
+        return { handled: true, config };
+      }
+      if (arg !== 'claude' && arg !== 'codex') {
+        await bot.sendMessage(chatId, `❌ 不支持的引擎: ${arg}\n可选: claude, codex`);
+        return { handled: true, config };
+      }
+      setDefaultEngine(arg);
+      const distill = providerMod ? providerMod.getDistillModel() : '(unknown)';
+      await bot.sendMessage(chatId, `✅ 默认引擎: ${arg}\n🧪 蒸馏模型已同步: ${distill}`);
+      return { handled: true, config };
+    }
+
+    // /distill-model [name] — show or update distill model
+    if (text === '/distill-model' || text.startsWith('/distill-model ')) {
+      if (!providerMod || typeof providerMod.getDistillModel !== 'function' || typeof providerMod.setDistillModel !== 'function') {
+        await bot.sendMessage(chatId, '❌ Distill model config is not available.');
+        return { handled: true, config };
+      }
+      const arg = text.slice('/distill-model'.length).trim();
+      if (!arg) {
+        await bot.sendMessage(chatId, `🧪 当前蒸馏模型: ${providerMod.getDistillModel()}\n用法: /distill-model <model>\n示例: /distill-model gpt-5.1-codex-mini`);
+        return { handled: true, config };
+      }
+      try {
+        providerMod.setDistillModel(arg);
+        await bot.sendMessage(chatId, `✅ 蒸馏模型已更新为: ${providerMod.getDistillModel()}`);
+      } catch (e) {
+        await bot.sendMessage(chatId, `❌ 设置失败: ${e.message}`);
+      }
+      return { handled: true, config };
+    }
+
+    const nlDistillIntent = parseDistillModelIntent(text);
+    if (nlDistillIntent) {
+      if (!providerMod || typeof providerMod.setDistillModel !== 'function' || typeof providerMod.getDistillModel !== 'function') {
+        await bot.sendMessage(chatId, '❌ Distill model config is not available.');
+        return { handled: true, config };
+      }
+      try {
+        providerMod.setDistillModel(nlDistillIntent.model);
+        await bot.sendMessage(chatId, `✅ 已按自然语言请求更新蒸馏模型: ${providerMod.getDistillModel()}`);
+      } catch (e) {
+        await bot.sendMessage(chatId, `❌ 设置失败: ${e.message}`);
+      }
+      return { handled: true, config };
+    }
+
     return { handled: false, config };
   }
 
-  return { handleAdminCommand };
+  return { handleAdminCommand, _private: { parseDistillModelIntent } };
 }
 
 module.exports = { createAdminCommandHandler };