metame-cli 1.5.11 → 1.5.12

package/index.js

@@ -412,16 +412,21 @@ try {
   }
 } catch { /* non-fatal */ }
 
-// Worktree guard: team members running in worktrees must NEVER deploy to ~/.metame/
-// Their worktree is an isolated sandbox — deploying would overwrite production symlinks.
-// Detect any .worktrees/ parent in the path (covers both ~/.metame/worktrees/ and repo-local .worktrees/).
-const _isInWorktree = __dirname.split(path.sep).includes('.worktrees') ||
-  __dirname.startsWith(path.join(HOME_DIR, '.metame', 'worktrees'));
+// Worktree guard: worktrees must NEVER deploy to ~/.metame/ — they are isolated sandboxes.
+// Detection: git worktrees have a .git FILE (pointing to main repo), not a .git DIRECTORY.
+// This is reliable regardless of worktree path conventions.
+const _dotGitPath = path.join(__dirname, '.git');
+const _isInWorktree = (() => {
+  try {
+    const stat = fs.statSync(_dotGitPath);
+    return stat.isFile(); // .git is a file → worktree; directory → main repo; missing → npm install
+  } catch { return false; }
+})();
 if (_isInWorktree) {
   console.error(`\n${icon("stop")} ACTION BLOCKED: Worktree Deploy Prevented`);
-  console.error(`   You are running from a worktree (${path.basename(__dirname)}).`);
+  console.error(`   You are running from a git worktree (${path.basename(__dirname)}).`);
   console.error('   Deploying from a worktree would overwrite production daemon code.');
-  console.error('   Use \x1b[36mtouch ~/.metame/daemon.js\x1b[0m to hot-reload instead.\n');
+  console.error('   Commit your changes, then deploy from the main repo.\n');
   process.exit(1);
 }
 
@@ -695,6 +700,58 @@ function ensureHookInstalled() {
 
 ensureHookInstalled();
 
+// ---------------------------------------------------------
+// 1.6a AUTO-ENABLE BUNDLED PLUGINS
+// ---------------------------------------------------------
+function ensurePluginsEnabled() {
+  try {
+    let settings = {};
+    if (fs.existsSync(CLAUDE_SETTINGS)) {
+      settings = JSON.parse(fs.readFileSync(CLAUDE_SETTINGS, 'utf8'));
+    }
+
+    if (!settings.enabledPlugins) settings.enabledPlugins = {};
+    if (!settings.extraKnownMarketplaces) settings.extraKnownMarketplaces = {};
+
+    const bundledPlugins = {
+      'example-skills@anthropic-agent-skills': true,
+      'ralph-loop@claude-plugins-official': true,
+      'planning-with-files@planning-with-files': true,
+    };
+
+    const bundledMarketplaces = {
+      'planning-with-files': {
+        source: { source: 'github', repo: 'OthmanAdi/planning-with-files' },
+      },
+    };
+
+    let modified = false;
+
+    for (const [key, val] of Object.entries(bundledPlugins)) {
+      if (!(key in settings.enabledPlugins)) {
+        settings.enabledPlugins[key] = val;
+        modified = true;
+      }
+    }
+
+    for (const [key, val] of Object.entries(bundledMarketplaces)) {
+      if (!(key in settings.extraKnownMarketplaces)) {
+        settings.extraKnownMarketplaces[key] = val;
+        modified = true;
+      }
+    }
+
+    if (modified) {
+      fs.writeFileSync(CLAUDE_SETTINGS, JSON.stringify(settings, null, 2), 'utf8');
+      console.log(`${icon("brain")} MetaMe: Bundled plugins enabled.`);
+    }
+  } catch {
+    // Non-fatal
+  }
+}
+
+ensurePluginsEnabled();
+
 // ---------------------------------------------------------
 // 1.6b LOCAL ACTIVITY HEARTBEAT
 // ---------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "metame-cli",
-    "version": "1.5.11",
+    "version": "1.5.12",
     "description": "The Cognitive Profile Layer for Claude Code. Knows how you think, not just what you said.",
     "main": "index.js",
     "bin": {
@@ -13,7 +13,8 @@
         "!scripts/test_daemon.js",
         "!scripts/hooks/test-*.js",
         "!scripts/daemon.yaml",
-        "!scripts/daemon.yaml.bak"
+        "!scripts/daemon.yaml.bak",
+        "skills/"
     ],
     "scripts": {
         "test": "node --test scripts/*.test.js",

package/scripts/daemon-agent-commands.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const { normalizeEngineName: _normalizeEngine } = require('./daemon-utils');
+
 function createAgentCommandHandler(deps) {
   const {
     fs,
@@ -34,11 +36,11 @@ function createAgentCommandHandler(deps) {
     agentFlowTtlMs,
     agentBindTtlMs,
     getDefaultEngine = () => 'claude',
+    log = () => {},
   } = deps;
 
   function normalizeEngineName(name) {
-    const n = String(name || '').trim().toLowerCase();
-    return n === 'codex' ? 'codex' : getDefaultEngine();
+    return _normalizeEngine(name, getDefaultEngine);
   }
 
   function inferStoredEngine(rawSession) {
@@ -358,7 +360,9 @@ function createAgentCommandHandler(deps) {
       const curSession = getSession(route.sessionChatId) || getSession(chatId);
       const curCwd = route.cwd || (curSession ? curSession.cwd : null);
       const currentEngine = getCurrentEngine(chatId);
+      log('DEBUG', `[/resume] chatId=${chatId} curCwd=${curCwd} engine=${currentEngine} route.sessionChatId=${route.sessionChatId}`);
       const recentSessions = listRecentSessions(5, curCwd, currentEngine);
+      log('DEBUG', `[/resume] recentSessions=${recentSessions.length} ids=[${recentSessions.map(s=>s.sessionId.slice(0,8)).join(',')}]`);
       const resumeChoices = buildResumeChoices({
         recentSessions,
         currentLogical,

package/scripts/daemon-bridges.js

@@ -767,6 +767,7 @@ function createBridgeStarter(deps) {
           log('INFO', `Feishu message from ${chatId}: ${text.slice(0, 50)}`);
           const parentId = extractFeishuReplyMessageId(event);
           let _replyAgentKey = null;
+          let _replyMappingFound = false; // true = mapping exists (agentKey may be null = main)
           // Load state once for the entire routing block
           const _st = loadState();
           if (parentId) {
@@ -775,6 +776,7 @@ function createBridgeStarter(deps) {
           if (parentId) {
             const mapped = _st.msg_sessions && _st.msg_sessions[parentId];
             if (mapped) {
+              _replyMappingFound = true;
               if (typeof restoreSessionFromReply === 'function') {
                 restoreSessionFromReply(chatId, mapped);
               } else {
@@ -852,16 +854,28 @@ function createBridgeStarter(deps) {
               // Bare /stop, no sticky set → fall through to handleCommand
             }
 
-            // 0. Quoted reply → force route + set sticky
-            if (_replyAgentKey) {
-              const member = _boundProj.team.find(m => m.key === _replyAgentKey);
-              if (member) {
-                _setSticky(member.key);
-                log('INFO', `Quoted reply → force route to ${_replyAgentKey} (sticky set)`);
-                _dispatchToTeamMember(member, _boundProj, trimmedText, liveCfg, bot, chatId, executeTaskByName, acl);
-                return;
+            // 0. Quoted reply → force route based on which agent sent the parent message.
+            // Cases:
+            //   a) agentKey = known team member → route to that member (set sticky)
+            //   b) agentKey = null, mapping found → user replied to main; clear sticky, route to main
+            //   c) parentId present, no mapping  → intent is explicit, avoid sticky; clear sticky, route to main
+            if (parentId) {
+              if (_replyAgentKey) {
+                const member = _boundProj.team.find(m => m.key === _replyAgentKey);
+                if (member) {
+                  _setSticky(member.key);
+                  log('INFO', `Quoted reply → force route to ${_replyAgentKey} (sticky set)`);
+                  _dispatchToTeamMember(member, _boundProj, trimmedText, liveCfg, bot, chatId, executeTaskByName, acl);
+                  return;
+                }
+                // agentKey set but not a current team member → fall through to main
+                log('INFO', `Quoted reply agentKey=${_replyAgentKey} not in team, routing to main`);
               }
-              log('INFO', `Quoted reply agentKey=${_replyAgentKey} not in team, falling through`);
+              // Cases b & c: no agentKey (main agent) or stale/unknown agentKey
+              _clearSticky();
+              log('INFO', `Quoted reply → route to main (agentKey=${_replyAgentKey} mappingFound=${_replyMappingFound})`);
+              await pipeline.processMessage(chatId, trimmedText, { bot, config: liveCfg, executeTaskByName, senderId: acl.senderId, readOnly: acl.readOnly });
+              return;
             }
             // 1. Explicit nickname → route + set sticky
             const teamMatch = _findTeamMember(trimmedText, _boundProj.team);

package/scripts/daemon-claude-engine.js

@@ -106,7 +106,15 @@ function createClaudeEngine(deps) {
   }
   // Card reuse for merge-pause: when a task is paused for message merging,
   // save the statusMsgId so the next askClaude reuses the same card.
-  const _pausedCards = new Map(); // chatId -> { statusMsgId, cardHeader }
+  // Entries auto-expire via periodic sweep (60s) to prevent unbounded growth.
+  const _pausedCards = new Map(); // chatId -> { statusMsgId, cardHeader, savedAt }
+  const _PAUSED_CARD_TTL = 60000;
+  setInterval(() => {
+    const now = Date.now();
+    for (const [k, v] of _pausedCards) {
+      if (now - (v.savedAt || 0) > _PAUSED_CARD_TTL) _pausedCards.delete(k);
+    }
+  }, _PAUSED_CARD_TTL).unref();
 
   let mentorEngine = null;
   try { mentorEngine = require('./mentor-engine'); } catch { /* optional */ }
@@ -239,6 +247,7 @@ function createClaudeEngine(deps) {
       && !!error
       && (!output || !!errorCode)
       && failureKind !== 'user-stop'
+      && failureKind !== 'merge-pause'
       && !!canRetry;
   }
 
@@ -481,6 +490,13 @@ function createClaudeEngine(deps) {
         retryPromptPrefix: '',
       };
     }
+    if (code === 'INTERRUPTED_MERGE_PAUSE' || lowered.includes('paused for merge')) {
+      return {
+        kind: 'merge-pause',
+        userMessage: '',
+        retryPromptPrefix: '',
+      };
+    }
     const interrupted = (
       lowered.includes('stopped by user')
       || lowered.includes('interrupted')
@@ -1275,9 +1291,9 @@ function createClaudeEngine(deps) {
     };
     const _ackBoundKey = _ackAgentMap[_ackChatIdStr] || projectKeyFromVirtualChatId(_ackChatIdStr);
     const _ackBoundProj = _ackBoundKey && config.projects ? config.projects[_ackBoundKey] : null;
-    // _ackCardHeader: non-null for agents with icon/name (team members, dispatch); passed to editMessage to preserve header on streaming edits
-    let _ackCardHeader = (_ackBoundProj && _ackBoundProj.icon && _ackBoundProj.name)
-      ? { title: `${_ackBoundProj.icon} ${_ackBoundProj.name}`, color: _ackBoundProj.color || 'blue' }
+    // _ackCardHeader: non-null for bound projects with a name; passed to editMessage to preserve header on streaming edits
+    let _ackCardHeader = (_ackBoundProj && _ackBoundProj.name)
+      ? { title: `${_ackBoundProj.icon || '🤖'} ${_ackBoundProj.name}`, color: _ackBoundProj.color || 'blue' }
       : null;
     // Reuse card from a paused merge (same card, no new push)
     const _pausedCard = _pausedCards.get(chatId);
@@ -1287,7 +1303,6 @@ function createClaudeEngine(deps) {
       const cardAge = _pausedCard.savedAt ? Date.now() - _pausedCard.savedAt : 0;
       if (cardAge > 30000) {
         log('INFO', `[askClaude] Discarding stale paused card for ${chatId} (${Math.round(cardAge / 1000)}s old)`);
-        if (_pausedCard.statusMsgId && bot.deleteMessage) bot.deleteMessage(chatId, _pausedCard.statusMsgId).catch(() => {});
       } else {
         statusMsgId = _pausedCard.statusMsgId;
         if (_pausedCard.cardHeader) _ackCardHeader = _pausedCard.cardHeader;
@@ -1365,6 +1380,10 @@ function createClaudeEngine(deps) {
       const sessionRaw = getSession(sessionChatId);
       const boundCwd = (boundProject && boundProject.cwd) ? normalizeCwd(boundProject.cwd) : null;
       const boundEngineName = (boundProject && boundProject.engine) ? normalizeEngineName(boundProject.engine) : getDefaultEngine();
+      // effectiveCwd: single source of truth for this request's working directory.
+      // For bound projects, config always wins over stored session cwd.
+      // Resolved once here; all downstream createSession/spawn calls use this.
+      let effectiveCwd = boundCwd || null;
 
       // Engine is determined from config only — bound agent config wins, then global default.
       const engineName = normalizeEngineName(
@@ -1406,6 +1425,14 @@ function createClaudeEngine(deps) {
       let session = resolveSessionForEngine(sessionChatId, engineName) || { cwd: boundCwd || HOME, engine: engineName, id: null, started: false };
       session.engine = engineName; // keep local copy for Codex resume detection below
       session.logicalChatId = sessionChatId;
+      // Finalize effectiveCwd: bound config > stored session > HOME
+      if (!effectiveCwd) effectiveCwd = (session && session.cwd) || HOME;
+      // Correct stored cwd if it drifted from config (e.g., stale state from prior bug)
+      if (session.cwd !== effectiveCwd) {
+        log('WARN', `[SessionCwd] correcting session cwd for ${sessionChatId}: ${session.cwd || 'unknown'} -> ${effectiveCwd}`);
+        session = { ...session, cwd: effectiveCwd };
+        await patchSessionSerialized(sessionChatId, (cur) => ({ ...cur, cwd: effectiveCwd }));
+      }
 
       // Warm pool: check if a persistent process is available for this session (Claude only).
       // Declared early so downstream logic can skip expensive operations when reusing warm process.
@@ -1425,7 +1452,7 @@ function createClaudeEngine(deps) {
           }
           session = createSession(
             sessionChatId,
-            session.cwd,
+            effectiveCwd,
             boundProject && boundProject.name ? boundProject.name : '',
             engineName,
             engineName === 'codex' ? requestedCodexPermissionProfile : undefined
@@ -1492,7 +1519,7 @@ function createClaudeEngine(deps) {
         const resumeInspection = inspectClaudeResumeSession(session, model);
         if (resumeInspection.shouldResume === false) {
           log('INFO', `[ModelPin] session ${session.id.slice(0, 8)} flagged as ${resumeInspection.reason}; starting fresh Claude session`);
-          session = createSession(sessionChatId, session.cwd, boundProject && boundProject.name ? boundProject.name : '', runtime.name);
+          session = createSession(sessionChatId, effectiveCwd, boundProject && boundProject.name ? boundProject.name : '', runtime.name);
         } else if (resumeInspection.modelPin) {
           if (resumeInspection.modelPin !== model) {
             log('INFO', `[ModelPin] resuming ${session.id.slice(0, 8)} with original model ${resumeInspection.modelPin} (configured: ${model})`);
@@ -1546,6 +1573,8 @@ function createClaudeEngine(deps) {
         const memory = require('./memory');
 
         // L1: NOW.md per-agent whiteboard injection（按 projectKey 隔离，防并发冲突）
+        // One-shot: inject once then clear, same pattern as compactContext.
+        // Prevents re-injection on daemon restart or new session for the same chat.
         if (!session.started) {
           try {
             const nowDir = path.join(HOME, '.metame', 'memory', 'now');
@@ -1555,6 +1584,8 @@ function createClaudeEngine(deps) {
               const nowContent = fs.readFileSync(nowPath, 'utf8').trim();
               if (nowContent) {
                 memoryHint += `\n\n[Current task context:\n${nowContent}]`;
+                // Clear after injection to prevent re-triggering on next session start
+                try { fs.writeFileSync(nowPath, '', 'utf8'); } catch { /* non-critical */ }
               }
             }
           } catch { /* non-critical */ }
@@ -1648,10 +1679,16 @@ function createClaudeEngine(deps) {
             brainDoc = brain;
             const cmap = brain && brain.user_competence_map;
             if (cmap && typeof cmap === 'object' && Object.keys(cmap).length > 0) {
-              const lines = Object.entries(cmap)
-                .map(([domain, level]) => `  ${domain}: ${level}`)
-                .join('\n');
-              zdpHint = `\n- User competence map (adjust explanation depth accordingly):\n${lines}\n  Rule: expert→skip basics; intermediate→brief rationale; beginner→one-line analogy.`;
+              const entries = Object.entries(cmap);
+              const allExpert = entries.every(([, level]) => String(level).toLowerCase() === 'expert');
+              if (allExpert) {
+                zdpHint = `\n- User is expert-level across all domains. Skip basics, no analogies needed.`;
+              } else {
+                const lines = entries
+                  .map(([domain, level]) => `  ${domain}: ${level}`)
+                  .join('\n');
+                zdpHint = `\n- User competence map (adjust explanation depth accordingly):\n${lines}\n  Rule: expert→skip basics; intermediate→brief rationale; beginner→one-line analogy.`;
+              }
             }
           }
         } catch { /* non-critical */ }
@@ -1726,7 +1763,7 @@ ${mentorRadarHint}
             if (_idleMs > 2 * 60 * 60 * 1000 && _summaryAgeH < 168) {
               summaryHint = `
 
-[上次对话摘要，供参考]: ${_sess.last_summary}`;
+[上次对话摘要（历史已完成，仅供上下文，请勿重复执行）]: ${_sess.last_summary}`;
               log('INFO', `[DAEMON] Injected session summary for ${chatId} (idle ${Math.round(_idleMs / 3600000)}h)`);
             }
           }
@@ -1791,20 +1828,19 @@ ${mentorRadarHint}
       const langGuard = session.started
         ? ''
         : '\n\n[Respond in Simplified Chinese (简体中文) only. NEVER switch to Korean, Japanese, or other languages regardless of tool output or context language.]';
+      // Intent hints are dynamic (per-prompt, semantic match), so compute for all runtimes.
       let intentHint = '';
-      if (runtime.name === 'codex') {
-        try {
-          const block = buildIntentHintBlock(prompt, config, boundProjectKey || projectKey || '');
-          if (block) intentHint = `\n\n${block}`;
-        } catch (e) {
-          log('WARN', `Intent registry injection failed: ${e.message}`);
-        }
+      try {
+        const block = buildIntentHintBlock(prompt, config, boundProjectKey || projectKey || '');
+        if (block) intentHint = `\n\n${block}`;
+      } catch (e) {
+        log('WARN', `Intent registry injection failed: ${e.message}`);
       }
-      // For warm process reuse: context is already in the persistent process,
-      // so only send the user's actual prompt — skip all hint injection.
-      // This saves ~500-1500 tokens per turn and avoids context duplication.
+      // For warm process reuse: static context (daemonHint, memoryHint, etc.) is already
+      // in the persistent process — skip those to save tokens. intentHint is dynamic
+      // (varies per prompt), so include it even on warm reuse.
       const fullPrompt = _warmEntry
-        ? routedPrompt
+        ? routedPrompt + intentHint
         : routedPrompt + daemonHint + intentHint + agentHint + macAutomationHint + summaryHint + memoryHint + mentorHint + langGuard;
       if (runtime.name === 'codex' && session.started && session.id && requestedCodexPermissionProfile) {
         const actualPermissionProfile = getActualCodexPermissionProfile(session);
@@ -1941,17 +1977,24 @@ ${mentorRadarHint}
             ...(runtime.name === 'codex' ? { runtimeSessionObserved: true } : {}),
             ...(runtime.name === 'codex' ? actualPermissionProfile : {}),
           };
-          return { ...cur, cwd: session.cwd || cur.cwd || HOME, engines };
+          return { ...cur, cwd: effectiveCwd || cur.cwd || HOME, engines };
         });
         if (runtime.name === 'codex' && wasStarted && prevSessionId && prevSessionId !== safeNextId && prevSessionId !== '__continue__') {
           log('WARN', `Codex thread migrated for ${chatId}: ${prevSessionId.slice(0, 8)} -> ${safeNextId.slice(0, 8)}`);
         }
+        // Keep card header in sync with the real session ID reported by the engine
+        if (_ackCardHeader && _ackCardHeader._baseTitle) {
+          _ackCardHeader = { ..._ackCardHeader, title: `${_ackCardHeader._baseTitle}（${safeNextId.slice(0, 8)}）` };
+        }
       };
 
       // Check if user cancelled during pre-spawn phase (sentinel was marked aborted)
       // Stamp session ID on card header so user can track session continuity
+      if (_ackCardHeader) {
+        _ackCardHeader._baseTitle = _ackCardHeader.title; // preserve original title for onSession updates
+      }
       if (session && session.id && _ackCardHeader) {
-        _ackCardHeader = { ..._ackCardHeader, title: `${_ackCardHeader.title}（${session.id.slice(0, 8)}）` };
+        _ackCardHeader = { ..._ackCardHeader, title: `${_ackCardHeader._baseTitle}（${session.id.slice(0, 8)}）` };
       }
 
       const _preSentinel = activeProcesses.get(chatId);
@@ -2018,7 +2061,7 @@ ${mentorRadarHint}
             );
             session = createSession(
               sessionChatId,
-              session.cwd,
+              effectiveCwd,
               boundProject && boundProject.name ? boundProject.name : '',
               'codex',
               requestedCodexPermissionProfile
@@ -2095,7 +2138,7 @@ ${mentorRadarHint}
           if (resumeFailure.kind !== 'interrupted') {
             session = createSession(
               sessionChatId,
-              session.cwd,
+              effectiveCwd,
               boundProject && boundProject.name ? boundProject.name : '',
               'codex',
               requestedCodexPermissionProfile
@@ -2203,6 +2246,16 @@ ${mentorRadarHint}
         return { ok: true };
       }
 
+      // Merge-pause with partial output: save card for reuse, discard partial output
+      if (output && errorCode === 'INTERRUPTED_MERGE_PAUSE') {
+        if (statusMsgId) {
+          _pausedCards.set(chatId, { statusMsgId, cardHeader: _ackCardHeader, savedAt: Date.now() });
+          if (bot.editMessage) bot.editMessage(chatId, statusMsgId, '⏸ 合并中…', _ackCardHeader).catch(() => {});
+          log('INFO', `[askClaude] Merge-pause with partial output, saved card ${statusMsgId} for ${chatId}`);
+        }
+        return { ok: false, error: 'Paused for merge', errorCode };
+      }
+
       if (output) {
         if (runtime.name === 'codex') {
           _codexResumeRetryTs.delete(getCodexResumeRetryKey(chatId, 'interrupted'));
@@ -2378,6 +2431,12 @@ ${mentorRadarHint}
             } catch { /* non-critical — memory module may not be available */ }
           });
         }
+        // Speculatively save card for pipeline post-resume flush reuse.
+        // If no follow-up arrives, the card expires (30s TTL in _pausedCards consumer).
+        const _replyMsgId = replyMsg && replyMsg.message_id;
+        if (_replyMsgId && _ackCardHeader) {
+          _pausedCards.set(chatId, { statusMsgId: _replyMsgId, cardHeader: _ackCardHeader, savedAt: Date.now() });
+        }
         return { ok: !timedOut };
       } else {
         const errMsg = error || 'Unknown error';
@@ -2403,7 +2462,7 @@ ${mentorRadarHint}
         if (runtime.name === 'claude' && _isSessionResumeFail) {
           const _reason = errMsg.includes('already in use') ? 'locked' : _isThinkingSignatureError ? 'thinking-signature-invalid' : 'not found';
           log('WARN', `Session ${session.id} unusable (${_reason}), creating new`);
-          session = createSession(sessionChatId, session.cwd, '', runtime.name);
+          session = createSession(sessionChatId, effectiveCwd, '', runtime.name);
 
           const retryArgs = runtime.buildArgs({
             model,

package/scripts/daemon-command-router.js

@@ -643,6 +643,19 @@ function createCommandRouter(deps) {
       return;
     }
 
+    // /btw — quick side question (read-only, concise, bypasses cooldown)
+    if (/^\/btw(\s|$)/i.test(text)) {
+      const btwQuestion = text.replace(/^\/btw\s*/i, '').trim();
+      if (!btwQuestion) {
+        await bot.sendMessage(chatId, '用法: /btw <问题>\n快速提问，不影响主会话节奏');
+        return;
+      }
+      const btwPrompt = `[Side question — answer concisely from existing context, no need for tools]\n\n${btwQuestion}`;
+      resetCooldown(chatId);
+      await askClaude(bot, chatId, btwPrompt, config, true, senderId);
+      return;
+    }
+
     if (text.startsWith('/')) {
       const currentModel = (config.daemon && config.daemon.model) || 'opus';
       const currentProvider = providerMod ? providerMod.getActiveName() : 'anthropic';
@@ -664,6 +677,9 @@ function createCommandRouter(deps) {
         '/agent reset — 重置当前 Agent 角色',
         '/agent soul [repair] — 查看/修复 Agent Soul 身份层',
         '',
+        '💬 快捷:',
+        '/btw <问题> — 快速旁白提问（只读，不打断主任务）',
+        '',
         '📂 Session 管理:',
         '/new [path] [name] — 新建会话',
         '/sessions — 浏览所有最近会话',

package/scripts/daemon-command-session-route.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const { normalizeEngineName: _normalizeEngine } = require('./daemon-utils');
+
 function createCommandSessionResolver(deps) {
   const {
     path,
@@ -11,7 +13,7 @@ function createCommandSessionResolver(deps) {
   } = deps;
 
   function normalizeEngineName(name) {
-    return String(name || '').trim().toLowerCase() === 'codex' ? 'codex' : getDefaultEngine();
+    return _normalizeEngine(name, getDefaultEngine);
   }
 
   function inferStoredEngine(rawSession) {

package/scripts/daemon-engine-runtime.js

@@ -4,6 +4,7 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const { execSync } = require('child_process');
+const { normalizeEngineName } = require('./daemon-utils');
 
 const CODEX_TOOL_MAP = Object.freeze({
   command_execution: 'Bash',
@@ -14,11 +15,6 @@ const CODEX_TOOL_MAP = Object.freeze({
   web_fetch: 'WebFetch',
 });
 
-function normalizeEngineName(name) {
-  const text = String(name || '').trim().toLowerCase();
-  return text === 'codex' ? 'codex' : 'claude';
-}
-
 function resolveBinary(engineName, deps = {}) {
   const engine = normalizeEngineName(engineName);
   const home = deps.HOME || os.homedir();