@nylorun/agents 0.9.0-beta → 0.11.0-beta

package/dist/client.js

@@ -1,371 +1,13 @@
-import { SANDBOX_TOOL_NAMES, delegateOf, isBuiltWorkflow, isSandboxToolName, } from "@nylorun/core/define";
-import { SCOPES_HEADER, SUBJECT_HEADER } from "@nylorun/core/compatibility";
-import { LiveEventSchema, SessionItemsResponseSchema, parseSubjectHeaders, } from "@nylorun/core/contracts";
+export * from "./session-client.js";
+import { AgentsClient } from "./session-client.js";
 import { resolveConnection } from "./connection.js";
-import { Transport, id, segment } from "./http.js";
-import { observeSSE } from "./sse.js";
-function sessionSandboxOf(transport, sessionId) {
-    const call = (tool, args) => transport.json(`/v1/sessions/${segment(sessionId)}/sandbox/${segment(tool)}`, "POST", args);
-    const sandbox = {};
-    for (const tool of SANDBOX_TOOL_NAMES) {
-        if (!isSandboxToolName(tool))
-            continue;
-        sandbox[tool] = (args) => call(tool, args);
-    }
-    return sandbox;
-}
-function linkedSessionId(event) {
-    if (event.type !== "node.agent")
-        return undefined;
-    const payload = event.payload;
-    if (!payload || typeof payload !== "object" || Array.isArray(payload))
-        return undefined;
-    const sessionId = payload.sessionId;
-    return typeof sessionId === "string" && sessionId.length > 0
-        ? sessionId
-        : undefined;
-}
-const middlewareClosure = "Hosted definitions support declarative capabilities and before/after hooks, not middleware closures";
-/** The agent's declarations, then those of each agent it uses as a tool, keyed `<child>/<capability>`. */
-function declarationsOf(agent) {
-    if (isBuiltWorkflow(agent) || agent.manifest.kind === "workflow")
-        return [];
-    const built = agent.build?.() ?? agent;
-    if (isBuiltWorkflow(built))
-        return [];
-    const binding = built.getBinding?.();
-    if (!binding || !("declarations" in binding))
-        return [];
-    const found = (binding.declarations ?? []).map((item) => ({ key: item.id, item }));
-    for (const tool of binding.tools ?? []) {
-        const delegate = delegateOf(tool);
-        const child = delegate?.agent;
-        for (const item of child?.getBinding().declarations ?? [])
-            found.push({ key: `${child.id}/${item.id}`, item });
-        // A flow agent used as a tool: its agents' declarations, keyed `<flow>/<agent>/<capability>`.
-        const flow = delegate?.workflow;
-        for (const leaf of Object.values(flow?.getBinding().agents ?? {}))
-            for (const item of leaf.declarations ?? [])
-                found.push({ key: `${flow.id}/${leaf.manifest.id}/${item.id}`, item });
-    }
-    return found;
-}
-function pluginRootsOf(agent) {
-    const roots = {};
-    for (const { key, item } of declarationsOf(agent))
-        if (item.pluginRoot)
-            roots[key] = item.pluginRoot;
-    return Object.keys(roots).length === 0 ? undefined : roots;
-}
-/** Closures stay on the live binding. The published manifest cannot name them. */
-export function assertNoMiddlewareClosures(agent) {
-    if (declarationsOf(agent).some(({ item }) => item.hasMiddleware))
-        throw new Error(middlewareClosure);
-}
-export class AgentsClient {
-    transport;
-    /** The subject this client acts for (`as`), or `undefined` for the principal itself. */
-    subject;
-    constructor(destination = {}) {
-        this.transport = new Transport(destination);
-        this.subject = undefined;
-    }
-    /**
-     * A client that acts for `subject`: every call sends `Nylorun-Subject` and
-     * `Nylorun-Scopes`, and the Runtime limits it to the scopes and to the subject's own sessions
-     * and vaults (Host feature `subject-headers`). For app servers, which authenticate the person
-     * themselves and hold the key; nothing is minted, cached or refreshed.
-     */
-    as(subject, options = {}) {
-        if (this.subject !== undefined)
-            throw new Error(`This client already acts for ${this.subject}`);
-        const scopes = [...(options.scopes ?? ["sessions:own"])].join(" ");
-        const parsed = parseSubjectHeaders(subject, scopes);
-        if (!parsed.ok)
-            throw new TypeError(parsed.message);
-        const client = Object.create(AgentsClient.prototype);
-        return Object.assign(client, {
-            transport: this.transport.withHeaders({
-                [SUBJECT_HEADER]: subject,
-                [SCOPES_HEADER]: [...parsed.scopes].join(" "),
-            }),
-            subject,
-        });
-    }
-    /** The Runtime's protocol features, including optional ones such as `transcript-events`. */
-    hostFeatures(options = {}) {
-        return this.transport.hostFeatures(options.signal);
-    }
-    listAgents(options = {}) {
-        return this.transport.json("/v1/agents", "GET", undefined, options.signal);
-    }
-    listSessions(options = {}) {
-        const query = options.agentId
-            ? `?agentId=${encodeURIComponent(options.agentId)}`
-            : "";
-        return this.transport.json(`/v1/sessions${query}`, "GET", undefined, options.signal);
-    }
-    async saveAgent(agent, options) {
-        if (isBuiltWorkflow(agent) && agent.manifest.workflowSchemaVersion === 2) {
-            // A v2 workflow embeds its agents: one document, carrying their plugin roots.
-            const pluginRoots = {};
-            for (const binding of Object.values(agent.getBinding().agents)) {
-                const leaf = { id: binding.manifest.id, manifest: binding.manifest, getBinding: () => binding };
-                assertNoMiddlewareClosures(leaf);
-                for (const [key, root] of Object.entries(pluginRootsOf(leaf) ?? {}))
-                    pluginRoots[`${leaf.id}/${key}`] = root;
-            }
-            return this.transport.json(`/v1/agents/${segment(agent.id)}`, "PUT", {
-                requestId: options.requestId ?? id(),
-                manifest: agent.manifest,
-                implementationVersion: options.implementationVersion,
-                ...(Object.keys(pluginRoots).length === 0 ? {} : { pluginRoots }),
-            });
-        }
-        if (isBuiltWorkflow(agent)) {
-            for (const binding of Object.values(agent.getBinding().agents)) {
-                await this.saveAgent({
-                    id: binding.manifest.id,
-                    manifest: binding.manifest,
-                    getBinding: () => binding,
-                }, options);
-            }
-            return this.transport.json(`/v1/agents/${segment(agent.id)}`, "PUT", {
-                requestId: options.requestId ?? id(),
-                manifest: agent.manifest,
-                implementationVersion: options.implementationVersion,
-            });
-        }
-        assertNoMiddlewareClosures(agent);
-        const pluginRoots = pluginRootsOf(agent);
-        return this.transport.json(`/v1/agents/${segment(agent.id)}`, "PUT", {
-            requestId: options.requestId ?? id(),
-            manifest: agent.manifest,
-            implementationVersion: options.implementationVersion,
-            ...(pluginRoots === undefined ? {} : { pluginRoots }),
-        });
-    }
-    async createSession(options) {
-        const sessionId = options.id ?? id();
-        await this.transport.json(`/v1/sessions/${segment(sessionId)}`, "PUT", {
-            requestId: options.requestId ?? id(),
-            agentId: options.agentId,
-            ownerUserId: options.ownerUserId,
-            ...(options.info ? { info: options.info } : {}),
-            ...(options.vaultIds ? { vaultIds: options.vaultIds } : {}),
-            ...(options.credentialSelections
-                ? { credentialSelections: options.credentialSelections }
-                : {}),
-            ...(options.sandbox ? { sandbox: options.sandbox } : {}),
-        });
-        return this.session(sessionId);
-    }
-    createVault(options) {
-        return this.transport.json("/v1/vaults", "POST", {
-            requestId: options.requestId ?? id(),
-            idempotencyKey: options.idempotencyKey,
-            name: options.name,
-            ownerUserId: options.ownerUserId,
-            ...(options.metadata ? { metadata: options.metadata } : {}),
-        });
-    }
-    listVaults(ownerUserId, signal) {
-        return this.transport.json(`/v1/vaults?ownerUserId=${encodeURIComponent(ownerUserId)}`, "GET", undefined, signal);
-    }
-    getVault(vaultId, signal) {
-        return this.transport.json(`/v1/vaults/${segment(vaultId)}`, "GET", undefined, signal);
-    }
-    deleteVault(vaultId) {
-        return this.transport.json(`/v1/vaults/${segment(vaultId)}`, "DELETE");
-    }
-    createCredential(vaultId, options) {
-        return this.transport.json(`/v1/vaults/${segment(vaultId)}/credentials`, "POST", {
-            requestId: options.requestId ?? id(),
-            idempotencyKey: options.idempotencyKey,
-            name: options.name,
-            auth: options.auth,
-        });
-    }
-    listCredentials(vaultId, signal) {
-        return this.transport.json(`/v1/vaults/${segment(vaultId)}/credentials`, "GET", undefined, signal);
-    }
-    getCredential(vaultId, credentialId, signal) {
-        return this.transport.json(`/v1/vaults/${segment(vaultId)}/credentials/${segment(credentialId)}`, "GET", undefined, signal);
-    }
-    rotateCredential(vaultId, credentialId, options) {
-        return this.transport.json(`/v1/vaults/${segment(vaultId)}/credentials/${segment(credentialId)}`, "POST", {
-            requestId: options.requestId ?? id(),
-            idempotencyKey: options.idempotencyKey,
-            auth: options.auth,
-        });
-    }
-    deleteCredential(vaultId, credentialId) {
-        return this.transport.json(`/v1/vaults/${segment(vaultId)}/credentials/${segment(credentialId)}`, "DELETE");
-    }
-    session(sessionId) {
-        return new SessionClient(this.transport, sessionId);
-    }
-}
-export class SessionClient {
-    transport;
-    id;
-    sandbox;
-    constructor(transport, id) {
-        this.transport = transport;
-        this.id = id;
-        this.sandbox = sessionSandboxOf(transport, id);
-    }
-    get path() {
-        return `/v1/sessions/${segment(this.id)}`;
-    }
-    inspect(signal) {
-        return this.transport.json(this.path, "GET", undefined, signal);
-    }
-    /** Pending waits / interactions from the session inspect view. */
-    async pending(signal) {
-        const view = await this.inspect(signal);
-        return view.waits ?? [];
-    }
-    command(command, signal) {
-        return this.transport.json(`${this.path}/commands`, "POST", command, signal);
-    }
-    /**
-     * Start a turn. Strings become `message.content`; any other JSON value becomes
-     * `message.data` (workflows.md §5).
-     */
-    input(value, options) {
-        const base = {
-            type: "message",
-            requestId: options.requestId ?? id(),
-            idempotencyKey: options.idempotencyKey,
-        };
-        return this.command(typeof value === "string"
-            ? { ...base, content: value }
-            : { ...base, data: value }, options.signal);
-    }
-    approve(interactionId, approved, options) {
-        return this.command({
-            type: "approve",
-            interactionId,
-            approved,
-            requestId: options.requestId ?? id(),
-            idempotencyKey: options.idempotencyKey,
-        }, options.signal);
-    }
-    respond(interactionId, value, options) {
-        return this.command({
-            type: "respond",
-            interactionId,
-            value,
-            requestId: options.requestId ?? id(),
-            idempotencyKey: options.idempotencyKey,
-        }, options.signal);
-    }
-    cancel(options) {
-        return this.command({
-            type: "cancel",
-            requestId: options.requestId ?? id(),
-            idempotencyKey: options.idempotencyKey,
-            ...(options.reason ? { reason: options.reason } : {}),
-        }, options.signal);
-    }
-    /** `agent` narrows to one agent used as a tool: its delegationId or its path. */
-    async history(options = {}) {
-        const query = new URLSearchParams();
-        if (options.cursor)
-            query.set("cursor", options.cursor);
-        if (options.agent)
-            query.set("agent", options.agent);
-        const search = query.toString();
-        return SessionItemsResponseSchema.parse(await this.transport.json(`${this.path}/items${search ? `?${search}` : ""}`, "GET", undefined, options.signal));
-    }
-    async *observe(options = {}) {
-        if (!options.follow) {
-            yield* this.observeOne(this.id, options);
-            return;
-        }
-        yield* this.observeFollowing(options);
-    }
-    async *observeOne(sessionId, options) {
-        for await (const frame of observeSSE(this.transport, `/v1/sessions/${segment(sessionId)}/events`, options)) {
-            if (frame.event === "heartbeat" || frame.event === "ready")
-                continue;
-            yield LiveEventSchema.parse(JSON.parse(frame.data));
-        }
-    }
-    /**
-     * Own session stream plus linked agent sessions announced in `node.agent`
-     * events, merged by `createdAt` then arrival order (workflows.md §11).
-     */
-    async *observeFollowing(options) {
-        const signal = options.signal;
-        const linked = new Set();
-        const queue = [];
-        let wait;
-        let open = 1;
-        let failed;
-        const wake = () => {
-            wait?.();
-            wait = undefined;
-        };
-        const push = (event) => {
-            queue.push(event);
-            queue.sort((a, b) => {
-                const byTime = a.createdAt.localeCompare(b.createdAt);
-                return byTime !== 0 ? byTime : a.cursor.localeCompare(b.cursor);
-            });
-            wake();
-        };
-        const pump = async (sessionId, cursor) => {
-            try {
-                for await (const event of this.observeOne(sessionId, { cursor, signal })) {
-                    push(event);
-                    const link = linkedSessionId(event);
-                    if (link && link !== this.id && !linked.has(link)) {
-                        linked.add(link);
-                        open += 1;
-                        void pump(link).finally(() => {
-                            open -= 1;
-                            wake();
-                        });
-                    }
-                }
-            }
-            catch (error) {
-                if (!signal?.aborted)
-                    failed = error;
-            }
-        };
-        void pump(this.id, options.cursor).finally(() => {
-            open -= 1;
-            wake();
-        });
-        while (!signal?.aborted) {
-            if (failed)
-                throw failed;
-            if (queue.length) {
-                yield queue.shift();
-                continue;
-            }
-            if (open <= 0)
-                return;
-            await new Promise((resolve) => {
-                wait = resolve;
-            });
-        }
-    }
-}
 export function createClient(destination = {}) {
-    if (destination.url !== undefined ||
-        destination.key !== undefined ||
-        destination.tenant !== undefined) {
+    if (destination.url !== undefined || destination.key !== undefined) {
         return new AgentsClient(destination);
     }
     return resolveConnection().then((connection) => new AgentsClient({
         url: connection.url,
         key: connection.key,
-        tenant: connection.tenant,
         ...(destination.fetch ? { fetch: destination.fetch } : {}),
     }));
 }
-export { RuntimeError, IncompatibleRuntimeError } from "./http.js";

package/dist/connection.d.ts

@@ -1,19 +1,19 @@
 import type { ErrorCode } from "@nylorun/core/compatibility";
 export interface ResolvedConnection {
     url: string;
-    tenant: string;
     key: string;
-    role: "application" | "executor";
     source: "options" | "environment" | "project-link";
 }
 export declare class ConnectionError extends Error {
     readonly code: ErrorCode;
     constructor(message: string);
 }
-/** Resolve Tenant API connection: options → environment → project link (D§7.1). */
+/**
+ * Resolve Tenant API connection: options → environment → project link (D§7.1). A connection is a
+ * Runtime URL and a key: the Runtime serves one Tenant, so nothing names it.
+ */
 export declare function resolveConnection(options?: {
     url?: string;
-    tenant?: string;
     key?: string;
     cwd?: string;
 }): Promise<ResolvedConnection>;

package/dist/connection.js

@@ -11,8 +11,8 @@ export class ConnectionError extends Error {
 }
 function missing(tried) {
     throw new ConnectionError(`connection_missing: no Runtime connection found (tried ${tried.join(", ")}). ` +
-        `Start the local stack with "npx nylorun up" and link this project with "npx @nylorun/cli tenant create", ` +
-        `or set NYLORUN_RUNTIME_URL, NYLORUN_TENANT and NYLORUN_SERVER_KEY.`);
+        `Run "npx nylorun start" in this project to start its stack and link it, ` +
+        `or set NYLORUN_RUNTIME_URL and NYLORUN_SERVER_KEY.`);
 }
 function stripTrailingSlash(url) {
     return url.replace(/\/$/, "");
@@ -37,55 +37,46 @@ async function readProjectLink(startDir) {
             throw error;
         }
         const link = ProjectLinkFileSchema.parse(JSON.parse(linkRaw));
+        // Formats 0 and 1 named a Tenant on a multi-Tenant Host of an older Runtime.
+        if (link.format < 2)
+            throw new ConnectionError(`connection_missing: the Project link at ${linkPath} is for a stack of an older ` +
+                `Runtime, before one Tenant per installation. Run "npx nylorun start" in this project ` +
+                `to start its own stack and link it again.`);
         const credentials = ProjectCredentialsFileSchema.parse(JSON.parse(await readFile(join(nylorun, "credentials.json"), "utf8")));
         return {
             url: stripTrailingSlash(link.hostUrl),
-            tenant: link.tenantId,
             key: credentials.applicationKey,
-            role: "application",
             source: "project-link",
         };
     }
 }
-/** Resolve Tenant API connection: options → environment → project link (D§7.1). */
+/**
+ * Resolve Tenant API connection: options → environment → project link (D§7.1). A connection is a
+ * Runtime URL and a key: the Runtime serves one Tenant, so nothing names it.
+ */
 export async function resolveConnection(options) {
     const tried = [];
     const optionUrl = options?.url;
-    const optionTenant = options?.tenant;
     const optionKey = options?.key;
-    const anyOption = optionUrl !== undefined ||
-        optionTenant !== undefined ||
-        optionKey !== undefined;
     tried.push("options");
-    if (anyOption) {
-        if (optionUrl && optionTenant && optionKey) {
+    if (optionUrl !== undefined || optionKey !== undefined) {
+        if (optionUrl && optionKey) {
             return {
                 url: stripTrailingSlash(optionUrl),
-                tenant: optionTenant,
                 key: optionKey,
-                role: "application",
                 source: "options",
             };
         }
         missing(tried.concat(["environment", "project-link"]));
     }
     const envUrl = env("NYLORUN_RUNTIME_URL");
-    const envTenant = env("NYLORUN_TENANT");
     const envServerKey = env("NYLORUN_SERVER_KEY");
-    const envExecutorKey = env("NYLORUN_EXECUTOR_KEY");
-    const anyEnv = envUrl !== undefined ||
-        envTenant !== undefined ||
-        envServerKey !== undefined ||
-        envExecutorKey !== undefined;
     tried.push("environment");
-    if (anyEnv) {
-        const key = envExecutorKey ?? envServerKey;
-        if (envUrl && envTenant && key) {
+    if (envUrl !== undefined || envServerKey !== undefined) {
+        if (envUrl && envServerKey) {
             return {
                 url: stripTrailingSlash(envUrl),
-                tenant: envTenant,
-                key,
-                role: envExecutorKey !== undefined ? "executor" : "application",
+                key: envServerKey,
                 source: "environment",
             };
         }

package/dist/delivery-token.d.ts

@@ -0,0 +1,62 @@
+/** The claims of a verified delivery token. */
+export interface DeliveryClaims {
+    readonly iss: string;
+    readonly aud: string;
+    /** The Action id, or `ping`. */
+    readonly sub: string;
+    /** The agent or workflow the Action belongs to. */
+    readonly agt: string;
+    /** The delivery's generation; `0` for a ping. */
+    readonly gen: number;
+    /** base64url SHA-256 of the request body. */
+    readonly bdy: string;
+    readonly iat: number;
+    readonly exp: number;
+    readonly jti: string;
+}
+/** Why a delivery was refused; `code` is sent back to the Runtime. */
+export declare class DeliveryVerificationError extends Error {
+    readonly code: "signature_missing" | "signature_invalid" | "key_unknown" | "token_expired";
+    readonly name = "DeliveryVerificationError";
+    constructor(code: "signature_missing" | "signature_invalid" | "key_unknown" | "token_expired", message: string);
+}
+/** Finds the public key for a `kid`, or `undefined` when the Tenant has none. */
+export type KeyLookup = (kid: string) => Promise<CryptoKey | undefined>;
+/**
+ * Verifies `token` against `body`. The keys are the installation's, so a valid signature already
+ * binds the issuer to its one Tenant: any `urn:nylorun:tenant:<id>` issuer is accepted (and
+ * returned in `iss`) unless `tenantId` names the one expected.
+ */
+export declare function verifyDeliveryToken(token: string | null, options: {
+    keys: KeyLookup;
+    /** When set, `iss` must name this Tenant. */
+    tenantId?: string;
+    body: Uint8Array;
+    /** When set, `aud` must equal it: the URL this endpoint was registered with. */
+    audience?: string;
+    now?: number;
+}): Promise<DeliveryClaims>;
+/** base64url SHA-256 of `body`: the token's `bdy` claim. */
+export declare function bodyHash(body: Uint8Array): Promise<string>;
+/**
+ * The Tenant's public keys, fetched from `GET /v1/access/jwks` and cached by `kid`. An
+ * unknown `kid` refetches once, at most every `refetchMs`, so forged tokens cannot make the
+ * endpoint call the Runtime on every request. Concurrent lookups share one in-flight fetch.
+ */
+export declare class JwksCache {
+    private readonly source;
+    private readonly refetchMs;
+    private readonly keys;
+    private lastFetch;
+    private pending;
+    constructor(source: {
+        url: string;
+        key?: string;
+        fetch?: typeof fetch;
+    } | {
+        keys: readonly JsonWebKey[];
+    }, refetchMs?: number);
+    readonly lookup: KeyLookup;
+    private load;
+    private fetchKeys;
+}