@mearl/setup 2.8.2 → 2.9.0

package/dist/browserExtension.js

@@ -488,11 +488,12 @@ export async function installMearlBrowserExtension(options = {}, dependencies =
     const setupManagedAtStart = setupManagedBrowserIds.length > 0;
     let cdpSession;
     const inspectOnce = async () => {
-        if (!useSharedCdpSession)
-            return inspectInstallation(chromeUserDataDirectory);
+        if (!useSharedCdpSession) {
+            return options.force ? null : inspectInstallation(chromeUserDataDirectory);
+        }
         const candidate = await connectCdp(chromeUserDataDirectory);
         try {
-            const installed = await candidate.inspectInstallation();
+            const installed = options.force ? null : await candidate.inspectInstallation();
             cdpSession?.close();
             cdpSession = candidate;
             return installed;

package/dist/cli.js

@@ -1,132 +1,140 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
+import { Command, CommanderError } from 'commander';
 import { configureAgentBayApiKey, promptAgentBayApiKey, readAgentBayApiKeyFile, readAgentBayApiKeyStdin, } from './agentBay.js';
 import { installMearlBrowserExtension } from './browserExtension.js';
 import { runMearlLifecycle } from './lifecycle.js';
 import { isMearlReleaseLine } from './version.js';
 const require = createRequire(import.meta.url);
 export const SETUP_VERSION = require('../package.json').version;
-export function parseSetupArgs(argv) {
-    if (argv.includes('--help') || argv.includes('-h')) {
-        return { agentBayReadStdin: false, help: true, skipSkill: false, yes: false };
+const baseParsedArgs = () => ({
+    agentBayReadStdin: false,
+    help: false,
+    skipSkill: false,
+    yes: false,
+});
+function commanderError(error) {
+    const message = error.message.replace(/^error:\s*/i, '');
+    if (error.code === 'commander.unknownCommand') {
+        return new Error(message.replace(/^unknown command/i, 'Unknown operation'));
     }
-    if (argv.includes('--version') || argv.includes('-v')) {
-        return {
-            agentBayReadStdin: false,
-            help: false,
-            skipSkill: false,
-            version: true,
-            yes: false,
-        };
+    if (error.code === 'commander.unknownOption') {
+        return new Error(message.replace(/^unknown option/i, 'Unknown option'));
     }
-    const firstArg = argv[0];
-    const operation = firstArg === undefined || firstArg.startsWith('-') ? 'install' : firstArg;
-    const optionStart = operation === firstArg ? 1 : 0;
-    if (operation === 'agentbay') {
-        if (argv.length === 1) {
-            return {
-                agentBayReadStdin: false,
-                help: false,
+    return new Error(message);
+}
+export function parseSetupArgs(argv) {
+    let parsed;
+    const program = new Command()
+        .name('mearl-setup')
+        .version(SETUP_VERSION, '-v, --version')
+        .exitOverride()
+        .configureOutput({ writeErr: () => { }, writeOut: () => { } });
+    const addLifecycleCommand = (operation) => {
+        const command = new Command(operation)
+            .exitOverride()
+            .configureOutput({ writeErr: () => { }, writeOut: () => { } })
+            .option('--local')
+            .option('--cloud')
+            .option('--qoder-cloud')
+            .option('--mcp')
+            .option('--target-line <major.minor.x>')
+            .option('--skip-skill')
+            .option('-y, --yes')
+            .option('--non-interactive')
+            .action(() => {
+            const options = command.opts();
+            if (options.cloud && options.qoderCloud) {
+                throw new Error('--cloud and --qoder-cloud cannot be used together');
+            }
+            if (options.targetLine && !isMearlReleaseLine(options.targetLine)) {
+                throw new Error('--target-line requires a valid Mearl release line such as 2.3.x');
+            }
+            if (operation === 'uninstall' && options.targetLine) {
+                throw new Error('--target-line is not available for uninstall');
+            }
+            const profiles = [];
+            if (options.local)
+                profiles.push('local');
+            if (options.cloud || options.qoderCloud)
+                profiles.push('cloud');
+            if (options.mcp)
+                profiles.push('mcp');
+            parsed = {
+                ...baseParsedArgs(),
                 operation,
-                skipSkill: false,
-                yes: false,
+                ...(options.cloud || options.qoderCloud
+                    ? { cloudMode: options.qoderCloud ? 'qoder' : 'websocket' }
+                    : {}),
+                ...(profiles.length > 0 ? { profiles } : {}),
+                skipSkill: options.skipSkill === true,
+                targetLine: options.targetLine,
+                yes: options.yes === true || options.nonInteractive === true,
             };
+        });
+        program.addCommand(command);
+    };
+    addLifecycleCommand('install');
+    addLifecycleCommand('update');
+    addLifecycleCommand('uninstall');
+    const extension = new Command('extension')
+        .exitOverride()
+        .configureOutput({ writeErr: () => { }, writeOut: () => { } })
+        .option('--force')
+        .option('-y, --yes')
+        .option('--non-interactive')
+        .action(() => {
+        const options = extension.opts();
+        parsed = {
+            ...baseParsedArgs(),
+            ...(options.force ? { force: true } : {}),
+            operation: 'extension',
+            yes: options.yes === true || options.nonInteractive === true,
+        };
+    });
+    program.addCommand(extension);
+    const agentbay = new Command('agentbay')
+        .exitOverride()
+        .configureOutput({ writeErr: () => { }, writeOut: () => { } })
+        .argument('[api-key]')
+        .option('--stdin')
+        .option('--key-file <path>')
+        .action((apiKey) => {
+        const options = agentbay.opts();
+        if (apiKey) {
+            throw new Error('API keys are not accepted as command-line arguments');
         }
-        if (argv.length === 2 && argv[1] === '--stdin') {
-            return {
-                agentBayReadStdin: true,
-                help: false,
-                operation,
-                skipSkill: false,
-                yes: false,
-            };
+        if (options.stdin && options.keyFile) {
+            throw new Error('--stdin and --key-file cannot be used together');
         }
-        if (argv.length === 3 && argv[1] === '--key-file' && argv[2]?.trim()) {
-            return {
-                agentBayKeyFile: argv[2],
-                agentBayReadStdin: false,
-                help: false,
-                operation,
-                skipSkill: false,
-                yes: false,
-            };
+        if (options.keyFile !== undefined && !options.keyFile.trim()) {
+            throw new Error('--key-file requires a non-empty path');
         }
-        throw new Error('Usage: npx @mearl/setup agentbay [--stdin | --key-file <path>]. API keys are not accepted as command-line arguments.');
-    }
-    if (operation === 'extension') {
-        const accepted = new Set(['--force', '--yes', '-y', '--non-interactive']);
-        const confirmationFlags = new Set(['--yes', '-y', '--non-interactive']);
-        const unknown = argv.slice(1).find(arg => !accepted.has(arg));
-        if (unknown)
-            throw new Error(`Unknown option: ${unknown}`);
-        return {
-            agentBayReadStdin: false,
-            help: false,
-            ...(argv.slice(1).includes('--force') ? { force: true } : {}),
-            operation,
-            skipSkill: false,
-            yes: argv.slice(1).some(arg => confirmationFlags.has(arg)),
+        parsed = {
+            ...baseParsedArgs(),
+            ...(options.keyFile ? { agentBayKeyFile: options.keyFile } : {}),
+            agentBayReadStdin: options.stdin === true,
+            operation: 'agentbay',
         };
+    });
+    program.addCommand(agentbay);
+    const normalizedArgv = argv[0] === undefined || argv[0].startsWith('-') ? ['install', ...argv] : argv;
+    try {
+        program.parse(['node', 'mearl-setup', ...normalizedArgv]);
     }
-    if (operation !== 'install' && operation !== 'update' && operation !== 'uninstall') {
-        throw new Error(`Unknown operation: ${operation}`);
-    }
-    const profiles = [];
-    let skipSkill = false;
-    let targetLine;
-    let yes = false;
-    let cloudMode;
-    for (let index = optionStart; index < argv.length; index += 1) {
-        const arg = argv[index];
-        if (arg === '--yes' || arg === '-y' || arg === '--non-interactive') {
-            yes = true;
-            continue;
-        }
-        if (arg === '--skip-skill') {
-            skipSkill = true;
-            continue;
-        }
-        if (arg === '--target-line') {
-            const value = argv[index + 1];
-            if (!isMearlReleaseLine(value)) {
-                throw new Error('--target-line requires a valid Mearl release line such as 2.3.x');
-            }
-            targetLine = value;
-            index += 1;
-            continue;
-        }
-        if (arg === '--cloud' || arg === '--qoder-cloud') {
-            const requestedMode = arg === '--qoder-cloud' ? 'qoder' : 'websocket';
-            if (cloudMode && cloudMode !== requestedMode) {
-                throw new Error('--cloud and --qoder-cloud cannot be used together');
-            }
-            cloudMode = requestedMode;
+    catch (error) {
+        if (error instanceof CommanderError) {
+            if (error.code === 'commander.helpDisplayed')
+                return { ...baseParsedArgs(), help: true };
+            if (error.code === 'commander.version')
+                return { ...baseParsedArgs(), version: true };
+            throw commanderError(error);
         }
-        const candidate = arg === '--local'
-            ? 'local'
-            : arg === '--cloud' || arg === '--qoder-cloud'
-                ? 'cloud'
-                : arg === '--mcp'
-                    ? 'mcp'
-                    : undefined;
-        if (!candidate)
-            throw new Error(`Unknown option: ${arg}`);
-        if (!profiles.includes(candidate))
-            profiles.push(candidate);
-    }
-    if (operation === 'uninstall' && targetLine) {
-        throw new Error('--target-line is not available for uninstall');
+        throw error;
     }
-    return {
-        agentBayReadStdin: false,
-        help: false,
-        operation,
-        ...(cloudMode ? { cloudMode } : {}),
-        ...(profiles.length > 0 ? { profiles } : {}),
-        skipSkill,
-        targetLine,
-        yes,
-    };
+    if (!parsed)
+        throw new Error('No setup operation was selected');
+    return parsed;
 }
 function printHelp(toError = false) {
     const output = `Mearl Setup v${SETUP_VERSION}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mearl/setup",
-  "version": "2.8.2",
+  "version": "2.9.0",
   "description": "One-shot environment setup and configuration for Mearl",
   "type": "module",
   "main": "dist/index.js",
@@ -56,15 +56,16 @@
   ],
   "license": "ISC",
   "engines": {
-    "node": ">=18"
+    "node": ">=22.12.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
+    "commander": "^15.0.0",
     "extract-zip": "^2.0.1",
     "ws": "^8.18.3",
-    "@mearl/client": "2.8.2"
+    "@mearl/client": "2.9.0"
   },
   "devDependencies": {
     "@types/node": "^24.9.1",