@nylorun/cli 0.3.0-beta → 0.4.1-beta

package/dist/runtime/commands.js

@@ -1,292 +0,0 @@
-import { resolve } from "node:path";
-import { CliError } from "../errors.js";
-import { exitCodeForStatusState, } from "./exit-codes.js";
-import { launcher, resolveHome, throwOnLauncherFailure, } from "./launcher.js";
-import { runtimeVersion } from "./version.js";
-export const runtimeUsage = `  runtime up [--port <n>]
-  runtime down [--wait] [--force] [--timeout <seconds>]
-  runtime status [--json] [--env]
-  runtime logs [-f|--follow] [-n <lines>] [--tenant <id>|--all]
-  runtime restart [--port <n>] [--allow-downgrade] [--wait|--force]
-  runtime run [--port <n>]
-  up                       alias for "runtime up"
-  down                     alias for "runtime down"
-  logs                     alias for "runtime logs"`;
-const usageError = (message) => new CliError(message, 2);
-function parseRuntimeFlags(args, allowed = {}) {
-    const booleans = new Set();
-    const values = new Map();
-    const rest = [];
-    const booleanNames = new Set(allowed.booleans ?? []);
-    const valueNames = new Set(allowed.values ?? []);
-    for (let index = 0; index < args.length; index += 1) {
-        const arg = args[index];
-        if (!arg.startsWith("-")) {
-            rest.push(arg);
-            continue;
-        }
-        if (booleanNames.has(arg)) {
-            if (booleans.has(arg))
-                throw usageError(`${arg} may only be supplied once.`);
-            booleans.add(arg);
-            continue;
-        }
-        if (valueNames.has(arg)) {
-            if (values.has(arg))
-                throw usageError(`${arg} may only be supplied once.`);
-            const value = args[++index];
-            if (!value || value.startsWith("-"))
-                throw usageError(`${arg} requires a value.`);
-            values.set(arg, value);
-            continue;
-        }
-        throw usageError(`Unknown flag ${arg}.\n${runtimeUsage}`);
-    }
-    return { rest, booleans, values };
-}
-function parsePort(value) {
-    if (value === undefined)
-        return undefined;
-    const port = Number(value);
-    if (!Number.isInteger(port) || port < 0 || port > 65535)
-        throw usageError("--port must be an integer between 0 and 65535.");
-    return port;
-}
-/**
- * `nylorun runtime …` and the `up` / `down` / `logs` aliases.
- * Dispatch from `cli.ts` is owned by WS-F2 (one-line import change).
- */
-export async function runtimeCommand(args, options = {}) {
-    const home = options.home ??
-        (options.env?.NYLORUN_HOME
-            ? resolve(options.env.NYLORUN_HOME)
-            : resolveHome());
-    const handle = options.handle ??
-        (await launcher(home, { env: options.env }));
-    const [verb, ...rest] = args;
-    if (verb === "up" || verb === "start") {
-        const flags = parseRuntimeFlags(rest, {
-            values: ["--port"],
-        });
-        if (flags.rest.length)
-            throw usageError(runtimeUsage);
-        const port = parsePort(flags.values.get("--port"));
-        const invokeArgs = ["up"];
-        if (port !== undefined)
-            invokeArgs.push("--port", String(port));
-        const outcome = await handle.invoke(invokeArgs);
-        throwOnLauncherFailure(outcome);
-        const result = outcome.result ?? {};
-        const url = typeof result.url === "string" ? result.url : undefined;
-        const started = result.started === true;
-        if (url && started) {
-            console.log(`Started the Runtime Host at ${url}${result.pid ? ` (pid ${result.pid})` : ""}. It stays running; stop it with "nylorun runtime down".`);
-        }
-        printUpResult(result);
-        console.log(`\n→ npx nylorun dev`);
-        return;
-    }
-    if (verb === "down" || verb === "stop") {
-        const flags = parseRuntimeFlags(rest, {
-            booleans: ["--wait", "--force"],
-            values: ["--timeout"],
-        });
-        if (flags.rest.length)
-            throw usageError(runtimeUsage);
-        if (flags.booleans.has("--wait") && flags.booleans.has("--force")) {
-            throw usageError("Use either --wait or --force, not both.");
-        }
-        const invokeArgs = ["down"];
-        if (flags.booleans.has("--wait"))
-            invokeArgs.push("--wait");
-        if (flags.booleans.has("--force"))
-            invokeArgs.push("--force");
-        if (flags.values.has("--timeout")) {
-            const seconds = Number(flags.values.get("--timeout"));
-            if (!Number.isFinite(seconds) || seconds <= 0)
-                throw usageError("--timeout must be a positive number of seconds.");
-            invokeArgs.push("--timeout", String(seconds));
-        }
-        const outcome = await handle.invoke(invokeArgs);
-        throwOnLauncherFailure(outcome);
-        const stopped = outcome.result?.stopped === true;
-        console.log(stopped
-            ? `Stopped the Runtime Host. host.json and Tenants are kept under the Host root.`
-            : `No Runtime Host is running.`);
-        return;
-    }
-    if (verb === "status") {
-        const flags = parseRuntimeFlags(rest, {
-            booleans: ["--json", "--env"],
-            values: ["--output"],
-        });
-        if (flags.rest.length)
-            throw usageError(runtimeUsage);
-        const json = flags.booleans.has("--json") || flags.values.get("--output") === "json";
-        if (flags.values.has("--output") &&
-            flags.values.get("--output") !== "json" &&
-            flags.values.get("--output") !== "text") {
-            throw usageError("--output must be text or json.");
-        }
-        if (flags.booleans.has("--env")) {
-            if (options.envHook)
-                await options.envHook();
-            else {
-                console.log("# runtime status --env requires a Project link (nylorun dev). Coming in a later release.");
-            }
-            return;
-        }
-        const outcome = await handle.invoke(["status"]);
-        throwOnLauncherFailure(outcome);
-        const result = outcome.result ?? {};
-        if (json) {
-            console.log(JSON.stringify({
-                ...result,
-                node: handle.runtime.node,
-                recommendedRuntimeVersion: runtimeVersion(),
-            }, null, 2));
-        }
-        else {
-            printStatus(result, handle);
-        }
-        const state = typeof result.state === "string" ? result.state : undefined;
-        const code = exitCodeForStatusState(state);
-        if (code !== undefined)
-            process.exitCode = code;
-        return;
-    }
-    if (verb === "logs") {
-        const flags = parseRuntimeFlags(rest, {
-            booleans: ["-f", "--follow", "--all"],
-            values: ["-n", "--lines", "--tenant"],
-        });
-        if (flags.rest.length)
-            throw usageError(runtimeUsage);
-        if (flags.booleans.has("--all") && flags.values.has("--tenant")) {
-            throw usageError("Use either --tenant or --all, not both.");
-        }
-        const linesRaw = flags.values.get("-n") ?? flags.values.get("--lines");
-        const lines = linesRaw !== undefined ? Number(linesRaw) : 200;
-        if (!Number.isInteger(lines) || lines < 1)
-            throw usageError("-n must be a positive integer.");
-        const follow = flags.booleans.has("-f") || flags.booleans.has("--follow");
-        const invokeArgs = ["logs", "--lines", String(lines)];
-        if (follow)
-            invokeArgs.push("--follow");
-        if (flags.booleans.has("--all"))
-            invokeArgs.push("--all");
-        if (flags.values.has("--tenant")) {
-            invokeArgs.push("--tenant", flags.values.get("--tenant"));
-        }
-        const outcome = follow
-            ? await handle.invokeStreaming(invokeArgs)
-            : await handle.invoke(invokeArgs);
-        if (outcome.exitCode !== 0) {
-            if (outcome.error?.code === "not_found" ||
-                /no .*log/i.test(outcome.error?.message ?? outcome.stderr)) {
-                throw new CliError(`No Runtime Host log under ${home}. Start one with "nylorun runtime up".`, 3);
-            }
-            throwOnLauncherFailure(outcome);
-        }
-        return;
-    }
-    if (verb === "restart") {
-        const flags = parseRuntimeFlags(rest, {
-            booleans: ["--allow-downgrade", "--wait", "--force"],
-            values: ["--port"],
-        });
-        if (flags.rest.length)
-            throw usageError(runtimeUsage);
-        if (flags.booleans.has("--wait") && flags.booleans.has("--force")) {
-            throw usageError("Use either --wait or --force, not both.");
-        }
-        const port = parsePort(flags.values.get("--port"));
-        const invokeArgs = ["restart"];
-        if (port !== undefined)
-            invokeArgs.push("--port", String(port));
-        if (flags.booleans.has("--allow-downgrade"))
-            invokeArgs.push("--allow-downgrade");
-        if (flags.booleans.has("--wait"))
-            invokeArgs.push("--wait");
-        if (flags.booleans.has("--force"))
-            invokeArgs.push("--force");
-        const outcome = await handle.invoke(invokeArgs);
-        throwOnLauncherFailure(outcome);
-        printUpResult(outcome.result ?? {});
-        return;
-    }
-    if (verb === "run") {
-        const flags = parseRuntimeFlags(rest, {
-            values: ["--port"],
-        });
-        if (flags.rest.length)
-            throw usageError(runtimeUsage);
-        const port = parsePort(flags.values.get("--port"));
-        const invokeArgs = ["run"];
-        if (port !== undefined)
-            invokeArgs.push("--port", String(port));
-        const outcome = await handle.invokeStreaming(invokeArgs);
-        throwOnLauncherFailure(outcome);
-        return;
-    }
-    throw usageError(runtimeUsage);
-}
-function printUpResult(result) {
-    const lines = [
-        ["Host", typeof result.hostId === "string" ? result.hostId : undefined],
-        ["URL", typeof result.url === "string" ? result.url : undefined],
-        [
-            "PID",
-            typeof result.pid === "number" ? String(result.pid) : undefined,
-        ],
-        [
-            "Version",
-            typeof result.version === "string" ? result.version : undefined,
-        ],
-        [
-            "Started",
-            result.started === true
-                ? "yes"
-                : result.started === false
-                    ? "already running"
-                    : undefined,
-        ],
-    ];
-    const width = Math.max(...lines.map(([label]) => label.length));
-    for (const [label, value] of lines) {
-        if (value !== undefined)
-            console.log(`${label.padEnd(width)}  ${value}`);
-    }
-}
-function printStatus(result, handle) {
-    const lines = [
-        ["Home", typeof result.home === "string" ? result.home : undefined],
-        ["State", typeof result.state === "string" ? result.state : undefined],
-        ["Host", typeof result.hostId === "string" ? result.hostId : undefined],
-        ["URL", typeof result.url === "string" ? result.url : undefined],
-        [
-            "PID",
-            typeof result.pid === "number" ? String(result.pid) : undefined,
-        ],
-        [
-            "Version",
-            typeof result.version === "string" ? result.version : undefined,
-        ],
-        [
-            "Last started",
-            typeof result.runtimeVersion === "string"
-                ? result.runtimeVersion
-                : undefined,
-        ],
-        ["Installed", `${handle.runtime.version} (${handle.runtime.bin})`],
-        ["Node", handle.runtime.node],
-        ["Recommended", runtimeVersion()],
-    ];
-    const width = Math.max(...lines.map(([label]) => label.length));
-    for (const [label, value] of lines) {
-        if (value !== undefined)
-            console.log(`${label.padEnd(width)}  ${value}`);
-    }
-}
-export { runtimeVersion } from "./version.js";
-export { launcher } from "./launcher.js";

package/dist/runtime/ephemeral.d.ts

@@ -1,37 +0,0 @@
-import { createAdmin as defaultCreateAdmin } from "@nylorun/admin";
-import type { Admin } from "@nylorun/admin";
-import { type LauncherOptions } from "./launcher.js";
-export interface EphemeralOptions extends LauncherOptions {
-    /** Temporary Host root. Default: a new directory under os.tmpdir(). */
-    home?: string;
-    /** Tenant display name. Default: directory basename or "ephemeral". */
-    name?: string;
-    /** Injected Admin factory (tests). Default: `@nylorun/admin` createAdmin. */
-    createAdmin?: typeof defaultCreateAdmin;
-    /** Abort / cleanup signal (tests and SIGINT wiring). */
-    signal?: AbortSignal;
-}
-export interface EphemeralTenant {
-    id: string;
-    name: string;
-}
-export interface EphemeralRuntime {
-    home: string;
-    url: string;
-    hostId: string;
-    version: string;
-    tenant: EphemeralTenant;
-    applicationKey: string;
-    admin: Admin;
-    /** Stop the Host and delete the temporary home. */
-    close(): Promise<void>;
-}
-/**
- * `nylorun dev --ephemeral` Host setup (D§12):
- * temporary home, start Host on port 0, `createAdmin({ home })`, `createTenant`.
- *
- * Uses launcher `up --port 0` (detached Host) rather than foreground `run`, so
- * the CLI can continue with Project setup / tsx watch and still `down` on exit.
- * Semantically matches D§12: temporary home, free port, createTenant, cleanup.
- */
-export declare function startEphemeral(options?: EphemeralOptions): Promise<EphemeralRuntime>;

package/dist/runtime/ephemeral.js

@@ -1,84 +0,0 @@
-import { mkdtemp, rm } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { createAdmin as defaultCreateAdmin } from "@nylorun/admin";
-import { CliError } from "../errors.js";
-import { launcher, throwOnLauncherFailure, } from "./launcher.js";
-/**
- * `nylorun dev --ephemeral` Host setup (D§12):
- * temporary home, start Host on port 0, `createAdmin({ home })`, `createTenant`.
- *
- * Uses launcher `up --port 0` (detached Host) rather than foreground `run`, so
- * the CLI can continue with Project setup / tsx watch and still `down` on exit.
- * Semantically matches D§12: temporary home, free port, createTenant, cleanup.
- */
-export async function startEphemeral(options = {}) {
-    const home = options.home ??
-        (await mkdtemp(join(tmpdir(), "nylorun-ephemeral-")));
-    const createAdminFn = options.createAdmin ?? defaultCreateAdmin;
-    const env = options.env ?? process.env;
-    const handle = await launcher(home, { env });
-    const up = await handle.invoke(["up", "--port", "0"], { env });
-    throwOnLauncherFailure(up);
-    const result = up.result ?? {};
-    const url = typeof result.url === "string" ? result.url : undefined;
-    if (!url) {
-        throw new CliError(`Ephemeral Runtime Host started without a URL under ${home}.`, 7);
-    }
-    const ready = {
-        url,
-        hostId: typeof result.hostId === "string" ? result.hostId : "host_unknown",
-        version: typeof result.version === "string"
-            ? result.version
-            : handle.runtime.version,
-    };
-    const admin = createAdminFn({ home });
-    const name = options.name ??
-        home.split(/[/\\]/).filter(Boolean).pop() ??
-        "ephemeral";
-    const created = await admin.createTenant({ name });
-    const tenant = {
-        id: created.tenant.id,
-        name: created.tenant.name ?? name,
-    };
-    let closed = false;
-    let closing;
-    const close = async () => {
-        if (closing)
-            return closing;
-        closing = (async () => {
-            if (closed)
-                return;
-            closed = true;
-            try {
-                const down = await handle.invoke(["down", "--force"], { env });
-                if (down.exitCode !== 0)
-                    throwOnLauncherFailure(down);
-            }
-            catch {
-                /* best-effort stop */
-            }
-            await rm(home, { recursive: true, force: true }).catch(() => undefined);
-        })();
-        return closing;
-    };
-    if (options.signal) {
-        const onAbort = () => {
-            void close();
-        };
-        if (options.signal.aborted)
-            void close();
-        else
-            options.signal.addEventListener("abort", onAbort, { once: true });
-    }
-    return {
-        home,
-        url: ready.url,
-        hostId: ready.hostId,
-        version: ready.version,
-        tenant,
-        applicationKey: created.applicationKey,
-        admin,
-        close,
-    };
-}

package/dist/runtime/exit-codes.d.ts

@@ -1,9 +0,0 @@
-import type { ErrorCode } from "@nylorun/agents";
-/**
- * Map launcher error codes (and a few Host states) to Tenants-era CLI exit codes.
- * See cli/README.md exit code table.
- */
-export declare const LAUNCHER_ERROR_EXIT_CODES: Record<string, number>;
-export declare function exitCodeForLauncherError(code: ErrorCode | string | undefined): number;
-/** `runtime status` when the Host is not running. */
-export declare function exitCodeForStatusState(state: string | undefined): number | undefined;

package/dist/runtime/exit-codes.js

@@ -1,43 +0,0 @@
-/**
- * Map launcher error codes (and a few Host states) to Tenants-era CLI exit codes.
- * See cli/README.md exit code table.
- */
-export const LAUNCHER_ERROR_EXIT_CODES = {
-    foreign_port: 4,
-    host_start_failed: 7,
-    incompatible_host: 5,
-    protocol_unsupported: 5,
-    // Everything else falls through to 1.
-    platform_unsupported: 1,
-    launcher_failed: 1,
-    lock_timeout: 1,
-    host_unresponsive: 1,
-    host_schema_newer: 1,
-    host_format_newer: 1,
-    downgrade_refused: 1,
-    upgrade_failed: 1,
-    active_work: 1,
-    not_found: 1,
-    connection_missing: 1,
-    host_rejected: 1,
-    origin_rejected: 1,
-    unsupported_media_type: 1,
-    tenant_conflict: 1,
-};
-export function exitCodeForLauncherError(code) {
-    if (!code)
-        return 1;
-    return LAUNCHER_ERROR_EXIT_CODES[code] ?? 1;
-}
-/** `runtime status` when the Host is not running. */
-export function exitCodeForStatusState(state) {
-    if (state === "running")
-        return undefined;
-    if (state === "foreign-port")
-        return 4;
-    if (state === "stopped" || state === "absent")
-        return 3;
-    if (state === "unresponsive")
-        return 1;
-    return 3;
-}

package/dist/runtime/index.d.ts

@@ -1,8 +0,0 @@
-export { baselineEnv } from "./baseline.js";
-export { runtimeVersion } from "./version.js";
-export { findOnPath, launcher, runtimeInstallCommand, throwOnLauncherFailure, } from "./launcher.js";
-export type { InstalledRuntime, LauncherHandle, LauncherInvokeResult, LauncherJsonEvent, LauncherOptions, } from "./launcher.js";
-export { runtimeCommand, runtimeUsage } from "./commands.js";
-export { startEphemeral } from "./ephemeral.js";
-export type { EphemeralOptions, EphemeralRuntime, EphemeralTenant, } from "./ephemeral.js";
-export { LAUNCHER_ERROR_EXIT_CODES, exitCodeForLauncherError, exitCodeForStatusState, } from "./exit-codes.js";

package/dist/runtime/index.js

@@ -1,6 +0,0 @@
-export { baselineEnv } from "./baseline.js";
-export { runtimeVersion } from "./version.js";
-export { findOnPath, launcher, runtimeInstallCommand, throwOnLauncherFailure, } from "./launcher.js";
-export { runtimeCommand, runtimeUsage } from "./commands.js";
-export { startEphemeral } from "./ephemeral.js";
-export { LAUNCHER_ERROR_EXIT_CODES, exitCodeForLauncherError, exitCodeForStatusState, } from "./exit-codes.js";

package/dist/runtime/launcher.d.ts

@@ -1,81 +0,0 @@
-import { type ProgressEvent } from "./progress.js";
-/** The launcher command `@nylorun/runtime` installs (npm bin). */
-export declare const LAUNCHER_BIN = "nylorun-runtime";
-/** Resolve NYLORUN_HOME, an explicit home, or `~/.nylorun`. */
-export declare function resolveHome(home?: string): string;
-export type LauncherJsonEvent = ProgressEvent | {
-    type: "result";
-    [field: string]: unknown;
-} | {
-    type: "error";
-    code: string;
-    message: string;
-    remedy: string;
-    details?: unknown;
-} | {
-    type: "log";
-    source: "host" | "tenant";
-    tenantId?: string;
-    line: string;
-};
-export interface LauncherInvokeResult {
-    events: LauncherJsonEvent[];
-    result?: Record<string, unknown>;
-    error?: {
-        code: string;
-        message: string;
-        remedy: string;
-        details?: unknown;
-    };
-    exitCode: number;
-    /** Raw stdout (NDJSON). */
-    stdout: string;
-    stderr: string;
-}
-/** The installed Runtime a handle runs, as its `version` command reports it. */
-export interface InstalledRuntime {
-    /** `nylorun-runtime` found on PATH. */
-    readonly bin: string;
-    readonly version: string;
-    /** Node the Runtime reported (the Host runs on the same Node). */
-    readonly node: string;
-}
-export interface LauncherHandle {
-    readonly home: string;
-    readonly runtime: InstalledRuntime;
-    /**
-     * Run a launcher command with `--json --home`. Progress events are rendered
-     * to stderr by default. Returns parsed events and the process exit code.
-     */
-    invoke(args: readonly string[], options?: InvokeOptions): Promise<LauncherInvokeResult>;
-    /**
-     * Long-running invoke (e.g. `run`, `logs --follow`). Resolves when the
-     * child exits; streams progress/log events as they arrive.
-     */
-    invokeStreaming(args: readonly string[], options?: InvokeOptions): Promise<LauncherInvokeResult>;
-}
-export interface InvokeOptions {
-    env?: NodeJS.ProcessEnv;
-    onEvent?: (event: LauncherJsonEvent) => void;
-    /** When false, skip default progress rendering. Default true. */
-    renderProgress?: boolean;
-    signal?: AbortSignal;
-}
-export interface LauncherOptions {
-    /** Environment for the launcher, including the PATH it is found on. */
-    env?: NodeJS.ProcessEnv;
-}
-/** Install command shown whenever the Runtime is missing or incompatible. */
-export declare function runtimeInstallCommand(): string;
-/** Find `name` on PATH (with PATHEXT on Windows). */
-export declare function findOnPath(name: string, env: NodeJS.ProcessEnv): string | undefined;
-/**
- * Find the installed Runtime's launcher on PATH and check it speaks this CLI's
- * launcher and Host protocols. Never downloads or installs anything: a missing
- * Runtime is a prerequisite error that names the install command.
- */
-export declare function launcher(home: string, options?: LauncherOptions): Promise<LauncherHandle>;
-/**
- * Throw CliError with the Tenants-era exit code for a failed launcher invoke.
- */
-export declare function throwOnLauncherFailure(outcome: LauncherInvokeResult): void;