@jackwener/opencli 1.0.6 → 1.1.1

package/dist/cli.d.ts

@@ -1 +1,7 @@
+/**
+ * CLI entry point: registers built-in commands and wires up Commander.
+ *
+ * Built-in commands are registered inline here (list, validate, explore, etc.).
+ * Dynamic adapter commands are registered via commanderAdapter.ts.
+ */
 export declare function runCli(BUILTIN_CLIS: string, USER_CLIS: string): void;

package/dist/cli.js

@@ -1,41 +1,61 @@
+/**
+ * CLI entry point: registers built-in commands and wires up Commander.
+ *
+ * Built-in commands are registered inline here (list, validate, explore, etc.).
+ * Dynamic adapter commands are registered via commanderAdapter.ts.
+ */
 import { Command } from 'commander';
 import chalk from 'chalk';
-import { executeCommand } from './engine.js';
-import { Strategy, fullName, getRegistry, strategyLabel } from './registry.js';
+import { fullName, getRegistry, strategyLabel } from './registry.js';
+import { serializeCommand, formatArgSummary } from './serialization.js';
 import { render as renderOutput } from './output.js';
-import { BrowserBridge, CDPBridge } from './browser/index.js';
-import { browserSession, DEFAULT_BROWSER_COMMAND_TIMEOUT, runWithTimeout } from './runtime.js';
+import { getBrowserFactory, browserSession } from './runtime.js';
 import { PKG_VERSION } from './version.js';
 import { printCompletionScript } from './completion.js';
-import { CliError } from './errors.js';
-import { shouldUseBrowserSession } from './capabilityRouting.js';
+import { loadExternalClis, executeExternalCli, installExternalCli, registerExternalCli, isBinaryInstalled } from './external.js';
+import { registerAllCommands } from './commanderAdapter.js';
 export function runCli(BUILTIN_CLIS, USER_CLIS) {
     const program = new Command();
-    program.name('opencli').description('Make any website your CLI. Zero setup. AI-powered.').version(PKG_VERSION);
-    // ── Built-in commands ──────────────────────────────────────────────────────
-    program.command('list').description('List all available CLI commands').option('-f, --format <fmt>', 'Output format: table, json, yaml, md, csv', 'table').option('--json', 'JSON output (deprecated)')
+    // enablePositionalOptions: prevents parent from consuming flags meant for subcommands;
+    // prerequisite for passThroughOptions to forward --help/--version to external binaries
+    program
+        .name('opencli')
+        .description('Make any website your CLI. Zero setup. AI-powered.')
+        .version(PKG_VERSION)
+        .enablePositionalOptions();
+    // ── Built-in: list ────────────────────────────────────────────────────────
+    program
+        .command('list')
+        .description('List all available CLI commands')
+        .option('-f, --format <fmt>', 'Output format: table, json, yaml, md, csv', 'table')
+        .option('--json', 'JSON output (deprecated)')
         .action((opts) => {
         const registry = getRegistry();
         const commands = [...registry.values()].sort((a, b) => fullName(a).localeCompare(fullName(b)));
-        const rows = commands.map(c => ({
-            command: fullName(c),
-            site: c.site,
-            name: c.name,
-            description: c.description,
-            strategy: strategyLabel(c),
-            browser: c.browser,
-            args: c.args.map(a => a.name).join(', '),
-        }));
         const fmt = opts.json && opts.format === 'table' ? 'json' : opts.format;
+        const isStructured = fmt === 'json' || fmt === 'yaml';
         if (fmt !== 'table') {
+            const rows = isStructured
+                ? commands.map(serializeCommand)
+                : commands.map(c => ({
+                    command: fullName(c),
+                    site: c.site,
+                    name: c.name,
+                    description: c.description,
+                    strategy: strategyLabel(c),
+                    browser: !!c.browser,
+                    args: formatArgSummary(c.args),
+                }));
             renderOutput(rows, {
                 fmt,
-                columns: ['command', 'site', 'name', 'description', 'strategy', 'browser', 'args'],
+                columns: ['command', 'site', 'name', 'description', 'strategy', 'browser', 'args',
+                    ...(isStructured ? ['columns', 'domain'] : [])],
                 title: 'opencli/list',
                 source: 'opencli list',
             });
             return;
         }
+        // Table (default) — grouped by site
         const sites = new Map();
         for (const cmd of commands) {
             const g = sites.get(cmd.site) ?? [];
@@ -48,48 +68,113 @@ export function runCli(BUILTIN_CLIS, USER_CLIS) {
         for (const [site, cmds] of sites) {
             console.log(chalk.bold.cyan(`  ${site}`));
             for (const cmd of cmds) {
-                const tag = strategyLabel(cmd) === 'public' ? chalk.green('[public]') : chalk.yellow(`[${strategyLabel(cmd)}]`);
+                const tag = strategyLabel(cmd) === 'public'
+                    ? chalk.green('[public]')
+                    : chalk.yellow(`[${strategyLabel(cmd)}]`);
                 console.log(`    ${cmd.name} ${tag}${cmd.description ? chalk.dim(` — ${cmd.description}`) : ''}`);
             }
             console.log();
         }
-        console.log(chalk.dim(`  ${commands.length} commands across ${sites.size} sites`));
+        const externalClis = loadExternalClis();
+        if (externalClis.length > 0) {
+            console.log(chalk.bold.cyan('  external CLIs'));
+            for (const ext of externalClis) {
+                const isInstalled = isBinaryInstalled(ext.binary);
+                const tag = isInstalled ? chalk.green('[installed]') : chalk.yellow('[auto-install]');
+                console.log(`    ${ext.name} ${tag}${ext.description ? chalk.dim(` — ${ext.description}`) : ''}`);
+            }
+            console.log();
+        }
+        console.log(chalk.dim(`  ${commands.length} built-in commands across ${sites.size} sites, ${externalClis.length} external CLIs`));
         console.log();
     });
-    program.command('validate').description('Validate CLI definitions').argument('[target]', 'site or site/name')
+    // ── Built-in: validate / verify ───────────────────────────────────────────
+    program
+        .command('validate')
+        .description('Validate CLI definitions')
+        .argument('[target]', 'site or site/name')
         .action(async (target) => {
         const { validateClisWithTarget, renderValidationReport } = await import('./validate.js');
         console.log(renderValidationReport(validateClisWithTarget([BUILTIN_CLIS, USER_CLIS], target)));
     });
-    program.command('verify').description('Validate + smoke test').argument('[target]').option('--smoke', 'Run smoke tests', false)
+    program
+        .command('verify')
+        .description('Validate + smoke test')
+        .argument('[target]')
+        .option('--smoke', 'Run smoke tests', false)
         .action(async (target, opts) => {
         const { verifyClis, renderVerifyReport } = await import('./verify.js');
         const r = await verifyClis({ builtinClis: BUILTIN_CLIS, userClis: USER_CLIS, target, smoke: opts.smoke });
         console.log(renderVerifyReport(r));
         process.exitCode = r.ok ? 0 : 1;
     });
-    program.command('explore').alias('probe').description('Explore a website: discover APIs, stores, and recommend strategies').argument('<url>').option('--site <name>').option('--goal <text>').option('--wait <s>', '', '3').option('--auto', 'Enable interactive fuzzing (simulate clicks to trigger lazy APIs)').option('--click <labels>', 'Comma-separated labels to click before fuzzing (e.g. "字幕,CC,评论")')
-        .action(async (url, opts) => { const { exploreUrl, renderExploreSummary } = await import('./explore.js'); const clickLabels = opts.click ? opts.click.split(',').map((s) => s.trim()) : undefined; const BrowserFactory = process.env.OPENCLI_CDP_ENDPOINT ? CDPBridge : BrowserBridge; const workspace = `explore:${opts.site ?? (() => { try {
-        return new URL(url).host;
-    }
-    catch {
-        return 'default';
-    } })()}`; console.log(renderExploreSummary(await exploreUrl(url, { BrowserFactory: BrowserFactory, site: opts.site, goal: opts.goal, waitSeconds: parseFloat(opts.wait), auto: opts.auto, clickLabels, workspace }))); });
-    program.command('synthesize').description('Synthesize CLIs from explore').argument('<target>').option('--top <n>', '', '3')
-        .action(async (target, opts) => { const { synthesizeFromExplore, renderSynthesizeSummary } = await import('./synthesize.js'); console.log(renderSynthesizeSummary(synthesizeFromExplore(target, { top: parseInt(opts.top) }))); });
-    program.command('generate').description('One-shot: explore → synthesize → register').argument('<url>').option('--goal <text>').option('--site <name>')
-        .action(async (url, opts) => { const { generateCliFromUrl, renderGenerateSummary } = await import('./generate.js'); const BrowserFactory = process.env.OPENCLI_CDP_ENDPOINT ? CDPBridge : BrowserBridge; const workspace = `generate:${opts.site ?? (() => { try {
-        return new URL(url).host;
-    }
-    catch {
-        return 'default';
-    } })()}`; const r = await generateCliFromUrl({ url, BrowserFactory: BrowserFactory, builtinClis: BUILTIN_CLIS, userClis: USER_CLIS, goal: opts.goal, site: opts.site, workspace }); console.log(renderGenerateSummary(r)); process.exitCode = r.ok ? 0 : 1; });
-    program.command('cascade').description('Strategy cascade: find simplest working strategy').argument('<url>').option('--site <name>')
+    // ── Built-in: explore / synthesize / generate / cascade ───────────────────
+    program
+        .command('explore')
+        .alias('probe')
+        .description('Explore a website: discover APIs, stores, and recommend strategies')
+        .argument('<url>')
+        .option('--site <name>')
+        .option('--goal <text>')
+        .option('--wait <s>', '', '3')
+        .option('--auto', 'Enable interactive fuzzing')
+        .option('--click <labels>', 'Comma-separated labels to click before fuzzing')
+        .action(async (url, opts) => {
+        const { exploreUrl, renderExploreSummary } = await import('./explore.js');
+        const clickLabels = opts.click
+            ? opts.click.split(',').map((s) => s.trim())
+            : undefined;
+        const workspace = `explore:${inferHost(url, opts.site)}`;
+        const result = await exploreUrl(url, {
+            BrowserFactory: getBrowserFactory(),
+            site: opts.site,
+            goal: opts.goal,
+            waitSeconds: parseFloat(opts.wait),
+            auto: opts.auto,
+            clickLabels,
+            workspace,
+        });
+        console.log(renderExploreSummary(result));
+    });
+    program
+        .command('synthesize')
+        .description('Synthesize CLIs from explore')
+        .argument('<target>')
+        .option('--top <n>', '', '3')
+        .action(async (target, opts) => {
+        const { synthesizeFromExplore, renderSynthesizeSummary } = await import('./synthesize.js');
+        console.log(renderSynthesizeSummary(synthesizeFromExplore(target, { top: parseInt(opts.top) })));
+    });
+    program
+        .command('generate')
+        .description('One-shot: explore → synthesize → register')
+        .argument('<url>')
+        .option('--goal <text>')
+        .option('--site <name>')
+        .action(async (url, opts) => {
+        const { generateCliFromUrl, renderGenerateSummary } = await import('./generate.js');
+        const workspace = `generate:${inferHost(url, opts.site)}`;
+        const r = await generateCliFromUrl({
+            url,
+            BrowserFactory: getBrowserFactory(),
+            builtinClis: BUILTIN_CLIS,
+            userClis: USER_CLIS,
+            goal: opts.goal,
+            site: opts.site,
+            workspace,
+        });
+        console.log(renderGenerateSummary(r));
+        process.exitCode = r.ok ? 0 : 1;
+    });
+    program
+        .command('cascade')
+        .description('Strategy cascade: find simplest working strategy')
+        .argument('<url>')
+        .option('--site <name>')
         .action(async (url, opts) => {
         const { cascadeProbe, renderCascadeResult } = await import('./cascade.js');
-        const BrowserFactory = process.env.OPENCLI_CDP_ENDPOINT ? CDPBridge : BrowserBridge;
-        const result = await browserSession(BrowserFactory, async (page) => {
-            // Navigate to the site first for cookie context
+        const workspace = `cascade:${inferHost(url, opts.site)}`;
+        const result = await browserSession(getBrowserFactory(), async (page) => {
             try {
                 const siteUrl = new URL(url);
                 await page.goto(`${siteUrl.protocol}//${siteUrl.host}`);
@@ -97,15 +182,12 @@ export function runCli(BUILTIN_CLIS, USER_CLIS) {
             }
             catch { }
             return cascadeProbe(page, url);
-        }, { workspace: `cascade:${opts.site ?? (() => { try {
-                return new URL(url).host;
-            }
-            catch {
-                return 'default';
-            } })()}` });
+        }, { workspace });
         console.log(renderCascadeResult(result));
     });
-    program.command('doctor')
+    // ── Built-in: doctor / setup / completion ─────────────────────────────────
+    program
+        .command('doctor')
         .description('Diagnose opencli browser bridge connectivity')
         .option('--live', 'Test browser connectivity (requires Chrome running)', false)
         .option('--sessions', 'Show active automation sessions', false)
@@ -114,124 +196,119 @@ export function runCli(BUILTIN_CLIS, USER_CLIS) {
         const report = await runBrowserDoctor({ live: opts.live, sessions: opts.sessions, cliVersion: PKG_VERSION });
         console.log(renderBrowserDoctorReport(report));
     });
-    program.command('setup')
+    program
+        .command('setup')
         .description('Interactive setup: verify browser bridge connectivity')
         .action(async () => {
         const { runSetup } = await import('./setup.js');
         await runSetup({ cliVersion: PKG_VERSION });
     });
-    program.command('completion')
+    program
+        .command('completion')
         .description('Output shell completion script')
         .argument('<shell>', 'Shell type: bash, zsh, or fish')
         .action((shell) => {
         printCompletionScript(shell);
     });
-    // ── Antigravity serve (built-in, long-running) ──────────────────────────────
+    // ── External CLIs ─────────────────────────────────────────────────────────
+    const externalClis = loadExternalClis();
+    program
+        .command('install')
+        .description('Install an external CLI')
+        .argument('<name>', 'Name of the external CLI')
+        .action((name) => {
+        const ext = externalClis.find(e => e.name === name);
+        if (!ext) {
+            console.error(chalk.red(`External CLI '${name}' not found in registry.`));
+            process.exitCode = 1;
+            return;
+        }
+        installExternalCli(ext);
+    });
+    program
+        .command('register')
+        .description('Register an external CLI')
+        .argument('<name>', 'Name of the CLI')
+        .option('--binary <bin>', 'Binary name if different from name')
+        .option('--install <cmd>', 'Auto-install command')
+        .option('--desc <text>', 'Description')
+        .action((name, opts) => {
+        registerExternalCli(name, { binary: opts.binary, install: opts.install, description: opts.desc });
+    });
+    function passthroughExternal(name, parsedArgs) {
+        const args = parsedArgs ?? (() => {
+            const idx = process.argv.indexOf(name);
+            return process.argv.slice(idx + 1);
+        })();
+        try {
+            executeExternalCli(name, args, externalClis);
+        }
+        catch (err) {
+            console.error(chalk.red(`Error: ${err.message}`));
+            process.exitCode = 1;
+        }
+    }
+    for (const ext of externalClis) {
+        if (program.commands.some(c => c.name() === ext.name))
+            continue;
+        program
+            .command(ext.name)
+            .description(`(External) ${ext.description || ext.name}`)
+            .argument('[args...]')
+            .allowUnknownOption()
+            .passThroughOptions()
+            .helpOption(false)
+            .action((args) => passthroughExternal(ext.name, args));
+    }
+    // ── Antigravity serve (long-running, special case) ────────────────────────
     const antigravityCmd = program.command('antigravity').description('antigravity commands');
-    antigravityCmd.command('serve')
+    antigravityCmd
+        .command('serve')
         .description('Start Anthropic-compatible API proxy for Antigravity')
         .option('--port <port>', 'Server port (default: 8082)', '8082')
         .action(async (opts) => {
         const { startServe } = await import('./clis/antigravity/serve.js');
         await startServe({ port: parseInt(opts.port) });
     });
-    // ── Dynamic site commands ──────────────────────────────────────────────────
-    const registry = getRegistry();
+    // ── Dynamic adapter commands ──────────────────────────────────────────────
     const siteGroups = new Map();
-    // Pre-seed with the antigravity command registered above to avoid duplicates
     siteGroups.set('antigravity', antigravityCmd);
-    for (const [, cmd] of registry) {
-        let siteCmd = siteGroups.get(cmd.site);
-        if (!siteCmd) {
-            siteCmd = program.command(cmd.site).description(`${cmd.site} commands`);
-            siteGroups.set(cmd.site, siteCmd);
+    registerAllCommands(program, siteGroups);
+    // ── Unknown command fallback ──────────────────────────────────────────────
+    const DENY_LIST = new Set([
+        'rm', 'sudo', 'dd', 'mkfs', 'fdisk', 'shutdown', 'reboot',
+        'kill', 'killall', 'chmod', 'chown', 'passwd', 'su', 'mount',
+        'umount', 'format', 'diskutil',
+    ]);
+    program.on('command:*', (operands) => {
+        const binary = operands[0];
+        if (DENY_LIST.has(binary)) {
+            console.error(chalk.red(`Refusing to register system command '${binary}'.`));
+            process.exitCode = 1;
+            return;
         }
-        // Skip if this subcommand was already hardcoded (e.g. antigravity serve)
-        if (siteCmd.commands.some((c) => c.name() === cmd.name))
-            continue;
-        const subCmd = siteCmd.command(cmd.name).description(cmd.description);
-        // Register positional args first, then named options
-        const positionalArgs = [];
-        for (const arg of cmd.args) {
-            if (arg.positional) {
-                const bracket = arg.required ? `<${arg.name}>` : `[${arg.name}]`;
-                subCmd.argument(bracket, arg.help ?? '');
-                positionalArgs.push(arg);
-            }
-            else {
-                const flag = arg.required ? `--${arg.name} <value>` : `--${arg.name} [value]`;
-                if (arg.required)
-                    subCmd.requiredOption(flag, arg.help ?? '');
-                else if (arg.default != null)
-                    subCmd.option(flag, arg.help ?? '', String(arg.default));
-                else
-                    subCmd.option(flag, arg.help ?? '');
-            }
+        if (isBinaryInstalled(binary)) {
+            console.log(chalk.cyan(`🔹 Auto-discovered local CLI '${binary}'. Registering...`));
+            registerExternalCli(binary);
+            passthroughExternal(binary);
         }
-        subCmd.option('-f, --format <fmt>', 'Output format: table, json, yaml, md, csv', 'table').option('-v, --verbose', 'Debug output', false);
-        subCmd.action(async (...actionArgs) => {
-            // Commander passes positional args first, then options object, then the Command
-            const actionOpts = actionArgs[positionalArgs.length] ?? {};
-            const startTime = Date.now();
-            const kwargs = {};
-            // Collect positional args
-            for (let i = 0; i < positionalArgs.length; i++) {
-                const arg = positionalArgs[i];
-                const v = actionArgs[i];
-                if (v !== undefined)
-                    kwargs[arg.name] = v;
-            }
-            // Collect named options
-            for (const arg of cmd.args) {
-                if (arg.positional)
-                    continue;
-                const camelName = arg.name.replace(/-([a-z])/g, (_m, ch) => ch.toUpperCase());
-                const v = actionOpts[arg.name] ?? actionOpts[camelName];
-                if (v !== undefined)
-                    kwargs[arg.name] = v;
-            }
-            try {
-                if (actionOpts.verbose)
-                    process.env.OPENCLI_VERBOSE = '1';
-                let result;
-                if (shouldUseBrowserSession(cmd)) {
-                    const BrowserFactory = process.env.OPENCLI_CDP_ENDPOINT ? CDPBridge : BrowserBridge;
-                    result = await browserSession(BrowserFactory, async (page) => {
-                        // Cookie/header strategies require same-origin context for credentialed fetch.
-                        if ((cmd.strategy === Strategy.COOKIE || cmd.strategy === Strategy.HEADER) && cmd.domain) {
-                            try {
-                                await page.goto(`https://${cmd.domain}`);
-                                await page.wait(2);
-                            }
-                            catch { }
-                        }
-                        return runWithTimeout(executeCommand(cmd, page, kwargs, actionOpts.verbose), { timeout: cmd.timeoutSeconds ?? DEFAULT_BROWSER_COMMAND_TIMEOUT, label: fullName(cmd) });
-                    }, { workspace: `site:${cmd.site}` });
-                }
-                else {
-                    result = await executeCommand(cmd, null, kwargs, actionOpts.verbose);
-                }
-                if (actionOpts.verbose && (!result || (Array.isArray(result) && result.length === 0))) {
-                    console.error(chalk.yellow(`[Verbose] Warning: Command returned an empty result. If the website structural API changed or requires authentication, check the network or update the adapter.`));
-                }
-                const resolved = getRegistry().get(fullName(cmd)) ?? cmd;
-                renderOutput(result, { fmt: actionOpts.format, columns: resolved.columns, title: `${resolved.site}/${resolved.name}`, elapsed: (Date.now() - startTime) / 1000, source: fullName(resolved), footerExtra: resolved.footerExtra?.(kwargs) });
-            }
-            catch (err) {
-                if (err instanceof CliError) {
-                    console.error(chalk.red(`Error [${err.code}]: ${err.message}`));
-                    if (err.hint)
-                        console.error(chalk.yellow(`Hint: ${err.hint}`));
-                }
-                else if (actionOpts.verbose && err.stack) {
-                    console.error(chalk.red(err.stack));
-                }
-                else {
-                    console.error(chalk.red(`Error: ${err.message ?? err}`));
-                }
-                process.exitCode = 1;
-            }
-        });
-    }
+        else {
+            console.error(chalk.red(`error: unknown command '${binary}'`));
+            program.outputHelp();
+            process.exitCode = 1;
+        }
+    });
     program.parse();
 }
+// ── Helpers ─────────────────────────────────────────────────────────────────
+/** Infer a workspace-friendly hostname from a URL, with site override. */
+function inferHost(url, site) {
+    if (site)
+        return site;
+    try {
+        return new URL(url).host;
+    }
+    catch {
+        return 'default';
+    }
+}