@nylorun/cli 0.3.0-beta → 0.4.0-beta

package/dist/project/create-tenant.d.ts

@@ -18,9 +18,11 @@ export interface CreateTenantResult {
         name: string;
     };
 }
+/** The Project's `package.json` name, else its directory name. */
+export declare function defaultTenantName(projectRoot: string): Promise<string>;
 /**
  * Create a Tenant via `@nylorun/admin` and write format-1 link + credentials.
  */
 export declare function createProjectTenant(options: CreateTenantOptions): Promise<CreateTenantResult>;
-/** Resolve Admin from the local Host root (after launcher `up`). */
+/** Resolve Admin from the local Host root (host.json and the admin key). */
 export declare function localAdmin(home?: string): Admin;

package/dist/project/create-tenant.js

@@ -5,7 +5,8 @@ import { newPrincipalId } from "@nylorun/agents";
 import { CliError } from "../errors.js";
 import { writeCredentials, } from "./credentials.js";
 import { writeLink } from "./link.js";
-async function defaultTenantName(projectRoot) {
+/** The Project's `package.json` name, else its directory name. */
+export async function defaultTenantName(projectRoot) {
     try {
         const pkg = JSON.parse(await readFile(join(projectRoot, "package.json"), "utf8"));
         if (typeof pkg.name === "string" && pkg.name.trim())
@@ -59,7 +60,7 @@ export async function createProjectTenant(options) {
         envelope: { id: created.tenant.id, name: created.tenant.name },
     };
 }
-/** Resolve Admin from the local Host root (after launcher `up`). */
+/** Resolve Admin from the local Host root (host.json and the admin key). */
 export function localAdmin(home) {
     return createAdmin(home ? { home } : undefined);
 }

package/dist/project/credentials.js

@@ -10,7 +10,7 @@ export async function readCredentials(projectRoot) {
             !/^[0-9a-f]{64}$/.test(value.applicationKey) ||
             typeof value?.principalId !== "string" ||
             value.principalId.length === 0) {
-            throw new CliError(`Invalid Project credentials at ${path}. Remove .nylorun/credentials.json and run nylorun dev.`, 1);
+            throw new CliError(`Invalid Project credentials at ${path}. Remove .nylorun/credentials.json and run nylo tenant create.`, 1);
         }
         const format = value.format === undefined || value.format === 0
             ? 0

package/dist/project/env.d.ts

@@ -0,0 +1,3 @@
+/** Three `export` lines for `nylo env` (was `nylorun status --env`, F2-7). */
+export declare function printLinkedEnvExports(projectRoot?: string): Promise<void>;
+export declare function shellQuote(value: string): string;

package/dist/project/env.js

@@ -0,0 +1,21 @@
+import { readCredentials } from "./credentials.js";
+import { readLink } from "./link.js";
+import { findProjectRoot } from "./root.js";
+/** Three `export` lines for `nylo env` (was `nylorun status --env`, F2-7). */
+export async function printLinkedEnvExports(projectRoot = process.cwd()) {
+    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 nylo tenant create 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)}`);
+}
+export function shellQuote(value) {
+    if (/^[A-Za-z0-9_./:-]+$/.test(value))
+        return value;
+    return `'${value.replace(/'/g, `'\\''`)}'`;
+}

package/dist/project/link.js

@@ -31,7 +31,7 @@ export async function readLink(projectRoot) {
             typeof value?.hostId !== "string" ||
             typeof value?.tenantId !== "string" ||
             !isTenantId(value.tenantId)) {
-            throw new CliError(`Invalid Project link at ${linkPath(projectRoot)}. Remove .nylorun/link.json and run nylorun dev.`, 1);
+            throw new CliError(`Invalid Project link at ${linkPath(projectRoot)}. Remove .nylorun/link.json and run nylo tenant create.`, 1);
         }
         const format = value.format === undefined || value.format === 0
             ? 0

package/dist/project/root.js

@@ -26,8 +26,9 @@ export function findProjectRoot(cwd = process.cwd()) {
     const root = parse(directory).root;
     let fallback;
     for (;;) {
+        // The home directory is never a Project, but a package.json below it is.
         if (directory === stop)
-            return undefined;
+            return fallback;
         if (existsSync(join(directory, ".nylorun")))
             return directory;
         if (!fallback && existsSync(join(directory, "package.json")))

package/dist/project/seed.d.ts

@@ -7,6 +7,11 @@ export interface SeedOptions {
     env?: Readonly<Record<string, string>>;
     fetchImpl?: typeof fetch;
     signal?: AbortSignal;
+    /**
+     * Seed the Tenant-level fixture model (`fixtureModel: true`, Host feature
+     * `tenant-fixture-model`) and skip the Project's model credential.
+     */
+    fixtureModel?: boolean;
 }
 /**
  * Seed non-secret Tenant config via `PUT /v1/tenant/config/seed`.
@@ -16,4 +21,5 @@ export interface SeedOptions {
 export declare function seedTenantFromProject(options: SeedOptions): Promise<{
     applied: string[];
     kept: string[];
+    model?: string;
 }>;

package/dist/project/seed.js

@@ -21,14 +21,12 @@ export async function seedTenantFromProject(options) {
     const env = options.env ?? loadProjectEnvironment(options.projectRoot);
     const fetchImpl = options.fetchImpl ?? fetch;
     const sandboxRaw = env.NYLORUN_SANDBOX?.trim();
-    const sandbox = sandboxRaw === "auto" ||
-        sandboxRaw === "microsandbox" ||
-        sandboxRaw === "virtual"
+    const sandbox = sandboxRaw === "auto" || sandboxRaw === "virtual"
         ? { backend: sandboxRaw }
         : undefined;
     let applied = [];
     let kept = [];
-    if (sandbox) {
+    if (sandbox || options.fixtureModel) {
         const response = await fetchImpl(`${options.hostUrl.replace(/\/$/, "")}/v1/tenant/config/seed`, {
             method: "PUT",
             headers: {
@@ -37,7 +35,8 @@ export async function seedTenantFromProject(options) {
             },
             body: JSON.stringify({
                 requestId: randomUUID(),
-                sandbox,
+                ...(sandbox ? { sandbox } : {}),
+                ...(options.fixtureModel ? { fixtureModel: true } : {}),
             }),
             signal: options.signal ?? AbortSignal.timeout(15_000),
         });
@@ -50,13 +49,16 @@ export async function seedTenantFromProject(options) {
         applied = body.applied ?? [];
         kept = body.kept ?? [];
     }
-    if (env.NYLORUN_DEV_MODEL?.trim() !== "fixture") {
+    // A fixture-model Tenant never calls a real model: its credential stays out of it.
+    let model;
+    if (!options.fixtureModel && env.NYLORUN_DEV_MODEL?.trim() !== "fixture") {
         const seeded = modelFromEnv(env, options.projectRoot);
         if (seeded) {
             await putHostModel(options.hostUrl, options.applicationKey, seeded, options.tenantId);
+            model = `${seeded.provider}/${seeded.model}`;
         }
     }
-    return { applied, kept };
+    return { applied, kept, ...(model ? { model } : {}) };
 }
 function modelFromEnv(env, projectRoot) {
     const provider = env.MODEL_PROVIDER?.trim();

package/dist/tenant/commands.js

@@ -3,10 +3,14 @@ import { randomUUID } from "node:crypto";
 import { createAdmin } from "@nylorun/admin";
 import { createClient, isTenantId } from "@nylorun/agents";
 import { CliError } from "../errors.js";
-import { resolveHome } from "../runtime/launcher.js";
+import { resolveHome } from "../home.js";
 import { readCredentials, removeCredentials, } from "../project/credentials.js";
 import { readLink, removeLink, writeLink, } from "../project/link.js";
-import { requireProjectRoot } from "../project/root.js";
+import { findProjectRoot, requireProjectRoot } from "../project/root.js";
+import { createProjectTenant, defaultTenantName, } from "../project/create-tenant.js";
+import { seedTenantFromProject } from "../project/seed.js";
+import { loadProjectEnvironment } from "../environment.js";
+import { shellQuote } from "../project/env.js";
 /** Exact-and-unique name or id match. */
 export function matchTenant(tenants, nameOrId) {
     if (isTenantId(nameOrId)) {
@@ -27,18 +31,73 @@ export function matchTenant(tenants, nameOrId) {
 function localAdmin(home) {
     return createAdmin(home ? { home } : undefined);
 }
+/**
+ * `nylo tenant create [name]`. Inside a Project: create the Tenant, write the
+ * Project link and credentials, and seed it from the Project's `.env` (sandbox
+ * and model provider). Outside one: create the Tenant and print its
+ * connection variables once, since the Host keeps only a hash of the key.
+ */
+async function createTenant(options) {
+    const admin = localAdmin(options.home);
+    let hostId;
+    try {
+        hostId = (await admin.status()).host?.hostId;
+    }
+    catch (error) {
+        throw new CliError(`No Runtime answers at ${admin.url} (${error instanceof Error ? error.message : String(error)}). Start the local stack with "npx nylorun up".`, 6);
+    }
+    if (!hostId)
+        throw new CliError(`Host at ${admin.url} did not report hostId in admin status.`, 1);
+    const projectRoot = findProjectRoot();
+    if (!projectRoot) {
+        const created = await admin.createTenant({ name: options.name ?? "tenant" });
+        console.log(`Tenant    ${created.tenant.name}  ${created.tenant.id}  (created)`);
+        console.log("# Not in a Project: nothing was linked. The key is shown only once.");
+        console.log(`export NYLORUN_RUNTIME_URL=${shellQuote(admin.url.replace(/\/$/, ""))}`);
+        console.log(`export NYLORUN_SERVER_KEY=${shellQuote(created.applicationKey)}`);
+        console.log(`export NYLORUN_TENANT=${shellQuote(created.tenant.id)}`);
+        return;
+    }
+    const link = await readLink(projectRoot);
+    if (link)
+        throw new CliError(`This Project is already linked to Tenant ${link.tenantId}. Use "nylo tenant use <name-or-id>" to switch, or "nylo tenant delete" first.`, 1);
+    const created = await createProjectTenant({
+        admin,
+        hostId,
+        projectRoot,
+        name: options.name ?? (await defaultTenantName(projectRoot)),
+    });
+    console.log(`Tenant    ${created.envelope.name}  ${created.envelope.id}  (created)`);
+    console.log(`Linked    ${projectRoot}/.nylorun/`);
+    const seeded = await seedTenantFromProject({
+        hostUrl: created.link.hostUrl,
+        tenantId: created.link.tenantId,
+        applicationKey: created.credentials.applicationKey,
+        projectRoot,
+        env: loadProjectEnvironment(projectRoot),
+    });
+    console.log(seeded.model
+        ? `Model     ${seeded.model} (from .env)`
+        : "Model     not configured: set it in Studio, or run nylo configure");
+}
 export async function tenantCommand(args) {
     const [verb, ...rest] = args;
     if (!verb || verb === "--help" || verb === "-h") {
-        console.log(`nylorun tenant current|list [--json]|use <name-or-id>|status [--json]|reset [--sessions|--sandboxes|--all] [--yes]|delete <name-or-id> [--yes]`);
+        console.log(`nylo tenant create [name]|current|list [--json]|use <name-or-id>|status [--json]|reset [--sessions|--sandboxes|--all] [--yes]|delete <name-or-id> [--yes]`);
         return;
     }
     const home = resolveHome();
+    if (verb === "create") {
+        if (rest.length > 1 || rest.some((arg) => arg.startsWith("-")))
+            throw new CliError("Usage: nylo tenant create [name]", 2);
+        await createTenant({ home, ...(rest[0] ? { name: rest[0] } : {}) });
+        return;
+    }
     if (verb === "current") {
         const root = requireProjectRoot();
         const link = await readLink(root);
         if (!link) {
-            console.log("No Project link. Run nylorun dev to create one.");
+            console.log("No Project link. Run nylo tenant create to create one.");
             return;
         }
         const admin = localAdmin(home);
@@ -52,7 +111,7 @@ export async function tenantCommand(args) {
     if (verb === "list") {
         const json = rest.includes("--json");
         if (rest.some((a) => a !== "--json")) {
-            throw new CliError("Usage: nylorun tenant list [--json]", 2);
+            throw new CliError("Usage: nylo tenant list [--json]", 2);
         }
         const admin = localAdmin(home);
         const tenants = await admin.listTenants();
@@ -73,7 +132,7 @@ export async function tenantCommand(args) {
     if (verb === "use") {
         const nameOrId = rest[0];
         if (!nameOrId || rest.length > 1) {
-            throw new CliError("Usage: nylorun tenant use <name-or-id>", 2);
+            throw new CliError("Usage: nylo tenant use <name-or-id>", 2);
         }
         const root = requireProjectRoot();
         const admin = localAdmin(home);
@@ -87,7 +146,7 @@ export async function tenantCommand(args) {
         console.warn("Sharing a Tenant shares executor registrations across Projects that link to it.");
         const credentials = await readCredentials(root);
         if (!credentials) {
-            throw new CliError("No Project credentials. Run nylorun dev to create a Tenant first, or copy credentials for the target Tenant.", 1);
+            throw new CliError("No Project credentials. Run nylo tenant create to create a Tenant first, or copy credentials for the target Tenant.", 1);
         }
         const client = createClient({
             url: admin.url,
@@ -98,7 +157,7 @@ export async function tenantCommand(args) {
             await client.transport.json("/v1/tenant", "GET");
         }
         catch {
-            throw new CliError(`Credentials do not authorize Tenant ${selected.id}. Create a new Tenant with nylorun dev instead of reusing another Project's Tenant without its key.`, 1);
+            throw new CliError(`Credentials do not authorize Tenant ${selected.id}. Create a new Tenant with nylo tenant create instead of reusing another Project's Tenant without its key.`, 1);
         }
         await writeLink(root, {
             format: 1,
@@ -112,13 +171,13 @@ export async function tenantCommand(args) {
     if (verb === "status") {
         const json = rest.includes("--json");
         if (rest.some((a) => a !== "--json")) {
-            throw new CliError("Usage: nylorun tenant status [--json]", 2);
+            throw new CliError("Usage: nylo tenant status [--json]", 2);
         }
         const root = requireProjectRoot();
         const link = await readLink(root);
         const credentials = await readCredentials(root);
         if (!link || !credentials) {
-            throw new CliError("No Project link. Run nylorun dev to create one.", 1);
+            throw new CliError("No Project link. Run nylo tenant create to create one.", 1);
         }
         const client = createClient({
             url: link.hostUrl,
@@ -174,7 +233,7 @@ export async function tenantCommand(args) {
         else if (flags.includes("--sessions") || flags.length === 0)
             scope = "sessions";
         else
-            throw new CliError("Usage: nylorun tenant reset [--sessions|--sandboxes|--all] [--yes]", 2);
+            throw new CliError("Usage: nylo tenant reset [--sessions|--sandboxes|--all] [--yes]", 2);
         if (flags.filter((f) => ["--sessions", "--sandboxes", "--all"].includes(f)).length > 1) {
             throw new CliError("Pass only one of --sessions, --sandboxes, --all.", 2);
         }
@@ -182,7 +241,7 @@ export async function tenantCommand(args) {
         const link = await readLink(root);
         const credentials = await readCredentials(root);
         if (!link || !credentials) {
-            throw new CliError("No Project link. Run nylorun dev first.", 1);
+            throw new CliError("No Project link. Run nylo tenant create first.", 1);
         }
         const admin = localAdmin(home);
         const tenants = await admin.listTenants();
@@ -215,7 +274,7 @@ export async function tenantCommand(args) {
         const yes = rest.includes("--yes");
         const nameOrId = rest.find((a) => a !== "--yes");
         if (!nameOrId || rest.filter((a) => a !== "--yes").length !== 1) {
-            throw new CliError("Usage: nylorun tenant delete <name-or-id> [--yes]", 2);
+            throw new CliError("Usage: nylo tenant delete <name-or-id> [--yes]", 2);
         }
         const root = requireProjectRoot();
         const admin = localAdmin(home);
@@ -243,7 +302,7 @@ export async function tenantCommand(args) {
         console.log(`Deleted Tenant ${selected.name ?? selected.id}.`);
         return;
     }
-    throw new CliError(`Unknown tenant command ${verb}.\nUsage: nylorun tenant current|list|use|status|reset|delete`, 2);
+    throw new CliError(`Unknown tenant command ${verb}.\nUsage: nylo tenant current|list|use|status|reset|delete`, 2);
 }
 async function confirmOrThrow(prompt) {
     if (!process.stdin.isTTY || !process.stdout.isTTY) {

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@nylorun/cli",
-  "version": "0.3.0-beta",
+  "version": "0.4.0-beta",
   "type": "module",
   "license": "Apache-2.0",
-  "description": "Nylorun local development CLI",
+  "description": "Nylorun Runtime client: Tenants, Project links and model providers",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nylorun/harness.git",
@@ -30,9 +30,9 @@
     "prepack": "npm run build"
   },
   "dependencies": {
-    "@nylorun/agents": "0.6.0-beta",
-    "@nylorun/admin": "0.2.0-beta",
-    "@earendil-works/pi-ai": "0.85.1"
+    "@nylorun/agents": "0.7.0-beta",
+    "@nylorun/admin": "0.3.0-beta",
+    "@earendil-works/pi-ai": "0.87.0"
   },
   "devDependencies": {
     "typescript": "npm:@typescript/typescript6@^6.0.2",
@@ -40,9 +40,6 @@
     "vitest": "^5.0.1"
   },
   "bin": {
-    "nylorun": "dist/cli.js"
-  },
-  "nylorun": {
-    "runtime": "0.10.0-beta"
+    "nylo": "dist/cli.js"
   }
 }

package/dist/dev-entry.d.ts

@@ -1,5 +0,0 @@
-/**
- * Legacy watcher entry. `nylorun dev` now runs the Project entry with
- * `tsx watch` directly (D§12).
- */
-export declare function legacyDevEntryRemoved(): never;

package/dist/dev-entry.js

@@ -1,7 +0,0 @@
-/**
- * Legacy watcher entry. `nylorun dev` now runs the Project entry with
- * `tsx watch` directly (D§12).
- */
-export function legacyDevEntryRemoved() {
-    throw new Error("cli/src/dev-entry.ts is no longer used. Point nylorun dev at your Project entry (default src/main.ts).");
-}

package/dist/dev.d.ts

@@ -1,47 +0,0 @@
-export interface DevelopOptions {
-    entry?: string;
-    flags?: readonly string[];
-    projectRoot?: string;
-    home?: string;
-}
-export type DevelopmentPreflight = {
-    tsx: string;
-    entry: string;
-    ephemeral: boolean;
-    localUi: boolean;
-    studio: boolean;
-    open: boolean;
-};
-/**
- * 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 declare function developmentPreflight(args?: readonly string[]): DevelopmentPreflight;
-/**
- * Resolve `@nylorun/studio` from the Project and call `startStudio`.
- * Used by `nylorun studio` and `nylorun dev --local-ui`.
- */
-export declare function startStudio(options: {
-    runtimeUrl: string;
-    serverKey: string;
-    tenant: {
-        id: string;
-        name: string;
-    };
-    open: boolean;
-    port?: number;
-    /** When true, force local UI. When false/omit, use startStudio default (hosted). */
-    localUi?: boolean;
-    cacheDir?: string;
-    projectRoot?: string;
-}): Promise<{
-    address: string;
-    launchUrl: string;
-    close(): Promise<void>;
-}>;
-/**
- * `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 declare function develop(options?: DevelopOptions): Promise<number>;