nylorun 0.3.0-beta → 0.5.0-beta

package/dist/stack/commands.js

@@ -1,38 +1,92 @@
 import { existsSync } from "node:fs";
-import { readFile, rm, mkdir } from "node:fs/promises";
+import { mkdir, readFile, rm } from "node:fs/promises";
+import { basename, resolve } from "node:path";
 import { compareVersions, PROTOCOL_HEADER, PROTOCOL_VERSION, } from "@nylorun/core/compatibility";
 import { CliError } from "../errors.js";
-import { resolveHome } from "../home.js";
+import { deriveTenantKey, PROJECT_PRINCIPAL_ID } from "../project/derived-key.js";
+import { readProjectCredentials, readProjectLink, writeProjectCredentials, writeProjectLink, } from "../project/link.js";
+import { findProjectRoot } from "../project/root.js";
+import { seedTenant } from "../project/seed.js";
+import { readTelemetry, STUDIO_ANALYTICS_ID, TELEMETRY_NOTICE, telemetryDecision, writeTelemetry, } from "../telemetry.js";
 import { dockerPreflight, parseComposePs, } from "./docker.js";
 import { readAdminKey, readHostConfig, STACK_CLIENT_HOST } from "./host-files.js";
 import { runtimeImageOverridden, stackImages } from "./images.js";
 import { stackPaths } from "./paths.js";
 import { prepareStack, readStackEnv } from "./prepare.js";
+import { assertTenantName, chooseTenantName, DEFAULT_TENANT, defaultNylorunRoot, listTenants, moveStackRoots, readTenantRecord, sanitizeTenantName, tenantRoot, tenantsDir, writeTenantRecord, } from "./stacks.js";
 import { mintStudioLogin, studioOrigin } from "./studio-login.js";
-export const STACK_SERVICES = ["postgres", "restate", "s2", "runtime", "studio"];
-const CORE_SERVICES = ["postgres", "restate", "s2", "runtime"];
-const DEFAULT_PROJECT = "nylorun";
-export const stackUsage = `  up|start [--no-studio] [--no-open] [--allow-downgrade] [--studio-embed-origin <origin>]... [--studio-embed-origin-reset]
-                                      set up the stack on first run, then start it; print the Runtime and Studio URLs and open Studio signed in (in a terminal).
-                                      refuses a Runtime older than the Host last ran unless --allow-downgrade.
-                                      --studio-embed-origin lets one more exact origin show Studio in a frame (a desktop app's development server); kept across starts until --studio-embed-origin-reset
-  down|stop                           stop the stack's containers; keep volumes
-  status [--json] [--env]             services, endpoints and Runtime health (--env: the linked Project's variables)
-  logs [service] [-f] [--tail <n>]    stack logs (${STACK_SERVICES.join(", ")})
-  studio [--no-open]                  sign a browser in to Studio (on the linked Project's Tenant); --no-open prints the login URL; start the stack if it is stopped
-  reset [--yes]                       delete the stack's volumes and Tenant directories`;
+export const STACK_SERVICES = ["postgres", "restate", "s2", "gateway", "runtime", "studio"];
+const CORE_SERVICES = ["postgres", "restate", "s2", "gateway", "runtime"];
+export const stackUsage = `  up|start [--tenant <name>] [--no-link] [--no-studio] [--no-open] [--allow-downgrade] [--studio-embed-origin <origin>]... [--studio-embed-origin-reset]
+                                      start the project's Tenant, creating it and the Project link (.nylorun/link.json,
+                                      credentials.json) on the first run; print the Runtime and Studio URLs and open Studio
+                                      signed in (in a terminal). --tenant attaches to (or creates) a named Tenant; --no-link
+                                      starts the default Tenant (or --tenant's) without linking the current directory
+  down|stop [--tenant <name>]         stop the Tenant's containers; keep volumes
+  status [--tenant <name>] [--json]   the Tenant, its id, services, endpoints and Runtime health
+  logs [service] [--tenant <name>] [-f] [--tail <n>]
+                                      container logs (${STACK_SERVICES.join(", ")})
+  studio [--tenant <name>] [--no-open]
+                                      sign a browser in to Studio on the Tenant; --no-open prints the login URL; start the Tenant if it is stopped
+  reset [--tenant <name>] [--yes]     delete the Tenant's data (volumes, tenant/ and vault key); the next start creates it anew
+  ls [--json]                         the Tenants on this machine
+  delete <tenant> --yes               remove a Tenant: containers, volumes and its Host root, with the vault key (KEK)`;
 const usageError = (message) => new CliError(message, 2);
-export function stackProject(env) {
-    const project = env.NYLORUN_STACK_PROJECT?.trim() || DEFAULT_PROJECT;
-    if (!/^[a-z0-9][a-z0-9_-]*$/.test(project))
-        throw usageError(`NYLORUN_STACK_PROJECT must be lowercase letters, digits, "-" or "_": ${project}`);
-    return project;
+/** The Compose project of Tenant `name`: `nylorun-<name>`, or `NYLORUN_COMPOSE_PROJECT`. */
+export function stackProject(env, name) {
+    const override = env.NYLORUN_COMPOSE_PROJECT?.trim();
+    if (!override)
+        return `nylorun-${name}`;
+    return assertTenantName(override, "NYLORUN_COMPOSE_PROJECT");
 }
-function context(deps) {
+function nylorunRoot(deps) {
+    return deps.nylorunRoot ?? defaultNylorunRoot();
+}
+async function tenantNames(deps) {
+    const names = (await listTenants(nylorunRoot(deps))).map((tenant) => tenant.name);
+    return names.length ? ` Tenants on this machine: ${names.join(", ")}.` : "";
+}
+/**
+ * Which Tenant a command acts on: `--tenant`, then `NYLORUN_TENANT`, then the Tenant of the
+ * project's link (format 3; `start` replaces an older one); for `start` in a project, then a
+ * name from the project directory (`chooseTenantName`); outside a project (or with
+ * --no-link), `default`. `NYLORUN_HOME` sets the Host root whatever the name; its name
+ * otherwise comes from its `tenant.json`, the project directory or the Host root's own.
+ */
+async function selectStack(deps, options = {}) {
+    const { env } = deps;
+    const base = nylorunRoot(deps);
+    const projectDir = options.noLink ? undefined : findProjectRoot(deps.cwd ?? process.cwd());
+    const link = projectDir ? await readProjectLink(projectDir) : undefined;
+    const explicit = options.name ?? (env.NYLORUN_TENANT?.trim() || undefined);
+    if (explicit !== undefined)
+        assertTenantName(explicit, options.name !== undefined ? "--tenant" : "NYLORUN_TENANT");
+    let name = explicit ?? link?.tenant;
+    let root;
+    const home = env.NYLORUN_HOME?.trim();
+    if (home) {
+        root = resolve(home);
+        name ??=
+            (await readTenantRecord(root))?.name ??
+                sanitizeTenantName(basename(projectDir ?? root));
+    }
+    else {
+        if (name === undefined && options.start && projectDir)
+            name = await chooseTenantName(base, projectDir);
+        if (name === undefined && !projectDir)
+            name = DEFAULT_TENANT;
+        if (name === undefined)
+            throw usageError(`No Tenant selected: run "nylorun start" in this project, pass --tenant <name>, or set NYLORUN_TENANT.${await tenantNames(deps)}`);
+        root = tenantRoot(base, name);
+    }
+    assertTenantName(name, "The Tenant name");
     return {
         deps,
-        paths: stackPaths(resolveHome(undefined, deps.env)),
-        project: stackProject(deps.env),
+        name,
+        paths: stackPaths(root),
+        project: stackProject(env, name),
+        ...(projectDir ? { projectDir } : {}),
+        ...(link ? { link } : {}),
     };
 }
 function composeArgs(ctx, ...args) {
@@ -49,7 +103,7 @@ function composeArgs(ctx, ...args) {
 }
 function requireStackFiles(ctx) {
     if (!existsSync(ctx.paths.compose) || !existsSync(ctx.paths.env))
-        throw new CliError(`No Nylorun stack under ${ctx.paths.root}. Run "nylorun start" first.`, 3);
+        throw new CliError(`No Tenant ${ctx.name} under ${ctx.paths.root}. Run "nylorun start" first.`, 3);
 }
 export function parseStackFlags(args, allowed, usage) {
     const booleans = new Set();
@@ -85,6 +139,11 @@ export function parseStackFlags(args, allowed, usage) {
     }
     return { rest, booleans, values, lists };
 }
+/** `--tenant` when given. */
+function nameOption(flags) {
+    const name = flags.values.get("--tenant");
+    return name === undefined ? {} : { name };
+}
 async function sleep(ms) {
     await new Promise((resolvePromise) => setTimeout(resolvePromise, ms));
 }
@@ -116,6 +175,61 @@ async function waitForHealth(ctx, runtimeUrl, hostId) {
         await sleep(ctx.deps.pollMs ?? 500);
     }
 }
+/** `/v1/admin/status`'s Tenant on the operator listener; undefined when it does not answer. */
+async function fetchTenant(deps, adminUrl, adminKey) {
+    if (!adminKey)
+        return undefined;
+    try {
+        const response = await deps.fetch(`${adminUrl}/v1/admin/status`, {
+            headers: {
+                authorization: `Bearer ${adminKey}`,
+                [PROTOCOL_HEADER]: String(PROTOCOL_VERSION),
+                accept: "application/json",
+            },
+            signal: AbortSignal.timeout(3000),
+            redirect: "error",
+        });
+        if (!response.ok)
+            return undefined;
+        const tenant = (await response.json()).tenant;
+        if (!tenant || (tenant.state !== "open" && tenant.state !== "unavailable"))
+            return undefined;
+        return {
+            id: typeof tenant.id === "string" ? tenant.id : null,
+            name: typeof tenant.name === "string" ? tenant.name : null,
+            state: tenant.state,
+            ...(tenant.cause ? { cause: tenant.cause } : {}),
+        };
+    }
+    catch {
+        return undefined;
+    }
+}
+/** Why the Tenant is unavailable, with the repair the Runtime names. */
+function tenantCauseMessage(ctx, tenant) {
+    const cause = tenant.cause;
+    const hint = cause.code === "schema-too-new"
+        ? ` This nylorun pins Runtime ${ctx.deps.runtimeVersion}, older than the Tenant's database: update nylorun (npx nylorun@latest start).`
+        : "";
+    return `Tenant ${ctx.name} is unavailable (${cause.code}): ${cause.message} ${cause.repair}${hint} See "nylorun logs runtime".`;
+}
+/**
+ * Wait until the Tenant is open: the Runtime creates it on the first start and opens
+ * it on later ones. A Tenant that could not be opened has a cause; report it.
+ */
+async function waitForTenant(ctx, adminUrl, adminKey) {
+    const deadline = Date.now() + (ctx.deps.healthTimeoutMs ?? 60_000);
+    for (;;) {
+        const tenant = await fetchTenant(ctx.deps, adminUrl, adminKey);
+        if (tenant?.state === "open" && tenant.id)
+            return { ...tenant, id: tenant.id };
+        if (tenant?.cause)
+            throw new CliError(tenantCauseMessage(ctx, tenant), 7);
+        if (Date.now() > deadline)
+            throw new CliError(`Tenant ${ctx.name} did not open (${adminUrl}/v1/admin/status: ${tenant ? tenant.state : "no answer"}). See "nylorun status" and "nylorun logs runtime".`, 7);
+        await sleep(ctx.deps.pollMs ?? 500);
+    }
+}
 /**
  * A Runtime started by the removed launcher (`nylorun runtime up`, the
  * `nylorun-runtime` bin) shares host.json; refuse to fight it.
@@ -154,37 +268,41 @@ function isOlder(version, than) {
         SEMVER.test(than) &&
         compareVersions(version, than) < 0);
 }
-/** The version of this Host's Runtime when it answers on the stack's port. */
-async function runningRuntimeVersion(ctx, hostId) {
-    const persisted = await readStackEnv(ctx.paths);
-    if (!persisted?.runtimePort || typeof hostId !== "string")
-        return undefined;
-    const health = await fetchHealth(ctx.deps, `http://${STACK_CLIENT_HOST}:${persisted.runtimePort}`);
-    return health?.status === "ok" && health.hostId === hostId ? health.version : undefined;
-}
 /**
- * Refuse to start a Runtime older than the one the Host last ran (host.json
- * `runtimeVersion`) or the one running now: Compose would replace it, every
- * client on the machine shares the stack, and a Runtime older than a Tenant's
- * schema quarantines that Tenant. Skipped when `NYLORUN_RUNTIME_IMAGE` names
- * the image.
+ * Refuse a Runtime older than the Tenant's database: the Runtime that last ran the Tenant
+ * (host.json `runtimeVersion`) migrated it, and an older one cannot open its Tenant
+ * (`schema-too-new`). Checked before Compose replaces anything. Skipped when
+ * `NYLORUN_RUNTIME_IMAGE` names the image.
  */
 async function refuseDowngrade(ctx, allowDowngrade) {
     const pinned = ctx.deps.runtimeVersion;
     const host = await readHostConfig(ctx.paths);
-    const newer = [];
-    if (isOlder(pinned, host?.runtimeVersion))
-        newer.push(`the Host last ran Runtime ${host.runtimeVersion} (${ctx.paths.config})`);
-    const running = await runningRuntimeVersion(ctx, host?.hostId);
-    if (isOlder(pinned, running) && running !== host?.runtimeVersion)
-        newer.push(`Runtime ${running} is running`);
-    if (newer.length === 0)
+    if (!isOlder(pinned, host?.runtimeVersion))
         return;
     if (allowDowngrade) {
-        ctx.deps.err(`Warning: downgrading to Runtime ${pinned}: ${newer.join(" and ")}. Tenants a newer Runtime migrated are quarantined.`);
+        ctx.deps.err(`Warning: starting Runtime ${pinned} on Tenant ${ctx.name}, which Runtime ${host.runtimeVersion} last ran. If that Runtime migrated the database, the Tenant stays unavailable (schema-too-new).`);
         return;
     }
-    throw new CliError(`Refusing to downgrade: this nylorun pins Runtime ${pinned}, but ${newer.join(" and ")}. Every project and app on this machine shares the stack, and a Runtime older than a Tenant's schema quarantines that Tenant. Update nylorun (npx nylorun@latest up), or run "nylorun start --allow-downgrade" to start Runtime ${pinned} anyway.`, 5);
+    throw new CliError(`Refusing to start Runtime ${pinned} on Tenant ${ctx.name}: Runtime ${host.runtimeVersion} last ran it (${ctx.paths.config}), and a Runtime older than the Tenant's database cannot open its Tenant. Update nylorun (npx nylorun@latest start), or run "nylorun start --allow-downgrade" when both Runtimes use the same database schema.`, 5);
+}
+/** Ports other Tenants keep in their `.env`, so a new Tenant avoids them. */
+async function reservedPorts(ctx) {
+    const others = (await listTenants(nylorunRoot(ctx.deps)))
+        .filter((tenant) => resolve(tenant.root) !== ctx.paths.root)
+        .map((tenant) => stackPaths(tenant.root));
+    const reserved = new Set();
+    for (const paths of others) {
+        const persisted = await readStackEnv(paths);
+        for (const port of [
+            persisted?.runtimePort,
+            persisted?.adminPort,
+            persisted?.studioPort,
+            persisted?.restatePort,
+        ])
+            if (port !== undefined)
+                reserved.add(port);
+    }
+    return reserved;
 }
 async function bringUp(ctx, options) {
     const { deps } = ctx;
@@ -192,8 +310,12 @@ async function bringUp(ctx, options) {
     const overridden = runtimeImageOverridden(deps.env);
     if (!overridden)
         await refuseDowngrade(ctx, options.allowDowngrade ?? false);
+    const telemetry = await readTelemetry(nylorunRoot(deps));
+    const analytics = telemetryDecision(deps.env, telemetry).enabled;
     const prepared = await prepareStack({
         paths: ctx.paths,
+        name: ctx.name,
+        project: ctx.project,
         images: stackImages(deps.env, {
             runtime: deps.runtimeVersion,
             studio: deps.studioVersion,
@@ -203,14 +325,33 @@ async function bringUp(ctx, options) {
         // An overriding image's version is unknown: keep the recorded one.
         runtimeVersion: overridden ? undefined : deps.runtimeVersion,
         ports: deps.ports,
+        reserved: await reservedPorts(ctx),
+        ...(deps.env.NYLORUN_DERIVED_PRINCIPALS?.trim()
+            ? { derivedPrincipals: deps.env.NYLORUN_DERIVED_PRINCIPALS }
+            : {}),
         ...(options.studioEmbedOrigins ? { studioEmbedOrigins: options.studioEmbedOrigins } : {}),
+        ...(analytics ? { studioAnalyticsId: STUDIO_ANALYTICS_ID } : {}),
     });
+    if (analytics && options.studio && telemetry.noticeShown === undefined) {
+        deps.err(TELEMETRY_NOTICE);
+        await writeTelemetry(nylorunRoot(deps), { ...telemetry, noticeShown: new Date().toISOString() });
+    }
+    const record = await readTenantRecord(ctx.paths.root);
+    const project = record?.project ?? ctx.projectDir;
+    if (record?.name !== ctx.name || record.project !== project)
+        await writeTenantRecord(ctx.paths.root, { name: ctx.name, ...(project ? { project } : {}) });
     if (prepared.firstRun)
-        deps.err(`Wrote ${ctx.paths.compose} and ${ctx.paths.env} (Runtime port ${prepared.env.runtimePort}, Studio port ${prepared.env.studioPort}).`);
-    const up = await deps.docker.stream(composeArgs(ctx, "up", "--detach", "--wait", "--wait-timeout", "300", ...CORE_SERVICES));
-    if (up !== 0)
-        throw new CliError(`docker compose up failed (exit ${up}). See "nylorun logs runtime" and "nylorun status".`, 7);
+        deps.err(`Created Tenant ${ctx.name} under ${ctx.paths.root} (Runtime port ${prepared.env.runtimePort}, Studio port ${prepared.env.studioPort}).`);
     const runtimeUrl = `http://${STACK_CLIENT_HOST}:${prepared.env.runtimePort}`;
+    const adminUrl = `http://${STACK_CLIENT_HOST}:${prepared.env.adminPort}`;
+    const up = await deps.docker.stream(composeArgs(ctx, "up", "--detach", "--wait", "--wait-timeout", "300", ...CORE_SERVICES));
+    if (up !== 0) {
+        // A Runtime whose Tenant cannot open fails readiness; its status names the cause.
+        const tenant = await fetchTenant(deps, adminUrl, prepared.adminKey);
+        if (tenant?.cause)
+            throw new CliError(tenantCauseMessage(ctx, tenant), 7);
+        throw new CliError(`docker compose up failed (exit ${up}). See "nylorun logs runtime", "nylorun logs gateway" and "nylorun status".`, 7);
+    }
     await waitForHealth(ctx, runtimeUrl, prepared.host.hostId);
     let studioStarted = false;
     if (options.studio) {
@@ -221,6 +362,7 @@ async function bringUp(ctx, options) {
     }
     return {
         runtimeUrl,
+        adminUrl,
         hostId: prepared.host.hostId,
         studioPort: prepared.env.studioPort,
         studioStarted,
@@ -258,17 +400,74 @@ async function openLogin(ctx, login) {
     if (!(await ctx.deps.openBrowser(login)))
         ctx.deps.out(`Sign in   ${login}`);
 }
-/** Printed by `start` while the Host has no Tenant: nylorun never creates one. */
-export const TENANT_HINT = "No Tenant yet. Create one in Studio, or run `npx @nylorun/cli tenant create` in your project.";
-const START_USAGE = "nylorun start [--no-studio] [--no-open] [--allow-downgrade] [--studio-embed-origin <origin>]... [--studio-embed-origin-reset]";
-async function start(ctx, args) {
+/**
+ * Link the project to the Tenant: `.nylorun/link.json` (format 3) and
+ * `.nylorun/credentials.json` with the key of the derived principal `project`. The link is
+ * rewritten only when it is older, or the Tenant's name, URL, Host or id changed; a new link
+ * seeds the Tenant from the project's `.env`.
+ */
+async function linkProject(ctx, started, tenantId) {
+    const { deps, projectDir, link } = ctx;
+    const applicationKey = deriveTenantKey(started.adminKey, tenantId, PROJECT_PRINCIPAL_ID);
+    const fresh = link?.format !== 3 ||
+        link.tenant !== ctx.name ||
+        link.hostUrl !== started.runtimeUrl ||
+        link.hostId !== started.hostId ||
+        link.tenantId !== tenantId;
+    if (fresh)
+        await writeProjectLink(projectDir, {
+            tenant: ctx.name,
+            hostUrl: started.runtimeUrl,
+            hostId: started.hostId,
+            tenantId,
+        });
+    const credentials = await readProjectCredentials(projectDir);
+    if (fresh ||
+        credentials?.applicationKey !== applicationKey ||
+        credentials.principalId !== PROJECT_PRINCIPAL_ID)
+        await writeProjectCredentials(projectDir, {
+            applicationKey,
+            principalId: PROJECT_PRINCIPAL_ID,
+        });
+    if (!fresh)
+        return;
+    deps.err(`Linked ${projectDir} to Tenant ${ctx.name} (.nylorun/link.json, .nylorun/credentials.json).`);
+    try {
+        const seeded = await seedTenant({
+            fetch: deps.fetch,
+            runtimeUrl: started.runtimeUrl,
+            applicationKey,
+            projectRoot: projectDir,
+        });
+        const set = [...seeded.applied, ...(seeded.model ? [`model ${seeded.model}`] : [])];
+        if (set.length)
+            deps.err(`Seeded the Tenant from .env: ${set.join(", ")}.`);
+    }
+    catch (error) {
+        deps.err(`Warning: could not seed the Tenant from .env (${error instanceof Error ? error.message : String(error)}). Set the model in Studio or with "npx @nylorun/cli configure".`);
+    }
+}
+const START_USAGE = "nylorun start [--tenant <name>] [--no-link] [--no-studio] [--no-open] [--allow-downgrade] [--studio-embed-origin <origin>]... [--studio-embed-origin-reset]";
+async function start(deps, args) {
     const flags = parseStackFlags(args, {
-        booleans: ["--no-studio", "--no-open", "--allow-downgrade", "--studio-embed-origin-reset"],
+        booleans: [
+            "--no-studio",
+            "--no-open",
+            "--no-link",
+            "--allow-downgrade",
+            "--studio-embed-origin-reset",
+        ],
+        values: ["--tenant"],
         lists: ["--studio-embed-origin"],
     }, START_USAGE);
     if (flags.rest.length)
         throw usageError(`Usage: ${START_USAGE}`);
-    await dockerPreflight(ctx.deps.docker);
+    const ctx = await selectStack(deps, {
+        ...nameOption(flags),
+        start: true,
+        noLink: flags.booleans.has("--no-link"),
+    });
+    await dockerPreflight(deps.docker);
     const embedOrigins = flags.lists.get("--studio-embed-origin") ?? [];
     const resetEmbed = flags.booleans.has("--studio-embed-origin-reset");
     const started = await bringUp(ctx, {
@@ -278,62 +477,47 @@ async function start(ctx, args) {
             ? { studioEmbedOrigins: { add: embedOrigins, reset: resetEmbed } }
             : {}),
     });
-    ctx.deps.out(`Runtime   ${started.runtimeUrl}`);
+    const tenant = await waitForTenant(ctx, started.adminUrl, started.adminKey);
+    if (ctx.projectDir)
+        await linkProject({ ...ctx, projectDir: ctx.projectDir }, started, tenant.id);
+    deps.out(`Tenant    ${ctx.name}  (${tenant.id})`);
+    deps.out(`Runtime   ${started.runtimeUrl}`);
     if (started.studioStarted) {
-        ctx.deps.out(`Studio    ${studioOrigin(started.studioPort)}`);
-        if (opensBrowser(ctx.deps, flags)) {
+        deps.out(`Studio    ${studioOrigin(started.studioPort)}`);
+        if (opensBrowser(deps, flags)) {
             const login = await tryStudioLogin(ctx, started.studioPort, started.adminKey);
             if (login)
-                await openLogin(ctx, login);
+                await openLogin(ctx, withNext(login, tenantStudioPath(tenant.id)));
         }
         else
-            ctx.deps.err(STUDIO_SIGN_IN_HINT);
+            deps.err(STUDIO_SIGN_IN_HINT);
     }
-    if ((await adminTenantCount(ctx.deps, started.runtimeUrl, started.adminKey)) === 0)
-        ctx.deps.err(TENANT_HINT);
     return 0;
 }
-async function stop(ctx, args) {
-    if (args.length)
-        throw usageError("Usage: nylorun stop");
+async function stop(deps, args) {
+    const usage = "nylorun stop [--tenant <name>]";
+    const flags = parseStackFlags(args, { values: ["--tenant"] }, usage);
+    if (flags.rest.length)
+        throw usageError(`Usage: ${usage}`);
+    const ctx = await selectStack(deps, nameOption(flags));
     requireStackFiles(ctx);
-    await dockerPreflight(ctx.deps.docker);
-    const code = await ctx.deps.docker.stream(composeArgs(ctx, "stop"));
+    await dockerPreflight(deps.docker);
+    const code = await deps.docker.stream(composeArgs(ctx, "stop"));
     if (code !== 0)
         throw new CliError(`docker compose stop failed (exit ${code}).`, 1);
-    ctx.deps.out("Stopped the Nylorun stack; volumes are kept.");
+    deps.out(`Stopped Tenant ${ctx.name}; its data is kept.`);
     return 0;
 }
-async function adminTenantCount(deps, runtimeUrl, adminKey) {
-    if (!adminKey)
-        return undefined;
-    try {
-        const response = await deps.fetch(`${runtimeUrl}/v1/admin/status`, {
-            headers: {
-                authorization: `Bearer ${adminKey}`,
-                [PROTOCOL_HEADER]: String(PROTOCOL_VERSION),
-                accept: "application/json",
-            },
-            signal: AbortSignal.timeout(3000),
-            redirect: "error",
-        });
-        if (!response.ok)
-            return undefined;
-        const body = (await response.json());
-        return Array.isArray(body.tenants) ? body.tenants.length : undefined;
-    }
-    catch {
-        return undefined;
-    }
-}
 async function stackStatus(ctx) {
     const base = {
+        name: ctx.name,
         project: ctx.project,
         home: ctx.paths.root,
         state: "absent",
         runtime: { healthy: false },
         studio: { state: "absent" },
         restate: {},
+        gateway: { state: "absent", healthy: false },
         services: [],
     };
     if (!existsSync(ctx.paths.compose) || !existsSync(ctx.paths.env))
@@ -347,14 +531,15 @@ async function stackStatus(ctx) {
     const health = runtimeUrl ? await fetchHealth(ctx.deps, runtimeUrl) : undefined;
     const host = await readHostConfig(ctx.paths);
     const healthy = health?.status === "ok" && (host === undefined || health.hostId === host.hostId);
-    // The Admin API answers on the operator port; an older stack has only the Runtime port.
+    // The Admin API answers on the operator port; an older Host root has only the Runtime port.
     const adminUrl = persisted.adminPort
         ? `http://${STACK_CLIENT_HOST}:${persisted.adminPort}`
         : runtimeUrl;
-    const tenants = healthy && adminUrl
-        ? await adminTenantCount(ctx.deps, adminUrl, await readAdminKey(ctx.paths))
+    const tenant = healthy && adminUrl
+        ? await fetchTenant(ctx.deps, adminUrl, await readAdminKey(ctx.paths))
         : undefined;
     const studio = services.find((s) => s.service === "studio");
+    const gateway = services.find((s) => s.service === "gateway");
     return {
         ...base,
         state: services.some((s) => s.state === "running") ? "running" : "stopped",
@@ -364,8 +549,8 @@ async function stackStatus(ctx) {
             healthy,
             ...(health?.version ? { version: health.version } : {}),
             ...(health?.hostId ? { hostId: health.hostId } : {}),
-            ...(tenants !== undefined ? { tenants } : {}),
         },
+        ...(tenant ? { tenant } : {}),
         studio: {
             ...(persisted.studioPort ? { url: studioOrigin(persisted.studioPort) } : {}),
             state: studio ? [studio.state, studio.health].filter(Boolean).join(", ") : "absent",
@@ -376,29 +561,46 @@ async function stackStatus(ctx) {
         restate: persisted.restatePort
             ? { url: `http://${STACK_CLIENT_HOST}:${persisted.restatePort}` }
             : {},
+        gateway: {
+            state: gateway ? [gateway.state, gateway.health].filter(Boolean).join(", ") : "absent",
+            healthy: isUp(services, "gateway"),
+        },
         services,
     };
 }
 /** What `nylorun status` reports, as data (`nylorun doctor`). */
-export async function readStackStatus(deps) {
-    return await stackStatus(context(deps));
-}
-async function status(ctx, args) {
-    const flags = parseStackFlags(args, { booleans: ["--json"] }, "nylorun status [--json]");
+export async function readStackStatus(deps, options = {}) {
+    await moveStackRoots(nylorunRoot(deps), deps.err);
+    return await stackStatus(await selectStack(deps, options));
+}
+function describeTenant(tenant) {
+    const who = `${tenant.id ?? "(no id yet)"}${tenant.name ? ` (${tenant.name})` : ""}`;
+    if (tenant.state === "open")
+        return `${who}  open`;
+    return tenant.cause
+        ? `${who}  unavailable: ${tenant.cause.code}: ${tenant.cause.message} ${tenant.cause.repair}`
+        : `${who}  unavailable (opening)`;
+}
+async function status(deps, args) {
+    const usage = "nylorun status [--tenant <name>] [--json]";
+    const flags = parseStackFlags(args, { booleans: ["--json"], values: ["--tenant"] }, usage);
     if (flags.rest.length)
-        throw usageError("Usage: nylorun status [--json]");
-    const result = await stackStatus(ctx);
-    const { out } = ctx.deps;
+        throw usageError(`Usage: ${usage}`);
+    const result = await stackStatus(await selectStack(deps, nameOption(flags)));
+    const { out } = deps;
     if (flags.booleans.has("--json")) {
         out(JSON.stringify(result, null, 2));
     }
     else if (result.state === "absent") {
-        out(`Stack       absent (no stack under ${result.home}; run "nylorun start")`);
+        out(`Tenant      ${result.name} absent (nothing under ${result.home}; run "nylorun start")`);
     }
     else {
-        out(`Stack       ${result.state} (project ${result.project})`);
+        out(`Tenant      ${result.name}  ${result.state} (Compose project ${result.project})`);
+        out(`Host root   ${result.home} (admin key in host-credentials.json, mode 0600)`);
+        if (result.tenant)
+            out(`Tenant id   ${describeTenant(result.tenant)}`);
         const runtimeDetail = result.runtime.healthy
-            ? `healthy, ${result.runtime.version ?? "?"}, ${result.runtime.hostId ?? "?"}${result.runtime.tenants !== undefined ? `, ${result.runtime.tenants} Tenant(s)` : ""}`
+            ? `healthy, ${result.runtime.version ?? "?"}, ${result.runtime.hostId ?? "?"}`
             : "not answering";
         out(`Runtime     ${result.runtime.url ?? "?"}  ${runtimeDetail}`);
         if (result.runtime.adminUrl)
@@ -406,6 +608,7 @@ async function status(ctx, args) {
         out(`Studio      ${result.studio.url ?? "?"}  ${result.studio.state} (log in with "nylorun studio")`);
         if (result.studio.embedOrigins?.length)
             out(`Embeds      ${result.studio.embedOrigins.join(" ")}  (may show Studio in a frame)`);
+        out(`Gateway     ${result.gateway.state} (the Model Gate; model calls fail while it is down)`);
         if (result.restate.url)
             out(`Restate UI  ${result.restate.url}`);
         out(`Services    ${STACK_SERVICES.map((name) => {
@@ -415,13 +618,12 @@ async function status(ctx, args) {
                 : "absent";
             return `${name} ${state}`;
         }).join(", ")}`);
-        out(`Host root   ${result.home} (admin key in host-credentials.json, mode 0600)`);
     }
     return result.runtime.healthy ? 0 : 3;
 }
-async function logs(ctx, args) {
-    const usage = `nylorun logs [${STACK_SERVICES.join("|")}] [-f] [--tail <n>]`;
-    const flags = parseStackFlags(args, { booleans: ["--follow"], values: ["--tail"], aliases: { "-f": "--follow" } }, usage);
+async function logs(deps, args) {
+    const usage = `nylorun logs [${STACK_SERVICES.join("|")}] [--tenant <name>] [-f] [--tail <n>]`;
+    const flags = parseStackFlags(args, { booleans: ["--follow"], values: ["--tail", "--tenant"], aliases: { "-f": "--follow" } }, usage);
     if (flags.rest.length > 1)
         throw usageError(`Usage: ${usage}`);
     const service = flags.rest[0];
@@ -430,19 +632,22 @@ async function logs(ctx, args) {
     const tail = flags.values.get("--tail");
     if (tail !== undefined && !/^\d+$/.test(tail))
         throw usageError(`Invalid --tail: ${tail}`);
+    const ctx = await selectStack(deps, nameOption(flags));
     requireStackFiles(ctx);
-    await dockerPreflight(ctx.deps.docker);
-    return await ctx.deps.docker.stream(composeArgs(ctx, "logs", ...(flags.booleans.has("--follow") ? ["--follow"] : []), ...(tail !== undefined ? ["--tail", tail] : []), ...(service ? [service] : [])));
+    await dockerPreflight(deps.docker);
+    return await deps.docker.stream(composeArgs(ctx, "logs", ...(flags.booleans.has("--follow") ? ["--follow"] : []), ...(tail !== undefined ? ["--tail", tail] : []), ...(service ? [service] : [])));
 }
-async function reset(ctx, args) {
-    const flags = parseStackFlags(args, { booleans: ["--yes"], aliases: { "-y": "--yes" } }, "nylorun reset [--yes]");
+async function reset(deps, args) {
+    const usage = "nylorun reset [--tenant <name>] [--yes]";
+    const flags = parseStackFlags(args, { booleans: ["--yes"], values: ["--tenant"], aliases: { "-y": "--yes" } }, usage);
     if (flags.rest.length)
-        throw usageError("Usage: nylorun reset [--yes]");
-    const { deps, paths } = ctx;
+        throw usageError(`Usage: ${usage}`);
+    const ctx = await selectStack(deps, nameOption(flags));
+    const { paths } = ctx;
     if (!flags.booleans.has("--yes")) {
-        const question = `Delete the stack's volumes (project ${ctx.project}) and every Tenant under ${paths.tenants}? This cannot be undone. [y/N] `;
+        const question = `Delete Tenant ${ctx.name}'s volumes (Compose project ${ctx.project}), its Tenant directory ${paths.tenant} and its vault key ${paths.vaultKey}? Its data is lost, and the next start creates the Tenant anew, with a new id. [y/N] `;
         if (!deps.confirm)
-            throw usageError("nylorun reset deletes all Tenants; pass --yes to confirm when not in a terminal.");
+            throw usageError(`nylorun reset deletes all of Tenant ${ctx.name}'s data; pass --yes to confirm when not in a terminal.`);
         if (!(await deps.confirm(question))) {
             deps.err("Reset cancelled.");
             return 1;
@@ -454,12 +659,97 @@ async function reset(ctx, args) {
         if (code !== 0)
             throw new CliError(`docker compose down failed (exit ${code}).`, 1);
     }
-    await rm(paths.tenants, { recursive: true, force: true });
-    await mkdir(paths.tenants, { recursive: true, mode: 0o700 });
-    deps.out(`Reset the Nylorun stack: volumes and Tenant directories deleted. Run "nylorun start" to start again.`);
+    await rm(paths.tenant, { recursive: true, force: true });
+    await mkdir(paths.tenant, { recursive: true, mode: 0o700 });
+    // The vault key goes with the Tenant's data; the next start writes a new one.
+    await rm(paths.keys, { recursive: true, force: true });
+    deps.out(`Reset Tenant ${ctx.name}: its volumes, Tenant directory and vault key deleted. Run "nylorun start" to create it anew (it relinks the project).`);
     return 0;
 }
-/** The stack when the Runtime (and Studio, if wanted) already answer; otherwise undefined. */
+/** Compose projects on this Docker engine and whether any container runs; undefined without Docker. */
+async function composeProjects(docker) {
+    const result = await docker.run(["compose", "ls", "--all", "--format", "json"]);
+    if (result.code !== 0)
+        return undefined;
+    try {
+        const text = result.stdout.trim();
+        const rows = (text === "" ? [] : JSON.parse(text));
+        return new Map(rows.map((row) => [
+            String(row.Name ?? ""),
+            /running/.test(String(row.Status ?? "")) ? "running" : "stopped",
+        ]));
+    }
+    catch {
+        return undefined;
+    }
+}
+async function ls(deps, args) {
+    const usage = "nylorun ls [--json]";
+    const flags = parseStackFlags(args, { booleans: ["--json"] }, usage);
+    if (flags.rest.length)
+        throw usageError(`Usage: ${usage}`);
+    const base = nylorunRoot(deps);
+    const projects = await composeProjects(deps.docker);
+    const state = (project) => (projects ? (projects.get(project) ?? "stopped") : "unknown");
+    const tenants = [];
+    for (const entry of await listTenants(base)) {
+        const persisted = (await readStackEnv(stackPaths(entry.root))) ?? {};
+        tenants.push({
+            name: entry.name,
+            root: entry.root,
+            ...(entry.record.project ? { project: entry.record.project } : {}),
+            state: state(`nylorun-${entry.name}`),
+            ...(persisted.runtimePort
+                ? { runtimeUrl: `http://${STACK_CLIENT_HOST}:${persisted.runtimePort}` }
+                : {}),
+            ...(persisted.studioPort ? { studioUrl: studioOrigin(persisted.studioPort) } : {}),
+            ports: {
+                ...(persisted.runtimePort ? { runtime: persisted.runtimePort } : {}),
+                ...(persisted.adminPort ? { admin: persisted.adminPort } : {}),
+                ...(persisted.studioPort ? { studio: persisted.studioPort } : {}),
+                ...(persisted.restatePort ? { restate: persisted.restatePort } : {}),
+            },
+        });
+    }
+    if (flags.booleans.has("--json")) {
+        deps.out(JSON.stringify({ tenants }, null, 2));
+        return 0;
+    }
+    if (tenants.length === 0) {
+        deps.out('No Tenants on this machine. Run "npx nylorun start" in a project (or anywhere, for the default Tenant).');
+        return 0;
+    }
+    const width = Math.max(6, ...tenants.map((tenant) => tenant.name.length)) + 2;
+    deps.out(`${"TENANT".padEnd(width)}${"STATE".padEnd(9)}${"RUNTIME".padEnd(24)}${"STUDIO".padEnd(24)}PROJECT`);
+    for (const tenant of tenants)
+        deps.out(`${tenant.name.padEnd(width)}${tenant.state.padEnd(9)}${(tenant.runtimeUrl ?? "-").padEnd(24)}${(tenant.studioUrl ?? "-").padEnd(24)}${tenant.project ?? "-"}`);
+    return 0;
+}
+async function deleteStack(deps, args) {
+    const usage = "nylorun delete <tenant> --yes";
+    const flags = parseStackFlags(args, { booleans: ["--yes"], aliases: { "-y": "--yes" } }, usage);
+    const [name, ...extra] = flags.rest;
+    if (name === undefined || extra.length)
+        throw usageError(`Usage: ${usage}`);
+    assertTenantName(name, "The Tenant name");
+    const base = nylorunRoot(deps);
+    const ctx = { deps, project: stackProject(deps.env, name), paths: stackPaths(tenantRoot(base, name)) };
+    if (!existsSync(ctx.paths.root))
+        throw new CliError(`No Tenant ${name} under ${tenantsDir(base)}. See "nylorun ls".`, 3);
+    if (!flags.booleans.has("--yes"))
+        throw usageError(`nylorun delete removes Tenant ${name}: its containers, volumes and Host root ${ctx.paths.root}, with its vault key (KEK) and all its data. This cannot be undone; pass --yes to confirm.`);
+    await dockerPreflight(deps.docker);
+    const files = existsSync(ctx.paths.compose) && existsSync(ctx.paths.env);
+    const code = await deps.docker.stream(files
+        ? composeArgs(ctx, "down", "--volumes", "--remove-orphans")
+        : ["compose", "--project-name", ctx.project, "down", "--volumes", "--remove-orphans"]);
+    if (code !== 0)
+        throw new CliError(`docker compose down failed (exit ${code}).`, 1);
+    await rm(ctx.paths.root, { recursive: true, force: true });
+    deps.out(`Deleted Tenant ${name}: its containers, volumes and Host root (vault key included).`);
+    return 0;
+}
+/** The Tenant when the Runtime (and Studio, if wanted) already answer; otherwise undefined. */
 async function runningStack(ctx, options) {
     if (!existsSync(ctx.paths.compose) || !existsSync(ctx.paths.env))
         return undefined;
@@ -471,7 +761,7 @@ async function runningStack(ctx, options) {
     if (typeof host?.hostId !== "string")
         return undefined;
     const services = await composePs(ctx);
-    if (!isUp(services, "runtime"))
+    if (!isUp(services, "runtime") || !isUp(services, "gateway"))
         return undefined;
     const studioUp = isUp(services, "studio");
     if (options.studio && !studioUp)
@@ -481,8 +771,12 @@ async function runningStack(ctx, options) {
     if (health?.status !== "ok" || health.hostId !== host.hostId)
         return undefined;
     return {
+        name: ctx.name,
         home: ctx.paths.root,
         runtimeUrl,
+        adminUrl: persisted.adminPort
+            ? `http://${STACK_CLIENT_HOST}:${persisted.adminPort}`
+            : runtimeUrl,
         hostId: host.hostId,
         adminKey,
         studioPort: persisted.studioPort,
@@ -490,22 +784,18 @@ async function runningStack(ctx, options) {
         started: false,
     };
 }
-/**
- * Start the stack unless it is already running (`nylorun studio`): the
- * `start` code path without its own output. Compose progress
- * still streams, since the first run pulls images.
- */
-export async function ensureStack(deps, options) {
-    const ctx = context(deps);
-    await dockerPreflight(deps.docker);
+async function ensureSelected(ctx, options) {
+    await dockerPreflight(ctx.deps.docker);
     const running = await runningStack(ctx, options);
     if (running)
         return running;
     const runtimeWasUp = isUp(existsSync(ctx.paths.compose) ? await composePs(ctx) : [], "runtime");
     const started = await bringUp(ctx, options);
     return {
+        name: ctx.name,
         home: ctx.paths.root,
         runtimeUrl: started.runtimeUrl,
+        adminUrl: started.adminUrl,
         hostId: started.hostId,
         adminKey: started.adminKey,
         studioPort: started.studioPort,
@@ -513,6 +803,14 @@ export async function ensureStack(deps, options) {
         started: !runtimeWasUp,
     };
 }
+/**
+ * Start the selected Tenant unless it is already running (`nylorun studio`): the
+ * `start` code path without its output, its Tenant wait or the Project link. Compose
+ * progress still streams, since the first run pulls images.
+ */
+export async function ensureStack(deps, options) {
+    return await ensureSelected(await selectStack(deps, options.name === undefined ? {} : { name: options.name }), options);
+}
 /** Add Studio's `next` path (e.g. `/tenants/<id>`) to a login URL. */
 export function withNext(loginUrl, next) {
     if (!next)
@@ -521,42 +819,54 @@ export function withNext(loginUrl, next) {
     url.searchParams.set("next", next);
     return url.toString();
 }
-/** The Studio page for one Tenant, as a login `next` path. */
+/** The Tenant's Studio page, as a login `next` path. */
 export function tenantStudioPath(tenantId) {
     return `/tenants/${encodeURIComponent(tenantId)}`;
 }
 /**
- * Mint a fresh Studio login URL on a running stack, landing on `next`.
+ * Mint a fresh Studio login URL on a running Tenant, landing on `next`.
  * Undefined (after a warning) when Studio does not answer.
  */
-export async function studioLoginUrl(deps, stack, next) {
-    const login = await tryStudioLogin(context(deps), stack.studioPort, stack.adminKey);
+export async function studioLoginUrl(deps, running, next) {
+    const login = await tryStudioLogin({ deps }, running.studioPort, running.adminKey);
     return login === undefined ? undefined : withNext(login, next);
 }
-async function studio(ctx, args, options = {}) {
-    const flags = parseStackFlags(args, { booleans: ["--no-open"] }, "nylorun studio [--no-open]");
+async function studio(deps, args, options = {}) {
+    const usage = "nylorun studio [--tenant <name>] [--no-open]";
+    const flags = parseStackFlags(args, { booleans: ["--no-open"], values: ["--tenant"] }, usage);
     if (flags.rest.length)
-        throw usageError("Usage: nylorun studio [--no-open]");
-    const stack = await ensureStack(ctx.deps, { studio: true });
-    if (stack.started)
-        ctx.deps.out(`Runtime   ${stack.runtimeUrl}`);
-    if (!stack.studioUp)
+        throw usageError(`Usage: ${usage}`);
+    const ctx = await selectStack(deps, nameOption(flags));
+    const running = await ensureSelected(ctx, { studio: true });
+    if (running.started)
+        deps.out(`Runtime   ${running.runtimeUrl}`);
+    if (!running.studioUp)
         throw new CliError(`Studio did not start. See "nylorun logs studio".`, 7);
-    const login = await studioLoginUrl(ctx.deps, stack, options.next);
+    // Studio serves the one Tenant; the link's Tenant id stands in while it is opening.
+    let next = options.next;
+    if (next === undefined) {
+        const tenant = await fetchTenant(deps, running.adminUrl, running.adminKey);
+        const linked = ctx.link?.tenant === ctx.name ? ctx.link.tenantId : undefined;
+        const tenantId = tenant?.id ?? linked;
+        if (tenantId)
+            next = tenantStudioPath(tenantId);
+    }
+    const login = await studioLoginUrl(deps, running, next);
     if (!login)
         return 1;
     if (flags.booleans.has("--no-open")) {
-        ctx.deps.out(`Studio    ${login}`);
+        deps.out(`Studio    ${login}`);
         return 0;
     }
-    const origin = studioOrigin(stack.studioPort);
-    ctx.deps.out(`Studio    ${options.next ? new URL(options.next, origin).toString() : origin}`);
-    await openLogin(ctx, login);
+    const origin = studioOrigin(running.studioPort);
+    deps.out(`Studio    ${next ? new URL(next, origin).toString() : origin}`);
+    await openLogin({ deps }, login);
     return 0;
 }
-/** `nylorun studio`, landing on `next` (the linked Project's Tenant) when given. */
+/** `nylorun studio`, landing on `next` when given, else on the Tenant's page. */
 export async function runStudioCommand(args, deps, options = {}) {
-    return await studio(context(deps), args, options);
+    await moveStackRoots(nylorunRoot(deps), deps.err);
+    return await studio(deps, args, options);
 }
 const COMMANDS = {
     start,
@@ -567,15 +877,18 @@ const COMMANDS = {
     status,
     logs,
     reset,
-    studio: (ctx, args) => studio(ctx, args),
+    studio: (deps, args) => studio(deps, args),
+    ls,
+    delete: deleteStack,
 };
 export function isStackCommand(name) {
     return name !== undefined && Object.hasOwn(COMMANDS, name);
 }
-/** Run one stack command (`up`/`start`, `down`/`stop`, `status`, `logs`, `reset`, `studio`). */
+/** Run one Tenant command (`up`/`start`, `down`/`stop`, `status`, `logs`, `reset`, `studio`, `ls`, `delete`). */
 export async function runStackCommand(name, args, deps) {
     const command = COMMANDS[name];
     if (!command)
-        throw usageError(`Unknown stack command ${name}.\n${stackUsage}`);
-    return await command(context(deps), args);
+        throw usageError(`Unknown command ${name}.\n${stackUsage}`);
+    await moveStackRoots(nylorunRoot(deps), deps.err);
+    return await command(deps, args);
 }