@rynx-ai/cli 0.1.11-beta.14 → 0.1.11-beta.16

package/dist/bundled-tmux.d.ts

@@ -0,0 +1,10 @@
+export declare const BUNDLED_TMUX_UNAVAILABLE_MESSAGE = "Rynx bundled tmux is unavailable; reinstall @rynx-ai/cli without omitting optional dependencies";
+export interface BundledTmuxResolutionOptions {
+    platform?: string;
+    arch?: string;
+    resolve?: (specifier: string) => string;
+}
+/** Resolve the executable shipped for this CLI's exact OS/architecture. */
+export declare function resolveBundledTmux(options?: BundledTmuxResolutionOptions): string | undefined;
+/** An explicit operator override wins; otherwise prefer the CLI-bundled binary. */
+export declare function resolveTmuxExecutable(env?: NodeJS.ProcessEnv, options?: BundledTmuxResolutionOptions): string | undefined;

package/dist/bundled-tmux.js

@@ -0,0 +1,32 @@
+import { accessSync, constants } from "node:fs";
+import { createRequire } from "node:module";
+const require = createRequire(import.meta.url);
+export const BUNDLED_TMUX_UNAVAILABLE_MESSAGE = "Rynx bundled tmux is unavailable; reinstall @rynx-ai/cli without omitting optional dependencies";
+const BUNDLED_TMUX_PACKAGES = {
+    "darwin-arm64": "@rynx-ai/tmux-darwin-arm64/bin/tmux",
+    "darwin-x64": "@rynx-ai/tmux-darwin-x64/bin/tmux",
+    "linux-arm64": "@rynx-ai/tmux-linux-arm64/bin/tmux",
+    "linux-x64": "@rynx-ai/tmux-linux-x64/bin/tmux",
+};
+/** Resolve the executable shipped for this CLI's exact OS/architecture. */
+export function resolveBundledTmux(options = {}) {
+    const platform = options.platform ?? process.platform;
+    const arch = options.arch ?? process.arch;
+    const specifier = BUNDLED_TMUX_PACKAGES[`${platform}-${arch}`];
+    if (!specifier)
+        return undefined;
+    let executable;
+    try {
+        executable = (options.resolve ?? require.resolve)(specifier);
+        accessSync(executable, constants.X_OK);
+    }
+    catch {
+        return undefined;
+    }
+    return executable;
+}
+/** An explicit operator override wins; otherwise prefer the CLI-bundled binary. */
+export function resolveTmuxExecutable(env = process.env, options = {}) {
+    const override = env.RYNX_TMUX_BIN?.trim();
+    return override || resolveBundledTmux(options);
+}

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

@@ -3,8 +3,9 @@ import { chmodSync, existsSync, mkdirSync, openSync, closeSync, readFileSync, re
 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 { inspectDaemonDiagnostics, inspectSystemDependencies, prepareBundledPlugins, verifySystemDependencies, } from "@rynx-ai/daemon/setup-service";
 import { createProgressDisplay } from "../progress-display.js";
+import { BUNDLED_TMUX_UNAVAILABLE_MESSAGE, resolveTmuxExecutable, } from "../bundled-tmux.js";
 import { fail } from "./errors.js";
 export async function runSetupCommand(args) {
     const options = parseSetupOptions(args);
@@ -76,9 +77,11 @@ export async function runSetupCommand(args) {
     }
     progress?.start("正在检查 tmux");
     try {
-        result.systemDependencies = await ensureSystemDependencies({
-            ...(progress ? { onProgress: (message) => progress.update(message) } : {}),
-        });
+        const tmuxBin = resolveTmuxExecutable();
+        if (!tmuxBin) {
+            throw new Error(BUNDLED_TMUX_UNAVAILABLE_MESSAGE);
+        }
+        result.systemDependencies = await verifySystemDependencies({ tmuxBin });
         progress?.succeed("tmux 已就绪");
     }
     catch (error) {
@@ -182,7 +185,15 @@ export async function runDoctorCommand(args) {
         return { id, installed: !probe.error && probe.status === 0 };
     });
     const daemon = await inspectDaemonDiagnostics();
-    const systemDependencies = await inspectSystemDependencies();
+    const tmuxBin = resolveTmuxExecutable();
+    const systemDependencies = tmuxBin
+        ? await inspectSystemDependencies({ tmuxBin })
+        : {
+            tmux: {
+                installed: false,
+                detail: BUNDLED_TMUX_UNAVAILABLE_MESSAGE,
+            },
+        };
     const result = {
         ok: configError === undefined &&
             runtimes.some((runtime) => runtime.installed) &&

package/dist/standalone.js

@@ -1,6 +1,7 @@
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { installedVersion } from "./version.js";
+import { BUNDLED_TMUX_UNAVAILABLE_MESSAGE, resolveTmuxExecutable, } from "./bundled-tmux.js";
 import { ensureDaemonControlEndpoint, resolveDaemonControlEndpoint, } from "./control-endpoint.js";
 /** Resolve the canonical Builtin Skill directory shipped by this exact CLI. */
 export function standaloneBuiltinSkillsDirectory(moduleUrl = import.meta.url) {
@@ -8,6 +9,9 @@ export function standaloneBuiltinSkillsDirectory(moduleUrl = import.meta.url) {
 }
 export async function startStandaloneDaemon(options = {}) {
     const cliVersion = installedVersion();
+    const tmuxBin = resolveTmuxExecutable();
+    if (!tmuxBin)
+        throw new Error(BUNDLED_TMUX_UNAVAILABLE_MESSAGE);
     const { startDaemon } = await import("@rynx-ai/daemon/lifecycle");
     return startDaemon({
         force: options.restart ?? false,
@@ -16,6 +20,7 @@ export async function startStandaloneDaemon(options = {}) {
             builtinSkillsDir: standaloneBuiltinSkillsDirectory(),
             cliVersion,
             productVersion: cliVersion,
+            tmuxBin,
         },
     });
 }

package/package.json

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