mocode-ai 1.3.7 → 1.3.9

package/dist/agent/index.js

@@ -194,8 +194,13 @@ function finishStandaloneBatch(id, expandSingleEntry) {
     batch.endBatch(id, layout);
     if (expandSingleEntry)
         batch.expandSingleEntryFully(id, layout);
-    // mutation 独占批收尾:分隔空行由 flushToolBatch 负责(见 subAgentGroupPendingSeparator);
-    // 不再有 sub-agent 独占批——sub-agent 已合并进组容器批。
+    // mutation 独占批收尾:currentBatchId 已置空。若不告知后续正文「刚出工具块」，
+    // writeAssistantText 的 inToolBlock 会判 false，LLM 流式前缀的 \n / \n\n 就不会被剥掉，
+    // 与 expandSingleEntryFully 已写的 separator 叠成 2 行空白（edit_file 后偶发空两行）。
+    // 置位后与 sub-agent 组收口走同一条对称路径；separator 已由 expandSingleEntryFully
+    // 内部 commit，后续 flush 由 isLastContentRowBlank 守卫拦住，不会多补一行。
+    // 只读批无需此标记：它的 currentBatchId 一直挂到正文到达，inToolBlock 天然为 true。
+    subAgentGroupPendingSeparator = true;
 }
 /** 将跨 LLM 工具轮次累计的调用写入内容区；正文开始或整个 turn 收尾时才切批。 */
 function flushToolBatch(expandSingleEntry = false) {

package/dist/config/index.js

@@ -529,6 +529,7 @@ export const config = {
     subAgentEnabled: process.env.MOCODE_SUBAGENT_ENABLED === 'true',
     subAgentMaxSteps: Number(process.env.SUB_AGENT_MAX_STEPS) || Number(process.env.MAX_STEPS) || 1000,
     frontendToolsEnabled: process.env.MOCODE_FRONTEND_TOOLS_ENABLED === 'true',
+    mcpEnabled: process.env.MOCODE_MCP_ENABLED !== 'false',
     sessionDir: path.join(process.cwd(), '.mocode', 'sessions'),
     searchApiKey: process.env.ANYSEARCH_API_KEY,
     sandboxRoot: process.env.SANDBOX_ROOT || undefined,
@@ -613,6 +614,15 @@ export function updateFrontendToolsConfig(enabled) {
     config.frontendToolsEnabled = enabled;
     process.env.MOCODE_FRONTEND_TOOLS_ENABLED = enabled ? 'true' : 'false';
 }
+/** MCP 总开关；关闭时下次启动跳过 MCP 配置读取与服务连接。 */
+export function isMcpEnabled() {
+    return config.mcpEnabled;
+}
+/** 运行时更新 MCP 开关；连接建立或释放、工具表刷新由 REPL 调用方执行。 */
+export function updateMcpConfig(enabled) {
+    config.mcpEnabled = enabled;
+    process.env.MOCODE_MCP_ENABLED = enabled ? 'true' : 'false';
+}
 /**
  * 记忆子系统总开关:单一来源。/memory_switch、/memory_status、buildSystemPrompt、
  * tools/builtins/index.ts、tools/constants.ts 的 plan-mode 列表都从这里查。

package/dist/i18n/index.js

@@ -27,6 +27,10 @@ const zhCN = {
     'commands.feOn': '开启前端工具簇',
     'commands.feOff': '关闭前端工具簇',
     'commands.feStatus': '查看前端工具簇状态',
+    'commands.mcp': 'MCP 服务开关（重启后生效）',
+    'commands.mcpOn': '开启 MCP 服务',
+    'commands.mcpOff': '关闭 MCP 服务',
+    'commands.mcpStatus': '查看 MCP 服务状态',
     'commands.theme': '切换颜色主题（↑↓·Enter）',
     'commands.model': '模型配置与预设管理',
     'commands.modelConfigure': '配置新模型（向导）',
@@ -175,7 +179,6 @@ const zhCN = {
     'banner.disabled': '关闭',
     'status.modeSwitch': 'Shift+Tab 切换',
     'status.history': '历史 ↑{count}（PgDn 回底）',
-    'status.interruptHint': 'Esc / Ctrl+C 中断',
     'status.measured': '实测',
     'status.estimated': '估算',
     'status.messages': '{count} 条消息',
@@ -260,6 +263,14 @@ const zhCN = {
     'fe.changedOn': '已开启前端工具簇；browser / dev_server / screenshot / view_image 将从下一次模型请求起可用。',
     'fe.changedOff': '已关闭前端工具簇；browser / dev_server / screenshot / view_image 已从模型工具表移除。',
     'fe.usage': '用法：/fe on|off|status',
+    'mcp.status': 'MCP 服务：{state}',
+    'mcp.stateOn': '开启',
+    'mcp.stateOff': '关闭',
+    'mcp.changedOn': '已开启 MCP；已按当前配置连接服务并刷新工具表。',
+    'mcp.changedOff': '已关闭 MCP；已断开连接并从工具表移除 MCP 工具。',
+    'mcp.usage': '用法：/mcp on|off|status',
+    'mcp.unchanged': 'MCP 已是{state}，未变更。',
+    'mcp.restartHint': '该设置已写入配置文件；下次启动将按此状态决定是否连接 MCP。',
     'plan.ready': '计划已就绪',
     'plan.approvalDetail': '切换到 auto 模式按上述计划执行？（plan 模式只读探查，执行需切 auto）',
     'plan.execute': '切 auto 执行',
@@ -318,6 +329,10 @@ const en = {
     'commands.feOn': 'Enable frontend tools',
     'commands.feOff': 'Disable frontend tools',
     'commands.feStatus': 'Show frontend tools status',
+    'commands.mcp': 'MCP service controls (applies immediately)',
+    'commands.mcpOn': 'Enable MCP services',
+    'commands.mcpOff': 'Disable MCP services',
+    'commands.mcpStatus': 'Show MCP service status',
     'commands.theme': 'Switch color theme (↑↓·Enter)',
     'commands.model': 'Model configuration and presets',
     'commands.modelConfigure': 'Configure a new model (wizard)',
@@ -466,7 +481,6 @@ const en = {
     'banner.disabled': 'Disabled',
     'status.modeSwitch': 'Shift+Tab Switch',
     'status.history': 'History ↑{count} (PgDn to bottom)',
-    'status.interruptHint': 'Esc / Ctrl+C to interrupt',
     'status.measured': 'measured',
     'status.estimated': 'estimated',
     'status.messages': '{count} messages',
@@ -551,6 +565,14 @@ const en = {
     'fe.changedOn': 'Frontend tools enabled; browser / dev_server / screenshot / view_image will be available from the next model request.',
     'fe.changedOff': 'Frontend tools disabled; browser / dev_server / screenshot / view_image have been removed from the model tool list.',
     'fe.usage': 'Usage: /fe on|off|status',
+    'mcp.status': 'MCP services: {state}',
+    'mcp.stateOn': 'enabled',
+    'mcp.stateOff': 'disabled',
+    'mcp.changedOn': 'MCP enabled; services have been connected from the current configuration and the tool list refreshed.',
+    'mcp.changedOff': 'MCP disabled; connections have been closed and MCP tools removed from the tool list.',
+    'mcp.usage': 'Usage: /mcp on|off|status',
+    'mcp.unchanged': 'MCP is already {state}; no change made.',
+    'mcp.restartHint': 'This setting is saved to the configuration file; future startups use it to decide whether to connect MCP.',
     'plan.ready': 'Plan ready',
     'plan.approvalDetail': 'Switch to auto mode and execute the plan above? (Plan mode is read-only; execution requires auto mode.)',
     'plan.execute': 'Switch to auto and execute',

package/dist/mcp/config.js

@@ -7,6 +7,9 @@ import path from 'node:path';
  * JSON 格式兼容常见的 { "mcpServers": { name: { command/url/... } } }，也允许直接 server map。
  */
 export function readMcpServers() {
+    // 总开关必须早于任何配置读取，以便即使用户级 MCP 配置存在也能快速启动。
+    if (process.env.MOCODE_MCP_ENABLED === 'false')
+        return { servers: [], warnings: [] };
     const warnings = [];
     const servers = new Map();
     const fromFile = process.env.MCP_CONFIG_PATH;

package/dist/repl/index.js

@@ -1,7 +1,7 @@
 import readline from 'node:readline/promises';
 import { emitKeypressEvents } from 'node:readline';
 import { stdin, stdout } from 'node:process';
-import { config, updateModelConfig, isModelConfigured, updateMemoryConfig, isMemoryEnabled, isSubAgentEnabled, updateSubAgentConfig, isFrontendToolsEnabled, updateFrontendToolsConfig, updateLanguageConfig, languageFromShell, buildBasePrompt, getPlanModeSuffix, hasCodegraphIndex, DEFAULT_CONTEXT_WINDOW_TOKENS, pinSessionModel, } from '../config/index.js';
+import { config, updateModelConfig, isModelConfigured, updateMemoryConfig, isMemoryEnabled, isSubAgentEnabled, updateSubAgentConfig, isFrontendToolsEnabled, updateFrontendToolsConfig, isMcpEnabled, updateMcpConfig, updateLanguageConfig, languageFromShell, buildBasePrompt, getPlanModeSuffix, hasCodegraphIndex, DEFAULT_CONTEXT_WINDOW_TOKENS, pinSessionModel, } from '../config/index.js';
 import { getLanguage, normalizeLanguage, t, } from '../i18n/index.js';
 import { DEFAULT_BUDGET_POLICY } from '../context/budget.js';
 import { updateConfigKey, writeConfigKeys, CONFIG_PATH } from '../config/file.js';
@@ -84,6 +84,13 @@ function buildSlashCommands() {
                 { name: 'status', value: '/fe status', desc: d('commands.feStatus') },
             ],
         },
+        {
+            name: '/mcp', desc: d('commands.mcp'), children: [
+                { name: 'on', value: '/mcp on', desc: d('commands.mcpOn') },
+                { name: 'off', value: '/mcp off', desc: d('commands.mcpOff') },
+                { name: 'status', value: '/mcp status', desc: d('commands.mcpStatus') },
+            ],
+        },
         { name: '/theme', desc: d('commands.theme') },
         {
             name: '/model', desc: d('commands.model'), children: [
@@ -157,7 +164,7 @@ const LLM_ERROR_HINT_KEYS = {
 const HELP_GROUPS = [
     { key: 'help.groupFrequent', names: ['/help', '/clear', '/context', '/compact', '/resume', '/model'] },
     { key: 'help.groupSession', names: ['/sessions', '/rollback', '/memory', '/skills', '/skill', '/init'] },
-    { key: 'help.groupConfig', names: ['/mode', '/subagent', '/fe', '/theme', '/pet', '/image', '/language', '/upgrade'] },
+    { key: 'help.groupConfig', names: ['/mode', '/subagent', '/fe', '/mcp', '/theme', '/pet', '/image', '/language', '/upgrade'] },
 ];
 /**
  * 菜单树里全部可用命令名(含分支路径与叶子的真实命令),供未知命令纠错建议用。
@@ -2401,6 +2408,43 @@ export async function startRepl(initialHistory, sessionId, sandboxRootOverride,
             layout.contentWrite(`${enabled ? ui.green : ui.yellow}${t(enabled ? 'fe.changedOn' : 'fe.changedOff')}${ui.reset}\n`);
             continue;
         }
+        if (line === '/mcp' || line.startsWith('/mcp ')) {
+            const arg = line.startsWith('/mcp ')
+                ? line.slice('/mcp '.length).trim().toLowerCase()
+                : 'status';
+            if (arg === '' || arg === 'status') {
+                const enabled = isMcpEnabled();
+                const state = t(enabled ? 'mcp.stateOn' : 'mcp.stateOff');
+                layout.contentWrite(`${ui.accent}${t('mcp.status', { state })}${ui.reset}\n` +
+                    `${ui.dim}MOCODE_MCP_ENABLED=${enabled ? 'true' : 'false'} · ${CONFIG_PATH}${ui.reset}\n` +
+                    `${ui.dim}${t('mcp.restartHint')}${ui.reset}\n`);
+                continue;
+            }
+            if (arg !== 'on' && arg !== 'off') {
+                layout.contentWrite(`${ui.yellow}${t('mcp.usage')}${ui.reset}\n`);
+                continue;
+            }
+            const enabled = arg === 'on';
+            if (enabled === isMcpEnabled()) {
+                layout.contentWrite(`${ui.dim}${t('mcp.unchanged', { state: t(enabled ? 'mcp.stateOn' : 'mcp.stateOff') })}${ui.reset}\n`);
+                continue;
+            }
+            updateMcpConfig(enabled);
+            updateConfigKey('MOCODE_MCP_ENABLED', enabled ? 'true' : 'false');
+            if (enabled) {
+                await initializeAllMcp();
+                registerToolsExtension('mcp', getMcpTools());
+            }
+            else {
+                await closeAllMcp();
+                registerToolsExtension('mcp', []);
+            }
+            refreshChatTools();
+            history[0] = { role: 'system', content: buildSystemMessage(getAgentMode() === 'plan') };
+            layout.rewriteBanner(bannerLines(banner()));
+            layout.contentWrite(`${enabled ? ui.green : ui.yellow}${t(enabled ? 'mcp.changedOn' : 'mcp.changedOff')}${ui.reset}\n`);
+            continue;
+        }
         if (line === '/memory_switch' ||
             line.startsWith('/memory_switch ') ||
             line === '/memory_status' ||

package/dist/ui/layout.js

@@ -1406,14 +1406,6 @@ function composeSpinnerLine(status, cols) {
     const elapsed = (mode === 'running' && turnStart != null)
         ? fmtElapsed(Date.now() - turnStart)
         : '';
-    // 新手中断提示:每轮开始后前 6 秒,spinner 行尾随一次 dim「(Esc / Ctrl+C 中断)」,
-    // 6 秒后自然消失(不常驻,不打扰老用户)。只在非滚动回看时画,回看态右段让给历史指示。
-    const INTERRUPT_HINT_WINDOW_MS = 6000;
-    const hintActive = !scrolled && mode === 'running' && turnStart != null
-        && Date.now() - turnStart < INTERRUPT_HINT_WINDOW_MS;
-    const hintText = t('status.interruptHint');
-    const hint = hintActive ? `  ${ui.dim}(${hintText})${ui.reset}` : '';
-    const hintW = hintActive ? 4 + displayWidth(hintText) : 0; // 2 缩进 + 左右括号
     // ── 左段:帧 + 状态 + 走时,全部紧跟 ──
     let lead;
     let leadW;
@@ -1432,17 +1424,17 @@ function composeSpinnerLine(status, cols) {
         leadW = 1 + 1 + displayWidth(label) + (elapsed ? 1 + displayWidth(elapsed) : 0);
     }
     else if (hasSpinner) {
-        // spinner 激活(思考中/执行工具…):帧 + 状态 + 走时 (+ 新手中断提示)
+        // spinner 激活(思考中/执行工具…):帧 + 状态 + 走时
         const ePart = elapsed ? ` ${ui.dim}${elapsed}${ui.reset}` : '';
-        lead = `${ui.bold}${ui.accent}${status.spinnerFrame}${ui.reset} ${ui.dim}${status.status}${ui.reset}${ePart}${hint}`;
-        leadW = 1 + 1 + displayWidth(status.status) + (elapsed ? 1 + displayWidth(elapsed) : 0) + hintW;
+        lead = `${ui.bold}${ui.accent}${status.spinnerFrame}${ui.reset} ${ui.dim}${status.status}${ui.reset}${ePart}`;
+        leadW = 1 + 1 + displayWidth(status.status) + (elapsed ? 1 + displayWidth(elapsed) : 0);
     }
     else if (spinning) {
-        // 运行态心跳帧(流式输出中 / 命令态如 /rollback /compact /resume):帧 + 状态文字(优先)或生成中(兜底) + 走时 (+ 新手中断提示)
+        // 运行态心跳帧(流式输出中 / 命令态如 /rollback /compact /resume):帧 + 状态文字(优先)或生成中(兜底) + 走时
         const label = status.status || '生成中';
         const ePart = elapsed ? ` ${ui.dim}${elapsed}${ui.reset}` : '';
-        lead = `${ui.bold}${ui.accent}${RUNNING_FRAMES[runningFrame]}${ui.reset} ${ui.dim}${label}${ui.reset}${ePart}${hint}`;
-        leadW = 1 + 1 + displayWidth(label) + (elapsed ? 1 + displayWidth(elapsed) : 0) + hintW;
+        lead = `${ui.bold}${ui.accent}${RUNNING_FRAMES[runningFrame]}${ui.reset} ${ui.dim}${label}${ui.reset}${ePart}`;
+        leadW = 1 + 1 + displayWidth(label) + (elapsed ? 1 + displayWidth(elapsed) : 0);
     }
     else {
         // INPUT 态:● + 状态文字(无走时)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mocode-ai",
-  "version": "1.3.7",
+  "version": "1.3.9",
   "description": "终端编码 agent:LLM + tool-call 循环 + 流式输出(含思考)+ 16 个工具,接任意 OpenAI 兼容后端。",
   "type": "module",
   "bin": {