metame-cli 1.4.34 → 1.5.0

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 };

package/scripts/daemon-agent-commands.js

@@ -28,8 +28,26 @@ function createAgentCommandHandler(deps) {
     attachOrCreateSession,
     agentFlowTtlMs,
     agentBindTtlMs,
+    getDefaultEngine = () => 'claude',
   } = deps;
 
+  function normalizeEngineName(name) {
+    const n = String(name || '').trim().toLowerCase();
+    return n === 'codex' ? 'codex' : getDefaultEngine();
+  }
+
+  function inferEngineByCwd(cfg, cwd) {
+    if (!cfg || !cfg.projects || !cwd) return null;
+    const targetCwd = normalizeCwd(cwd);
+    for (const proj of Object.values(cfg.projects || {})) {
+      if (!proj || !proj.cwd) continue;
+      if (normalizeCwd(proj.cwd) === targetCwd) {
+        return normalizeEngineName(proj.engine);
+      }
+    }
+    return null;
+  }
+
   // Pending activations have no TTL — they persist until consumed.
   // The creating chatId is stored to prevent self-activation.
 
@@ -127,7 +145,12 @@ function createAgentCommandHandler(deps) {
       const action = res.data.isNewProject ? '绑定成功' : '重新绑定';
       const displayCwd = String(res.data.cwd || '').replace(HOME, '~');
       if (res.data.cwd && typeof attachOrCreateSession === 'function') {
-        attachOrCreateSession(chatId, normalizeCwd(res.data.cwd), p.name || agentName || res.data.projectKey || '');
+        attachOrCreateSession(
+          chatId,
+          normalizeCwd(res.data.cwd),
+          p.name || agentName || res.data.projectKey || '',
+          p.engine || getDefaultEngine()
+        );
       }
       await bot.sendMessage(chatId, `${icon} ${p.name || agentName} ${action}\n目录: ${displayCwd}`);
       return { ok: true, data: res.data };
@@ -140,7 +163,7 @@ function createAgentCommandHandler(deps) {
     }
     const fallbackCwd = (fallback.data && fallback.data.cwd) || agentCwd;
     if (fallbackCwd && typeof attachOrCreateSession === 'function') {
-      attachOrCreateSession(chatId, normalizeCwd(fallbackCwd), agentName || '');
+      attachOrCreateSession(chatId, normalizeCwd(fallbackCwd), agentName || '', getDefaultEngine());
     }
     return {
       ok: true,
@@ -163,9 +186,9 @@ function createAgentCommandHandler(deps) {
 
   async function createAgentViaUnifiedApi(chatId, name, dir, roleDesc, opts = {}) {
     // Default: skip binding the creating chat — let the target group activate via /activate
-    const { skipChatBinding = true } = opts;
+    const { skipChatBinding = true, engine = null } = opts;
     if (agentTools && typeof agentTools.createNewWorkspaceAgent === 'function') {
-      const res = await agentTools.createNewWorkspaceAgent(name, dir, roleDesc, chatId, { skipChatBinding });
+      const res = await agentTools.createNewWorkspaceAgent(name, dir, roleDesc, chatId, { skipChatBinding, engine });
       if (res.ok && skipChatBinding && res.data && res.data.projectKey) {
         storePendingActivation(res.data.projectKey, name, res.data.cwd, chatId);
       }
@@ -273,10 +296,14 @@ function createAgentCommandHandler(deps) {
       const cwd = fullMatch.projectPath || (getSession(chatId) && getSession(chatId).cwd) || HOME;
 
       const state2 = loadState();
+      const cfgForEngine = loadConfig();
+      const engineByTargetCwd = inferEngineByCwd(cfgForEngine, cwd);
+      const currentEngine = normalizeEngineName(state2.sessions[chatId] && state2.sessions[chatId].engine);
       state2.sessions[chatId] = {
         id: sessionId,
         cwd,
         started: true,
+        engine: engineByTargetCwd || currentEngine,
       };
       saveState(state2);
       const name = fullMatch.customTitle;
@@ -485,7 +512,36 @@ function createAgentCommandHandler(deps) {
             }
           }
         }
-        // No pending activation at all — guide to manual bind
+        // No pending activation — fall back to scanning daemon.yaml for unbound projects
+        const allBoundKeys = new Set(Object.values({
+          ...(cfg.telegram ? cfg.telegram.chat_agent_map : {}),
+          ...(cfg.feishu ? cfg.feishu.chat_agent_map : {}),
+        }));
+        const unboundProjects = Object.entries(cfg.projects || {})
+          .filter(([key, p]) => p && p.cwd && !allBoundKeys.has(key))
+          .map(([key, p]) => ({ key, name: p.name || key, cwd: p.cwd, icon: p.icon || '🤖' }));
+
+        if (unboundProjects.length === 1) {
+          // Exactly one unbound project — auto-bind using project KEY (not display name)
+          // to ensure toProjectKey() resolves to the correct existing key in daemon.yaml
+          const proj = unboundProjects[0];
+          const bindRes2 = await bindViaUnifiedApi(bot, chatId, proj.key, proj.cwd);
+          if (bindRes2.ok) pendingActivations && pendingActivations.delete(proj.key);
+          return true;
+        }
+
+        if (unboundProjects.length > 1) {
+          // Multiple unbound projects — show pick list using project keys
+          const lines = ['请选择要激活的 Agent：', ''];
+          for (const p of unboundProjects) {
+            lines.push(`${p.icon} ${p.name}  →  \`/agent bind ${p.key} ${p.cwd}\``);
+          }
+          lines.push('\n发送对应命令即可绑定此群。');
+          await bot.sendMessage(chatId, lines.join('\n'));
+          return true;
+        }
+
+        // Truly nothing to activate
         await bot.sendMessage(chatId,
           '没有待激活的 Agent。\n\n如果已创建过 Agent，直接用:\n`/agent bind <名称> <目录>`\n即可绑定，不需要重新创建。'
         );
@@ -517,4 +573,6 @@ function createAgentCommandHandler(deps) {
   return { handleAgentCommand };
 }
 
-module.exports = { createAgentCommandHandler };
+module.exports = {
+  createAgentCommandHandler,
+};

package/scripts/daemon-agent-tools.js

@@ -31,13 +31,17 @@ function createAgentTools(deps) {
     return (String(agentName || '').replace(/[^a-zA-Z0-9_]/g, '_').toLowerCase() || String(chatId));
   }
 
+  function normalizeEngine(engine) {
+    return String(engine || '').trim().toLowerCase() === 'codex' ? 'codex' : 'claude';
+  }
+
   function ensureAdapterConfig(cfg, adapterKey) {
     if (!cfg[adapterKey]) cfg[adapterKey] = {};
     if (!cfg[adapterKey].allowed_chat_ids) cfg[adapterKey].allowed_chat_ids = [];
     if (!cfg[adapterKey].chat_agent_map) cfg[adapterKey].chat_agent_map = {};
   }
 
-  async function bindAgentToChat(chatId, agentName, workspaceDir, { force = false } = {}) {
+  async function bindAgentToChat(chatId, agentName, workspaceDir, { force = false, engine = null } = {}) {
     try {
       const safeName = sanitizeText(agentName, 120);
       if (!safeName) return { ok: false, error: 'agentName is required' };
@@ -49,6 +53,7 @@ function createAgentTools(deps) {
 
       const projectKey = toProjectKey(safeName, chatId);
       let resolvedDir = resolveWorkspaceDir(workspaceDir);
+      const normalizedEngine = engine ? normalizeEngine(engine) : null;
 
       if (!resolvedDir) {
         const existing = cfg.projects[projectKey];
@@ -80,7 +85,12 @@ function createAgentTools(deps) {
       cfg[adapterKey].chat_agent_map[String(chatId)] = projectKey;
       const existed = !!cfg.projects[projectKey];
       if (!existed) {
-        cfg.projects[projectKey] = { name: safeName, cwd: resolvedDir, nicknames: [safeName] };
+        cfg.projects[projectKey] = {
+          name: safeName,
+          cwd: resolvedDir,
+          nicknames: [safeName],
+          ...(normalizedEngine === 'codex' ? { engine: 'codex' } : {}),
+        };
       } else {
         const nicknames = Array.isArray(cfg.projects[projectKey].nicknames)
           ? cfg.projects[projectKey].nicknames
@@ -91,6 +101,7 @@ function createAgentTools(deps) {
           name: safeName,
           cwd: resolvedDir,
           nicknames,
+          ...(normalizedEngine === 'codex' ? { engine: 'codex' } : {}),
         };
       }
 
@@ -175,8 +186,9 @@ ${safeDelta}
     }
   }
 
-  async function createNewWorkspaceAgent(agentName, workspaceDir, roleDescription, chatId, { skipChatBinding = false } = {}) {
+  async function createNewWorkspaceAgent(agentName, workspaceDir, roleDescription, chatId, { skipChatBinding = false, engine = null } = {}) {
     let bindData;
+    const normalizedEngine = engine ? normalizeEngine(engine) : null;
 
     if (skipChatBinding) {
       // Create the project entry without touching chat_agent_map
@@ -192,7 +204,16 @@ ${safeDelta}
       const projectKey = toProjectKey(safeName, chatId);
       const existed = !!cfg.projects[projectKey];
       if (!existed) {
-        cfg.projects[projectKey] = { name: safeName, cwd: resolvedDir, nicknames: [safeName] };
+        cfg.projects[projectKey] = {
+          name: safeName,
+          cwd: resolvedDir,
+          nicknames: [safeName],
+          ...(normalizedEngine === 'codex' ? { engine: 'codex' } : {}),
+        };
+        writeConfigSafe(cfg);
+        backupConfig();
+      } else if (normalizedEngine === 'codex') {
+        cfg.projects[projectKey] = { ...cfg.projects[projectKey], engine: 'codex' };
         writeConfigSafe(cfg);
         backupConfig();
       }
@@ -204,7 +225,7 @@ ${safeDelta}
         project: cfg.projects[projectKey],
       };
     } else {
-      const bindResult = await bindAgentToChat(chatId, agentName, workspaceDir);
+      const bindResult = await bindAgentToChat(chatId, agentName, workspaceDir, { engine: normalizedEngine });
       if (!bindResult.ok) return bindResult;
       bindData = bindResult.data;
     }