@maplezzk/mcps 1.0.14 → 1.0.18

package/README.md

@@ -25,11 +25,7 @@ mcps 支持守护进程模式，可以保持与 MCP 服务的长连接，显著
 
 **启动守护进程：**
 ```bash
-mcps daemon
-```
-或者
-```bash
-mcps daemon start
+mcps start
 ```
 
 **重启连接：**
@@ -37,49 +33,68 @@ mcps daemon start
 
 ```bash
 # 重置所有连接
-mcps daemon restart
+mcps restart
 
 # 仅重置特定服务的连接
-mcps daemon restart my-server
+mcps restart my-server
 ```
 
 **停止守护进程：**
 ```bash
-mcps daemon stop
+mcps stop
+```
+
+**查看守护进程状态：**
+```bash
+mcps status
 ```
 
+> **注意**：旧的三词命令（如 `mcps daemon start`）仍然可用，保持向后兼容。
+
 ### 2. 服务管理 (Server Management)
 
 **查看所有服务：**
 ```bash
-mcps server list
+mcps ls
 ```
 
 **添加 Stdio 服务：**
 ```bash
 # 添加本地 Node.js 服务
-mcps server add my-server --command node --args ./build/index.js
+mcps add my-server --command node --args ./build/index.js
 
 # 使用 npx/uvx 添加服务
-mcps server add fetch --command uvx --args mcp-server-fetch
+mcps add fetch --command uvx --args mcp-server-fetch
 ```
 
 **添加 SSE 服务：**
 ```bash
-mcps server add remote-server --type sse --url http://localhost:8000/sse
+mcps add remote-server --type sse --url http://localhost:8000/sse
 ```
 
 **添加 Streamable HTTP 服务：**
 ```bash
-mcps server add my-http-server --type http --url http://localhost:8000/mcp
+mcps add my-http-server --type http --url http://localhost:8000/mcp
 ```
 
 **移除服务：**
 ```bash
-mcps server remove my-server
+mcps rm my-server
+```
+
+**更新服务：**
+```bash
+# 刷新所有服务连接
+mcps update
+
+# 更新特定服务的命令
+mcps update my-server --command new-command
+
+# 更新特定服务的参数
+mcps update my-server --args arg1 arg2
 ```
 
-### 2. 工具交互 (Tool Interaction)
+### 3. 工具交互 (Tool Interaction)
 
 **查看服务下的可用工具：**
 ```bash

package/dist/commands/daemon.js

@@ -1,128 +1,196 @@
 import { spawn } from 'child_process';
 import http from 'http';
+import net from 'net';
 import chalk from 'chalk';
 import { connectionPool } from '../core/pool.js';
 import { createRequire } from 'module';
 import { DAEMON_PORT } from '../core/constants.js';
 const require = createRequire(import.meta.url);
 const pkg = require('../../package.json');
-export const registerDaemonCommand = (program) => {
-    const daemonCmd = program.command('daemon')
-        .description('Manage the mcps daemon')
-        .usage('start|stop|restart|status'); // Simplify usage display
-    daemonCmd.command('start', { isDefault: true, hidden: true }) // Hide default start from help but keep functionality
-        .description('Start the daemon (default)')
-        .option('-p, --port <number>', 'Port to listen on', String(DAEMON_PORT))
-        .action(async (options) => {
-        const port = parseInt(options.port);
-        // Check if already running
+// Check if a port is in use
+function isPortInUse(port) {
+    return new Promise((resolve) => {
+        const server = net.createServer();
+        server.once('error', () => {
+            resolve(true); // Port is in use
+        });
+        server.once('listening', () => {
+            server.once('close', () => {
+                resolve(false); // Port is available
+            });
+            server.close();
+        });
+        server.listen(port, '127.0.0.1');
+    });
+}
+// Action functions for daemon commands
+const startAction = async (options, parentCmd) => {
+    const port = parseInt(options.port || DAEMON_PORT);
+    // Check if port is in use (more reliable than HTTP check)
+    const portInUse = await isPortInUse(port);
+    if (portInUse) {
+        // Try to check if it's our daemon via HTTP
         try {
             const res = await fetch(`http://localhost:${port}/status`);
             if (res.ok) {
                 console.log(chalk.yellow(`Daemon is already running on port ${port}.`));
+                process.exit(0);
                 return;
             }
         }
         catch {
-            // Not running, safe to start
-            // If we are already detached (indicated by env var), run the server
-            if (process.env.MCPS_DAEMON_DETACHED === 'true') {
-                startDaemon(port);
-                return;
-            }
-            // Otherwise, spawn a detached process
-            console.log(chalk.gray('Starting daemon in background...'));
-            const subprocess = spawn(process.execPath, [process.argv[1], 'daemon', 'start'], {
-                detached: true,
-                // Pipe stdout/stderr so we can see initialization logs
-                stdio: ['ignore', 'pipe', 'pipe'],
-                env: {
-                    ...process.env,
-                    MCPS_DAEMON_DETACHED: 'true'
-                }
-            });
-            // Stream logs to current console while waiting for ready
-            if (subprocess.stdout) {
-                subprocess.stdout.on('data', (data) => {
-                    process.stdout.write(chalk.gray(`[Daemon] ${data}`));
-                });
+            // Port is in use but not our daemon
+            console.error(chalk.red(`Port ${port} is already in use by another process.`));
+            process.exit(1);
+            return;
+        }
+    }
+    // If we are already detached (indicated by env var), run the server
+    if (process.env.MCPS_DAEMON_DETACHED === 'true') {
+        startDaemon(port);
+        return;
+    }
+    // Otherwise, spawn a detached process
+    console.log(chalk.gray('Starting daemon in background...'));
+    let childFailed = false;
+    const subprocess = spawn(process.execPath, [process.argv[1], 'daemon', 'start'], {
+        detached: true,
+        // Pipe stdout/stderr so we can see initialization logs
+        stdio: ['ignore', 'pipe', 'pipe'],
+        env: {
+            ...process.env,
+            MCPS_DAEMON_DETACHED: 'true'
+        }
+    });
+    // Stream logs to current console while waiting for ready
+    if (subprocess.stdout) {
+        subprocess.stdout.on('data', (data) => {
+            process.stdout.write(chalk.gray(`[Daemon] ${data}`));
+        });
+    }
+    if (subprocess.stderr) {
+        subprocess.stderr.on('data', (data) => {
+            const msg = data.toString();
+            process.stderr.write(chalk.red(`[Daemon] ${msg}`));
+            // Detect port conflict in child process
+            if (msg.includes('Port') && msg.includes('is already in use')) {
+                childFailed = true;
             }
-            if (subprocess.stderr) {
-                subprocess.stderr.on('data', (data) => {
-                    process.stderr.write(chalk.red(`[Daemon] ${data}`));
-                });
+        });
+    }
+    subprocess.unref();
+    // Wait briefly to ensure it started (optional but good UX)
+    // We can poll status for a second
+    const start = Date.now();
+    // Increased timeout to allow for connection initialization
+    while (Date.now() - start < 10000) {
+        // If child reported port conflict, check if daemon is actually running
+        if (childFailed) {
+            const stillRunning = await isPortInUse(port);
+            if (stillRunning) {
+                // Another daemon is running
+                console.log(chalk.yellow(`\nDaemon is already running on port ${port}.`));
+                process.exit(0);
+                return;
             }
-            subprocess.unref();
-            // Wait briefly to ensure it started (optional but good UX)
-            // We can poll status for a second
-            const start = Date.now();
-            // Increased timeout to allow for connection initialization
-            while (Date.now() - start < 10000) {
-                try {
-                    const res = await fetch(`http://localhost:${port}/status`);
-                    if (res.ok) {
-                        const data = await res.json();
-                        if (data.initialized) {
-                            console.log(chalk.green(`Daemon started successfully on port ${port}.`));
-                            process.exit(0);
-                        }
-                    }
+        }
+        try {
+            const res = await fetch(`http://localhost:${port}/status`);
+            if (res.ok) {
+                const data = await res.json();
+                if (data.initialized) {
+                    console.log(chalk.green(`Daemon started successfully on port ${port}.`));
+                    process.exit(0);
                 }
-                catch { }
-                await new Promise(r => setTimeout(r, 200));
             }
-            console.log(chalk.yellow('Daemon started (async check timeout, but likely running).'));
         }
-    });
-    daemonCmd.command('stop')
-        .description('Stop the running daemon')
-        .action(async () => {
-        try {
-            await fetch(`http://localhost:${DAEMON_PORT}/stop`, { method: 'POST' });
-            console.log(chalk.green('Daemon stopped successfully.'));
+        catch { }
+        await new Promise(r => setTimeout(r, 200));
+    }
+    console.log(chalk.yellow('Daemon started (async check timeout, but likely running).'));
+    process.exit(0);
+};
+const stopAction = async (parentCmd) => {
+    try {
+        const port = parseInt(parentCmd.opts().port || DAEMON_PORT);
+        await fetch(`http://localhost:${port}/stop`, { method: 'POST' });
+        console.log(chalk.green('Daemon stopped successfully.'));
+    }
+    catch (e) {
+        console.error(chalk.red('Failed to stop daemon. Is it running?'));
+    }
+};
+const statusAction = async (parentCmd) => {
+    try {
+        const port = parseInt(parentCmd.opts().port || DAEMON_PORT);
+        const res = await fetch(`http://localhost:${port}/status`);
+        const data = await res.json();
+        console.log(chalk.green(`Daemon is running (v${data.version})`));
+        if (data.connections && data.connections.length > 0) {
+            console.log(chalk.bold('\nActive Connections:'));
+            data.connections.forEach((conn) => {
+                const count = conn.toolsCount !== null ? `(${conn.toolsCount} tools)` : (data.initializing ? '(initializing)' : '(error listing tools)');
+                const status = conn.status === 'error' ? chalk.red('[Error]') : '';
+                console.log(chalk.cyan(`- ${conn.name} ${chalk.gray(count)} ${status}`));
+            });
         }
-        catch (e) {
-            console.error(chalk.red('Failed to stop daemon. Is it running?'));
+        else {
+            console.log(chalk.gray('No active connections.'));
         }
-    });
+    }
+    catch (e) {
+        console.error(chalk.red('Daemon is not running.'));
+    }
+};
+const restartAction = async (serverName, parentCmd) => {
+    try {
+        const port = parseInt(parentCmd.opts().port || DAEMON_PORT);
+        const res = await fetch(`http://localhost:${port}/restart`, {
+            method: 'POST',
+            body: JSON.stringify({ server: serverName })
+        });
+        const data = await res.json();
+        console.log(chalk.green(data.message));
+    }
+    catch (e) {
+        console.error(chalk.red('Failed to restart. Is the daemon running?'));
+    }
+};
+export const registerDaemonCommand = (program) => {
+    // ===== Top-level commands (new, simplified) =====
+    program.command('start')
+        .description('Start the daemon')
+        .option('-p, --port <number>', 'Daemon port', String(DAEMON_PORT))
+        .action((options) => startAction(options, program));
+    program.command('stop')
+        .description('Stop the daemon')
+        .option('-p, --port <number>', 'Daemon port', String(DAEMON_PORT))
+        .action(() => stopAction(program));
+    program.command('status')
+        .description('Check daemon status')
+        .option('-p, --port <number>', 'Daemon port', String(DAEMON_PORT))
+        .action(() => statusAction(program));
+    program.command('restart [server]')
+        .description('Restart the daemon or a specific server connection')
+        .option('-p, --port <number>', 'Daemon port', String(DAEMON_PORT))
+        .action((serverName) => restartAction(serverName, program));
+    // ===== Legacy daemon subcommands (for backward compatibility) =====
+    const daemonCmd = program.command('daemon')
+        .description('Manage the mcps daemon (legacy, use top-level commands)')
+        .usage('start|stop|restart|status')
+        .option('-p, --port <number>', 'Daemon port', String(DAEMON_PORT));
+    daemonCmd.command('start', { isDefault: true, hidden: true })
+        .description('Start the daemon (default)')
+        .action((options) => startAction(options, daemonCmd));
+    daemonCmd.command('stop')
+        .description('Stop the running daemon')
+        .action(() => stopAction(daemonCmd));
     daemonCmd.command('status')
         .description('Check daemon status')
-        .action(async () => {
-        try {
-            const res = await fetch(`http://localhost:${DAEMON_PORT}/status`);
-            const data = await res.json();
-            console.log(chalk.green(`Daemon is running (v${data.version})`));
-            if (data.connections && data.connections.length > 0) {
-                console.log(chalk.bold('\nActive Connections:'));
-                data.connections.forEach((conn) => {
-                    const count = conn.toolsCount !== null ? `(${conn.toolsCount} tools)` : (data.initializing ? '(initializing)' : '(error listing tools)');
-                    const status = conn.status === 'error' ? chalk.red('[Error]') : '';
-                    console.log(chalk.cyan(`- ${conn.name} ${chalk.gray(count)} ${status}`));
-                });
-            }
-            else {
-                console.log(chalk.gray('No active connections.'));
-            }
-        }
-        catch (e) {
-            console.error(chalk.red('Daemon is not running.'));
-        }
-    });
+        .action(() => statusAction(daemonCmd));
     daemonCmd.command('restart [server]')
         .description('Restart the daemon or a specific server connection')
-        .action(async (serverName) => {
-        try {
-            const res = await fetch(`http://localhost:${DAEMON_PORT}/restart`, {
-                method: 'POST',
-                body: JSON.stringify({ server: serverName })
-            });
-            const data = await res.json();
-            console.log(chalk.green(data.message));
-        }
-        catch (e) {
-            console.error(chalk.red('Failed to restart. Is the daemon running?'));
-        }
-    });
+        .action((serverName) => restartAction(serverName, daemonCmd));
 };
 const startDaemon = (port) => {
     const server = http.createServer(async (req, res) => {
@@ -238,12 +306,18 @@ const startDaemon = (port) => {
     });
     server.listen(port, async () => {
         // Initialize all connections eagerly
-        await connectionPool.initializeAll();
+        try {
+            await connectionPool.initializeAll();
+        }
+        catch (error) {
+            console.error('[Daemon] Error during initialization:', error.message);
+            // Don't exit, continue running with partial connections
+        }
     });
     server.on('error', (e) => {
         if (e.code === 'EADDRINUSE') {
-            console.log(chalk.yellow(`Port ${port} is already in use.`));
-            process.exit(0); // Exit gracefully if already running
+            console.error(chalk.red(`Port ${port} is already in use by another daemon.`));
+            process.exit(1); // Exit with error if port is in use
         }
         else {
             console.error('[Daemon] Server error:', e);
@@ -258,4 +332,8 @@ const startDaemon = (port) => {
     };
     process.on('SIGINT', shutdown);
     process.on('SIGTERM', shutdown);
+    // Prevent unhandled rejections from crashing the daemon
+    process.on('unhandledRejection', (reason, promise) => {
+        console.error('[Daemon] Unhandled Rejection at:', promise, 'reason:', reason);
+    });
 };

package/dist/commands/server.js

@@ -1,5 +1,6 @@
 import chalk from 'chalk';
 import { configManager } from '../core/config.js';
+import { DaemonClient } from '../core/daemon-client.js';
 export const registerServerCommands = (program) => {
     const listServersAction = () => {
         const servers = configManager.listServers();
@@ -21,25 +22,7 @@ export const registerServerCommands = (program) => {
             console.log('');
         });
     };
-    // Register top-level list command
-    program.command('list')
-        .alias('ls')
-        .description('List all configured servers')
-        .action(listServersAction);
-    const serverCmd = program.command('server')
-        .description('Manage MCP servers');
-    serverCmd.command('list')
-        .alias('ls')
-        .description('List all configured servers')
-        .action(listServersAction);
-    serverCmd.command('add <name>')
-        .description('Add a new MCP server')
-        .option('--type <type>', 'Server type (stdio, sse, or http)', 'stdio')
-        .option('--command <command>', 'Command to execute (for stdio)')
-        .option('--args [args...]', 'Arguments for the command', [])
-        .option('--url <url>', 'URL for SSE/HTTP connection')
-        .option('--env <env...>', 'Environment variables (KEY=VALUE)', [])
-        .action((name, options) => {
+    const addServerAction = (name, options) => {
         try {
             if (options.type === 'sse' || options.type === 'http') {
                 if (!options.url)
@@ -76,11 +59,8 @@ export const registerServerCommands = (program) => {
         catch (error) {
             console.error(chalk.red(`Error adding server: ${error.message}`));
         }
-    });
-    serverCmd.command('remove <name>')
-        .alias('rm')
-        .description('Remove a server')
-        .action((name) => {
+    };
+    const removeServerAction = (name) => {
         try {
             configManager.removeServer(name);
             console.log(chalk.green(`Server "${name}" removed.`));
@@ -88,13 +68,35 @@ export const registerServerCommands = (program) => {
         catch (error) {
             console.error(chalk.red(error.message));
         }
-    });
-    serverCmd.command('update <name>')
-        .description('Update a server')
-        .option('--command <command>', 'New command')
-        .option('--args [args...]', 'New arguments for the command')
-        .option('--url <url>', 'New URL')
-        .action((name, options) => {
+    };
+    const updateServerAction = async (name, options) => {
+        // If no server name provided, refresh all connections
+        if (!name) {
+            try {
+                await DaemonClient.ensureDaemon();
+                // Call daemon restart API to refresh all connections
+                const port = parseInt(process.env.MCPS_PORT || '4100');
+                const res = await fetch(`http://localhost:${port}/restart`, {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify({})
+                });
+                if (res.ok) {
+                    const data = await res.json();
+                    console.log(chalk.green(data.message));
+                    console.log(chalk.gray('All servers will be reconnected on next use.'));
+                }
+                else {
+                    throw new Error('Failed to refresh connections');
+                }
+            }
+            catch (error) {
+                console.error(chalk.red(`Failed to refresh all servers: ${error.message}`));
+                console.error(chalk.yellow('Make sure the daemon is running (use: mcps start)'));
+            }
+            return;
+        }
+        // Update specific server configuration
         try {
             const updates = {};
             if (options.command)
@@ -105,13 +107,67 @@ export const registerServerCommands = (program) => {
                 updates.url = options.url;
             if (Object.keys(updates).length === 0) {
                 console.log(chalk.yellow('No updates provided.'));
+                console.log(chalk.gray('Use: mcps update <server> --command <cmd> --args <args>'));
                 return;
             }
             configManager.updateServer(name, updates);
             console.log(chalk.green(`Server "${name}" updated.`));
+            console.log(chalk.gray('Note: Restart the daemon to apply changes: mcps restart'));
         }
         catch (error) {
             console.error(chalk.red(`Error updating server: ${error.message}`));
         }
-    });
+    };
+    // ===== Top-level commands (new, simplified) =====
+    // List command (already exists, keeping as-is)
+    program.command('list')
+        .alias('ls')
+        .description('List all configured servers')
+        .action(listServersAction);
+    // Add server command
+    program.command('add <name>')
+        .description('Add a new MCP server')
+        .option('--type <type>', 'Server type (stdio, sse, or http)', 'stdio')
+        .option('--command <command>', 'Command to execute (for stdio)')
+        .option('--args [args...]', 'Arguments for the command', [])
+        .option('--url <url>', 'URL for SSE/HTTP connection')
+        .option('--env <env...>', 'Environment variables (KEY=VALUE)', [])
+        .action(addServerAction);
+    // Remove server command
+    program.command('remove <name>')
+        .alias('rm')
+        .description('Remove a server')
+        .action(removeServerAction);
+    // Update server command
+    program.command('update [name]')
+        .description('Update a server configuration or refresh all servers')
+        .option('--command <command>', 'New command')
+        .option('--args [args...]', 'New arguments for the command')
+        .option('--url <url>', 'New URL')
+        .action(updateServerAction);
+    // ===== Legacy server subcommands (for backward compatibility) =====
+    const serverCmd = program.command('server')
+        .description('Manage MCP servers (legacy, use top-level commands)');
+    serverCmd.command('list')
+        .alias('ls')
+        .description('List all configured servers')
+        .action(listServersAction);
+    serverCmd.command('add <name>')
+        .description('Add a new MCP server')
+        .option('--type <type>', 'Server type (stdio, sse, or http)', 'stdio')
+        .option('--command <command>', 'Command to execute (for stdio)')
+        .option('--args [args...]', 'Arguments for the command', [])
+        .option('--url <url>', 'URL for SSE/HTTP connection')
+        .option('--env <env...>', 'Environment variables (KEY=VALUE)', [])
+        .action(addServerAction);
+    serverCmd.command('remove <name>')
+        .alias('rm')
+        .description('Remove a server')
+        .action(removeServerAction);
+    serverCmd.command('update [name]')
+        .description('Update a server configuration or refresh all servers')
+        .option('--command <command>', 'New command')
+        .option('--args [args...]', 'New arguments for the command')
+        .option('--url <url>', 'New URL')
+        .action(updateServerAction);
 };

package/dist/core/constants.js

@@ -1,2 +1,3 @@
-export const DAEMON_PORT = 4100;
+// Support custom port via environment variable
+export const DAEMON_PORT = parseInt(process.env.MCPS_PORT || '4100');
 export const DAEMON_BASE_URL = `http://localhost:${DAEMON_PORT}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maplezzk/mcps",
-  "version": "1.0.14",
+  "version": "1.0.18",
   "description": "A CLI to manage and use MCP servers",
   "publishConfig": {
     "access": "public"