nylorun 0.5.0-beta → 0.6.0-beta

package/dist/stack/commands.js

@@ -8,28 +8,29 @@ import { readProjectCredentials, readProjectLink, writeProjectCredentials, write
 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 { dockerPreflight, formatBytes, parseComposePs, tenantMemory, } 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 { disconnectProxy, ensureProxySettings, PROXY_PROJECT, proxyDisabled, proxyOrigin, readProxySettings, readProxyStatus, refreshProxyRoutes, startProxy, stopProxy, } from "./proxy.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", "gateway", "runtime", "studio"];
-const CORE_SERVICES = ["postgres", "restate", "s2", "gateway", "runtime"];
+export const STACK_SERVICES = ["postgres", "restate", "s2-lite", "gateway", "runtime", "studio"];
+const CORE_SERVICES = ["postgres", "restate", "s2-lite", "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
+  down|stop [--tenant <name> | --all] stop the Tenant's containers (--all: every Tenant's, and the Studio proxy); 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
+  ls [--json]                         the Tenants on this machine, with their memory in use
   delete <tenant> --yes               remove a Tenant: containers, volumes and its Host root, with the vault key (KEK)`;
 const usageError = (message) => new CliError(message, 2);
 /** The Compose project of Tenant `name`: `nylorun-<name>`, or `NYLORUN_COMPOSE_PROJECT`. */
@@ -42,6 +43,57 @@ export function stackProject(env, name) {
 function nylorunRoot(deps) {
     return deps.nylorunRoot ?? defaultNylorunRoot();
 }
+/**
+ * The Studio proxy serves the machine's Tenants (`~/.nylorun/tenants`), unless
+ * NYLORUN_PROXY_DISABLED=1; a Host root or Compose project of its own (NYLORUN_HOME,
+ * NYLORUN_COMPOSE_PROJECT, as the repository's smokes use) is outside it.
+ */
+function proxied(ctx) {
+    const { env } = ctx.deps;
+    return !proxyDisabled(env) && !env.NYLORUN_HOME?.trim() && !env.NYLORUN_COMPOSE_PROJECT?.trim();
+}
+/** Studio's URL for browsers: through the proxy when it serves the Tenant, else its own port. */
+async function studioUrl(ctx, studioPort) {
+    const settings = proxied(ctx) ? await readProxySettings(nylorunRoot(ctx.deps)) : undefined;
+    return settings ? proxyOrigin(ctx.name, settings.port) : studioOrigin(studioPort);
+}
+/** The proxy's routes: every Tenant on this machine. */
+async function proxyRoutes(deps) {
+    return (await listTenants(nylorunRoot(deps))).map((tenant) => ({
+        name: tenant.name,
+        project: stackProject(deps.env, tenant.name),
+    }));
+}
+/**
+ * Compose's names for a 0.5 Tenant's volumes (`<project>_postgres`, …) that exist on this
+ * engine, and whether this release's `<project>-postgres` does.
+ */
+async function oldVolumes(docker, project) {
+    const result = await docker.run(["volume", "ls", "--quiet", "--filter", `name=${project}`]);
+    const names = new Set(result.code === 0 ? result.stdout.split(/\s+/) : []);
+    return {
+        old: ["postgres", "restate", "s2", "workspaces"]
+            .map((volume) => `${project}_${volume}`)
+            .filter((name) => names.has(name)),
+        current: names.has(`${project}-postgres`),
+    };
+}
+/**
+ * Before `docker compose down` (`reset`, `delete`): detach the proxy from the Tenant's network
+ * so Compose can remove it. After it: drop a 0.5 Tenant's volumes and network.
+ */
+async function composeDown(ctx, args) {
+    const { docker } = ctx.deps;
+    await disconnectProxy(docker, ctx.project);
+    const code = await docker.stream(args);
+    if (code !== 0)
+        throw new CliError(`docker compose down failed (exit ${code}).`, 1);
+    const { old } = await oldVolumes(docker, ctx.project);
+    if (old.length) {
+        await docker.run(["volume", "rm", ...old]);
+        await docker.run(["network", "rm", `${ctx.project}_default`]);
+    }
+}
 async function tenantNames(deps) {
     const names = (await listTenants(nylorunRoot(deps))).map((tenant) => tenant.name);
     return names.length ? ` Tenants on this machine: ${names.join(", ")}.` : "";
@@ -285,10 +337,10 @@ async function refuseDowngrade(ctx, allowDowngrade) {
     }
     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)
+/** Ports the Tenants on this machine keep in their `.env` (but the one under `except`). */
+async function tenantPorts(base, except) {
+    const others = (await listTenants(base))
+        .filter((tenant) => resolve(tenant.root) !== except)
         .map((tenant) => stackPaths(tenant.root));
     const reserved = new Set();
     for (const paths of others) {
@@ -304,14 +356,31 @@ async function reservedPorts(ctx) {
     }
     return reserved;
 }
+/** Ports other Tenants and the proxy keep, so a new Tenant avoids them. */
+async function reservedPorts(ctx) {
+    const base = nylorunRoot(ctx.deps);
+    const reserved = await tenantPorts(base, ctx.paths.root);
+    const proxy = await readProxySettings(base);
+    if (proxy)
+        reserved.add(proxy.port);
+    return reserved;
+}
 async function bringUp(ctx, options) {
     const { deps } = ctx;
     await refuseLauncherRuntime(ctx);
     const overridden = runtimeImageOverridden(deps.env);
     if (!overridden)
         await refuseDowngrade(ctx, options.allowDowngrade ?? false);
-    const telemetry = await readTelemetry(nylorunRoot(deps));
+    const legacy = await oldVolumes(deps.docker, ctx.project);
+    if (legacy.old.length && !legacy.current)
+        throw new CliError(`Tenant ${ctx.name} was created by nylorun 0.5; its data is in the old volumes ${legacy.old.join(", ")}. Run "nylorun reset --tenant ${ctx.name}" to start it fresh; that also removes the old volumes (or drop them yourself with "docker volume rm ${legacy.old.join(" ")}").`, 3);
+    const base = nylorunRoot(deps);
+    const telemetry = await readTelemetry(base);
     const analytics = telemetryDecision(deps.env, telemetry).enabled;
+    // The proxy's port avoids every Tenant's; a new Tenant's ports then avoid the proxy's.
+    const proxy = proxied(ctx)
+        ? await ensureProxySettings(base, deps.ports, await tenantPorts(base))
+        : undefined;
     const prepared = await prepareStack({
         paths: ctx.paths,
         name: ctx.name,
@@ -331,6 +400,7 @@ async function bringUp(ctx, options) {
             : {}),
         ...(options.studioEmbedOrigins ? { studioEmbedOrigins: options.studioEmbedOrigins } : {}),
         ...(analytics ? { studioAnalyticsId: STUDIO_ANALYTICS_ID } : {}),
+        ...(proxy ? { studioPublicOrigin: proxyOrigin(ctx.name, proxy.port) } : {}),
     });
     if (analytics && options.studio && telemetry.noticeShown === undefined) {
         deps.err(TELEMETRY_NOTICE);
@@ -360,30 +430,59 @@ async function bringUp(ctx, options) {
         if (!studioStarted)
             deps.err(`Warning: Studio did not start (image ${prepared.env.studioImage}). The Runtime is up; see "nylorun logs studio".`);
     }
+    let studioUrl = studioOrigin(prepared.env.studioPort);
+    if (studioStarted && proxy) {
+        const up = await startProxy({
+            docker: deps.docker,
+            base,
+            settings: proxy,
+            routes: await proxyRoutes(deps),
+            err: deps.err,
+            ...(deps.pollMs !== undefined ? { pollMs: deps.pollMs } : {}),
+        });
+        if (up)
+            studioUrl = proxyOrigin(ctx.name, proxy.port);
+    }
     return {
         runtimeUrl,
         adminUrl,
         hostId: prepared.host.hostId,
         studioPort: prepared.env.studioPort,
+        studioUrl,
         studioStarted,
         adminKey: prepared.adminKey,
     };
 }
-async function tryStudioLogin(ctx, studioPort, adminKey) {
-    const deadline = Date.now() + (ctx.deps.loginTimeoutMs ?? 15_000);
+const errorText = (error) => (error instanceof Error ? error.message : String(error));
+/**
+ * A login URL on Studio's URL: through the proxy when it serves the Tenant (once; a proxy that
+ * does not answer falls back, saying so), else on Studio's own port, retried while it starts.
+ */
+async function tryStudioLogin(ctx, studio, adminKey) {
+    const { deps } = ctx;
+    const origin = studioOrigin(studio.port);
+    if (studio.url !== origin) {
+        try {
+            return await mintStudioLogin({ fetch: deps.fetch, origin: studio.url, adminKey });
+        }
+        catch (error) {
+            deps.err(`Studio did not answer through the proxy at ${studio.url} (${errorText(error)}); signing in at ${origin} instead.`);
+        }
+    }
+    const deadline = Date.now() + (deps.loginTimeoutMs ?? 15_000);
     let lastError = "";
     for (;;) {
         try {
-            return await mintStudioLogin({ fetch: ctx.deps.fetch, studioPort, adminKey });
+            return await mintStudioLogin({ fetch: deps.fetch, origin, adminKey });
         }
         catch (error) {
-            lastError = error instanceof Error ? error.message : String(error);
+            lastError = errorText(error);
         }
         if (Date.now() > deadline)
             break;
-        await sleep(ctx.deps.pollMs ?? 500);
+        await sleep(deps.pollMs ?? 500);
     }
-    ctx.deps.err(`Warning: Studio at ${studioOrigin(studioPort)} is not reachable for a login (${lastError}).`);
+    deps.err(`Warning: Studio at ${origin} is not reachable for a login (${lastError}).`);
     return undefined;
 }
 /** Printed by `start` when it does not open Studio itself. */
@@ -483,22 +582,46 @@ async function start(deps, args) {
     deps.out(`Tenant    ${ctx.name}  (${tenant.id})`);
     deps.out(`Runtime   ${started.runtimeUrl}`);
     if (started.studioStarted) {
-        deps.out(`Studio    ${studioOrigin(started.studioPort)}`);
+        deps.out(`Studio    ${started.studioUrl}`);
         if (opensBrowser(deps, flags)) {
-            const login = await tryStudioLogin(ctx, started.studioPort, started.adminKey);
+            const login = await tryStudioLogin(ctx, { port: started.studioPort, url: started.studioUrl }, started.adminKey);
             if (login)
                 await openLogin(ctx, withNext(login, tenantStudioPath(tenant.id)));
         }
         else
             deps.err(STUDIO_SIGN_IN_HINT);
     }
+    await alsoRunning(ctx);
     return 0;
 }
+/** After `start`: the machine's other running Tenants and their memory, on stderr. */
+async function alsoRunning(ctx) {
+    const { deps } = ctx;
+    const projects = await composeProjects(deps.docker);
+    if (!projects)
+        return;
+    const others = (await listTenants(nylorunRoot(deps)))
+        .map((tenant) => tenant.name)
+        .filter((name) => name !== ctx.name && projects.get(`nylorun-${name}`) === "running");
+    if (others.length === 0)
+        return;
+    const memory = await tenantMemory(deps.docker);
+    const sizes = others.map((name) => memory?.get(name));
+    const total = sizes.every((size) => size !== undefined)
+        ? sizes.reduce((sum, size) => sum + size, 0)
+        : undefined;
+    deps.err(`Also running: ${others.join(", ")}${total === undefined ? "" : ` (about ${formatBytes(total)})`}. "nylorun stop --all" stops them all.`);
+}
 async function stop(deps, args) {
-    const usage = "nylorun stop [--tenant <name>]";
-    const flags = parseStackFlags(args, { values: ["--tenant"] }, usage);
+    const usage = "nylorun stop [--tenant <name> | --all]";
+    const flags = parseStackFlags(args, { booleans: ["--all"], values: ["--tenant"] }, usage);
     if (flags.rest.length)
         throw usageError(`Usage: ${usage}`);
+    if (flags.booleans.has("--all")) {
+        if (flags.values.has("--tenant"))
+            throw usageError(`--all and --tenant are exclusive. Usage: ${usage}`);
+        return await stopAll(deps);
+    }
     const ctx = await selectStack(deps, nameOption(flags));
     requireStackFiles(ctx);
     await dockerPreflight(deps.docker);
@@ -508,6 +631,34 @@ async function stop(deps, args) {
     deps.out(`Stopped Tenant ${ctx.name}; its data is kept.`);
     return 0;
 }
+/** `stop --all`: every running Tenant on this machine, then the Studio proxy; volumes are kept. */
+async function stopAll(deps) {
+    await dockerPreflight(deps.docker);
+    const projects = (await composeProjects(deps.docker)) ?? new Map();
+    const stopped = [];
+    for (const tenant of await listTenants(nylorunRoot(deps))) {
+        const project = `nylorun-${tenant.name}`;
+        if (projects.get(project) !== "running")
+            continue;
+        const paths = stackPaths(tenant.root);
+        const code = await deps.docker.stream(existsSync(paths.compose) && existsSync(paths.env)
+            ? composeArgs({ project, paths }, "stop")
+            : ["compose", "--project-name", project, "stop"]);
+        if (code !== 0)
+            throw new CliError(`docker compose stop failed for Tenant ${tenant.name} (exit ${code}).`, 1);
+        stopped.push(tenant.name);
+    }
+    const proxy = projects.get(PROXY_PROJECT) === "running" && (await stopProxy(deps.docker));
+    deps.out(stopped.length
+        ? `Stopped Tenants ${stopped.join(", ")}${proxy ? " and the Studio proxy" : ""}; their data is kept.`
+        : `No Tenant was running${proxy ? "; stopped the Studio proxy" : ""}.`);
+    return 0;
+}
+async function studioUrls(ctx, port) {
+    const url = await studioUrl(ctx, port);
+    const direct = studioOrigin(port);
+    return url === direct ? { url } : { url: direct, proxyUrl: url };
+}
 async function stackStatus(ctx) {
     const base = {
         name: ctx.name,
@@ -552,7 +703,7 @@ async function stackStatus(ctx) {
         },
         ...(tenant ? { tenant } : {}),
         studio: {
-            ...(persisted.studioPort ? { url: studioOrigin(persisted.studioPort) } : {}),
+            ...(persisted.studioPort ? await studioUrls(ctx, persisted.studioPort) : {}),
             state: studio ? [studio.state, studio.health].filter(Boolean).join(", ") : "absent",
             ...(persisted.studioFrameAncestors
                 ? { embedOrigins: persisted.studioFrameAncestors }
@@ -568,6 +719,10 @@ async function stackStatus(ctx) {
         services,
     };
 }
+/** The Studio proxy, as data (`nylorun doctor`). */
+export async function readProxyReport(deps) {
+    return await readProxyStatus(deps.docker, nylorunRoot(deps), deps.env);
+}
 /** What `nylorun status` reports, as data (`nylorun doctor`). */
 export async function readStackStatus(deps, options = {}) {
     await moveStackRoots(nylorunRoot(deps), deps.err);
@@ -605,7 +760,8 @@ async function status(deps, args) {
         out(`Runtime     ${result.runtime.url ?? "?"}  ${runtimeDetail}`);
         if (result.runtime.adminUrl)
             out(`Admin API   ${result.runtime.adminUrl}  (operators only, never proxied)`);
-        out(`Studio      ${result.studio.url ?? "?"}  ${result.studio.state} (log in with "nylorun studio")`);
+        const also = result.studio.proxyUrl ? `also ${result.studio.url}; ` : "";
+        out(`Studio      ${result.studio.proxyUrl ?? result.studio.url ?? "?"}  ${result.studio.state} (${also}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)`);
@@ -655,9 +811,7 @@ async function reset(deps, args) {
     }
     if (existsSync(paths.compose) && existsSync(paths.env)) {
         await dockerPreflight(deps.docker);
-        const code = await deps.docker.stream(composeArgs(ctx, "down", "--volumes", "--remove-orphans"));
-        if (code !== 0)
-            throw new CliError(`docker compose down failed (exit ${code}).`, 1);
+        await composeDown(ctx, composeArgs(ctx, "down", "--volumes", "--remove-orphans"));
     }
     await rm(paths.tenant, { recursive: true, force: true });
     await mkdir(paths.tenant, { recursive: true, mode: 0o700 });
@@ -691,18 +845,30 @@ async function ls(deps, args) {
     const base = nylorunRoot(deps);
     const projects = await composeProjects(deps.docker);
     const state = (project) => (projects ? (projects.get(project) ?? "stopped") : "unknown");
+    const memory = [...(projects?.values() ?? [])].includes("running")
+        ? await tenantMemory(deps.docker)
+        : undefined;
+    const proxy = proxyDisabled(deps.env) ? undefined : await readProxySettings(base);
     const tenants = [];
     for (const entry of await listTenants(base)) {
         const persisted = (await readStackEnv(stackPaths(entry.root))) ?? {};
+        const tenantState = state(`nylorun-${entry.name}`);
         tenants.push({
             name: entry.name,
             root: entry.root,
             ...(entry.record.project ? { project: entry.record.project } : {}),
-            state: state(`nylorun-${entry.name}`),
+            state: tenantState,
+            memoryBytes: (tenantState === "running" && memory?.get(entry.name)) || null,
             ...(persisted.runtimePort
                 ? { runtimeUrl: `http://${STACK_CLIENT_HOST}:${persisted.runtimePort}` }
                 : {}),
-            ...(persisted.studioPort ? { studioUrl: studioOrigin(persisted.studioPort) } : {}),
+            ...(persisted.studioPort
+                ? {
+                    studioUrl: proxy
+                        ? proxyOrigin(entry.name, proxy.port)
+                        : studioOrigin(persisted.studioPort),
+                }
+                : {}),
             ports: {
                 ...(persisted.runtimePort ? { runtime: persisted.runtimePort } : {}),
                 ...(persisted.adminPort ? { admin: persisted.adminPort } : {}),
@@ -719,10 +885,20 @@ async function ls(deps, args) {
         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 ?? "-"}`);
+    const rows = [
+        ["TENANT", "STATE", "MEMORY", "RUNTIME", "STUDIO", "PROJECT"],
+        ...tenants.map((tenant) => [
+            tenant.name,
+            tenant.state,
+            tenant.memoryBytes === null ? "-" : formatBytes(tenant.memoryBytes),
+            tenant.runtimeUrl ?? "-",
+            tenant.studioUrl ?? "-",
+            tenant.project ?? "-",
+        ]),
+    ];
+    const widths = rows[0].map((_, column) => Math.max(...rows.map((row) => row[column].length)) + 2);
+    for (const row of rows)
+        deps.out(row.map((cell, column) => (column < row.length - 1 ? cell.padEnd(widths[column]) : cell)).join(""));
     return 0;
 }
 async function deleteStack(deps, args) {
@@ -740,12 +916,11 @@ async function deleteStack(deps, args) {
         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
+    await composeDown(ctx, 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 });
+    await refreshProxyRoutes(deps.docker, base, await proxyRoutes(deps));
     deps.out(`Deleted Tenant ${name}: its containers, volumes and Host root (vault key included).`);
     return 0;
 }
@@ -780,6 +955,7 @@ async function runningStack(ctx, options) {
         hostId: host.hostId,
         adminKey,
         studioPort: persisted.studioPort,
+        studioUrl: await studioUrl(ctx, persisted.studioPort),
         studioUp,
         started: false,
     };
@@ -799,6 +975,7 @@ async function ensureSelected(ctx, options) {
         hostId: started.hostId,
         adminKey: started.adminKey,
         studioPort: started.studioPort,
+        studioUrl: started.studioUrl,
         studioUp: started.studioStarted,
         started: !runtimeWasUp,
     };
@@ -828,7 +1005,7 @@ export function tenantStudioPath(tenantId) {
  * Undefined (after a warning) when Studio does not answer.
  */
 export async function studioLoginUrl(deps, running, next) {
-    const login = await tryStudioLogin({ deps }, running.studioPort, running.adminKey);
+    const login = await tryStudioLogin({ deps }, { port: running.studioPort, url: running.studioUrl }, running.adminKey);
     return login === undefined ? undefined : withNext(login, next);
 }
 async function studio(deps, args, options = {}) {
@@ -858,7 +1035,8 @@ async function studio(deps, args, options = {}) {
         deps.out(`Studio    ${login}`);
         return 0;
     }
-    const origin = studioOrigin(running.studioPort);
+    // The login's origin: the proxy's, or Studio's own port when the proxy did not answer.
+    const origin = new URL(login).origin;
     deps.out(`Studio    ${next ? new URL(next, origin).toString() : origin}`);
     await openLogin({ deps }, login);
     return 0;

package/dist/stack/compose-file.d.ts

@@ -2,8 +2,11 @@
  * A local Tenant's Compose file (Runtime Architecture §14.3), written to
  * `<Host root>/docker/compose.yaml` by `nylorun start`. Each local Tenant is one installation
  * (tenancy.md §6): its own Compose project (`nylorun-<name>`, the file's `name`), volumes,
- * network and ports. Everything else that varies (ports, the Postgres password, UID/GID, the
- * Host root, the images, the Tenant's name) comes from `docker/.env`.
+ * network and ports. Container, network and volume names are global on the Docker engine, so
+ * every one is `<project>-<role>` (`nylorun-shop-studio`, network `nylorun-shop`, volume
+ * `nylorun-shop-postgres`), labelled `dev.nylorun.tenant: <name>`; they are written here, from
+ * the project and the Tenant's name. Everything else that varies (ports, the Postgres password,
+ * UID/GID, the Host root, the images, Studio's public origins) comes from `docker/.env`.
  *
  * The Tenant's state is its Postgres database, executed through Restate, with its
  * history in s2-lite; the Runtime's /ready checks all three. Postgres initialises the
@@ -33,4 +36,4 @@
  * it is down, model and MCP calls fail, deliveries are retried, vault writes and
  * token minting answer 503, and the session takes the next message.
  */
-export declare function renderComposeFile(project: string): string;
+export declare function renderComposeFile(project: string, name: string): string;

package/dist/stack/compose-file.js

@@ -3,8 +3,11 @@ import { PINNED_IMAGES } from "./images.js";
  * A local Tenant's Compose file (Runtime Architecture §14.3), written to
  * `<Host root>/docker/compose.yaml` by `nylorun start`. Each local Tenant is one installation
  * (tenancy.md §6): its own Compose project (`nylorun-<name>`, the file's `name`), volumes,
- * network and ports. Everything else that varies (ports, the Postgres password, UID/GID, the
- * Host root, the images, the Tenant's name) comes from `docker/.env`.
+ * network and ports. Container, network and volume names are global on the Docker engine, so
+ * every one is `<project>-<role>` (`nylorun-shop-studio`, network `nylorun-shop`, volume
+ * `nylorun-shop-postgres`), labelled `dev.nylorun.tenant: <name>`; they are written here, from
+ * the project and the Tenant's name. Everything else that varies (ports, the Postgres password,
+ * UID/GID, the Host root, the images, Studio's public origins) comes from `docker/.env`.
  *
  * The Tenant's state is its Postgres database, executed through Restate, with its
  * history in s2-lite; the Runtime's /ready checks all three. Postgres initialises the
@@ -34,13 +37,18 @@ import { PINNED_IMAGES } from "./images.js";
  * it is down, model and MCP calls fail, deliveries are retried, vault writes and
  * token minting answer 503, and the session takes the next message.
  */
-export function renderComposeFile(project) {
+export function renderComposeFile(project, name) {
     return `# Written by \`nylorun start\`; rewritten on every start. Settings live in .env.
 name: ${project}
 
+x-tenant: &tenant
+  dev.nylorun.tenant: "${name}"
+
 services:
   postgres: # Session Store
     image: ${PINNED_IMAGES.postgres}
+    container_name: ${project}-postgres
+    labels: *tenant
     # Logical replication feeds the stream relay; a stuck slot is capped at 4 GB of WAL.
     command: ["postgres", "-c", "wal_level=logical", "-c", "max_slot_wal_keep_size=4GB"]
     environment:
@@ -59,9 +67,14 @@ services:
 
   restate: # Durable Session Execution
     image: ${PINNED_IMAGES.restate}
+    container_name: ${project}-restate
+    labels: *tenant
     command: ["--node-name=restate-1"] # stable name, so data is found on restart
     environment:
       RESTATE_WORKER__INVOKER__REQUEST_IDENTITY_PRIVATE_KEY_PEM_FILE: /run/nylorun/restate-identity.pem
+      # RocksDB's memory (block cache and memtables) defaults to 2 GiB; a local Tenant needs a
+      # fraction of it, and several Tenants share a laptop.
+      RESTATE_ROCKSDB_TOTAL_MEMORY_SIZE: 256MiB
     volumes:
       - restate:/restate-data
       - \${NYLORUN_HOST_ROOT:?run nylorun start}/docker/restate-identity.pem:/run/nylorun/restate-identity.pem:ro
@@ -74,20 +87,24 @@ services:
       retries: 30
     restart: unless-stopped
 
-  s2: # Durable Streams; not published, only the Runtime reaches it
+  s2-lite: # Durable Streams; not published, only the Runtime reaches it
     image: ${PINNED_IMAGES.s2}
+    container_name: ${project}-s2-lite
+    labels: *tenant
     command: ["lite", "--local-root", "/home/nonroot/data"] # local disk; listens on port 80
     # The image runs as uid 65532. Docker fills a new volume with the image's
     # /home/nonroot, owned by that user; a volume at a path the image lacks
     # (e.g. /data) is root-owned and s2-lite cannot write it.
     volumes:
-      - s2:/home/nonroot
+      - s2-lite:/home/nonroot
     # The s2 image has no shell or HTTP client, so it has no health check;
     # the Runtime's /ready covers it.
     restart: unless-stopped
 
   gateway: # the Model and Tool Gates and keys: the vault key, credentials, signing, outbound calls; not published
     image: \${NYLORUN_RUNTIME_IMAGE:?run nylorun start}
+    container_name: ${project}-gateway
+    labels: *tenant
     command: ["--service", "gates,keys"]
     user: "\${NYLORUN_UID:?run nylorun start}:\${NYLORUN_GID:?run nylorun start}"
     depends_on:
@@ -116,12 +133,14 @@ services:
 
   runtime:
     image: \${NYLORUN_RUNTIME_IMAGE:?run nylorun start}
+    container_name: ${project}-runtime
+    labels: *tenant
     command: ["--service", "core,loop"]
     user: "\${NYLORUN_UID:?run nylorun start}:\${NYLORUN_GID:?run nylorun start}"
     depends_on:
       postgres: { condition: service_healthy }
       restate: { condition: service_healthy }
-      s2: { condition: service_started }
+      s2-lite: { condition: service_started }
     environment:
       NYLORUN_HOME: /nylorun
       NYLORUN_PACKING: combined
@@ -149,7 +168,7 @@ services:
       NYLORUN_RESTATE_ADMIN_URL: http://restate:9070
       NYLORUN_WORKER_URL: http://runtime:9080 # registered with Restate; not published
       NYLORUN_RESTATE_IDENTITY_KEY: \${NYLORUN_RESTATE_IDENTITY_KEY:?run nylorun start}
-      NYLORUN_S2_ENDPOINT: http://s2:80
+      NYLORUN_S2_ENDPOINT: http://s2-lite:80
       NYLORUN_S2_TOKEN: ignored # s2-lite has no access tokens yet
       NYLORUN_WORKSPACE_STORE_URL: file:///workspaces
       # Action endpoints on this machine: \`localhost\` in a registered URL means the Docker host.
@@ -181,6 +200,8 @@ services:
 
   studio: # dashboard + trusted proxy
     image: \${NYLORUN_STUDIO_IMAGE:?run nylorun start}
+    container_name: ${project}-studio
+    labels: *tenant
     user: "\${NYLORUN_UID}:\${NYLORUN_GID}" # reads the 0600 admin key file
     depends_on:
       runtime: { condition: service_healthy }
@@ -188,8 +209,13 @@ services:
       NYLORUN_RUNTIME_URL: http://runtime:4001 # the operator listener: Admin and Tenant API
       NYLORUN_ADMIN_KEY_FILE: /run/nylorun/host-credentials.json
       PORT: "3000"
-      # Studio's Host check accepts localhost/127.0.0.1 on the published port.
+      # Studio's Host check accepts localhost/127.0.0.1 on the published port, and the
+      # proxy's origin (http://<name>.localhost:<port>), kept in .env.
       NYLORUN_STUDIO_PUBLIC_PORT: \${NYLORUN_STUDIO_PORT}
+      NYLORUN_STUDIO_PUBLIC_ORIGINS: \${NYLORUN_STUDIO_PUBLIC_ORIGINS:-}
+      # Browsers share cookies across ports of one host: a cookie per Tenant keeps the
+      # sessions of two Studios on localhost apart.
+      NYLORUN_STUDIO_SESSION_COOKIE: nylorun_studio_${name}
       # Exact origins that may frame Studio (Babai Desktop); kept in .env.
       NYLORUN_STUDIO_FRAME_ANCESTORS: \${NYLORUN_STUDIO_FRAME_ANCESTORS:-}
       # Studio's anonymous usage analytics; empty when telemetry is off.
@@ -205,10 +231,15 @@ services:
       retries: 30
     restart: unless-stopped
 
+networks:
+  default:
+    name: ${project}
+    labels: *tenant
+
 volumes:
-  postgres: {}
-  restate: {}
-  s2: {}
-  workspaces: {}
+  postgres: { name: ${project}-postgres, labels: *tenant }
+  restate: { name: ${project}-restate, labels: *tenant }
+  s2-lite: { name: ${project}-s2-lite, labels: *tenant }
+  workspaces: { name: ${project}-workspaces, labels: *tenant }
 `;
 }

package/dist/stack/docker.d.ts

@@ -36,3 +36,13 @@ export interface ComposeService {
 }
 /** Parse `docker compose ps --format json` (a JSON array, or one object per line). */
 export declare function parseComposePs(stdout: string): ComposeService[];
+/** `123.4MiB` (from `docker stats` MemUsage) in bytes; undefined when unreadable. */
+export declare function parseByteSize(text: string): number | undefined;
+/** `812 MB`, `2.1 GB`. */
+export declare function formatBytes(bytes: number): string;
+/**
+ * Memory in use per Tenant: the sum over its running containers, found by the label
+ * `dev.nylorun.tenant`, from one `docker stats --no-stream`. Undefined when Docker does not
+ * answer; a Tenant with no running container is absent.
+ */
+export declare function tenantMemory(docker: DockerRunner): Promise<Map<string, number> | undefined>;