@nylorun/cli 0.3.0-beta → 0.4.1-beta

package/dist/runtime/launcher.js

@@ -1,243 +0,0 @@
-import { spawn } from "node:child_process";
-import { existsSync, realpathSync, statSync } from "node:fs";
-import { homedir } from "node:os";
-import { delimiter, dirname, join, resolve } from "node:path";
-import { PROTOCOL_VERSION } from "@nylorun/agents";
-import { CliError } from "../errors.js";
-import { exitCodeForLauncherError, } from "./exit-codes.js";
-import { renderProgress } from "./progress.js";
-import { runtimeVersion } from "./version.js";
-/** The launcher command `@nylorun/runtime` installs (npm bin). */
-export const LAUNCHER_BIN = "nylorun-runtime";
-/** The `nylorun-runtime --json` contract this CLI speaks (core LAUNCHER_PROTOCOL). */
-const LAUNCHER_PROTOCOL = 1;
-/** Resolve NYLORUN_HOME, an explicit home, or `~/.nylorun`. */
-export function resolveHome(home) {
-    if (home !== undefined && home.trim() !== "")
-        return resolve(home);
-    const fromEnv = process.env.NYLORUN_HOME?.trim();
-    if (fromEnv)
-        return resolve(fromEnv);
-    return resolve(join(homedir(), ".nylorun"));
-}
-/** Install command shown whenever the Runtime is missing or incompatible. */
-export function runtimeInstallCommand() {
-    return `npm install --global @nylorun/runtime@${runtimeVersion()}`;
-}
-/** Find `name` on PATH (with PATHEXT on Windows). */
-export function findOnPath(name, env) {
-    const dirs = (env.PATH ?? env.Path ?? "").split(delimiter).filter(Boolean);
-    const extensions = process.platform === "win32"
-        ? (env.PATHEXT ?? ".COM;.EXE;.BAT;.CMD").split(";").filter(Boolean)
-        : [""];
-    for (const dir of dirs) {
-        for (const extension of extensions) {
-            const candidate = join(dir, `${name}${extension.toLowerCase()}`);
-            try {
-                if (statSync(candidate).isFile())
-                    return candidate;
-            }
-            catch {
-                /* not here */
-            }
-        }
-    }
-    return undefined;
-}
-/**
- * npm links a bin to the package's JS file: a symlink on POSIX, a `.cmd` shim
- * next to the package on Windows. Running that file on this Node avoids
- * spawning `.cmd` shims, which Node refuses without a shell.
- */
-function launcherScript(bin) {
-    if (process.platform !== "win32") {
-        const real = realpathSync(bin);
-        return real.endsWith(".js") ? real : undefined;
-    }
-    const dir = dirname(bin);
-    const main = join("@nylorun", "runtime", "dist", "launcher", "main.js");
-    // Global prefix (`<prefix>/nylorun-runtime.cmd`) or project `.bin`.
-    for (const candidate of [
-        join(dir, "node_modules", main),
-        join(dir, "..", main),
-    ]) {
-        if (existsSync(candidate))
-            return candidate;
-    }
-    return 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 async function launcher(home, options = {}) {
-    const resolvedHome = resolve(home);
-    const env = options.env ?? process.env;
-    const bin = findOnPath(LAUNCHER_BIN, env);
-    if (!bin) {
-        throw new CliError(`The Nylorun Runtime is not installed (no "${LAUNCHER_BIN}" on PATH).\nInstall it, then retry:\n  ${runtimeInstallCommand()}`, 1);
-    }
-    const probe = await invokeLauncher(bin, resolvedHome, ["version"], { env, renderProgress: false }, false);
-    throwOnLauncherFailure(probe);
-    const info = probe.result ?? {};
-    const version = typeof info.runtimeVersion === "string" ? info.runtimeVersion : "unknown";
-    const protocol = info.protocol;
-    const hostCompatible = typeof protocol?.min === "number" &&
-        typeof protocol.max === "number" &&
-        protocol.min <= PROTOCOL_VERSION &&
-        PROTOCOL_VERSION <= protocol.max;
-    if (info.launcherProtocol !== LAUNCHER_PROTOCOL || !hostCompatible) {
-        throw new CliError(`The installed Nylorun Runtime ${version} (${bin}) is not compatible with this CLI.\nInstall a compatible Runtime, then retry:\n  ${runtimeInstallCommand()}`, 1);
-    }
-    return createHandle(resolvedHome, {
-        bin,
-        version,
-        node: typeof info.node === "string" ? info.node : "unknown",
-    }, env);
-}
-function createHandle(home, runtime, defaultEnv) {
-    const run = (args, options = {}, streaming) => invokeLauncher(runtime.bin, home, args, {
-        ...options,
-        env: options.env ?? defaultEnv,
-    }, streaming);
-    return {
-        home,
-        runtime,
-        invoke: (args, options) => run(args, options, false),
-        invokeStreaming: (args, options) => run(args, options, true),
-    };
-}
-/** Quote one argument for cmd.exe (only used for non-npm `.cmd` shims). */
-function quoteForCmd(value) {
-    return `"${value.replace(/"/g, '""')}"`;
-}
-function spawnLauncher(bin, args, env) {
-    const options = {
-        env: { ...env },
-        stdio: ["ignore", "pipe", "pipe"],
-    };
-    const script = launcherScript(bin);
-    if (script)
-        return spawn(process.execPath, [script, ...args], options);
-    if (process.platform === "win32" && /\.(cmd|bat)$/i.test(bin)) {
-        // Windows runs .cmd files only through cmd.exe, which needs quoting.
-        return spawn(quoteForCmd(bin), args.map(quoteForCmd), {
-            ...options,
-            shell: true,
-        });
-    }
-    return spawn(bin, args, options);
-}
-async function invokeLauncher(bin, home, args, options, _streaming) {
-    const childArgs = ["--json", "--home", home, ...args];
-    const child = spawnLauncher(bin, childArgs, options.env);
-    const events = [];
-    let result;
-    let error;
-    let stdout = "";
-    let stderr = "";
-    let lineBuffer = "";
-    const handleLine = (line) => {
-        const trimmed = line.trim();
-        if (!trimmed)
-            return;
-        let event;
-        try {
-            event = JSON.parse(trimmed);
-        }
-        catch {
-            return;
-        }
-        events.push(event);
-        options.onEvent?.(event);
-        if (event.type === "progress" && options.renderProgress !== false) {
-            renderProgress(event);
-        }
-        if (event.type === "result") {
-            const { type: _t, ...fields } = event;
-            result = fields;
-        }
-        if (event.type === "error") {
-            error = {
-                code: event.code,
-                message: event.message,
-                remedy: event.remedy,
-                ...(event.details !== undefined ? { details: event.details } : {}),
-            };
-        }
-        if (event.type === "log") {
-            const prefix = event.source === "tenant" && event.tenantId
-                ? `[${event.tenantId}] `
-                : "";
-            process.stdout.write(`${prefix}${event.line}\n`);
-        }
-    };
-    child.stdout?.on("data", (chunk) => {
-        const text = chunk.toString("utf8");
-        stdout += text;
-        lineBuffer += text;
-        const parts = lineBuffer.split("\n");
-        lineBuffer = parts.pop() ?? "";
-        for (const part of parts)
-            handleLine(part);
-    });
-    child.stderr?.on("data", (chunk) => {
-        stderr += chunk.toString("utf8");
-    });
-    const abort = () => {
-        try {
-            child.kill("SIGTERM");
-        }
-        catch {
-            /* ignore */
-        }
-    };
-    if (options.signal) {
-        if (options.signal.aborted)
-            abort();
-        else
-            options.signal.addEventListener("abort", abort, { once: true });
-    }
-    const exitCode = await waitForExit(child);
-    if (lineBuffer.trim())
-        handleLine(lineBuffer);
-    if (options.signal) {
-        options.signal.removeEventListener("abort", abort);
-    }
-    return {
-        events,
-        ...(result ? { result } : {}),
-        ...(error ? { error } : {}),
-        exitCode,
-        stdout,
-        stderr,
-    };
-}
-function waitForExit(child) {
-    return new Promise((resolvePromise, reject) => {
-        child.once("error", reject);
-        child.once("exit", (code, signal) => {
-            if (code !== null)
-                resolvePromise(code);
-            else
-                resolvePromise(signal === "SIGINT" ? 130 : signal === "SIGTERM" ? 143 : 1);
-        });
-    });
-}
-/**
- * Throw CliError with the Tenants-era exit code for a failed launcher invoke.
- */
-export function throwOnLauncherFailure(outcome) {
-    if (outcome.exitCode === 0)
-        return;
-    if (outcome.exitCode === 2) {
-        throw new CliError(outcome.error?.message ??
-            (outcome.stderr.trim() || "Invalid runtime arguments."), 2);
-    }
-    const code = outcome.error?.code;
-    const message = outcome.error
-        ? `${outcome.error.message}${outcome.error.remedy ? `\n${outcome.error.remedy}` : ""}`
-        : outcome.stderr.trim() || `Runtime launcher failed (exit ${outcome.exitCode}).`;
-    throw new CliError(message, exitCodeForLauncherError(code));
-}

package/dist/runtime/progress.d.ts

@@ -1,10 +0,0 @@
-/**
- * Render launcher progress the way the Tenants-era CLI did: phase name on
- * stderr.
- */
-export type ProgressEvent = {
-    type: "progress";
-    phase: "start" | "stop" | "wait";
-    message?: string;
-};
-export declare function renderProgress(event: ProgressEvent, write?: (line: string) => void): void;

package/dist/runtime/progress.js

@@ -1,8 +0,0 @@
-export function renderProgress(event, write = (line) => {
-    process.stderr.write(`${line}\n`);
-}) {
-    const parts = [event.phase];
-    if (event.message)
-        parts.push(event.message);
-    write(parts.join(" "));
-}

package/dist/runtime/version.d.ts

@@ -1,6 +0,0 @@
-/**
- * Recommended Runtime version from `cli/package.json` `nylorun.runtime` (D7):
- * the version named in install instructions. Compatibility itself is checked
- * by launcher and Host protocol, not by an exact match.
- */
-export declare function runtimeVersion(): string;

package/dist/runtime/version.js

@@ -1,27 +0,0 @@
-import { readFileSync } from "node:fs";
-import { dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
-import { CliError } from "../errors.js";
-function cliPackageJsonPath() {
-    // src/runtime/*.ts and dist/runtime/*.js both sit two levels below cli/.
-    return join(dirname(fileURLToPath(import.meta.url)), "..", "..", "package.json");
-}
-/**
- * Recommended Runtime version from `cli/package.json` `nylorun.runtime` (D7):
- * the version named in install instructions. Compatibility itself is checked
- * by launcher and Host protocol, not by an exact match.
- */
-export function runtimeVersion() {
-    let raw;
-    try {
-        raw = JSON.parse(readFileSync(cliPackageJsonPath(), "utf8"));
-    }
-    catch (error) {
-        throw new CliError(`Cannot read CLI package.json: ${error instanceof Error ? error.message : String(error)}`, 1);
-    }
-    const version = raw?.nylorun?.runtime;
-    if (typeof version !== "string" || version.trim() === "") {
-        throw new CliError('cli/package.json is missing "nylorun.runtime" (the recommended Runtime version).', 1);
-    }
-    return version;
-}