@maplezzk/mcps 1.0.4 → 1.0.14

package/dist/commands/call.js

@@ -1,36 +1,6 @@
 import chalk from 'chalk';
 import { configManager } from '../core/config.js';
-import { McpClientService } from '../core/client.js';
-const DAEMON_PORT = 4100;
-async function tryCallDaemon(serverName, toolName, args) {
-    try {
-        const response = await fetch(`http://localhost:${DAEMON_PORT}/call`, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ server: serverName, tool: toolName, args }),
-        });
-        if (!response.ok) {
-            // If daemon returns error, we might want to show it or fallback?
-            // Let's assume 500 means daemon tried and failed, so we shouldn't fallback to local spawn as it might fail same way.
-            // But if 404/Connection Refused, then daemon is not running.
-            // fetch throws on connection refused.
-            const err = await response.json();
-            throw new Error(err.error || 'Daemon error');
-        }
-        const data = await response.json();
-        console.log(chalk.green('Tool execution successful (via Daemon):'));
-        printResult(data.result);
-        return true;
-    }
-    catch (error) {
-        // If connection failed (daemon not running), return false to fallback
-        if (error.cause?.code === 'ECONNREFUSED' || error.message.includes('fetch failed')) {
-            return false;
-        }
-        // If daemon connected but returned error (e.g. tool failed), rethrow
-        throw error;
-    }
-}
+import { DaemonClient } from '../core/daemon-client.js';
 function printResult(result) {
     if (result.content) {
         result.content.forEach((item) => {
@@ -82,34 +52,23 @@ Notes:
                 }
             });
         }
-        // 1. Try Daemon first
-        try {
-            const handled = await tryCallDaemon(serverName, toolName, params);
-            if (handled)
-                return;
-        }
-        catch (error) {
-            console.error(chalk.red(`Daemon call failed: ${error.message}`));
-            process.exit(1);
-        }
-        // 2. Fallback to standalone execution
+        // Check if server exists in config first
         const serverConfig = configManager.getServer(serverName);
         if (!serverConfig) {
-            console.error(chalk.red(`Server "${serverName}" not found.`));
+            console.error(chalk.red(`Server "${serverName}" not found in config.`));
             process.exit(1);
         }
-        const client = new McpClientService();
         try {
-            await client.connect(serverConfig);
-            const result = await client.callTool(toolName, params);
+            // Auto-start daemon if needed
+            await DaemonClient.ensureDaemon();
+            // Execute via daemon
+            const result = await DaemonClient.executeTool(serverName, toolName, params);
             console.log(chalk.green('Tool execution successful:'));
             printResult(result);
         }
         catch (error) {
-            console.error(chalk.red(`Tool call failed: ${error.message}`));
-        }
-        finally {
-            await client.close();
+            console.error(chalk.red(`Execution failed: ${error.message}`));
+            process.exit(1);
         }
     });
 };

package/dist/commands/daemon.js

@@ -1,40 +1,118 @@
+import { spawn } from 'child_process';
 import http from 'http';
 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');
-const PORT = 4100;
 export const registerDaemonCommand = (program) => {
     const daemonCmd = program.command('daemon')
-        .description('Manage the mcps daemon');
-    daemonCmd.command('start', { isDefault: true })
+        .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(PORT))
+        .option('-p, --port <number>', 'Port to listen on', String(DAEMON_PORT))
         .action(async (options) => {
         const port = parseInt(options.port);
-        // ... (server logic) ...
-        // Need to move the server creation logic here or keep it in the main action if no subcommands match?
-        // Commander handling of default commands with subcommands can be tricky.
-        // Let's refactor to use separate actions.
-        startDaemon(port);
+        // Check if already running
+        try {
+            const res = await fetch(`http://localhost:${port}/status`);
+            if (res.ok) {
+                console.log(chalk.yellow(`Daemon is already running on port ${port}.`));
+                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}`));
+                });
+            }
+            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) {
+                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:${PORT}/stop`, { method: 'POST' });
+            await fetch(`http://localhost:${DAEMON_PORT}/stop`, { method: 'POST' });
             console.log(chalk.green('Daemon stopped successfully.'));
         }
         catch (e) {
             console.error(chalk.red('Failed to stop daemon. Is it running?'));
         }
     });
+    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.'));
+        }
+    });
     daemonCmd.command('restart [server]')
         .description('Restart the daemon or a specific server connection')
         .action(async (serverName) => {
         try {
-            const res = await fetch(`http://localhost:${PORT}/restart`, {
+            const res = await fetch(`http://localhost:${DAEMON_PORT}/restart`, {
                 method: 'POST',
                 body: JSON.stringify({ server: serverName })
             });
@@ -48,7 +126,10 @@ export const registerDaemonCommand = (program) => {
 };
 const startDaemon = (port) => {
     const server = http.createServer(async (req, res) => {
-        // ... (middleware) ...
+        // Basic Error Handling
+        req.on('error', (err) => {
+            console.error('[Daemon] Request error:', err);
+        });
         res.setHeader('Access-Control-Allow-Origin', '*');
         res.setHeader('Access-Control-Allow-Methods', 'POST, GET, OPTIONS');
         res.setHeader('Access-Control-Allow-Headers', 'Content-Type');
@@ -58,8 +139,15 @@ const startDaemon = (port) => {
             return;
         }
         if (req.method === 'GET' && req.url === '/status') {
+            const initStatus = connectionPool.getInitStatus();
+            const connections = await connectionPool.getActiveConnectionDetails(!initStatus.initializing);
             res.writeHead(200, { 'Content-Type': 'application/json' });
-            res.end(JSON.stringify({ status: 'running', version: pkg.version }));
+            res.end(JSON.stringify({
+                status: 'running',
+                version: pkg.version,
+                connections,
+                ...initStatus
+            }));
             return;
         }
         // ... (restart/stop/call handlers) ...
@@ -121,17 +209,46 @@ const startDaemon = (port) => {
             });
             return;
         }
+        if (req.method === 'POST' && req.url === '/list') {
+            let body = '';
+            req.on('data', chunk => { body += chunk.toString(); });
+            req.on('end', async () => {
+                try {
+                    const { server: serverName } = JSON.parse(body);
+                    if (!serverName) {
+                        res.writeHead(400, { 'Content-Type': 'application/json' });
+                        res.end(JSON.stringify({ error: 'Missing server name' }));
+                        return;
+                    }
+                    const client = await connectionPool.getClient(serverName);
+                    const toolsResult = await client.listTools();
+                    res.writeHead(200, { 'Content-Type': 'application/json' });
+                    res.end(JSON.stringify(toolsResult));
+                }
+                catch (error) {
+                    console.error(`[Daemon] Error listing tools:`, error);
+                    res.writeHead(500, { 'Content-Type': 'application/json' });
+                    res.end(JSON.stringify({ error: error.message }));
+                }
+            });
+            return;
+        }
         res.writeHead(404);
         res.end();
     });
-    server.listen(port, () => {
-        console.log(chalk.green(`
-🚀 mcps Daemon started on port ${port}
------------------------------------
-- Keeps connections to MCP servers alive
-- Improves performance for frequent tool calls
-- Run 'mcps call ...' in another terminal to use it automatically
-        `));
+    server.listen(port, async () => {
+        // Initialize all connections eagerly
+        await connectionPool.initializeAll();
+    });
+    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
+        }
+        else {
+            console.error('[Daemon] Server error:', e);
+            process.exit(1);
+        }
     });
     const shutdown = async () => {
         console.log('\n[Daemon] Shutting down...');

package/dist/commands/server.js

@@ -1,12 +1,7 @@
 import chalk from 'chalk';
 import { configManager } from '../core/config.js';
 export const registerServerCommands = (program) => {
-    const serverCmd = program.command('server')
-        .description('Manage MCP servers');
-    serverCmd.command('list')
-        .alias('ls')
-        .description('List all configured servers')
-        .action(() => {
+    const listServersAction = () => {
         const servers = configManager.listServers();
         if (servers.length === 0) {
             console.log(chalk.yellow('No servers configured.'));
@@ -25,7 +20,18 @@ 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')
@@ -86,12 +92,15 @@ export const registerServerCommands = (program) => {
     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) => {
         try {
             const updates = {};
             if (options.command)
                 updates.command = options.command;
+            if (options.args)
+                updates.args = options.args;
             if (options.url)
                 updates.url = options.url;
             if (Object.keys(updates).length === 0) {

package/dist/commands/tools.js

@@ -1,49 +1,51 @@
 import chalk from 'chalk';
 import { configManager } from '../core/config.js';
-import { McpClientService } from '../core/client.js';
+import { DaemonClient } from '../core/daemon-client.js';
+function printTools(serverName, tools) {
+    console.log(chalk.bold(`\nAvailable Tools for ${serverName}:`));
+    if (!tools || tools.length === 0) {
+        console.log(chalk.yellow('No tools found.'));
+    }
+    else {
+        tools.forEach((tool) => {
+            console.log(chalk.cyan(`\n- ${tool.name}`));
+            if (tool.description) {
+                console.log(`  ${tool.description}`);
+            }
+            console.log(chalk.gray('  Arguments:'));
+            const schema = tool.inputSchema;
+            if (schema.properties) {
+                Object.entries(schema.properties).forEach(([key, value]) => {
+                    const required = schema.required?.includes(key) ? chalk.red('*') : '';
+                    console.log(`    ${key}${required}: ${value.type || 'any'} ${value.description ? `(${value.description})` : ''}`);
+                });
+            }
+            else {
+                console.log('    None');
+            }
+        });
+    }
+}
 export const registerToolsCommand = (program) => {
     program.command('tools <server>')
         .description('List available tools on a server')
         .action(async (serverName) => {
+        // Check if server exists in config first
         const serverConfig = configManager.getServer(serverName);
         if (!serverConfig) {
-            console.error(chalk.red(`Server "${serverName}" not found.`));
+            console.error(chalk.red(`Server "${serverName}" not found in config.`));
             process.exit(1);
         }
-        const client = new McpClientService();
         try {
-            // console.log(chalk.gray(`Connecting to ${serverName}...`));
-            await client.connect(serverConfig);
-            const tools = await client.listTools();
-            console.log(chalk.bold(`\nAvailable Tools for ${serverName}:`));
-            if (tools.tools.length === 0) {
-                console.log(chalk.yellow('No tools found.'));
-            }
-            else {
-                tools.tools.forEach(tool => {
-                    console.log(chalk.cyan(`\n- ${tool.name}`));
-                    if (tool.description) {
-                        console.log(`  ${tool.description}`);
-                    }
-                    console.log(chalk.gray('  Arguments:'));
-                    const schema = tool.inputSchema;
-                    if (schema.properties) {
-                        Object.entries(schema.properties).forEach(([key, value]) => {
-                            const required = schema.required?.includes(key) ? chalk.red('*') : '';
-                            console.log(`    ${key}${required}: ${value.type || 'any'} ${value.description ? `(${value.description})` : ''}`);
-                        });
-                    }
-                    else {
-                        console.log('    None');
-                    }
-                });
-            }
+            // Auto-start daemon if needed
+            await DaemonClient.ensureDaemon();
+            // List via daemon
+            const tools = await DaemonClient.listTools(serverName);
+            printTools(serverName, tools);
         }
         catch (error) {
             console.error(chalk.red(`Failed to list tools: ${error.message}`));
-        }
-        finally {
-            await client.close();
+            process.exit(1);
         }
     });
 };

package/dist/core/client.js

@@ -6,13 +6,39 @@ import { EventSource } from 'eventsource';
 // Required for SSEClientTransport in Node.js environment
 // @ts-ignore
 global.EventSource = EventSource;
+const resolveEnvPlaceholders = (input) => {
+    const missing = new Set();
+    const resolved = input.replace(/\$\{([A-Za-z0-9_]+)\}|\$([A-Za-z0-9_]+)/g, (match, braced, bare) => {
+        const key = braced || bare;
+        const val = process.env[key];
+        if (val === undefined) {
+            missing.add(key);
+            return match;
+        }
+        return val;
+    });
+    if (missing.size > 0) {
+        const list = Array.from(missing).join(', ');
+        throw new Error(`Missing environment variables: ${list}`);
+    }
+    return resolved;
+};
 export class McpClientService {
     client = null;
     transport = null;
     async connect(config) {
         try {
             if (config.type === 'stdio') {
-                const rawEnv = config.env ? { ...process.env, ...config.env } : process.env;
+                const resolvedConfigEnv = {};
+                if (config.env) {
+                    for (const key in config.env) {
+                        const val = config.env[key];
+                        if (typeof val === 'string') {
+                            resolvedConfigEnv[key] = resolveEnvPlaceholders(val);
+                        }
+                    }
+                }
+                const rawEnv = config.env ? { ...process.env, ...resolvedConfigEnv } : process.env;
                 const env = {};
                 for (const key in rawEnv) {
                     const val = rawEnv[key];
@@ -20,17 +46,20 @@ export class McpClientService {
                         env[key] = val;
                     }
                 }
+                const args = config.args ? config.args.map(arg => resolveEnvPlaceholders(arg)) : [];
                 this.transport = new StdioClientTransport({
                     command: config.command,
-                    args: config.args,
+                    args,
                     env: env,
                 });
             }
             else if (config.type === 'http') {
-                this.transport = new StreamableHTTPClientTransport(new URL(config.url));
+                const url = resolveEnvPlaceholders(config.url);
+                this.transport = new StreamableHTTPClientTransport(new URL(url));
             }
             else {
-                this.transport = new SSEClientTransport(new URL(config.url));
+                const url = resolveEnvPlaceholders(config.url);
+                this.transport = new SSEClientTransport(new URL(url));
             }
             this.client = new Client({
                 name: 'mcp-cli',

package/dist/core/constants.js

@@ -0,0 +1,2 @@
+export const DAEMON_PORT = 4100;
+export const DAEMON_BASE_URL = `http://localhost:${DAEMON_PORT}`;

package/dist/core/daemon-client.js

@@ -0,0 +1,67 @@
+import { spawn } from 'child_process';
+import chalk from 'chalk';
+import { DAEMON_BASE_URL } from './constants.js';
+export class DaemonClient {
+    static async isRunning() {
+        try {
+            const res = await fetch(`${DAEMON_BASE_URL}/status`);
+            return res.ok;
+        }
+        catch {
+            return false;
+        }
+    }
+    static async startDaemon() {
+        console.log(chalk.gray('Starting background daemon...'));
+        // Use process.argv[1] which points to the CLI entry point
+        // detached: true allows the child to keep running after parent exits
+        const subprocess = spawn(process.execPath, [process.argv[1], 'daemon', 'start'], {
+            detached: true,
+            stdio: 'ignore',
+            env: process.env
+        });
+        subprocess.unref();
+        // Wait for daemon to be ready
+        const start = Date.now();
+        while (Date.now() - start < 5000) { // 5s timeout
+            if (await this.isRunning()) {
+                return;
+            }
+            await new Promise(resolve => setTimeout(resolve, 200));
+        }
+        throw new Error('Daemon failed to start within timeout');
+    }
+    static async ensureDaemon() {
+        if (await this.isRunning()) {
+            return;
+        }
+        await this.startDaemon();
+    }
+    static async executeTool(serverName, toolName, args) {
+        const response = await fetch(`${DAEMON_BASE_URL}/call`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ server: serverName, tool: toolName, args }),
+        });
+        if (!response.ok) {
+            const err = await response.json();
+            throw new Error(err.error || 'Daemon error');
+        }
+        const data = await response.json();
+        return data.result;
+    }
+    static async listTools(serverName) {
+        const response = await fetch(`${DAEMON_BASE_URL}/list`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ server: serverName }),
+        });
+        if (!response.ok) {
+            const err = await response.json();
+            throw new Error(err.error || 'Daemon error');
+        }
+        const data = await response.json();
+        // The daemon returns { tools: { tools: [...] } } because of ListToolsResult wrapping
+        return data.tools.tools || [];
+    }
+}

package/dist/core/pool.js

@@ -2,7 +2,9 @@ import { McpClientService } from './client.js';
 import { configManager } from './config.js';
 export class ConnectionPool {
     clients = new Map();
-    async getClient(serverName) {
+    initializing = false;
+    initialized = false;
+    async getClient(serverName, options) {
         if (this.clients.has(serverName)) {
             return this.clients.get(serverName);
         }
@@ -10,9 +12,17 @@ export class ConnectionPool {
         if (!serverConfig) {
             throw new Error(`Server "${serverName}" not found in config.`);
         }
-        console.log(`[Daemon] Connecting to server: ${serverName}...`);
         const client = new McpClientService();
-        await client.connect(serverConfig);
+        const connectPromise = client.connect(serverConfig);
+        if (options?.timeoutMs) {
+            const timeoutPromise = new Promise((_, reject) => {
+                setTimeout(() => reject(new Error(`Connection timeout after ${options.timeoutMs}ms`)), options.timeoutMs);
+            });
+            await Promise.race([connectPromise, timeoutPromise]);
+        }
+        else {
+            await connectPromise;
+        }
         this.clients.set(serverName, client);
         return client;
     }
@@ -42,5 +52,59 @@ export class ConnectionPool {
         }
         this.clients.clear();
     }
+    async initializeAll() {
+        const servers = configManager.listServers();
+        this.initializing = true;
+        this.initialized = false;
+        // 过滤掉 disabled 的服务器
+        const enabledServers = servers.filter(server => {
+            const disabled = server.disabled === true;
+            if (disabled) {
+                console.log(`[Daemon] Skipping disabled server: ${server.name}`);
+            }
+            return !disabled;
+        });
+        if (enabledServers.length === 0) {
+            console.log('[Daemon] No enabled servers to initialize.');
+            this.initializing = false;
+            this.initialized = true;
+            return;
+        }
+        console.log(`[Daemon] Initializing ${enabledServers.length} connection(s)...`);
+        for (const server of enabledServers) {
+            try {
+                console.log(`[Daemon] Connecting to server: ${server.name}...`);
+                await this.getClient(server.name, { timeoutMs: 8000 });
+                console.log(`[Daemon] ✓ Connected to ${server.name}`);
+            }
+            catch (error) {
+                console.error(`[Daemon] ✗ Failed to connect to ${server.name}:`, error.message);
+            }
+        }
+        this.initializing = false;
+        this.initialized = true;
+        console.log('[Daemon] Initialization complete.');
+    }
+    getInitStatus() {
+        return { initializing: this.initializing, initialized: this.initialized };
+    }
+    async getActiveConnectionDetails(includeTools = true) {
+        const details = [];
+        for (const [name, client] of this.clients) {
+            let toolsCount = null;
+            let status = 'connected';
+            if (includeTools) {
+                try {
+                    const result = await client.listTools();
+                    toolsCount = result.tools.length;
+                }
+                catch (e) {
+                    status = 'error';
+                }
+            }
+            details.push({ name, toolsCount, status });
+        }
+        return details;
+    }
 }
 export const connectionPool = new ConnectionPool();

package/package.json

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