@xfe-repo/cli-plugin-ai-mcp 2.0.7 → 2.0.9

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @xfe-repo/cli-plugin-ai-mcp
 
+## 2.0.9
+
+### Patch Changes
+
+- 优化deploy
+
+## 2.0.8
+
+### Patch Changes
+
+- 新增deploy自动部署支持
+- Updated dependencies
+  - @xfe-repo/cli-core@2.1.0
+  - @xfe-repo/cli-plugin-ai-rules@2.0.8
+
 ## 2.0.7
 
 ### Patch Changes

package/README.md

@@ -5,6 +5,7 @@ MCP（Model Context Protocol）服务器插件，将 XFE CLI 的命令暴露为
 ## 功能
 
 - 将 CLI 命令自动映射为 MCP Tools
+- 同步命令完成后直接返回日志结果，异步或持续命令返回 sessionId 供 Agent 拉取日志
 - 支持动态端口分配，端口冲突时自动递增
 - 增量日志拉取，Agent 可持续监控任务输出
 - 通过 `mcp:enable` / `mcp:disable` 命令控制服务开关

package/dist/index.js

@@ -32,14 +32,14 @@ export function aiMcpPlugin() {
                 label: 'MCP',
                 icon: '⬡',
                 color: 'blue',
-                slot: 'footer',
+                slot: 'header',
                 value: (state) => {
                     const mcp = state['ai-mcp'];
                     if (!mcp || mcp.status === 'off')
                         return undefined;
                     if (mcp.status === 'error')
                         return '异常';
-                    return `MCP:${mcp.port}`;
+                    return `${mcp.port}`;
                 },
                 url: (state) => {
                     const mcp = state['ai-mcp'];
@@ -151,9 +151,10 @@ function buildMcpInjectionItems(config) {
         '## XFE 项目脚手架 (重要!!!)',
         '',
         '- 对于项目运行、构建、错误检查、环境切换，优先使用 `xfe-cli-mcp` 提供的工具，不要直接运行 pnpm、npm、yarn 等脚本命令。',
-        '- 所有命令工具都会立即返回 sessionId。拿到 sessionId 后，必须使用 xfe-get-session-logs 轮询日志和状态，直到 status 变为 completed 或 error。',
+        '- MCP 命令可能直接返回 completed/error 结果；当返回 status 为 running 时，必须使用 xfe-get-session-logs 基于 sessionId 轮询日志和状态。',
         '- 除非用户明确要求停止任务，否则不要调用 xfe-kill-session 终止已有的开发任务。',
         '- 项目错误、编译日志获取优先顺序是：`xfe-cli-mcp` dev session log > IDE TypeScript/ESLint 报错 > 相关模块代码链路',
+        '- 不要轻易修改用户的环境、平台等配置，验证结果优先dev session log，不要频繁build验证',
     ].join('\n');
     const serverConfig = {
         type: 'http',

package/dist/server.js

@@ -11,11 +11,16 @@ import { WebStandardStreamableHTTPServerTransport } from '@modelcontextprotocol/
 import { Hono } from 'hono';
 import { cors } from 'hono/cors';
 import { z } from 'zod';
+import { CommandExecutionMode } from '@xfe-repo/cli-core';
 import { MemoryLogger, AutoPrompt, LogSpinner } from './adapters.js';
 const MCP_SERVER_INFO = { name: 'xfe-cli', version: '2.0.0' };
 const LIST_SESSIONS_TOOL_NAME = 'xfe-list-sessions';
 const GET_SESSION_LOGS_TOOL_NAME = 'xfe-get-session-logs';
 const KILL_SESSION_TOOL_NAME = 'xfe-kill-session';
+const PERSISTENT_COMMAND_NAMES = new Set(['dev']);
+const JSON_RPC_VERSION = '2.0';
+const MCP_BAD_REQUEST_ERROR_CODE = -32000;
+const MCP_SESSION_NOT_FOUND_ERROR_CODE = -32001;
 // ─── Public API ────────────────────────────────────────────
 export async function startMcpServer(ctx, port) {
     const sessions = new Map();
@@ -72,14 +77,14 @@ function createHttpApp(ctx, sessions) {
     app.get('/mcp', async (c) => {
         const sessionId = c.req.header('mcp-session-id');
         if (!sessionId || !sessions.has(sessionId)) {
-            return c.text('No active session', 400);
+            return mcpSessionErrorResponse(c, sessionId);
         }
         return sessions.get(sessionId).transport.handleRequest(c.req.raw);
     });
     app.on('DELETE', '/mcp', async (c) => {
         const sessionId = c.req.header('mcp-session-id');
         if (!sessionId || !sessions.has(sessionId)) {
-            return c.text('No active session', 400);
+            return mcpSessionErrorResponse(c, sessionId);
         }
         return sessions.get(sessionId).transport.handleRequest(c.req.raw);
     });
@@ -158,8 +163,9 @@ function registerSingleCommandTool(mcpServer, ctx, command, pluginName) {
     }
     mcpServer.registerTool(toolName, toolConfig, (params) => executeCommandAsTool(ctx, command, params));
 }
-function executeCommandAsTool(ctx, command, params) {
+async function executeCommandAsTool(ctx, command, params) {
     const logger = new MemoryLogger();
+    const executionMode = resolveCommandExecutionMode(command, params);
     const sessionId = ctx.sessions.createSession({
         commandName: command.name,
         source: 'mcp',
@@ -168,15 +174,21 @@ function executeCommandAsTool(ctx, command, params) {
         createSpinner: () => new LogSpinner(logger),
         prefilled: params,
     });
+    if (executionMode === CommandExecutionMode.Sync) {
+        await waitForSessionSettled(ctx, sessionId);
+        const logResult = ctx.sessions.getSessionLogs(sessionId);
+        return mcpResult(buildCompletedCommandResult({ commandName: command.name, executionMode, logResult, sessionId }));
+    }
     return mcpResult({
         sessionId,
         command: command.name,
         status: 'running',
         source: 'mcp',
+        executionMode,
         logTool: GET_SESSION_LOGS_TOOL_NAME,
         listSessionsTool: LIST_SESSIONS_TOOL_NAME,
         killSessionTool: KILL_SESSION_TOOL_NAME,
-        message: `命令 "${command.name}" 已启动。请使用 ${GET_SESSION_LOGS_TOOL_NAME} 基于 sessionId 拉取日志。`,
+        message: buildRunningCommandMessage(command.name, executionMode),
     });
 }
 function mcpResult(data) {
@@ -190,8 +202,8 @@ function buildCommandToolDescription(command, pluginName) {
     const lines = [
         `[来源插件: ${pluginName}]`,
         command.description ?? command.simpleDescription,
-        '调用该工具会异步创建一个新的 xfe session 并立即返回 sessionId，不会等待命令执行完成。',
-        `调用后请使用 ${GET_SESSION_LOGS_TOOL_NAME} 轮询日志；如需确认是否已有可复用任务，先使用 ${LIST_SESSIONS_TOOL_NAME}。`,
+        '调用该工具会创建一个新的 xfe session。同步任务会在命令完成后直接返回日志结果；异步或持续任务会立即返回 sessionId。',
+        `当返回 status 为 running 时，请使用 ${GET_SESSION_LOGS_TOOL_NAME} 轮询日志；如需确认是否已有可复用任务，先使用 ${LIST_SESSIONS_TOOL_NAME}。`,
     ];
     if (command.parameters) {
         lines.push('若命令可能触发交互，请在本次调用中一次性传入所有相关参数。');
@@ -201,4 +213,77 @@ function buildCommandToolDescription(command, pluginName) {
 function resolveSession(ctx, sessionId) {
     return ctx.sessions.getSession(sessionId);
 }
+function mcpSessionErrorResponse(c, sessionId) {
+    if (sessionId) {
+        return c.json(createJsonRpcError(MCP_SESSION_NOT_FOUND_ERROR_CODE, 'Session not found'), 404);
+    }
+    return c.json(createJsonRpcError(MCP_BAD_REQUEST_ERROR_CODE, 'Bad Request: Mcp-Session-Id header is required'), 400);
+}
+function createJsonRpcError(code, message) {
+    return {
+        jsonrpc: JSON_RPC_VERSION,
+        error: { code, message },
+        id: null,
+    };
+}
+function resolveCommandExecutionMode(command, params) {
+    if (typeof command.execMode === 'function') {
+        return command.execMode(params);
+    }
+    if (command.execMode)
+        return command.execMode;
+    if (PERSISTENT_COMMAND_NAMES.has(command.name))
+        return CommandExecutionMode.Persistent;
+    return CommandExecutionMode.Sync;
+}
+function waitForSessionSettled(ctx, sessionId) {
+    const session = ctx.sessions.getSession(sessionId);
+    if (!session || session.status !== 'running')
+        return Promise.resolve();
+    return new Promise((resolve) => {
+        let unsubscribe = () => { };
+        const completeIfSettled = () => {
+            const currentSession = ctx.sessions.getSession(sessionId);
+            if (currentSession?.status === 'running')
+                return;
+            unsubscribe();
+            resolve();
+        };
+        unsubscribe = ctx.sessions.subscribe(completeIfSettled);
+        completeIfSettled();
+    });
+}
+function buildCompletedCommandResult(options) {
+    const { commandName, executionMode, sessionId, logResult } = options;
+    const status = logResult?.status ?? 'completed';
+    return {
+        sessionId,
+        command: commandName,
+        status,
+        source: 'mcp',
+        executionMode,
+        logs: logResult?.logs ?? [],
+        totalLines: logResult?.totalLines ?? 0,
+        hasMore: logResult?.hasMore ?? false,
+        logTool: GET_SESSION_LOGS_TOOL_NAME,
+        listSessionsTool: LIST_SESSIONS_TOOL_NAME,
+        message: buildCompletedCommandMessage(commandName, status),
+    };
+}
+function buildCompletedCommandMessage(commandName, status) {
+    if (status === 'error')
+        return `命令 "${commandName}" 执行失败，错误日志已随本次响应返回。`;
+    return `命令 "${commandName}" 已完成，结果已随本次响应返回。`;
+}
+function buildRunningCommandMessage(commandName, mode) {
+    const modeName = formatExecutionMode(mode);
+    return `命令 "${commandName}" 已启动。该任务为${modeName}，请使用 ${GET_SESSION_LOGS_TOOL_NAME} 基于 sessionId 拉取日志。`;
+}
+function formatExecutionMode(mode) {
+    if (mode === CommandExecutionMode.Persistent)
+        return '持续任务';
+    if (mode === CommandExecutionMode.Async)
+        return '异步任务';
+    return '同步任务';
+}
 //# sourceMappingURL=server.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfe-repo/cli-plugin-ai-mcp",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "description": "XFE CLI MCP Server 插件 —— 将 CLI 命令暴露为 MCP Tools",
   "type": "module",
   "main": "./dist/index.js",
@@ -11,8 +11,8 @@
     "get-port": "^7.1.0",
     "hono": "^4.7.0",
     "zod": "^4.3.6",
-    "@xfe-repo/cli-plugin-ai-rules": "2.0.7",
-    "@xfe-repo/cli-core": "2.0.8"
+    "@xfe-repo/cli-core": "2.1.0",
+    "@xfe-repo/cli-plugin-ai-rules": "2.0.8"
   },
   "devDependencies": {
     "@types/node": "^24.3.0",