@nylorun/cli 0.14.0-beta → 0.14.2-beta

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @nylorun/cli
 
+## 0.14.2-beta
+
+### Patch Changes
+
+- Pin agents to the tested release.
+- Pin admin to the tested release.
+- Updated dependencies
+- Updated dependencies
+  - @nylorun/agents@0.19.1-beta
+  - @nylorun/admin@0.14.1-beta
+
+## 0.14.1-beta
+
+### Patch Changes
+
+- 7780b2f: **One client and connection layer.** The Project link and credentials are read one way, and every Runtime client shares one `/health` probe.
+
+  - `@nylorun/core`: `@nylorun/core/project` (Node only, the one Core subpath that imports Node modules) reads the Nylorun home, a local Tenant's Host root (`tenantHostRoot`), the Project root (`findProjectRoot`) and the Project link and credentials (`findLinkedProject`, `readProjectLink`, `readCredentialsFile`), validated with `ProjectLinkFileSchema` and `ProjectCredentialsFileSchema`; a broken or newer file throws `ProjectFileError`. `@nylorun/core/transport` (browser-safe) holds the `/health` compatibility probe (`checkHealth`), `parseProtocolRange` (on `ProtocolRangeSchema`, ignoring fields a newer Host adds), `describeIncompatibility`, `requestHeaders` and `readBody`.
+  - `@nylorun/agents`: `resolveConnection` and `createClient()` find the Project as every reader does: the nearest directory with `.nylorun/` from `cwd` upwards, never the home directory or above it (they used to walk to the filesystem root, and past a `.nylorun/` without a link). A link without `credentials.json`, or a link or credentials file that does not validate, is now `connection_missing` naming the file and `npx nylorun start`, instead of a raw file-system or parse error. `@nylorun/agents/client` loads the link reader only when `createClient()` resolves a connection, so it imports no Node module. The root entry re-exports `checkHealth`, `describeIncompatibility` and `parseProtocolRange`.
+  - `@nylorun/admin`: `createAdmin` reads the Project link with the same reader. A link that does not validate is now refused like one from an older nylorun (when nothing else names the Host root), and a linked Project's `credentials.json` that does not validate is `connection_missing` instead of being skipped. `@nylorun/admin/project` re-exports `@nylorun/core/project` for tools that depend on this package. The `/health` check and request headers come from `@nylorun/core/transport`.
+  - `nylorun`: reads the Project link and credentials with `@nylorun/core/project`; a credentials file whose keys are not 64 hex characters is replaced by `start`, as an unreadable one was. No command changes.
+  - `@nylorun/cli`: `nylo` reads the Project root, link and credentials through `@nylorun/admin/project` instead of its own copies, with the same messages. No command changes.
+  - `@nylorun/studio`: the server's Runtime compatibility probe is `checkHealth` from `@nylorun/agents`.
+
+- Pin agents to the tested release.
+- Pin admin to the tested release.
+- Updated dependencies [7780b2f]
+- Updated dependencies [070674d]
+- Updated dependencies
+- Updated dependencies
+  - @nylorun/agents@0.19.0-beta
+  - @nylorun/admin@0.14.0-beta
+
 ## 0.14.0-beta
 
 ### Major Changes

package/dist/access/commands.js

@@ -1,6 +1,6 @@
+import { findProjectRoot } from "@nylorun/admin/project";
 import { CliError } from "../errors.js";
 import { linkedConnection, managementClient } from "../project/connection.js";
-import { findProjectRoot } from "../project/root.js";
 export const accessUsage = `nylo access signing-keys <list|rotate|revoke>
 
   signing-keys list                  list the signing keys

package/dist/cli.js

@@ -3,7 +3,7 @@ import "./baseline.js";
 import { ConfigurationCancelled, configureProvider, fetchModelCatalog, } from "./model/configure.js";
 import { putHostModel } from "./model/host-model.js";
 import { CliError } from "./errors.js";
-import { findProjectRoot } from "./project/root.js";
+import { findProjectRoot } from "@nylorun/admin/project";
 import { printLinkedEnvExports } from "./project/env.js";
 import { linkedConnection, managementClient } from "./project/connection.js";
 import { accessCommand } from "./access/commands.js";

package/dist/doctor.js

@@ -1,7 +1,7 @@
 import { release } from "node:os";
+import { findProjectRoot } from "@nylorun/admin/project";
 import { CliError } from "./errors.js";
 import { linkedConnection, managementClient } from "./project/connection.js";
-import { findProjectRoot } from "./project/root.js";
 function platformLine() {
     const os = process.platform === "darwin"
         ? "macOS"

package/dist/installation/commands.js

@@ -3,9 +3,9 @@
  * API (the Project's management key).
  */
 import { createInterface } from "node:readline/promises";
+import { findProjectRoot } from "@nylorun/admin/project";
 import { CliError } from "../errors.js";
 import { linkedConnection, managementClient } from "../project/connection.js";
-import { findProjectRoot } from "../project/root.js";
 const projectRoot = () => findProjectRoot() ?? process.cwd();
 /**
  * `nylo status [--json]`: the Tenant, its checks and counts. A Tenant that is not open does not

package/dist/model/configure.js

@@ -5,7 +5,7 @@ import { join } from "node:path";
 import { builtinModels } from "@earendil-works/pi-ai/providers/all";
 import { createProvider, } from "@earendil-works/pi-ai";
 import { stream, streamSimple, } from "@earendil-works/pi-ai/api/openai-completions";
-import { resolveHome } from "../home.js";
+import { nylorunHome } from "@nylorun/admin/project";
 export class ConfigurationCancelled extends Error {
     signal;
     exitCode;
@@ -276,7 +276,7 @@ export async function configureProvider(options = {}) {
  * A stable id for this CLI installation, created on first use under the Host root.
  * OpenAI's "Sign in with ChatGPT" sends it as the agent host id.
  */
-export function installationId(home = resolveHome()) {
+export function installationId(home = nylorunHome()) {
     const file = join(home, "cli-installation-id");
     try {
         const existing = readFileSync(file, "utf8").trim();

package/dist/project/credentials.d.ts

@@ -1,14 +1,9 @@
+import { type ProjectCredentials } from "@nylorun/admin/project";
 /**
  * Project-local credentials (mode 0600): the application key and its principal, and the
  * management key and its principal when `nylorun start` issued one. A format 0 file may still
  * carry a legacy `executors` map from before protocol 3; it is ignored.
  */
-export interface ProjectCredentials {
-    format: 0 | 1;
-    applicationKey: string;
-    principalId: string;
-    managementKey?: string;
-    managementPrincipalId?: string;
-}
-/** The Project's credentials, which `nylorun start` writes beside the link. */
+export type { ProjectCredentials };
+/** The Project's credentials, which `nylorun start` writes beside the link; kept 0600. */
 export declare function readCredentials(projectRoot: string): Promise<ProjectCredentials | undefined>;

package/dist/project/credentials.js

@@ -1,40 +1,21 @@
-import { chmod, readFile } from "node:fs/promises";
+import { chmod } from "node:fs/promises";
+import { ProjectFileError, projectCredentialsPath, readProjectCredentials, } from "@nylorun/admin/project";
 import { CliError } from "../errors.js";
-import { credentialsPath } from "./link.js";
-/** The Project's credentials, which `nylorun start` writes beside the link. */
+/** The Project's credentials, which `nylorun start` writes beside the link; kept 0600. */
 export async function readCredentials(projectRoot) {
-    const path = credentialsPath(projectRoot);
+    const path = projectCredentialsPath(projectRoot);
+    let credentials;
     try {
-        const value = JSON.parse(await readFile(path, "utf8"));
-        if (typeof value?.applicationKey !== "string" ||
-            !/^[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 "npx nylorun start".`, 1);
-        }
-        const format = value.format === undefined || value.format === 0
-            ? 0
-            : value.format === 1
-                ? 1
-                : undefined;
-        if (format === undefined) {
-            throw new CliError(`Project credentials at ${path} have an unsupported format. Upgrade the CLI.`, 1);
-        }
-        await chmod(path, 0o600);
-        return {
-            format,
-            applicationKey: value.applicationKey,
-            principalId: value.principalId,
-            ...(typeof value.managementKey === "string" &&
-                /^[0-9a-f]{64}$/.test(value.managementKey) &&
-                typeof value.managementPrincipalId === "string"
-                ? { managementKey: value.managementKey, managementPrincipalId: value.managementPrincipalId }
-                : {}),
-        };
+        credentials = readProjectCredentials(projectRoot);
     }
     catch (error) {
-        if (error.code === "ENOENT")
-            return undefined;
-        throw error;
+        if (!(error instanceof ProjectFileError))
+            throw error;
+        throw new CliError(error.reason === "newer"
+            ? `Project credentials at ${path} have an unsupported format. Upgrade the CLI.`
+            : `Invalid Project credentials at ${path}. Remove .nylorun/credentials.json and run "npx nylorun start".`, 1);
     }
+    if (credentials)
+        await chmod(path, 0o600);
+    return credentials;
 }

package/dist/project/env.js

@@ -1,6 +1,6 @@
+import { findProjectRoot } from "@nylorun/admin/project";
 import { readCredentials } from "./credentials.js";
 import { readLink } from "./link.js";
-import { findProjectRoot } from "./root.js";
 /** Two `export` lines for `nylo env` (was `nylorun status --env`, F2-7). */
 export async function printLinkedEnvExports(projectRoot = process.cwd()) {
     const root = findProjectRoot(projectRoot) ?? projectRoot;

package/dist/project/link.d.ts

@@ -1,17 +1,10 @@
+import { type ProjectLink as LinkFile } from "@nylorun/admin/project";
 /**
  * Project-local link to an installation (format 3). `nylorun start` writes it; `nylo` only
- * reads it. `tenantId` is information: the installation serves one Tenant, so nothing selects it.
+ * reads it, with `@nylorun/core/project`'s reader (through `@nylorun/admin/project`).
+ * `tenantId` is information: the installation serves one Tenant, so nothing selects it.
  */
-export interface ProjectLink {
+export type ProjectLink = LinkFile & {
     format: 3;
-    /** The local Tenant the link names (`~/.nylorun/tenants/<tenant>/`). */
-    tenant?: string;
-    hostUrl: string;
-    hostId: string;
-    tenantId?: string;
-}
-export declare function nylorunDir(projectRoot: string): string;
-export declare function linkPath(projectRoot: string): string;
-/** `.nylorun/credentials.json`. */
-export declare function credentialsPath(projectRoot: string): string;
+};
 export declare function readLink(projectRoot: string): Promise<ProjectLink | undefined>;

package/dist/project/link.js

@@ -1,52 +1,22 @@
-import { readFile } from "node:fs/promises";
-import { join } from "node:path";
+import { ProjectFileError, projectLinkPath, readProjectLink, } from "@nylorun/admin/project";
 import { CliError } from "../errors.js";
-export function nylorunDir(projectRoot) {
-    return join(projectRoot, ".nylorun");
-}
-export function linkPath(projectRoot) {
-    return join(nylorunDir(projectRoot), "link.json");
-}
-/** `.nylorun/credentials.json`. */
-export function credentialsPath(projectRoot) {
-    return join(nylorunDir(projectRoot), "credentials.json");
-}
 export async function readLink(projectRoot) {
-    const path = linkPath(projectRoot);
-    let value;
-    let raw;
+    const path = projectLinkPath(projectRoot);
+    let link;
     try {
-        raw = await readFile(path, "utf8");
+        link = readProjectLink(projectRoot);
     }
     catch (error) {
-        if (error.code === "ENOENT")
-            return undefined;
-        throw error;
-    }
-    try {
-        value = JSON.parse(raw);
-    }
-    catch {
-        throw new CliError(`Invalid Project link at ${path}. Remove .nylorun/link.json and run "npx nylorun start".`, 1);
+        if (!(error instanceof ProjectFileError))
+            throw error;
+        throw new CliError(error.reason === "newer"
+            ? `Project link at ${path} has an unsupported format. Upgrade the CLI.`
+            : `Invalid Project link at ${path}. Remove .nylorun/link.json and run "npx nylorun start".`, 1);
     }
+    if (link === undefined)
+        return undefined;
     // Formats 0 to 2 are from older releases.
-    if (value?.format === undefined ||
-        value.format === 0 ||
-        value.format === 1 ||
-        value.format === 2)
+    if (link.format !== 3)
         throw new CliError(`The Project link at ${path} is from an older nylorun. Run "npx nylorun start" in this project to link it again.`, 1);
-    if (value.format !== 3)
-        throw new CliError(`Project link at ${path} has an unsupported format. Upgrade the CLI.`, 1);
-    if (typeof value.hostUrl !== "string" ||
-        typeof value.hostId !== "string" ||
-        (value.tenant !== undefined && typeof value.tenant !== "string") ||
-        (value.tenantId !== undefined && typeof value.tenantId !== "string"))
-        throw new CliError(`Invalid Project link at ${path}. Remove .nylorun/link.json and run "npx nylorun start".`, 1);
-    return {
-        format: 3,
-        ...(value.tenant ? { tenant: value.tenant } : {}),
-        hostUrl: value.hostUrl.replace(/\/$/, ""),
-        hostId: value.hostId,
-        ...(value.tenantId ? { tenantId: value.tenantId } : {}),
-    };
+    return { ...link, format: 3 };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nylorun/cli",
-  "version": "0.14.0-beta",
+  "version": "0.14.2-beta",
   "type": "module",
   "license": "Apache-2.0",
   "description": "Nylorun Runtime client: the linked installation's Tenant, its access and its model provider",
@@ -30,8 +30,8 @@
     "prepack": "npm run build"
   },
   "dependencies": {
-    "@nylorun/agents": "0.18.0-beta",
-    "@nylorun/admin": "0.13.0-beta",
+    "@nylorun/agents": "0.19.1-beta",
+    "@nylorun/admin": "0.14.1-beta",
     "@earendil-works/pi-ai": "0.99.1"
   },
   "devDependencies": {

package/dist/home.d.ts

@@ -1,6 +0,0 @@
-/**
- * Where `nylo` keeps its own files (the installation id): an explicit home,
- * `NYLORUN_HOME`, or `~/.nylorun`, which holds the local Tenants' Host roots
- * (`tenants/<name>/`). `@nylorun/admin` resolves a Tenant's Host root itself.
- */
-export declare function resolveHome(home?: string, env?: Readonly<Record<string, string | undefined>>): string;

package/dist/home.js

@@ -1,15 +0,0 @@
-import { homedir } from "node:os";
-import { join, resolve } from "node:path";
-/**
- * Where `nylo` keeps its own files (the installation id): an explicit home,
- * `NYLORUN_HOME`, or `~/.nylorun`, which holds the local Tenants' Host roots
- * (`tenants/<name>/`). `@nylorun/admin` resolves a Tenant's Host root itself.
- */
-export function resolveHome(home, env = process.env) {
-    if (home !== undefined && home.trim() !== "")
-        return resolve(home);
-    const fromEnv = env.NYLORUN_HOME?.trim();
-    if (fromEnv)
-        return resolve(fromEnv);
-    return resolve(join(homedir(), ".nylorun"));
-}

package/dist/project/root.d.ts

@@ -1,9 +0,0 @@
-/**
- * The nearest `.nylorun` wins so an initialised Project keeps working from a
- * subdirectory; otherwise the nearest package.json defines the Project. The
- * walk stops at the home directory because `~/.nylorun` is the Host root, never
- * a Project root.
- */
-export declare function findProjectRoot(cwd?: string): string | undefined;
-/** Require a Project root or throw a usage-oriented error. */
-export declare function requireProjectRoot(cwd?: string): string;

package/dist/project/root.js

@@ -1,52 +0,0 @@
-import { existsSync, realpathSync } from "node:fs";
-import { homedir } from "node:os";
-import { dirname, join, parse, resolve } from "node:path";
-/**
- * The nearest `.nylorun` wins so an initialised Project keeps working from a
- * subdirectory; otherwise the nearest package.json defines the Project. The
- * walk stops at the home directory because `~/.nylorun` is the Host root, never
- * a Project root.
- */
-export function findProjectRoot(cwd = process.cwd()) {
-    const stop = (() => {
-        try {
-            return realpathSync(homedir());
-        }
-        catch {
-            return homedir();
-        }
-    })();
-    let directory = resolve(cwd);
-    try {
-        directory = realpathSync(directory);
-    }
-    catch {
-        /* unresolvable cwd falls through */
-    }
-    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 fallback;
-        if (existsSync(join(directory, ".nylorun")))
-            return directory;
-        if (!fallback && existsSync(join(directory, "package.json")))
-            fallback = directory;
-        if (directory === root)
-            break;
-        const parent = dirname(directory);
-        if (parent === directory)
-            break;
-        directory = parent;
-    }
-    return fallback;
-}
-/** Require a Project root or throw a usage-oriented error. */
-export function requireProjectRoot(cwd = process.cwd()) {
-    const root = findProjectRoot(cwd);
-    if (!root) {
-        throw new Error("No Project found (looked for package.json or .nylorun/). Run this from a Project directory.");
-    }
-    return root;
-}