@nylorun/cli 0.3.0-beta → 0.4.0-beta

package/dist/dev.js

@@ -1,278 +0,0 @@
-import { spawn } from "node:child_process";
-import { createRequire } from "node:module";
-import { basename, join, resolve } from "node:path";
-import { pathToFileURL } from "node:url";
-import { loadProjectEnvironment } from "./environment.js";
-import { attachProject } from "./project/attach.js";
-import { seedTenantFromProject } from "./project/seed.js";
-import { requireProjectRoot } from "./project/root.js";
-import { resolveHome } from "./runtime/launcher.js";
-const DEV_FLAGS = ["--ephemeral", "--local-ui", "--no-studio", "--no-open"];
-/**
- * Everything that can be checked without contacting the Host, so a Project that
- * cannot run never causes a Runtime Host to be started on its behalf.
- */
-export function developmentPreflight(args = []) {
-    const flags = [];
-    let entry;
-    for (const arg of args) {
-        if (DEV_FLAGS.includes(arg)) {
-            flags.push(arg);
-            continue;
-        }
-        if (arg.startsWith("-")) {
-            throw new Error("Usage: nylorun dev [entry] [--ephemeral] [--local-ui] [--no-studio] [--no-open]\nDefault entry: src/main.ts");
-        }
-        if (entry !== undefined) {
-            throw new Error("Usage: nylorun dev [entry] [--ephemeral] [--local-ui] [--no-studio] [--no-open]\nDefault entry: src/main.ts");
-        }
-        entry = arg;
-    }
-    if (new Set(flags).size !== flags.length) {
-        throw new Error("Usage: nylorun dev [entry] [--ephemeral] [--local-ui] [--no-studio] [--no-open]\nDefault entry: src/main.ts");
-    }
-    const localUi = flags.includes("--local-ui");
-    const noStudio = flags.includes("--no-studio");
-    if (localUi && noStudio) {
-        throw new Error("--local-ui cannot be combined with --no-studio.");
-    }
-    const require = createRequire(join(process.cwd(), "package.json"));
-    let tsx;
-    try {
-        tsx = require.resolve("tsx/cli");
-    }
-    catch {
-        throw new Error("Install tsx to use nylorun dev");
-    }
-    if (localUi) {
-        try {
-            require.resolve("@nylorun/studio");
-        }
-        catch {
-            throw new Error("Install @nylorun/studio to use the Studio dashboard.");
-        }
-    }
-    return {
-        tsx,
-        entry: entry ?? "src/main.ts",
-        ephemeral: flags.includes("--ephemeral"),
-        localUi,
-        studio: localUi,
-        open: !flags.includes("--no-open"),
-    };
-}
-/**
- * Resolve `@nylorun/studio` from the Project and call `startStudio`.
- * Used by `nylorun studio` and `nylorun dev --local-ui`.
- */
-export async function startStudio(options) {
-    const projectRoot = options.projectRoot ?? process.cwd();
-    let entry;
-    try {
-        entry = createRequire(join(projectRoot, "package.json")).resolve("@nylorun/studio");
-    }
-    catch {
-        throw new Error("Install @nylorun/studio to use the Studio dashboard.");
-    }
-    const studio = await import(pathToFileURL(entry).href);
-    const cacheDir = options.cacheDir ?? resolveHome();
-    const ui = options.localUi ? "local" : undefined;
-    return studio.startStudio({
-        runtimeUrl: options.runtimeUrl,
-        serverKey: options.serverKey,
-        tenant: options.tenant,
-        open: options.open,
-        cacheDir,
-        ...(ui === undefined ? {} : { ui }),
-        ...(options.port === undefined ? {} : { port: options.port }),
-    });
-}
-/**
- * `nylorun dev [entry]` — D§12 steps 1–4.
- * Spawns `tsx watch <entry>` with the three Project environment variables.
- * `--local-ui` also starts the Studio proxy with a local dashboard.
- */
-export async function develop(options = {}) {
-    const normalized = options;
-    const projectRoot = normalized.projectRoot ?? requireProjectRoot();
-    const previous = process.cwd();
-    process.chdir(projectRoot);
-    let preflight;
-    try {
-        preflight = developmentPreflight([
-            ...(normalized.entry ? [normalized.entry] : []),
-            ...(normalized.flags ?? []),
-        ]);
-    }
-    finally {
-        process.chdir(previous);
-    }
-    if (preflight.ephemeral) {
-        const { startEphemeral } = await import("./runtime/ephemeral.js");
-        const { writeLink } = await import("./project/link.js");
-        const { writeCredentials } = await import("./project/credentials.js");
-        const ephemeral = await startEphemeral({
-            name: basename(projectRoot),
-        });
-        try {
-            await writeCredentials(projectRoot, {
-                applicationKey: ephemeral.applicationKey,
-                principalId: "pr_ephemeral",
-            });
-            await writeLink(projectRoot, {
-                hostUrl: ephemeral.url,
-                hostId: ephemeral.hostId,
-                tenantId: ephemeral.tenant.id,
-            });
-            const envMap = loadProjectEnvironment(projectRoot);
-            await seedTenantFromProject({
-                hostUrl: ephemeral.url,
-                tenantId: ephemeral.tenant.id,
-                applicationKey: ephemeral.applicationKey,
-                projectRoot,
-                env: envMap,
-            });
-            return await spawnWatcher({
-                projectRoot,
-                entry: preflight.entry,
-                tsx: preflight.tsx,
-                envMap,
-                hostUrl: ephemeral.url,
-                tenantId: ephemeral.tenant.id,
-                applicationKey: ephemeral.applicationKey,
-                tenantName: ephemeral.tenant.name,
-                hostStarted: true,
-                ephemeral: true,
-                localUi: preflight.localUi,
-                openStudio: preflight.open,
-                home: normalized.home,
-            });
-        }
-        finally {
-            await ephemeral.close();
-        }
-    }
-    const attached = await attachProject({
-        projectRoot,
-        ...(normalized.home ? { home: normalized.home } : {}),
-    });
-    const envMap = loadProjectEnvironment(projectRoot);
-    await seedTenantFromProject({
-        hostUrl: attached.link.hostUrl,
-        tenantId: attached.link.tenantId,
-        applicationKey: attached.credentials.applicationKey,
-        projectRoot,
-        env: envMap,
-    });
-    return spawnWatcher({
-        projectRoot,
-        entry: preflight.entry,
-        tsx: preflight.tsx,
-        envMap,
-        hostUrl: attached.link.hostUrl,
-        tenantId: attached.link.tenantId,
-        applicationKey: attached.credentials.applicationKey,
-        tenantName: attached.tenantName,
-        hostStarted: attached.hostStarted,
-        ephemeral: false,
-        localUi: preflight.localUi,
-        openStudio: preflight.open,
-        home: normalized.home ?? attached.home,
-    });
-}
-async function spawnWatcher(options) {
-    const entryPath = resolve(options.projectRoot, options.entry);
-    const childEnv = {
-        ...process.env,
-        ...options.envMap,
-        NYLORUN_RUNTIME_URL: options.hostUrl,
-        NYLORUN_TENANT: options.tenantId,
-        NYLORUN_SERVER_KEY: options.applicationKey,
-    };
-    let studio;
-    let studioMode;
-    if (options.localUi) {
-        studio = await startStudio({
-            runtimeUrl: options.hostUrl,
-            serverKey: options.applicationKey,
-            tenant: { id: options.tenantId, name: options.tenantName },
-            open: options.openStudio,
-            localUi: true,
-            cacheDir: resolveHome(options.home),
-            projectRoot: options.projectRoot,
-        });
-        studioMode = "local";
-    }
-    // Handle signals before the banner: a supervisor may stop us as soon as it
-    // reads it, and an unhandled SIGTERM would kill this process and orphan the
-    // detached watcher.
-    let child;
-    let stopping;
-    const stop = (signal) => {
-        if (stopping)
-            return;
-        stopping = signal;
-        child?.kill(signal);
-    };
-    const interrupt = () => stop("SIGINT");
-    const terminate = () => stop("SIGTERM");
-    process.on("SIGINT", interrupt);
-    process.on("SIGTERM", terminate);
-    try {
-        printBanner({
-            hostUrl: options.hostUrl,
-            hostStarted: options.hostStarted,
-            ephemeral: options.ephemeral,
-            tenantName: options.tenantName,
-            tenantId: options.tenantId,
-            entry: options.entry,
-            studioLaunchUrl: studio?.launchUrl,
-            studioMode,
-        });
-        if (stopping)
-            return stopping === "SIGINT" ? 130 : 143;
-        const watcher = spawn(process.execPath, [options.tsx, "watch", "--clear-screen=false", entryPath], {
-            cwd: options.projectRoot,
-            stdio: "inherit",
-            env: childEnv,
-            detached: process.platform !== "win32",
-        });
-        child = watcher;
-        return await new Promise((resolvePromise, reject) => {
-            watcher.once("error", reject);
-            watcher.once("exit", (code, signal) => resolvePromise(code ?? (signal === "SIGINT" ? 130 : 143)));
-        });
-    }
-    finally {
-        process.removeListener("SIGINT", interrupt);
-        process.removeListener("SIGTERM", terminate);
-        await studio?.close().catch(() => { });
-    }
-}
-function printBanner(options) {
-    const hostNote = options.ephemeral
-        ? "(ephemeral; removed on exit)"
-        : options.hostStarted
-            ? "(started; stays running)"
-            : "(already running)";
-    const short = options.tenantId.length > 12
-        ? `${options.tenantId.slice(0, 12)}…`
-        : options.tenantId;
-    console.log(`Host          ${options.hostUrl}  ${hostNote}`);
-    console.log(`Tenant        ${options.tenantName}  ${short}`);
-    console.log(`Entry         ${options.entry}`);
-    if (options.studioLaunchUrl) {
-        console.log(`Studio        ${options.studioLaunchUrl}`);
-        if (options.studioMode === "hosted") {
-            console.log(`Safari or offline: nylorun studio --local-ui`);
-        }
-    }
-    else {
-        console.log(`Studio: npm run studio`);
-    }
-    console.log("");
-    console.log("Ctrl-C stops this Project only.");
-    if (!options.ephemeral) {
-        console.log("nylorun runtime down  stops the Host.");
-    }
-}

package/dist/launcher.d.ts

@@ -1,5 +0,0 @@
-/**
- * `nylorun serve` was removed (D§12 / F2-5). Use `nylorun dev` in development
- * and `node dist/src/main.js` (with the three environment variables) in production.
- */
-export declare function serve(): Promise<never>;

package/dist/launcher.js

@@ -1,7 +0,0 @@
-/**
- * `nylorun serve` was removed (D§12 / F2-5). Use `nylorun dev` in development
- * and `node dist/src/main.js` (with the three environment variables) in production.
- */
-export async function serve() {
-    throw new Error("nylorun serve was removed. Use nylorun dev [entry] in development, or node dist/src/main.js with NYLORUN_RUNTIME_URL, NYLORUN_TENANT and NYLORUN_SERVER_KEY.");
-}

package/dist/project/attach.d.ts

@@ -1,32 +0,0 @@
-import { type ProjectCredentials } from "./credentials.js";
-import { type ProjectLink } from "./link.js";
-export interface UpResult {
-    url: string;
-    hostId: string;
-    pid: number;
-    version: string;
-    started: boolean;
-}
-export interface AttachedProject {
-    projectRoot: string;
-    link: ProjectLink;
-    credentials: ProjectCredentials;
-    host: UpResult;
-    tenantName: string;
-    hostStarted: boolean;
-    home: string;
-}
-export interface AttachOptions {
-    projectRoot: string;
-    home?: string;
-    /** Interactive stdin; defaults to process.stdin when TTY. */
-    input?: NodeJS.ReadableStream;
-    output?: NodeJS.WritableStream;
-    fetchImpl?: typeof fetch;
-}
-/**
- * Ensure the local Runtime is up and a Project link authenticates (D§12 step 2).
- */
-export declare function attachProject(options: AttachOptions): Promise<AttachedProject>;
-/** Three `export` lines for `runtime status --env` (F2-7). */
-export declare function printLinkedEnvExports(projectRoot?: string): Promise<void>;

package/dist/project/attach.js

@@ -1,241 +0,0 @@
-import { createInterface } from "node:readline/promises";
-import { createAdmin } from "@nylorun/admin";
-import { PROTOCOL_HEADER, PROTOCOL_VERSION, TENANT_HEADER, } from "@nylorun/agents";
-import { CliError } from "../errors.js";
-import { launcher, resolveHome, throwOnLauncherFailure, } from "../runtime/launcher.js";
-import { readCredentials, removeCredentials, } from "./credentials.js";
-import { createProjectTenant } from "./create-tenant.js";
-import { readLink, removeLink, writeLink, } from "./link.js";
-function tenantHeaders(key, tenantId) {
-    return {
-        authorization: `Bearer ${key}`,
-        [TENANT_HEADER]: tenantId,
-        [PROTOCOL_HEADER]: String(PROTOCOL_VERSION),
-    };
-}
-async function probeTenant(hostUrl, tenantId, applicationKey, fetchImpl) {
-    try {
-        const response = await fetchImpl(`${hostUrl}/v1/tenant`, {
-            headers: tenantHeaders(applicationKey, tenantId),
-            signal: AbortSignal.timeout(5_000),
-        });
-        return response.ok ? "ok" : "rejected";
-    }
-    catch {
-        return "rejected";
-    }
-}
-async function healthHostId(hostUrl, fetchImpl) {
-    try {
-        const response = await fetchImpl(`${hostUrl}/health`, {
-            signal: AbortSignal.timeout(3_000),
-        });
-        if (!response.ok)
-            return undefined;
-        const body = (await response.json());
-        return typeof body.hostId === "string" ? body.hostId : undefined;
-    }
-    catch {
-        return undefined;
-    }
-}
-/**
- * Ensure the local Runtime is up and a Project link authenticates (D§12 step 2).
- */
-export async function attachProject(options) {
-    const fetchImpl = options.fetchImpl ?? fetch;
-    const projectRoot = options.projectRoot;
-    const home = resolveHome(options.home);
-    const handle = await launcher(home);
-    const upOutcome = await handle.invoke(["up"]);
-    throwOnLauncherFailure(upOutcome);
-    const host = upResultFromInvoke(upOutcome);
-    const hostUrl = host.url.replace(/\/$/, "");
-    const hostId = host.hostId ||
-        (await healthHostId(hostUrl, fetchImpl)) ||
-        "";
-    if (!hostId) {
-        throw new CliError(`Runtime Host at ${hostUrl} did not report a hostId. Restart with "nylorun runtime restart".`, 1);
-    }
-    const admin = createAdmin({ home });
-    let link = await readLink(projectRoot);
-    let credentials = await readCredentials(projectRoot);
-    if (!link || !credentials) {
-        const created = await createProjectTenant({
-            admin,
-            hostId,
-            hostUrl,
-            projectRoot,
-        });
-        return {
-            projectRoot,
-            link: created.link,
-            credentials: created.credentials,
-            host,
-            tenantName: created.envelope.name,
-            hostStarted: host.started,
-            home,
-        };
-    }
-    if (link.hostUrl.replace(/\/$/, "") !== hostUrl) {
-        const liveId = await healthHostId(hostUrl, fetchImpl);
-        if (liveId && liveId === link.hostId) {
-            link = { ...link, hostUrl, format: 1 };
-            await writeLink(projectRoot, link);
-        }
-    }
-    const liveId = await healthHostId(hostUrl, fetchImpl);
-    if (liveId && liveId !== link.hostId) {
-        throw new CliError(`Project link points at Host ${link.hostId}, but ${hostUrl} is ${liveId}. Relink: remove .nylorun/link.json and run nylorun dev.`, 1);
-    }
-    const auth = await probeTenant(hostUrl, link.tenantId, credentials.applicationKey, fetchImpl);
-    if (auth === "ok") {
-        const tenants = await admin.listTenants();
-        const match = tenants.find((t) => t.id === link.tenantId);
-        return {
-            projectRoot,
-            link: { ...link, hostUrl, hostId: liveId ?? link.hostId, format: 1 },
-            credentials,
-            host,
-            tenantName: match?.name ?? match?.envelope?.name ?? link.tenantId,
-            hostStarted: host.started,
-            home,
-        };
-    }
-    const tenants = await admin.listTenants();
-    const known = tenants.some((t) => t.id === link.tenantId);
-    if (known) {
-        throw new CliError(`Application credential rejected for Tenant ${link.tenantId} on Host ${link.hostId}. Relink: remove .nylorun/link.json and .nylorun/credentials.json, then run nylorun dev.`, 1);
-    }
-    const choice = await chooseUnknownTenantRecovery({
-        tenantId: link.tenantId,
-        tenants,
-        input: options.input,
-        output: options.output,
-    });
-    if (choice === "remove") {
-        await removeLink(projectRoot);
-        await removeCredentials(projectRoot);
-        throw new CliError("Removed Project link. Run nylorun dev again to create a new Tenant.", 1);
-    }
-    if (choice === "create") {
-        await removeLink(projectRoot);
-        await removeCredentials(projectRoot);
-        const created = await createProjectTenant({
-            admin,
-            hostId: liveId ?? hostId,
-            hostUrl,
-            projectRoot,
-        });
-        return {
-            projectRoot,
-            link: created.link,
-            credentials: created.credentials,
-            host,
-            tenantName: created.envelope.name,
-            hostStarted: host.started,
-            home,
-        };
-    }
-    const selected = choice.tenant;
-    await writeLink(projectRoot, {
-        format: 1,
-        hostUrl,
-        hostId: liveId ?? hostId,
-        tenantId: selected.id,
-    });
-    const retry = await probeTenant(hostUrl, selected.id, credentials.applicationKey, fetchImpl);
-    if (retry !== "ok") {
-        throw new CliError(`Credentials do not authorize Tenant ${selected.id}. Remove .nylorun/credentials.json and create a new Tenant with nylorun dev.`, 1);
-    }
-    return {
-        projectRoot,
-        link: {
-            format: 1,
-            hostUrl,
-            hostId: liveId ?? hostId,
-            tenantId: selected.id,
-        },
-        credentials,
-        host,
-        tenantName: selected.name ?? selected.envelope?.name ?? selected.id,
-        hostStarted: host.started,
-        home,
-    };
-}
-async function chooseUnknownTenantRecovery(options) {
-    const message = `Linked Tenant ${options.tenantId} is unknown on this Host.`;
-    const tty = options.input === undefined
-        ? Boolean(process.stdin.isTTY && process.stdout.isTTY)
-        : true;
-    if (!tty) {
-        throw new CliError(`${message} Create a new Tenant (remove .nylorun/link.json), choose another with "nylorun tenant use", or remove the link.`, 1);
-    }
-    const input = options.input ?? process.stdin;
-    const output = options.output ?? process.stdout;
-    const rl = createInterface({ input, output });
-    try {
-        output.write(`${message}\n`);
-        output.write("  1) Create a new Tenant\n");
-        output.write("  2) Choose another Tenant on this Host\n");
-        output.write("  3) Remove the Project link\n");
-        const answer = (await rl.question("Choose [1/2/3]: ")).trim();
-        if (answer === "1")
-            return "create";
-        if (answer === "3")
-            return "remove";
-        if (answer === "2") {
-            const open = options.tenants.filter((t) => t.state === "open" && t.name);
-            if (open.length === 0) {
-                throw new CliError("No open Tenants on this Host to choose. Create a new one instead.", 1);
-            }
-            for (let i = 0; i < open.length; i += 1) {
-                const t = open[i];
-                output.write(`  ${i + 1}) ${t.name ?? "(unnamed)"}  ${t.id}\n`);
-            }
-            const pick = Number((await rl.question(`Choose Tenant [1-${open.length}]: `)).trim());
-            if (!Number.isInteger(pick) || pick < 1 || pick > open.length) {
-                throw new CliError("Invalid Tenant choice.", 2);
-            }
-            return { tenant: open[pick - 1] };
-        }
-        throw new CliError("Invalid choice.", 2);
-    }
-    finally {
-        rl.close();
-    }
-}
-/** Three `export` lines for `runtime status --env` (F2-7). */
-export async function printLinkedEnvExports(projectRoot = process.cwd()) {
-    const { findProjectRoot } = await import("./root.js");
-    const root = findProjectRoot(projectRoot) ?? projectRoot;
-    const link = await readLink(root);
-    const credentials = await readCredentials(root);
-    if (!link || !credentials) {
-        console.log("# No Project link in this directory. Run nylorun dev to create one.");
-        return;
-    }
-    console.log(`export NYLORUN_RUNTIME_URL=${shellQuote(link.hostUrl)}`);
-    console.log(`export NYLORUN_SERVER_KEY=${shellQuote(credentials.applicationKey)}`);
-    console.log(`export NYLORUN_TENANT=${shellQuote(link.tenantId)}`);
-}
-function upResultFromInvoke(outcome) {
-    const result = outcome.result ?? {};
-    const url = typeof result.url === "string" ? result.url : "";
-    const hostId = typeof result.hostId === "string" ? result.hostId : "";
-    if (!url) {
-        throw new CliError("Runtime up succeeded without a URL.", 1);
-    }
-    return {
-        url,
-        hostId,
-        pid: typeof result.pid === "number" ? result.pid : 0,
-        version: typeof result.version === "string" ? result.version : "",
-        started: Boolean(result.started),
-    };
-}
-function shellQuote(value) {
-    if (/^[A-Za-z0-9_./:-]+$/.test(value))
-        return value;
-    return `'${value.replace(/'/g, `'\\''`)}'`;
-}

package/dist/runtime/commands.d.ts

@@ -1,16 +0,0 @@
-import { type LauncherHandle, type LauncherOptions } from "./launcher.js";
-export declare const runtimeUsage = "  runtime up [--port <n>]\n  runtime down [--wait] [--force] [--timeout <seconds>]\n  runtime status [--json] [--env]\n  runtime logs [-f|--follow] [-n <lines>] [--tenant <id>|--all]\n  runtime restart [--port <n>] [--allow-downgrade] [--wait|--force]\n  runtime run [--port <n>]\n  up                       alias for \"runtime up\"\n  down                     alias for \"runtime down\"\n  logs                     alias for \"runtime logs\"";
-export interface RuntimeCommandOptions extends LauncherOptions {
-    home?: string;
-    /** Injected launcher handle (tests). */
-    handle?: LauncherHandle;
-    /** Hook for `status --env` (F2 wires Project link exports). */
-    envHook?: () => void | Promise<void>;
-}
-/**
- * `nylorun runtime …` and the `up` / `down` / `logs` aliases.
- * Dispatch from `cli.ts` is owned by WS-F2 (one-line import change).
- */
-export declare function runtimeCommand(args: readonly string[], options?: RuntimeCommandOptions): Promise<void>;
-export { runtimeVersion } from "./version.js";
-export { launcher } from "./launcher.js";