@jackwener/opencli 1.7.0 → 1.7.1

package/dist/src/cli.js

@@ -8,7 +8,7 @@ import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { Command } from 'commander';
-import chalk from 'chalk';
+import { styleText } from 'node:util';
 import { findPackageRoot, getBuiltEntryCandidates } from './package-paths.js';
 import { fullName, getRegistry, strategyLabel } from './registry.js';
 import { serializeCommand, formatArgSummary } from './serialization.js';
@@ -20,6 +20,7 @@ import { loadExternalClis, executeExternalCli, installExternalCli, registerExter
 import { registerAllCommands } from './commanderAdapter.js';
 import { EXIT_CODES, getErrorMessage } from './errors.js';
 import { daemonStop } from './commands/daemon.js';
+import { log } from './logger.js';
 const CLI_FILE = fileURLToPath(import.meta.url);
 /** Create a browser page for browser commands. Uses a dedicated browser workspace for session persistence. */
 async function getBrowserPage() {
@@ -81,31 +82,31 @@ export function createProgram(BUILTIN_CLIS, USER_CLIS) {
             sites.set(cmd.site, g);
         }
         console.log();
-        console.log(chalk.bold('  opencli') + chalk.dim(' — available commands'));
+        console.log(styleText('bold', '  opencli') + styleText('dim', ' — available commands'));
         console.log();
         for (const [site, cmds] of sites) {
-            console.log(chalk.bold.cyan(`  ${site}`));
+            console.log(styleText(['bold', 'cyan'], `  ${site}`));
             for (const cmd of cmds) {
                 const label = strategyLabel(cmd);
                 const tag = label === 'public'
-                    ? chalk.green('[public]')
-                    : chalk.yellow(`[${label}]`);
-                const aliases = cmd.aliases?.length ? chalk.dim(` (aliases: ${cmd.aliases.join(', ')})`) : '';
-                console.log(`    ${cmd.name} ${tag}${aliases}${cmd.description ? chalk.dim(` — ${cmd.description}`) : ''}`);
+                    ? styleText('green', '[public]')
+                    : styleText('yellow', `[${label}]`);
+                const aliases = cmd.aliases?.length ? styleText('dim', ` (aliases: ${cmd.aliases.join(', ')})`) : '';
+                console.log(`    ${cmd.name} ${tag}${aliases}${cmd.description ? styleText('dim', ` — ${cmd.description}`) : ''}`);
             }
             console.log();
         }
         const externalClis = loadExternalClis();
         if (externalClis.length > 0) {
-            console.log(chalk.bold.cyan('  external CLIs'));
+            console.log(styleText(['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}`) : ''}`);
+                const tag = isInstalled ? styleText('green', '[installed]') : styleText('yellow', '[auto-install]');
+                console.log(`    ${ext.name} ${tag}${ext.description ? styleText('dim', ` — ${ext.description}`) : ''}`);
             }
             console.log();
         }
-        console.log(chalk.dim(`  ${commands.length} built-in commands across ${sites.size} sites, ${externalClis.length} external CLIs`));
+        console.log(styleText('dim', `  ${commands.length} built-in commands across ${sites.size} sites, ${externalClis.length} external CLIs`));
         console.log();
     });
     // ── Built-in: validate / verify ───────────────────────────────────────────
@@ -258,13 +259,13 @@ export function createProgram(BUILTIN_CLIS, USER_CLIS) {
             catch (err) {
                 const msg = getErrorMessage(err);
                 if (msg.includes('Extension not connected') || msg.includes('Daemon')) {
-                    console.error(`Browser not connected. Run 'opencli doctor' to diagnose.`);
+                    log.error(`Browser not connected. Run 'opencli doctor' to diagnose.`);
                 }
                 else if (msg.includes('attach failed') || msg.includes('chrome-extension://')) {
-                    console.error(`Browser attach failed — another extension may be interfering. Try disabling 1Password.`);
+                    log.error(`Browser attach failed — another extension may be interfering. Try disabling 1Password.`);
                 }
                 else {
-                    console.error(`Error: ${msg}`);
+                    log.error(msg);
                 }
                 process.exitCode = EXIT_CODES.GENERIC_ERROR;
             }
@@ -336,12 +337,12 @@ export function createProgram(BUILTIN_CLIS, USER_CLIS) {
     }));
     get.command('text').argument('<index>', 'Element index').description('Element text content')
         .action(browserAction(async (page, index) => {
-        const text = await page.evaluate(`document.querySelector('[data-opencli-ref="${index}"]')?.textContent?.trim()`);
+        const text = await page.evaluate(`((idx) => document.querySelector('[data-opencli-ref="' + idx + '"]')?.textContent?.trim())(${JSON.stringify(String(index))})`);
         console.log(text ?? '(empty)');
     }));
     get.command('value').argument('<index>', 'Element index').description('Input/textarea value')
         .action(browserAction(async (page, index) => {
-        const val = await page.evaluate(`document.querySelector('[data-opencli-ref="${index}"]')?.value`);
+        const val = await page.evaluate(`((idx) => document.querySelector('[data-opencli-ref="' + idx + '"]')?.value)(${JSON.stringify(String(index))})`);
         console.log(val ?? '(empty)');
     }));
     get.command('html').option('--selector <css>', 'CSS selector scope').description('Page HTML (or scoped)')
@@ -352,7 +353,7 @@ export function createProgram(BUILTIN_CLIS, USER_CLIS) {
     }));
     get.command('attributes').argument('<index>', 'Element index').description('Element attributes')
         .action(browserAction(async (page, index) => {
-        const attrs = await page.evaluate(`JSON.stringify(Object.fromEntries([...document.querySelector('[data-opencli-ref="${index}"]')?.attributes].map(a=>[a.name,a.value])))`);
+        const attrs = await page.evaluate(`((idx) => JSON.stringify(Object.fromEntries([...document.querySelector('[data-opencli-ref="' + idx + '"]')?.attributes].map(a=>[a.name,a.value]))))(${JSON.stringify(String(index))})`);
         console.log(attrs ?? '{}');
     }));
     // ── Interact ──
@@ -564,7 +565,7 @@ export function createProgram(BUILTIN_CLIS, USER_CLIS) {
             const fs = await import('node:fs');
             const path = await import('node:path');
             const dir = path.join(os.homedir(), '.opencli', 'clis', site);
-            const filePath = path.join(dir, `${command}.ts`);
+            const filePath = path.join(dir, `${command}.js`);
             if (fs.existsSync(filePath)) {
                 console.log(`Adapter already exists: ${filePath}`);
                 return;
@@ -633,7 +634,7 @@ cli({
             }
             const { execFileSync } = await import('node:child_process');
             const os = await import('node:os');
-            const filePath = path.join(os.homedir(), '.opencli', 'clis', site, `${command}.ts`);
+            const filePath = path.join(os.homedir(), '.opencli', 'clis', site, `${command}.js`);
             if (!fs.existsSync(filePath)) {
                 console.error(`Adapter not found: ${filePath}`);
                 console.error(`Run "opencli browser init ${name}" to create it.`);
@@ -718,18 +719,18 @@ cli({
             await discoverPlugins();
             if (Array.isArray(result)) {
                 if (result.length === 0) {
-                    console.log(chalk.yellow('No plugins were installed (all skipped or incompatible).'));
+                    console.log(styleText('yellow', 'No plugins were installed (all skipped or incompatible).'));
                 }
                 else {
-                    console.log(chalk.green(`\u2705 Installed ${result.length} plugin(s) from monorepo: ${result.join(', ')}`));
+                    console.log(styleText('green', `\u2705 Installed ${result.length} plugin(s) from monorepo: ${result.join(', ')}`));
                 }
             }
             else {
-                console.log(chalk.green(`\u2705 Plugin "${result}" installed successfully. Commands are ready to use.`));
+                console.log(styleText('green', `\u2705 Plugin "${result}" installed successfully. Commands are ready to use.`));
             }
         }
         catch (err) {
-            console.error(chalk.red(`Error: ${getErrorMessage(err)}`));
+            console.error(styleText('red', `Error: ${getErrorMessage(err)}`));
             process.exitCode = EXIT_CODES.GENERIC_ERROR;
         }
     });
@@ -741,10 +742,10 @@ cli({
         const { uninstallPlugin } = await import('./plugin.js');
         try {
             uninstallPlugin(name);
-            console.log(chalk.green(`✅ Plugin "${name}" uninstalled.`));
+            console.log(styleText('green', `✅ Plugin "${name}" uninstalled.`));
         }
         catch (err) {
-            console.error(chalk.red(`Error: ${getErrorMessage(err)}`));
+            console.error(styleText('red', `Error: ${getErrorMessage(err)}`));
             process.exitCode = EXIT_CODES.GENERIC_ERROR;
         }
     });
@@ -755,12 +756,12 @@ cli({
         .option('--all', 'Update all installed plugins')
         .action(async (name, opts) => {
         if (!name && !opts.all) {
-            console.error(chalk.red('Error: Please specify a plugin name or use the --all flag.'));
+            console.error(styleText('red', 'Error: Please specify a plugin name or use the --all flag.'));
             process.exitCode = EXIT_CODES.USAGE_ERROR;
             return;
         }
         if (name && opts.all) {
-            console.error(chalk.red('Error: Cannot specify both a plugin name and --all.'));
+            console.error(styleText('red', 'Error: Cannot specify both a plugin name and --all.'));
             process.exitCode = EXIT_CODES.USAGE_ERROR;
             return;
         }
@@ -772,36 +773,36 @@ cli({
                 await discoverPlugins();
             }
             let hasErrors = false;
-            console.log(chalk.bold('  Update Results:'));
+            console.log(styleText('bold', '  Update Results:'));
             for (const result of results) {
                 if (result.success) {
-                    console.log(`  ${chalk.green('✓')} ${result.name}`);
+                    console.log(`  ${styleText('green', '✓')} ${result.name}`);
                     continue;
                 }
                 hasErrors = true;
-                console.log(`  ${chalk.red('✗')} ${result.name} — ${chalk.dim(result.error)}`);
+                console.log(`  ${styleText('red', '✗')} ${result.name} — ${styleText('dim', String(result.error))}`);
             }
             if (results.length === 0) {
-                console.log(chalk.dim('  No plugins installed.'));
+                console.log(styleText('dim', '  No plugins installed.'));
                 return;
             }
             console.log();
             if (hasErrors) {
-                console.error(chalk.red('Completed with some errors.'));
+                console.error(styleText('red', 'Completed with some errors.'));
                 process.exitCode = EXIT_CODES.GENERIC_ERROR;
             }
             else {
-                console.log(chalk.green('✅ All plugins updated successfully.'));
+                console.log(styleText('green', '✅ All plugins updated successfully.'));
             }
             return;
         }
         try {
             updatePlugin(name);
             await discoverPlugins();
-            console.log(chalk.green(`✅ Plugin "${name}" updated successfully.`));
+            console.log(styleText('green', `✅ Plugin "${name}" updated successfully.`));
         }
         catch (err) {
-            console.error(chalk.red(`Error: ${getErrorMessage(err)}`));
+            console.error(styleText('red', `Error: ${getErrorMessage(err)}`));
             process.exitCode = EXIT_CODES.GENERIC_ERROR;
         }
     });
@@ -813,8 +814,8 @@ cli({
         const { listPlugins } = await import('./plugin.js');
         const plugins = listPlugins();
         if (plugins.length === 0) {
-            console.log(chalk.dim('  No plugins installed.'));
-            console.log(chalk.dim(`  Install one with: opencli plugin install github:user/repo`));
+            console.log(styleText('dim', '  No plugins installed.'));
+            console.log(styleText('dim', '  Install one with: opencli plugin install github:user/repo'));
             return;
         }
         if (opts.format === 'json') {
@@ -827,7 +828,7 @@ cli({
             return;
         }
         console.log();
-        console.log(chalk.bold('  Installed plugins'));
+        console.log(styleText('bold', '  Installed plugins'));
         console.log();
         // Group by monorepo
         const standalone = plugins.filter((p) => !p.monorepoName);
@@ -840,24 +841,24 @@ cli({
             monoGroups.set(p.monorepoName, g);
         }
         for (const p of standalone) {
-            const version = p.version ? chalk.green(` @${p.version}`) : '';
-            const desc = p.description ? chalk.dim(` — ${p.description}`) : '';
-            const cmds = p.commands.length > 0 ? chalk.dim(` (${p.commands.join(', ')})`) : '';
-            const src = p.source ? chalk.dim(` ← ${p.source}`) : '';
-            console.log(`  ${chalk.cyan(p.name)}${version}${desc}${cmds}${src}`);
+            const version = p.version ? styleText('green', ` @${p.version}`) : '';
+            const desc = p.description ? styleText('dim', ` — ${p.description}`) : '';
+            const cmds = p.commands.length > 0 ? styleText('dim', ` (${p.commands.join(', ')})`) : '';
+            const src = p.source ? styleText('dim', ` ← ${p.source}`) : '';
+            console.log(`  ${styleText('cyan', p.name)}${version}${desc}${cmds}${src}`);
         }
         for (const [mono, group] of monoGroups) {
             console.log();
-            console.log(chalk.bold.magenta(`  📦 ${mono}`) + chalk.dim(' (monorepo)'));
+            console.log(styleText(['bold', 'magenta'], `  📦 ${mono}`) + styleText('dim', ' (monorepo)'));
             for (const p of group) {
-                const version = p.version ? chalk.green(` @${p.version}`) : '';
-                const desc = p.description ? chalk.dim(` — ${p.description}`) : '';
-                const cmds = p.commands.length > 0 ? chalk.dim(` (${p.commands.join(', ')})`) : '';
-                console.log(`    ${chalk.cyan(p.name)}${version}${desc}${cmds}`);
+                const version = p.version ? styleText('green', ` @${p.version}`) : '';
+                const desc = p.description ? styleText('dim', ` — ${p.description}`) : '';
+                const cmds = p.commands.length > 0 ? styleText('dim', ` (${p.commands.join(', ')})`) : '';
+                console.log(`    ${styleText('cyan', p.name)}${version}${desc}${cmds}`);
             }
         }
         console.log();
-        console.log(chalk.dim(`  ${plugins.length} plugin(s) installed`));
+        console.log(styleText('dim', `  ${plugins.length} plugin(s) installed`));
         console.log();
     });
     pluginCmd
@@ -873,20 +874,20 @@ cli({
                 dir: opts.dir,
                 description: opts.description,
             });
-            console.log(chalk.green(`✅ Plugin scaffold created at ${result.dir}`));
+            console.log(styleText('green', `✅ Plugin scaffold created at ${result.dir}`));
             console.log();
-            console.log(chalk.bold('  Files created:'));
+            console.log(styleText('bold', '  Files created:'));
             for (const f of result.files) {
-                console.log(`    ${chalk.cyan(f)}`);
+                console.log(`    ${styleText('cyan', f)}`);
             }
             console.log();
-            console.log(chalk.dim('  Next steps:'));
-            console.log(chalk.dim(`    cd ${result.dir}`));
-            console.log(chalk.dim(`    opencli plugin install file://${result.dir}`));
-            console.log(chalk.dim(`    opencli ${name} hello`));
+            console.log(styleText('dim', '  Next steps:'));
+            console.log(styleText('dim', `    cd ${result.dir}`));
+            console.log(styleText('dim', `    opencli plugin install file://${result.dir}`));
+            console.log(styleText('dim', `    opencli ${name} hello`));
         }
         catch (err) {
-            console.error(chalk.red(`Error: ${getErrorMessage(err)}`));
+            console.error(styleText('red', `Error: ${getErrorMessage(err)}`));
             process.exitCode = EXIT_CODES.GENERIC_ERROR;
         }
     });
@@ -905,7 +906,7 @@ cli({
         .action((name) => {
         const ext = externalClis.find(e => e.name === name);
         if (!ext) {
-            console.error(chalk.red(`External CLI '${name}' not found in registry.`));
+            console.error(styleText('red', `External CLI '${name}' not found in registry.`));
             process.exitCode = EXIT_CODES.USAGE_ERROR;
             return;
         }
@@ -930,7 +931,7 @@ cli({
             executeExternalCli(name, args, externalClis);
         }
         catch (err) {
-            console.error(chalk.red(`Error: ${getErrorMessage(err)}`));
+            console.error(styleText('red', `Error: ${getErrorMessage(err)}`));
             process.exitCode = EXIT_CODES.GENERIC_ERROR;
         }
     }
@@ -953,6 +954,7 @@ cli({
         .description('Start Anthropic-compatible API proxy for Antigravity')
         .option('--port <port>', 'Server port (default: 8082)', '8082')
         .action(async (opts) => {
+        // @ts-expect-error JS adapter — no type declarations
         const { startServe } = await import('../clis/antigravity/serve.js');
         await startServe({ port: parseInt(opts.port) });
     });
@@ -965,9 +967,9 @@ cli({
     // Only explicitly registered external CLIs (via `opencli register`) are allowed.
     program.on('command:*', (operands) => {
         const binary = operands[0];
-        console.error(chalk.red(`error: unknown command '${binary}'`));
+        console.error(styleText('red', `error: unknown command '${binary}'`));
         if (isBinaryInstalled(binary)) {
-            console.error(chalk.dim(`  Tip: '${binary}' exists on your PATH. Use 'opencli register ${binary}' to add it as an external CLI.`));
+            console.error(styleText('dim', `  Tip: '${binary}' exists on your PATH. Use 'opencli register ${binary}' to add it as an external CLI.`));
         }
         program.outputHelp();
         process.exitCode = EXIT_CODES.USAGE_ERROR;

package/dist/src/commanderAdapter.d.ts

@@ -16,7 +16,6 @@ export declare function normalizeArgValue(argType: string | undefined, value: un
  * Register a single CliCommand as a Commander subcommand.
  */
 export declare function registerCommandToProgram(siteCmd: Command, cmd: CliCommand): void;
-export type GenericErrorKind = 'auth' | 'http' | 'not-found' | 'other';
 /**
  * Register all commands from the registry onto a Commander program.
  */

package/dist/src/commanderAdapter.js

@@ -9,13 +9,13 @@
  *
  * All execution logic lives in execution.ts.
  */
-import chalk from 'chalk';
+import { log } from './logger.js';
+import yaml from 'js-yaml';
 import { fullName, getRegistry } from './registry.js';
 import { formatRegistryHelpText } from './serialization.js';
 import { render as renderOutput } from './output.js';
-import { executeCommand } from './execution.js';
-import { CliError, EXIT_CODES, ERROR_ICONS, getErrorMessage, BrowserConnectError, AuthRequiredError, TimeoutError, SelectorError, EmptyResultError, ArgumentError, AdapterLoadError, CommandExecutionError, } from './errors.js';
-import { getDaemonHealth } from './browser/daemon-client.js';
+import { executeCommand, prepareCommandArgs } from './execution.js';
+import { CliError, EXIT_CODES, ArgumentError, toEnvelope, } from './errors.js';
 import { isDiagnosticEnabled } from './diagnostic.js';
 export function normalizeArgValue(argType, value, name) {
     if (argType !== 'bool' && argType !== 'boolean')
@@ -71,11 +71,11 @@ export function registerCommandToProgram(siteCmd, cmd) {
         // ── Execute + render ────────────────────────────────────────────────
         try {
             // ── Collect kwargs ────────────────────────────────────────────────
-            const kwargs = {};
+            const rawKwargs = {};
             for (let i = 0; i < positionalArgs.length; i++) {
                 const v = actionArgs[i];
                 if (v !== undefined)
-                    kwargs[positionalArgs[i].name] = v;
+                    rawKwargs[positionalArgs[i].name] = v;
             }
             for (const arg of cmd.args) {
                 if (arg.positional)
@@ -83,9 +83,9 @@ export function registerCommandToProgram(siteCmd, cmd) {
                 const camelName = arg.name.replace(/-([a-z])/g, (_m, ch) => ch.toUpperCase());
                 const v = optionsRecord[arg.name] ?? optionsRecord[camelName];
                 if (v !== undefined)
-                    kwargs[arg.name] = normalizeArgValue(arg.type, v, arg.name);
+                    rawKwargs[arg.name] = normalizeArgValue(arg.type, v, arg.name);
             }
-            cmd.validateArgs?.(kwargs);
+            const kwargs = prepareCommandArgs(cmd, rawKwargs);
             const verbose = optionsRecord.verbose === true;
             let format = typeof optionsRecord.format === 'string' ? optionsRecord.format : 'table';
             const formatExplicit = subCmd.getOptionValueSource('format') === 'cli';
@@ -94,9 +94,9 @@ export function registerCommandToProgram(siteCmd, cmd) {
             if (cmd.deprecated) {
                 const message = typeof cmd.deprecated === 'string' ? cmd.deprecated : `${fullName(cmd)} is deprecated.`;
                 const replacement = cmd.replacedBy ? ` Use ${cmd.replacedBy} instead.` : '';
-                console.error(chalk.yellow(`Deprecated: ${message}${replacement}`));
+                log.warn(`Deprecated: ${message}${replacement}`);
             }
-            const result = await executeCommand(cmd, kwargs, verbose);
+            const result = await executeCommand(cmd, kwargs, verbose, { prepared: true });
             if (result === null || result === undefined) {
                 return;
             }
@@ -105,7 +105,7 @@ export function registerCommandToProgram(siteCmd, cmd) {
                 format = resolved.defaultFormat;
             }
             if (verbose && (!result || (Array.isArray(result) && result.length === 0))) {
-                console.error(chalk.yellow('[Verbose] Warning: Command returned an empty result.'));
+                log.warn('Command returned an empty result.');
             }
             renderOutput(result, {
                 fmt: format,
@@ -118,162 +118,37 @@ export function registerCommandToProgram(siteCmd, cmd) {
             });
         }
         catch (err) {
-            await renderError(err, fullName(cmd), optionsRecord.verbose === true);
+            renderError(err, fullName(cmd), optionsRecord.verbose === true);
             process.exitCode = resolveExitCode(err);
         }
     });
 }
-// ── Error classification ─────────────────────────────────────────────────────
-const ISSUES_URL = 'https://github.com/jackwener/opencli/issues';
-const GENERIC_ERROR_MAP = {
-    auth: { icon: '🔒', exitCode: EXIT_CODES.NOPERM, hint: 'Open Chrome or Chromium, log in to the target site, then retry.' },
-    http: { icon: '🌐', exitCode: EXIT_CODES.GENERIC_ERROR, hint: 'Check your login status, or the site may be temporarily unavailable.' },
-    'not-found': { icon: '📭', exitCode: EXIT_CODES.EMPTY_RESULT, hint: 'The resource was not found. The adapter or page structure may have changed.' },
-    other: { icon: '💥', exitCode: EXIT_CODES.GENERIC_ERROR, hint: '' },
-};
-/** Pattern-based classifier for untyped errors thrown by adapters. */
-function classifyGenericError(msg) {
-    const m = msg.toLowerCase();
-    let kind = 'other';
-    if (/not logged in|login required|please log in|未登录|请先登录|authentication required|cookie expired/.test(m))
-        kind = 'auth';
-    else if (/\b(status[: ]+)?[45]\d{2}\b|http[/ ][45]\d{2}/.test(m))
-        kind = 'http';
-    else if (/not found|未找到|could not find|no .+ found/.test(m))
-        kind = 'not-found';
-    return { kind, ...GENERIC_ERROR_MAP[kind] };
-}
 // ── Exit code resolution ─────────────────────────────────────────────────────
 function resolveExitCode(err) {
     if (err instanceof CliError)
         return err.exitCode;
-    return classifyGenericError(getErrorMessage(err)).exitCode;
-}
-/** Render a status line for BrowserConnectError based on real-time or kind-derived state. */
-function renderBridgeStatus(running, extensionConnected) {
-    const ok = chalk.green('✓');
-    const fail = chalk.red('✗');
-    console.error(`  Daemon    ${running ? ok : fail} ${running ? 'running' : 'not running'}`);
-    console.error(`  Extension ${extensionConnected ? ok : fail} ${extensionConnected ? 'connected' : 'not connected'}`);
-    console.error();
-    if (!running) {
-        console.error(chalk.yellow('  Run the command again — daemon should auto-start.'));
-        console.error(chalk.dim('  Still failing? Run: opencli doctor'));
-    }
-    else if (!extensionConnected) {
-        console.error(chalk.yellow('  Install the Browser Bridge extension to continue:'));
-        console.error(chalk.dim('    1. Download from github.com/jackwener/opencli/releases'));
-        console.error(chalk.dim('    2. chrome://extensions → Enable Developer Mode → Load unpacked'));
-    }
-    else {
-        console.error(chalk.yellow('  Connection failed despite extension being active.'));
-        console.error(chalk.dim('  Try reloading the extension, or run: opencli doctor'));
-    }
+    return EXIT_CODES.GENERIC_ERROR;
 }
+// ── Error rendering ─────────────────────────────────────────────────────────
 /** Emit AutoFix hint for repairable adapter errors (skipped if already in diagnostic mode). */
-function emitAutoFixHint(cmdName) {
+function emitAutoFixHint(envelope, cmdName) {
     if (isDiagnosticEnabled())
-        return; // Already collecting diagnostics, don't repeat
-    console.error();
-    console.error(chalk.cyan('💡 AutoFix: re-run with OPENCLI_DIAGNOSTIC=1 for repair context.'));
-    console.error(chalk.dim(`    OPENCLI_DIAGNOSTIC=1 ${cmdName}`));
+        return envelope;
+    return envelope + `# AutoFix: re-run with OPENCLI_DIAGNOSTIC=1 for repair context\n# OPENCLI_DIAGNOSTIC=1 ${cmdName}\n`;
 }
-async function renderError(err, cmdName, verbose) {
-    // ── BrowserConnectError: real-time diagnosis, kind as fallback ────────
-    if (err instanceof BrowserConnectError) {
-        console.error(chalk.red(`🔌 ${err.message}`));
-        if (err.hint)
-            console.error(chalk.yellow(`→ ${err.hint}`));
-        console.error();
-        try {
-            const health = await getDaemonHealth({ timeout: 300 });
-            renderBridgeStatus(health.state !== 'stopped', health.state === 'ready');
-        }
-        catch (_statusErr) {
-            // getDaemonHealth itself failed — derive best-guess state from kind.
-            const running = err.kind !== 'daemon-not-running';
-            const extensionConnected = err.kind === 'command-failed';
-            renderBridgeStatus(running, extensionConnected);
-        }
-        return;
-    }
-    // ── AuthRequiredError ─────────────────────────────────────────────────
-    if (err instanceof AuthRequiredError) {
-        console.error(chalk.red(`🔒 Not logged in to ${err.domain}`));
-        // Respect custom hints set by the adapter; fall back to generic guidance.
-        console.error(chalk.yellow(`→ ${err.hint ?? `Open Chrome or Chromium and log in to https://${err.domain}, then retry.`}`));
-        return;
-    }
-    // ── TimeoutError ──────────────────────────────────────────────────────
-    if (err instanceof TimeoutError) {
-        console.error(chalk.red(`⏱  ${err.message}`));
-        console.error(chalk.yellow('→ Try again, or raise the limit:'));
-        console.error(chalk.dim(`    OPENCLI_BROWSER_COMMAND_TIMEOUT=60 ${cmdName}`));
-        return;
-    }
-    // ── SelectorError / EmptyResultError: likely outdated adapter ─────────
-    if (err instanceof SelectorError || err instanceof EmptyResultError) {
-        const icon = ERROR_ICONS[err.code] ?? '⚠️';
-        console.error(chalk.red(`${icon} ${err.message}`));
-        console.error(chalk.yellow(`→ ${err.hint ?? 'The page structure may have changed — this adapter may be outdated.'}`));
-        console.error(chalk.dim(`  Debug:  ${cmdName} --verbose`));
-        console.error(chalk.dim(`  Report: ${ISSUES_URL}`));
-        emitAutoFixHint(cmdName);
-        return;
-    }
-    // ── ArgumentError ─────────────────────────────────────────────────────
-    if (err instanceof ArgumentError) {
-        console.error(chalk.red(`❌ ${err.message}`));
-        if (err.hint)
-            console.error(chalk.yellow(`→ ${err.hint}`));
-        return;
-    }
-    // ── AdapterLoadError ──────────────────────────────────────────────────
-    if (err instanceof AdapterLoadError) {
-        console.error(chalk.red(`📦 ${err.message}`));
-        if (err.hint)
-            console.error(chalk.yellow(`→ ${err.hint}`));
-        return;
-    }
-    // ── CommandExecutionError ─────────────────────────────────────────────
-    if (err instanceof CommandExecutionError) {
-        console.error(chalk.red(`💥 ${err.message}`));
-        if (err.hint) {
-            console.error(chalk.yellow(`→ ${err.hint}`));
-        }
-        else {
-            console.error(chalk.dim(`  Add --verbose for details, or report: ${ISSUES_URL}`));
-        }
-        return;
-    }
-    // ── Other typed CliError (fallback for future codes) ──────────────────
-    if (err instanceof CliError) {
-        const icon = ERROR_ICONS[err.code] ?? '⚠️';
-        console.error(chalk.red(`${icon} ${err.message}`));
-        if (err.hint)
-            console.error(chalk.yellow(`→ ${err.hint}`));
-        return;
-    }
-    // ── Generic Error from adapters: classify by message pattern ──────────
-    const msg = getErrorMessage(err);
-    const classified = classifyGenericError(msg);
-    if (classified.kind !== 'other') {
-        console.error(chalk.red(`${classified.icon} ${msg}`));
-        console.error(chalk.yellow(`→ ${classified.hint}`));
-        if (classified.kind === 'not-found')
-            console.error(chalk.dim(`  Report: ${ISSUES_URL}`));
-        if (classified.kind === 'not-found')
-            emitAutoFixHint(cmdName);
-        return;
-    }
-    // ── Unknown error: show stack in verbose mode ─────────────────────────
+function renderError(err, cmdName, verbose) {
+    const envelope = toEnvelope(err);
+    // In verbose mode, include stack trace for debugging
     if (verbose && err instanceof Error && err.stack) {
-        console.error(chalk.red(err.stack));
+        envelope.error.stack = err.stack;
     }
-    else {
-        console.error(chalk.red(`💥 Unexpected error: ${msg}`));
-        console.error(chalk.dim(`  Run with --verbose for details, or report: ${ISSUES_URL}`));
+    let output = yaml.dump(envelope, { sortKeys: false, lineWidth: 120, noRefs: true });
+    // Append AutoFix hint for repairable errors
+    const code = envelope.error.code;
+    if (code === 'SELECTOR' || code === 'EMPTY_RESULT' || code === 'ADAPTER_LOAD' || code === 'UNKNOWN') {
+        output = emitAutoFixHint(output, cmdName);
     }
+    process.stderr.write(output);
 }
 /**
  * Register all commands from the registry onto a Commander program.