@rynx-ai/cli 0.1.11-beta.13 → 0.1.11-beta.15

package/dist/commands/browser.js

@@ -4,6 +4,7 @@ import { connectBrowserAutomation, } from "@rynx-ai/browser-cdp";
 import WebSocket from "ws";
 import { parseBrowserCliArgs, resolveBrowserCliTarget, } from "../browser-cli-args.js";
 import { callManagedRuntimeBrowser, callResidentRuntime, getResidentRuntimeLocalBrowserAutomationAccess, getResidentRuntimeLocalBrowserEndpoint, readOptionalManagedRuntimeBrowserCredential, } from "../control-client.js";
+import { createProgressDisplay } from "../progress-display.js";
 import { fail } from "./errors.js";
 export async function runBrowserCommand(args) {
     let parsed;
@@ -20,9 +21,18 @@ export async function runBrowserCommand(args) {
         const channel = browserReleaseChannel(parsed.channel);
         const { createBrowserArtifactManagementService } = await import("@rynx-ai/daemon/browser-artifacts");
         const artifacts = createBrowserArtifactManagementService();
-        const result = parsed.subcommand === "install"
-            ? await artifacts.install(parsed.version ? { version: parsed.version } : { channel }, parsed.json ? {} : { onProgress: (message) => console.error(message) })
-            : await artifacts.update({ channel }, parsed.json ? {} : { onProgress: (message) => console.error(message) });
+        const progress = parsed.json ? undefined : createProgressDisplay();
+        progress?.start(parsed.subcommand === "install" ? "正在安装 Rynx Browser" : "正在更新 Rynx Browser");
+        let result;
+        try {
+            result = parsed.subcommand === "install"
+                ? await artifacts.install(parsed.version ? { version: parsed.version } : { channel }, progress ? { onProgress: (message) => progress.update(message) } : {})
+                : await artifacts.update({ channel }, progress ? { onProgress: (message) => progress.update(message) } : {});
+        }
+        catch (error) {
+            progress?.clear();
+            throw error;
+        }
         if (parsed.json) {
             console.log(JSON.stringify({
                 resolved: result.resolved,
@@ -30,9 +40,7 @@ export async function runBrowserCommand(args) {
             }, null, 2));
         }
         else {
-            for (const message of result.messages)
-                console.log(message);
-            console.log(`Active Browser engine: Chrome for Testing ${result.installed.version}.`);
+            progress.succeed(`Rynx Browser 已就绪：Chrome for Testing ${result.installed.version}`);
         }
         return 0;
     }

package/dist/commands/plugin.js

@@ -1,14 +1,25 @@
 import { createInterface } from "node:readline/promises";
-import { cancelResidentPluginInstallation, commitResidentPluginInstallation, invokeResidentPluginCommand, listResidentPlugins, prepareResidentPluginInstallation, setResidentPluginEnabled, uninstallResidentPlugin, } from "../control-client.js";
+import { cancelResidentPluginInstallation, commitResidentPluginInstallation, prepareResidentPluginInstallation, setResidentPluginEnabled, uninstallResidentPlugin, } from "../control-client.js";
 import { fail } from "./errors.js";
-const PLUGIN_STDIN_MAX_BYTES = 256 * 1024;
 const PLUGIN_DIGEST_PATTERN = /^sha256-[A-Za-z0-9+/]{43}={0,2}$/;
 const CANONICAL_PLUGIN_ID_PATTERN = /^[a-z][a-z0-9-]{0,62}@[a-z0-9][a-z0-9-]{0,62}(?:\/[a-z0-9][a-z0-9._-]{0,99})?$/;
+const PLUGIN_USAGE = `Usage: rynx plugin <command|plugin-id>
+
+Management:
+  list
+  install <source|plugin@market> [--force] [--expect-digest <sha256-...>]
+  update <plugin@market> [--expect-digest <sha256-...>]
+  enable|disable|uninstall <plugin@market>
+
+Plugin commands:
+  <plugin-id> <command> [args...]
+  <plugin-id> --help`;
 export async function runPluginManageCommand(args, options = {}) {
     const [subcommand, pluginId] = args;
     switch (subcommand) {
         case "list": {
-            const plugins = await listResidentPlugins();
+            const { listInstalledPlugins } = await import("@rynx-ai/daemon/plugin-cli");
+            const plugins = listInstalledPlugins();
             console.log("Plugins");
             if (plugins.length === 0) {
                 console.log("  (none)");
@@ -126,23 +137,50 @@ export async function runPluginCommand(args) {
     const [pluginId, command] = args;
     if (!pluginId)
         fail("plugin: missing plugin id");
+    if (pluginId === "--help" || pluginId === "-h" || pluginId === "help") {
+        console.log(PLUGIN_USAGE);
+        return 0;
+    }
     if (["list", "install", "update", "uninstall", "enable", "disable"].includes(pluginId)) {
         return runPluginManageCommand(args);
     }
     if (!command)
         fail(`plugin ${pluginId}: missing command`);
-    const stdin = process.stdin.isTTY
-        ? undefined
-        : await readStdinBounded(PLUGIN_STDIN_MAX_BYTES);
-    const result = await invokeResidentPluginCommand(pluginId, args.slice(1), stdin === undefined ? {} : { stdin });
-    if (result.stdout)
-        process.stdout.write(result.stdout);
-    if (result.stderr)
-        process.stderr.write(result.stderr);
-    if (result.truncated) {
-        process.stderr.write("rynx: plugin command output was truncated by the daemon\n");
+    const pluginCli = await import("@rynx-ai/daemon/plugin-cli");
+    if (command === "--help" || command === "-h") {
+        console.log(pluginCli.installedPluginCommandUsage(pluginId));
+        return 0;
+    }
+    return runPluginCliWithForwardedSignals((signal) => pluginCli.runPluginCliCommand(pluginId, args.slice(1), {
+        stdio: "inherit",
+        signal,
+    }));
+}
+async function runPluginCliWithForwardedSignals(run) {
+    const controller = new AbortController();
+    let interruptedBy;
+    const interrupt = (signal) => {
+        interruptedBy ??= signal;
+        if (!controller.signal.aborted) {
+            controller.abort(new Error(`plugin command interrupted by ${signal}`));
+        }
+    };
+    const onSigint = () => interrupt("SIGINT");
+    const onSigterm = () => interrupt("SIGTERM");
+    process.on("SIGINT", onSigint);
+    process.on("SIGTERM", onSigterm);
+    try {
+        return (await run(controller.signal)).code;
+    }
+    catch (error) {
+        if (interruptedBy)
+            return interruptedBy === "SIGINT" ? 130 : 143;
+        throw error;
+    }
+    finally {
+        process.off("SIGINT", onSigint);
+        process.off("SIGTERM", onSigterm);
     }
-    return result.code;
 }
 function parseInstallationArgs(operation, args) {
     const target = args[0];
@@ -219,15 +257,3 @@ async function confirmInTerminal(message) {
         prompt.close();
     }
 }
-async function readStdinBounded(maxBytes) {
-    const chunks = [];
-    let bytes = 0;
-    for await (const chunk of process.stdin) {
-        const value = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
-        bytes += value.byteLength;
-        if (bytes > maxBytes)
-            fail(`plugin stdin exceeds ${maxBytes} bytes`);
-        chunks.push(value);
-    }
-    return Buffer.concat(chunks, bytes).toString("utf8");
-}

package/dist/commands/setup.js

@@ -4,9 +4,11 @@ import path from "node:path";
 import * as prompts from "@clack/prompts";
 import { AGENT_RUNTIME_IDS, getRuntimeProfile, loadConfig, rynxConfigFile, } from "@rynx-ai/core";
 import { ensureSystemDependencies, inspectDaemonDiagnostics, inspectSystemDependencies, prepareBundledPlugins, } from "@rynx-ai/daemon/setup-service";
+import { createProgressDisplay } from "../progress-display.js";
 import { fail } from "./errors.js";
 export async function runSetupCommand(args) {
     const options = parseSetupOptions(args);
+    const progress = options.json ? undefined : createProgressDisplay();
     const interactive = !options.nonInteractive &&
         !options.hasConfigurationArguments &&
         Boolean(process.stdin.isTTY && process.stdout.isTTY);
@@ -53,36 +55,46 @@ export async function runSetupCommand(args) {
         },
     };
     let failed = false;
+    progress?.start("正在准备 Rynx 内置插件");
     try {
         const plugins = await prepareBundledPlugins();
         result.plugins = {
             status: plugins.status,
             changed: [...plugins.installed, ...plugins.updated],
         };
+        progress?.succeed("Rynx 内置插件已就绪");
     }
     catch (error) {
         failed = true;
+        progress?.clear();
+        const detail = errorMessage(error);
         result.plugins = {
             status: "error",
-            detail: errorMessage(error),
+            detail,
         };
+        console.error(`Rynx 内置插件准备失败：${detail}`);
     }
+    progress?.start("正在检查 tmux");
     try {
         result.systemDependencies = await ensureSystemDependencies({
-            onProgress: (message) => console.error(message),
+            ...(progress ? { onProgress: (message) => progress.update(message) } : {}),
         });
+        progress?.succeed("tmux 已就绪");
     }
     catch (error) {
         failed = true;
+        progress?.clear();
         const detail = errorMessage(error);
         result.systemDependencies = {
             tmux: { installed: false, detail },
         };
-        console.error(`tmux: ${detail}`);
+        console.error(`tmux 准备失败：${detail}`);
     }
+    progress?.start("正在检查 Rynx Browser");
     const diagnostics = await inspectDaemonDiagnostics();
     if (!diagnostics.browser.supported) {
         result.browser = { action: options.browser, status: "unsupported" };
+        progress?.succeed("当前平台不支持 Rynx Browser");
     }
     else if (diagnostics.browser.installedVersion) {
         result.browser = {
@@ -90,29 +102,39 @@ export async function runSetupCommand(args) {
             status: "ready",
             version: diagnostics.browser.installedVersion,
         };
+        progress?.succeed(`Rynx Browser 已就绪：${diagnostics.browser.installedVersion}`);
     }
     else if (options.browser !== "skip") {
+        progress?.update("正在安装 Rynx Browser");
         try {
             const { createBrowserArtifactManagementService } = await import("@rynx-ai/daemon/browser-artifacts");
-            const installed = await createBrowserArtifactManagementService().install({ channel: "stable" }, options.json
-                ? {}
-                : { onProgress: (message) => console.error(message) });
+            const installed = await createBrowserArtifactManagementService().install({ channel: "stable" }, progress ? { onProgress: (message) => progress.update(message) } : {});
             result.browser = {
                 action: options.browser,
                 status: "ready",
                 version: installed.installed.version,
             };
+            progress?.succeed(`Rynx Browser 已就绪：${installed.installed.version}`);
         }
         catch (error) {
             failed = true;
+            progress?.clear();
+            const detail = errorMessage(error);
             result.browser = {
                 action: options.browser,
                 status: "error",
-                detail: errorMessage(error),
+                detail,
             };
+            console.error(`Rynx Browser 安装失败：${detail}`);
         }
     }
-    if (options.json) {
+    else {
+        progress?.succeed("已跳过 Rynx Browser 安装");
+    }
+    if (options.resultFile) {
+        writeJsonAtomically(options.resultFile, result);
+    }
+    else if (options.json) {
         console.log(JSON.stringify(result, null, 2));
     }
     else if (interactive) {
@@ -211,6 +233,17 @@ function parseSetupOptions(args) {
             options.nonInteractive = true;
             continue;
         }
+        if (arg === "--result-file") {
+            if (options.resultFile !== undefined)
+                fail("setup: duplicate option --result-file");
+            const value = args[index + 1];
+            if (!value || value.startsWith("--"))
+                fail("setup: --result-file requires a value");
+            options.resultFile = path.resolve(value);
+            options.nonInteractive = true;
+            index += 1;
+            continue;
+        }
         if (arg === "--install-browser" || arg === "--skip-browser") {
             if (options.browser !== "auto")
                 fail("setup: choose only one Browser action");
@@ -250,6 +283,9 @@ function parseSetupOptions(args) {
             fail(`setup: unknown option ${arg}`);
         }
     }
+    if (options.json && options.resultFile) {
+        fail("setup: choose either --json or --result-file");
+    }
     return options;
 }
 async function collectInteractiveSetup(config) {
@@ -315,14 +351,16 @@ function readRawConfig() {
     }
 }
 function writeConfigAtomically(config) {
-    const file = rynxConfigFile();
+    writeJsonAtomically(rynxConfigFile(), config);
+}
+function writeJsonAtomically(file, value) {
     const directory = path.dirname(file);
     mkdirSync(directory, { recursive: true, mode: 0o700 });
     const temporary = path.join(directory, `.${path.basename(file)}.${process.pid}.tmp`);
     let descriptor;
     try {
         descriptor = openSync(temporary, "wx", 0o600);
-        writeFileSync(descriptor, `${JSON.stringify(config, null, 2)}\n`, "utf8");
+        writeFileSync(descriptor, `${JSON.stringify(value, null, 2)}\n`, "utf8");
         closeSync(descriptor);
         descriptor = undefined;
         renameSync(temporary, file);

package/dist/progress-display.d.ts

@@ -0,0 +1,7 @@
+export interface ProgressDisplay {
+    start(message: string): void;
+    update(message: string): void;
+    succeed(message: string): void;
+    clear(): void;
+}
+export declare function createProgressDisplay(): ProgressDisplay;

package/dist/progress-display.js

@@ -0,0 +1,78 @@
+import * as prompts from "@clack/prompts";
+const DOWNLOAD_PERCENT_PATTERN = /下载进度：(\d{1,3})%$/u;
+export function createProgressDisplay() {
+    if (!prompts.isTTY(process.stdout) || prompts.isCI()) {
+        return {
+            start: (message) => console.log(message),
+            update: (message) => console.log(message),
+            succeed: (message) => console.log(message),
+            clear: () => undefined,
+        };
+    }
+    const spinner = prompts.spinner({ output: process.stdout });
+    const progress = prompts.progress({
+        output: process.stdout,
+        max: 100,
+        size: 28,
+        style: "block",
+    });
+    let spinnerActive = false;
+    let progressActive = false;
+    let completedPercent = 0;
+    const clear = () => {
+        if (progressActive)
+            progress.clear();
+        if (spinnerActive)
+            spinner.clear();
+        progressActive = false;
+        spinnerActive = false;
+        completedPercent = 0;
+    };
+    const finishDownload = () => {
+        if (!progressActive)
+            return;
+        progress.stop("Chrome for Testing 下载完成");
+        progressActive = false;
+        completedPercent = 0;
+    };
+    return {
+        start(message) {
+            clear();
+            spinner.start(message);
+            spinnerActive = true;
+        },
+        update(message) {
+            const match = DOWNLOAD_PERCENT_PATTERN.exec(message);
+            if (match) {
+                const percent = Math.min(100, Number(match[1]));
+                if (spinnerActive) {
+                    spinner.clear();
+                    spinnerActive = false;
+                }
+                if (!progressActive) {
+                    progress.start(message);
+                    progressActive = true;
+                }
+                progress.advance(percent - completedPercent, message);
+                completedPercent = percent;
+                return;
+            }
+            finishDownload();
+            if (spinnerActive)
+                spinner.message(message);
+            else {
+                spinner.start(message);
+                spinnerActive = true;
+            }
+        },
+        succeed(message) {
+            finishDownload();
+            if (spinnerActive)
+                spinner.stop(message);
+            else
+                prompts.log.success(message);
+            spinnerActive = false;
+        },
+        clear,
+    };
+}

package/dist/usage.d.ts

@@ -1 +1 @@
-export declare const USAGE = "Usage: rynx <command>\n\nGeneral:\n  version [--json] | --version\n                     print the installed Rynx version\n\nSetup:\n  setup [--non-interactive] [--default-runtime <codex|traex|claude>]\n        [--host <host>] [--port <port>] [--log-level <level>]\n        [--install-browser|--skip-browser] [--json]\n                     initialize configuration and local dependencies\n  doctor             read-only health check\n\nLifecycle:\n  start | restart | stop | status | logs\n  update [version] [--check] [--json]\n\nPlugins:\n  market list\n  market add <git-or-local-source> [--alias <id>]\n  market refresh [market-id]\n  market remove <market-id>\n  plugin list\n  plugin install <source|plugin@market> [--force] [--expect-digest <sha256-...>]\n  plugin update <plugin@market> [--expect-digest <sha256-...>]\n  plugin enable|disable|uninstall <plugin@market>\n  plugin <plugin@market> <command>  invoke a plugin-owned command\n\nAgents:\n  agent list\n  agent show <id>\n  agent add <id>\n  agent rm <id>\n\nBuiltin Skills:\n  skills list [--json]\n  skills get <browser|emulator> [--full] [--json]\n\nMaintenance:\n  cleanup sessions [--dry-run]\n\nEmulator:\n  emulator <args...>\n\nRemote Runtime:\n  runtime share --address <host|ws-url> [--label <label>] [--json]\n  runtime add --pairing-code <rynx://...> [--name <name>]\n  runtime list [--json]\n  runtime test <local|daemon-id> [--json]\n  runtime forget <daemon-id>\n  runtime clients list [--json]\n  runtime clients revoke <grant-id>\n\nSessions:\n  session fork <session-id> [--title <title>] [--json]\n\nBrowser:\n  browser install|update|version|clean [...]\n  browser open [url] [--session <id>] [--runtime <local|daemon-id>] [--json]\n  browser status|pages|close [--session <id>] [--runtime <local|daemon-id>] [--json]\n  browser endpoint [--ensure] [--session <local-id>] [--json]\n  browser snapshot [--session <local-id>] [--json]\n  browser navigate <url> [--session <local-id>] [--json]\n  browser click (--ref <ref>|--selector <css>|--x <n> --y <n>) [--session <local-id>] [--json]\n  browser type (--ref <ref>|--selector <css>) --text <text> [--session <local-id>] [--json]\n  browser screenshot --output <absolute-path> [--session <local-id>] [--json]\n";
+export declare const USAGE = "Usage: rynx <command>\n\nGeneral:\n  version [--json] | --version\n                     print the installed Rynx version\n\nSetup:\n  setup [--non-interactive] [--default-runtime <codex|traex|claude>]\n        [--host <host>] [--port <port>] [--log-level <level>]\n        [--install-browser|--skip-browser] [--json|--result-file <path>]\n                     initialize configuration and local dependencies\n  doctor             read-only health check\n\nLifecycle:\n  start | restart | stop | status | logs\n  update [version] [--check] [--json]\n\nPlugins:\n  market list\n  market add <git-or-local-source> [--alias <id>]\n  market refresh [market-id]\n  market remove <market-id>\n  plugin list\n  plugin install <source|plugin@market> [--force] [--expect-digest <sha256-...>]\n  plugin update <plugin@market> [--expect-digest <sha256-...>]\n  plugin enable|disable|uninstall <plugin@market>\n  plugin <plugin@market> <command>  invoke a plugin-owned command\n\nAgents:\n  agent list\n  agent show <id>\n  agent add <id>\n  agent rm <id>\n\nBuiltin Skills:\n  skills list [--json]\n  skills get <browser|emulator> [--full] [--json]\n\nMaintenance:\n  cleanup sessions [--dry-run]\n\nEmulator:\n  emulator <args...>\n\nRemote Runtime:\n  runtime share --address <host|ws-url> [--label <label>] [--json]\n  runtime add --pairing-code <rynx://...> [--name <name>]\n  runtime list [--json]\n  runtime test <local|daemon-id> [--json]\n  runtime forget <daemon-id>\n  runtime clients list [--json]\n  runtime clients revoke <grant-id>\n\nSessions:\n  session fork <session-id> [--title <title>] [--json]\n\nBrowser:\n  browser install|update|version|clean [...]\n  browser open [url] [--session <id>] [--runtime <local|daemon-id>] [--json]\n  browser status|pages|close [--session <id>] [--runtime <local|daemon-id>] [--json]\n  browser endpoint [--ensure] [--session <local-id>] [--json]\n  browser snapshot [--session <local-id>] [--json]\n  browser navigate <url> [--session <local-id>] [--json]\n  browser click (--ref <ref>|--selector <css>|--x <n> --y <n>) [--session <local-id>] [--json]\n  browser type (--ref <ref>|--selector <css>) --text <text> [--session <local-id>] [--json]\n  browser screenshot --output <absolute-path> [--session <local-id>] [--json]\n";

package/dist/usage.js

@@ -7,7 +7,7 @@ General:
 Setup:
   setup [--non-interactive] [--default-runtime <codex|traex|claude>]
         [--host <host>] [--port <port>] [--log-level <level>]
-        [--install-browser|--skip-browser] [--json]
+        [--install-browser|--skip-browser] [--json|--result-file <path>]
                      initialize configuration and local dependencies
   doctor             read-only health check
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rynx-ai/cli",
-  "version": "0.1.11-beta.13",
+  "version": "0.1.11-beta.15",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/rynx-ai/rynx.git",
@@ -51,11 +51,11 @@
   "dependencies": {
     "@clack/prompts": "^1.6.0",
     "ws": "^8.21.0",
-    "@rynx-ai/browser-cdp": "0.1.11-beta.13",
-    "@rynx-ai/core": "0.1.11-beta.13",
-    "@rynx-ai/daemon": "0.1.11-beta.13",
-    "@rynx-ai/emulator": "0.1.11-beta.13",
-    "@rynx-ai/protocol": "0.1.11-beta.13"
+    "@rynx-ai/browser-cdp": "0.1.11-beta.15",
+    "@rynx-ai/core": "0.1.11-beta.15",
+    "@rynx-ai/daemon": "0.1.11-beta.15",
+    "@rynx-ai/emulator": "0.1.11-beta.15",
+    "@rynx-ai/protocol": "0.1.11-beta.15"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"