@baitong-dev/execute-command-mcp 0.0.1 → 0.0.2

package/ExecuteCommandMcpServer.js

@@ -53,7 +53,9 @@ const fs = __importStar(require("fs"));
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
 const zod_1 = __importDefault(require("zod"));
-const HOME_APP_DIR = '.baitong-desktop';
+const MCP_NAME = 'Execute Command MCP';
+const MCP_VERSION = '0.0.2';
+const HOME_DIR = process.env.MCP_HOME_DIR || os_1.default.homedir();
 function getBinaryName(name) {
     if (process.platform == 'win32') {
         return `${name}.exe`;
@@ -62,10 +64,10 @@ function getBinaryName(name) {
 }
 function getBinaryPath(name) {
     if (!name) {
-        return path_1.default.join(os_1.default.homedir(), HOME_APP_DIR, 'bin');
+        return path_1.default.join(os_1.default.homedir(), HOME_DIR, 'bin');
     }
     const binaryName = getBinaryName(name);
-    const binariesDir = path_1.default.join(os_1.default.homedir(), HOME_APP_DIR, 'bin');
+    const binariesDir = path_1.default.join(os_1.default.homedir(), HOME_DIR, 'bin');
     const binariesDirExists = fs.existsSync(binariesDir);
     return binariesDirExists ? path_1.default.join(binariesDir, binaryName) : binaryName;
 }
@@ -125,9 +127,27 @@ function handleCommand(fullCommand) {
         args
     };
 }
+/**
+ * 检查一个目录是否是另一个目录的子目录
+ * @param {string} parent - 父目录路径
+ * @param {string} child - 要检查的子目录路径
+ * @param {Object} options - 配置选项
+ * @param {boolean} options.resolveSymlinks - 是否解析符号链接
+ * @param {boolean} options.includeSelf - 是否将自身视为子目录
+ * @returns {boolean|Promise<boolean>} - 同步返回 boolean，异步返回 Promise
+ */
+function isSubdirectory(parent, child, { includeSelf = false }) {
+    const parentPath = path_1.default.resolve(parent);
+    const childPath = path_1.default.resolve(child);
+    const relative = path_1.default.relative(parentPath, childPath);
+    if (includeSelf && childPath === parentPath) {
+        return true;
+    }
+    return relative && !relative.startsWith('..') && !path_1.default.isAbsolute(relative);
+}
 const server = new mcp_js_1.McpServer({
-    name: 'execute-command-mcp',
-    version: '1.0.0'
+    name: MCP_NAME,
+    version: MCP_VERSION
 }, {
     capabilities: {
         logging: {}
@@ -169,7 +189,7 @@ function formatCommandLine(command) {
  * Format timing
  */
 function formatTiming(durationMs) {
-    return `[${durationMs}ms]`;
+    return `[duration: ${durationMs}ms]`;
 }
 /**
  * Middle-truncate output to preserve beginning and end
@@ -205,31 +225,27 @@ function classifyErrorType(exitCode, killed, forceKilled, spawnError, cwdError)
 /**
  * Format command result for output (Batch 1.2: includes errorType)
  */
-function formatResult(result, options = {}) {
+function formatResult(result, options) {
     const { description, timeout, command, showTiming = false } = options;
-    let output = '';
-    if (description)
-        output += `=== ${description} ===\n`;
-    if (command)
-        output += `${formatCommandLine(command)}\n`;
-    if (result.stdout)
-        output += result.stdout;
-    if (result.stderr)
-        output += `\n[stderr]: ${result.stderr}`;
+    let output = `=== ${formatCommandLine(command)} ${description ? `(${description})` : ''} ===`;
+    if (result.truncatedStdout)
+        output += `\n\n[stdout]: ${result.truncatedStdout}`;
+    if (result.truncatedStderr)
+        output += `\n\n[stderr]: ${result.truncatedStderr}`;
     if (result.killed) {
         if (result.forceKilled) {
-            output += `\n[timeout after ${(timeout || 30000) + GRACEFUL_TIMEOUT_MS}ms, SIGKILL]`;
+            output += `\n\n[timeout after ${(timeout || 30000) + GRACEFUL_TIMEOUT_MS}ms, SIGKILL]`;
         }
         else {
-            output += `\n[timeout after ${timeout || 30000}ms, SIGTERM]`;
+            output += `\n\n[timeout after ${timeout || 30000}ms, SIGTERM]`;
         }
     }
     if (result.errorType && result.errorType !== 'timeout') {
-        output += `\n[errorType: ${result.errorType}]`;
+        output += `\n\n[errorType: ${result.errorType}]`;
     }
-    output += `\n[exit code: ${result.exitCode}]`;
+    output += `\n\n[exit code: ${result.exitCode}]`;
     if (showTiming && result.durationMs !== undefined) {
-        output += `\n${formatTiming(result.durationMs)}`;
+        output += `\n\n${formatTiming(result.durationMs)}`;
     }
     return output.trim() || '(no output)';
 }
@@ -240,13 +256,20 @@ function formatResult(result, options = {}) {
  * Write output to file (before truncation)
  * Returns error message on failure, undefined on success
  */
-function writeOutputToFile(filePath, content) {
+function writeOutputToFile(filePath, content, label = 'stdout') {
     try {
-        fs.writeFileSync(filePath, content, 'utf8');
-        return undefined;
+        if (isSubdirectory(HOME_DIR, filePath, {
+            includeSelf: true
+        })) {
+            fs.writeFileSync(filePath, content, 'utf-8');
+            return `\n\n[${label} saved to: ${filePath}]`;
+        }
+        else {
+            throw Error(`"${filePath}" is not in home directory`);
+        }
     }
     catch (err) {
-        return err.message;
+        return `\n\n[${label} save failed: ${err.message}]`;
     }
 }
 /**
@@ -276,6 +299,8 @@ async function executeSequence(options) {
                     command: ((_a = commands[0]) === null || _a === void 0 ? void 0 : _a.command) || '',
                     stdout: '',
                     stderr: `[error]: Working directory does not exist: ${cwd}`,
+                    truncatedStdout: '',
+                    truncatedStderr: `[error]: Working directory does not exist: ${cwd}`,
                     exitCode: 1,
                     durationMs: 0,
                     stopped: true,
@@ -307,21 +332,25 @@ async function executeSequence(options) {
                 results.push({
                     index,
                     command,
-                    stdout: '',
+                    stdout: command,
                     stderr: '',
+                    truncatedStdout: command,
+                    truncatedStderr: '',
                     exitCode: 0,
-                    durationMs: 0
+                    durationMs: 1
                 });
                 continue;
             }
             // 每次执行非cd命令
             const result = await executeCommand(Object.assign(Object.assign({}, options), { cwd: newCwd, timeout: newTimeout, command }));
-            const { stdout, stderr, exitCode, killed, durationMs } = result;
+            const { stdout, stderr, exitCode, killed, durationMs, truncatedStderr, truncatedStdout } = result;
             const sequenceResult = {
                 index,
                 command,
                 stdout,
                 stderr,
+                truncatedStdout,
+                truncatedStderr,
                 exitCode,
                 durationMs,
                 stopped: false
@@ -387,8 +416,14 @@ const bashInputSchema = zod_1.default.object({
         .max(1000000)
         .optional()
         .describe('Maximum output length before middle-truncation (default 30000)'),
-    outputFile: zod_1.default.string().optional().describe('File path to save full stdout (before truncation)'),
-    stderrFile: zod_1.default.string().optional().describe('File path to save full stderr (before truncation)'),
+    outputFile: zod_1.default
+        .string()
+        .optional()
+        .describe('File path (.txt) to save full stdout (before truncation)'),
+    stderrFile: zod_1.default
+        .string()
+        .optional()
+        .describe('File path (.txt) to save full stderr (before truncation)'),
     loginShell: zod_1.default
         .boolean()
         .optional()
@@ -398,7 +433,7 @@ const bashInputSchema = zod_1.default.object({
  * Execute a command and return result
  */
 function executeCommand(options) {
-    const { command, cwd = DEFAULT_CWD, timeout = 30000, env, stdin, maxOutput = 30000, outputFile, stderrFile
+    const { command, cwd = DEFAULT_CWD, timeout = 30000, env, stdin, maxOutput = 30000
     // loginShell = false
      } = options;
     return new Promise(resolve => {
@@ -407,6 +442,8 @@ function executeCommand(options) {
         // Batch 1.3: CWD Validation
         if (!fs.existsSync(cwd)) {
             resolve({
+                truncatedStdout: '',
+                truncatedStderr: `[error]: Working directory does not exist: ${cwd}`,
                 stdout: '',
                 stderr: `[error]: Working directory does not exist: ${cwd}`,
                 exitCode: 1,
@@ -423,7 +460,6 @@ function executeCommand(options) {
             // Use -lc for login shell (sources .profile), -c for regular
             // const shellArgs = loginShell ? ['-lc', command] : ['-c', command]
             const handledCommand = handleCommand(command);
-            console.log(handledCommand);
             proc = (0, child_process_1.spawn)(handledCommand.command, handledCommand.args, {
                 cwd,
                 env: mergedEnv,
@@ -432,6 +468,8 @@ function executeCommand(options) {
         }
         catch (err) {
             resolve({
+                truncatedStdout: '',
+                truncatedStderr: `[error]: Failed to spawn process: ${err.message}`,
                 stdout: '',
                 stderr: `[error]: Failed to spawn process: ${err.message}`,
                 exitCode: 1,
@@ -476,14 +514,7 @@ function executeCommand(options) {
             if (graceTimer)
                 clearTimeout(graceTimer);
             const durationMs = Date.now() - startTime;
-            // Batch 5.1: Write to files BEFORE truncation
-            if (outputFile) {
-                writeOutputToFile(outputFile, stdout);
-            }
-            if (stderrFile) {
-                writeOutputToFile(stderrFile, stderr);
-            }
-            // Apply truncation for response
+            const errorType = classifyErrorType(code, killed, forceKilled);
             let truncatedStdout = stdout;
             let truncatedStderr = stderr;
             if (truncatedStdout.length > maxOutput) {
@@ -492,10 +523,11 @@ function executeCommand(options) {
             if (truncatedStderr.length > maxOutput) {
                 truncatedStderr = middleTruncate(truncatedStderr, maxOutput);
             }
-            const errorType = classifyErrorType(code, killed, forceKilled);
             resolve({
-                stdout: truncatedStdout,
-                stderr: truncatedStderr,
+                truncatedStdout,
+                truncatedStderr,
+                stdout,
+                stderr,
                 exitCode: killed ? EXIT_CODE_TIMEOUT : code,
                 killed,
                 forceKilled,
@@ -510,6 +542,8 @@ function executeCommand(options) {
                 clearTimeout(graceTimer);
             const durationMs = Date.now() - startTime;
             resolve({
+                truncatedStdout: '',
+                truncatedStderr: err.message,
                 stdout: '',
                 stderr: err.message,
                 exitCode: 1,
@@ -525,7 +559,7 @@ server.registerTool('execute_command', {
     description: 'Execute a command directly. Returns stdout, stderr, and exit code.',
     inputSchema: bashInputSchema
 }, async (args) => {
-    const command = args.command;
+    const { command, outputFile, stderrFile, timeout = 30000 } = args;
     if (command.includes('&&')) {
         return executeSequenceCallback({
             commands: command.split('&&').map(cmd => ({ command: cmd.trim() })),
@@ -547,16 +581,16 @@ server.registerTool('execute_command', {
     // Use formatFullOutput for DRY consistency
     let output = formatResult(result, {
         description: args.description,
-        timeout: args.timeout,
+        timeout,
         command,
         showTiming: true
     });
     // Add file save notices
-    if (args.outputFile) {
-        output += `\n[stdout saved to: ${args.outputFile}]`;
+    if (outputFile && result.stdout) {
+        output += writeOutputToFile(outputFile, result.stdout);
     }
-    if (args.stderrFile) {
-        output += `\n[stderr saved to: ${args.stderrFile}]`;
+    if (stderrFile && result.stderr) {
+        output += writeOutputToFile(stderrFile, result.stderr);
     }
     return {
         isError: result.exitCode !== 0,
@@ -593,7 +627,10 @@ const bashSequenceInputSchema = zod_1.default.object({
         .record(zod_1.default.string(), zod_1.default.string())
         .optional()
         .describe('Additional environment variables to set'),
-    outputFile: zod_1.default.string().optional().describe('File path to save full output (before truncation)')
+    outputFile: zod_1.default
+        .string()
+        .optional()
+        .describe('File path (.txt) to save full output (before truncation)')
 });
 const executeSequenceCallback = async (args) => {
     var _a;
@@ -613,35 +650,32 @@ const executeSequenceCallback = async (args) => {
         }
     }
     const seqResult = await executeSequence(args);
-    // Format output per Batch 4.4 spec
     const outputParts = seqResult.results.map(r => {
-        const header = r.description
-            ? `[${r.index}] === ${r.description} ===`
-            : `[${r.index}] === Command ${r.index} ===`;
-        const cmdLine = formatCommandLine(r.command);
-        let body = '';
-        if (r.stdout)
-            body += r.stdout;
-        if (r.stderr)
-            body += `\n[stderr]: ${r.stderr}`;
-        body += `\n[exit code: ${r.exitCode}]`;
+        let output = `[${r.index}] === Command ${formatCommandLine(r.command)} ${r.description ? `(${r.description})` : ''} ===`;
+        if (r.truncatedStdout)
+            output += `\n\n[stdout]: ${r.truncatedStdout}`;
+        if (r.truncatedStderr)
+            output += `\n\n[stderr]: ${r.truncatedStderr}`;
+        output += `\n\n[exit code: ${r.exitCode}]`;
         if (r.stopped && r.stopReason) {
-            body += `\n[stopped - ${r.stopReason}]`;
+            output += `\n\n[stopped - ${r.stopReason}]`;
         }
-        const timing = formatTiming(r.durationMs);
-        return `${header}\n${cmdLine}\n${body.trim()}\n${timing}`;
+        output += `\n\n${formatTiming(r.durationMs)}`;
+        return output;
     });
     // Summary
-    let summary = `\n=== Summary ===`;
-    summary += `\nTotal: ${seqResult.totalDurationMs}ms | Executed: ${seqResult.executed}/${commands.length} | Succeeded: ${seqResult.succeeded} | Failed: ${seqResult.failed}`;
+    let summary = `\n\n=== Summary ===`;
+    summary += `\n\nTotal: ${seqResult.totalDurationMs}ms | Executed: ${seqResult.executed}/${commands.length} | Succeeded: ${seqResult.succeeded} | Failed: ${seqResult.failed}`;
     if (seqResult.stoppedAt !== undefined) {
         const stoppedCmd = seqResult.results[seqResult.stoppedAt];
         const stoppedDesc = (stoppedCmd === null || stoppedCmd === void 0 ? void 0 : stoppedCmd.description) || ((_a = stoppedCmd === null || stoppedCmd === void 0 ? void 0 : stoppedCmd.command) === null || _a === void 0 ? void 0 : _a.slice(0, 30)) || 'unknown';
-        summary += `\nStopped at: [${seqResult.stoppedAt + 1}] ${stoppedDesc}`;
+        summary += `\n\nStopped at: [${seqResult.stoppedAt + 1}] ${stoppedDesc}`;
     }
     let response = outputParts.join('\n\n') + summary;
     if (args.outputFile) {
-        response += `\n[output saved to: ${args.outputFile}]`;
+        response += writeOutputToFile(args.outputFile, seqResult.results
+            .map(r => `[${r.index}] === Command ${r.index} ===\n[stdout]: ${r.stdout}\n[stderr]: ${r.stderr}`)
+            .join('\n\n'), 'output');
     }
     return {
         isError: seqResult.failed > 0,

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@baitong-dev/execute-command-mcp",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "main": "ExecuteCommandMcpServer.js",
   "bin": {
-    "@baitong-dev/skills-mcp": "./ExecuteCommandMcpServer.js"
+    "@baitong-dev/execute-command-mcp": "./ExecuteCommandMcpServer.js"
   },
   "files": [
     "ExecuteCommandMcpServer.js",