@mearl/mcp-server 2.8.2 → 2.9.1

package/dist/cliArgs.d.ts

@@ -0,0 +1,6 @@
+export type McpCliMode = 'server' | 'configure' | 'uninstall' | 'help' | 'version';
+export interface ParsedMcpArgs {
+    forwardedArgs: string[];
+    mode: McpCliMode;
+}
+export declare function parseMcpArgs(argv: string[]): Promise<ParsedMcpArgs>;

package/dist/cliArgs.js

@@ -0,0 +1,84 @@
+export async function parseMcpArgs(argv) {
+    if (argv.length === 0)
+        return { forwardedArgs: [], mode: 'server' };
+    const { Command, CommanderError } = await import('commander');
+    const configureAlias = argv.includes('--configure');
+    const uninstallAlias = argv.includes('--uninstall');
+    if (configureAlias && uninstallAlias) {
+        throw new Error('--configure and --uninstall cannot be used together');
+    }
+    const compatibilityMode = configureAlias ? 'configure' : uninstallAlias ? 'uninstall' : undefined;
+    const normalizedArgv = compatibilityMode
+        ? [compatibilityMode, ...argv.filter(arg => arg !== '--configure' && arg !== '--uninstall')]
+        : argv;
+    const program = new Command()
+        .name('mearl-mcp-server')
+        .helpOption(false)
+        .allowExcessArguments(false)
+        .exitOverride()
+        .configureOutput({ writeErr: () => { }, writeOut: () => { } })
+        .argument('[command]')
+        .option('--extension-id <id>')
+        .option('--id <id>')
+        .option('--skip-mcp')
+        .option('--get')
+        .option('--global-install')
+        .option('--managed-by-setup')
+        .option('-y, --yes')
+        .option('--non-interactive')
+        .option('-h, --help')
+        .option('-v, --version');
+    try {
+        program.parse(['node', 'mearl-mcp-server', ...normalizedArgv]);
+    }
+    catch (error) {
+        if (error instanceof CommanderError) {
+            throw new Error(error.message.replace(/^error:\s*/i, ''), { cause: error });
+        }
+        throw error;
+    }
+    const options = program.opts();
+    if (options.help)
+        return { forwardedArgs: [], mode: 'help' };
+    if (options.version)
+        return { forwardedArgs: [], mode: 'version' };
+    const command = program.processedArgs[0];
+    if (command !== 'configure' && command !== 'uninstall') {
+        throw new Error(command ? `Unknown command: ${command}` : 'configure or uninstall is required');
+    }
+    const configureOnly = [
+        ['extensionId', '--extension-id'],
+        ['id', '--id'],
+        ['skipMcp', '--skip-mcp'],
+        ['get', '--get'],
+        ['globalInstall', '--global-install'],
+    ];
+    const uninstallOnly = [['managedBySetup', '--managed-by-setup']];
+    const disallowed = command === 'configure' ? uninstallOnly : configureOnly;
+    for (const [name, flag] of disallowed) {
+        if (program.getOptionValueSource(name) === 'cli') {
+            throw new Error(`${flag} is not available for ${command}`);
+        }
+    }
+    if (options.extensionId && options.id && options.extensionId !== options.id) {
+        throw new Error('--extension-id and --id cannot specify different values');
+    }
+    const forwardedArgs = [];
+    if (command === 'configure') {
+        const extensionId = options.extensionId ?? options.id;
+        if (extensionId)
+            forwardedArgs.push('--extension-id', extensionId);
+        if (options.skipMcp)
+            forwardedArgs.push('--skip-mcp');
+        if (options.get)
+            forwardedArgs.push('--get');
+        if (options.globalInstall)
+            forwardedArgs.push('--global-install');
+    }
+    else if (options.managedBySetup) {
+        forwardedArgs.push('--managed-by-setup');
+    }
+    if (options.yes || options.nonInteractive)
+        forwardedArgs.push('--yes');
+    return { forwardedArgs, mode: command };
+}

package/dist/configure.d.ts

@@ -13,6 +13,7 @@ export interface ConfigureArgs {
     extensionId?: string;
     get: boolean;
     globalInstall: boolean;
+    help: boolean;
     skipMcp: boolean;
     yes: boolean;
 }

package/dist/configure.js

@@ -15,39 +15,63 @@ import path, { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { HOST_NAME, DEFAULT_EXTENSION_ID } from './constants.js';
 import prompts from 'prompts';
+import { Command, CommanderError } from 'commander';
 import { MCP_CLIENTS, getMCPServerConfig, isNpxMode, isClientInstalled, } from './mcp-clients.js';
 // 日志输出
 const log = (...args) => {
     console.log('[Configure]', ...args);
 };
-// 解析命令行参数
+class ConfigureUsageError extends Error {
+    name = 'ConfigureUsageError';
+}
 export function parseConfigureArgs(args = process.argv.slice(2)) {
-    let extensionId;
-    let skipMcp = false;
-    let get = false;
-    let globalInstall = false;
-    let yes = false;
-    for (const arg of args) {
-        if (arg.startsWith('--extension-id=')) {
-            extensionId = arg.split('=')[1];
-        }
-        else if (arg.startsWith('--id=')) {
-            extensionId = arg.split('=')[1];
-        }
-        else if (arg === '--skip-mcp') {
-            skipMcp = true;
-        }
-        else if (arg === '--get') {
-            get = true;
-        }
-        else if (arg === '--global-install') {
-            globalInstall = true;
-        }
-        else if (arg === '--yes' || arg === '-y' || arg === '--non-interactive') {
-            yes = true;
+    const program = new Command()
+        .name('mearl-mcp-configure')
+        .helpOption(false)
+        .allowExcessArguments(false)
+        .exitOverride()
+        .configureOutput({ writeErr: () => { }, writeOut: () => { } })
+        .option('--extension-id <id>')
+        .option('--id <id>')
+        .option('--skip-mcp')
+        .option('--get')
+        .option('--global-install')
+        .option('-y, --yes')
+        .option('--non-interactive')
+        .option('-h, --help');
+    try {
+        program.parse(['node', 'mearl-mcp-configure', ...args]);
+    }
+    catch (error) {
+        if (error instanceof CommanderError) {
+            throw new ConfigureUsageError(error.message.replace(/^error:\s*/i, ''), { cause: error });
         }
+        throw error;
+    }
+    const options = program.opts();
+    if (options.extensionId && options.id && options.extensionId !== options.id) {
+        throw new ConfigureUsageError('--extension-id and --id cannot specify different values');
     }
-    return { extensionId, skipMcp, get, globalInstall, yes };
+    return {
+        extensionId: options.extensionId ?? options.id,
+        get: options.get === true,
+        globalInstall: options.globalInstall === true,
+        help: options.help === true,
+        skipMcp: options.skipMcp === true,
+        yes: options.yes === true || options.nonInteractive === true,
+    };
+}
+function printConfigureHelp() {
+    console.log(`Usage: mearl-mcp-configure [options]
+
+Options:
+  --extension-id <id>  Configure a custom extension ID
+  --skip-mcp           Skip MCP client configuration
+  --get                Print current configuration
+  --global-install     Use the globally installed command
+  --yes, -y            Configure detected clients without prompts
+  --non-interactive    Alias for --yes
+  --help, -h           Show this help`);
 }
 // 替换或追加 TOML 中的 mcp_servers.xxx 节
 function replaceTOMLSection(content, serverName, newSectionLines) {
@@ -211,7 +235,11 @@ export function shouldUseNpx(globalInstall, detectNpxMode = isNpxMode) {
     return !globalInstall && detectNpxMode();
 }
 export async function runConfigure(argv = process.argv.slice(2)) {
-    const { extensionId, get, globalInstall, skipMcp, yes } = parseConfigureArgs(argv);
+    const { extensionId, get, globalInstall, help, skipMcp, yes } = parseConfigureArgs(argv);
+    if (help) {
+        printConfigureHelp();
+        return;
+    }
     // 如果是查看配置，显示后退出
     if (get) {
         showCurrentConfig();
@@ -328,7 +356,7 @@ if (process.argv[1] && path.resolve(process.argv[1]) === currentFile) {
         await runConfigure();
     }
     catch (error) {
-        console.error('Configuration failed:', error);
-        process.exitCode = 1;
+        console.error(`Configuration failed: ${error instanceof Error ? error.message : String(error)}`);
+        process.exitCode = error instanceof ConfigureUsageError ? 2 : 1;
     }
 }