@nylorun/agents 0.9.0-beta → 0.10.0-beta

package/dist/http.d.ts

@@ -1,9 +1,22 @@
 import { type Compatibility, type ProtocolRange } from "@nylorun/core/compatibility";
+/**
+ * Subject tokens for a client that holds no Tenant key (a browser or an app; Host feature
+ * `subject-tokens`). `get` returns a current token and may fetch a new one; `invalidate`
+ * drops the cached one after the Runtime answered `401 token_expired`.
+ */
+export interface TokenSource {
+    get(signal?: AbortSignal): Promise<string>;
+    invalidate(): void;
+}
 export interface Destination {
     url?: string;
     key?: string;
     tenant?: string;
     fetch?: typeof fetch;
+    /** Instead of `key`: subject tokens. The client then skips the `/health` check. */
+    token?: TokenSource;
+    /** A publishable key (Host feature `browser-access`); it also names the Tenant. */
+    publishableKey?: string;
 }
 export declare function env(name: string): string | undefined;
 export declare class RuntimeError extends Error {
@@ -23,27 +36,44 @@ export declare class IncompatibleRuntimeError extends Error {
 }
 export declare class Transport {
     readonly url: string;
+    /** The Tenant key; empty for a client that uses subject tokens. */
     readonly key: string;
+    /** The Tenant id; empty when a publishable key names it. */
     readonly tenant: string;
+    readonly token: TokenSource | undefined;
+    readonly publishableKey: string | undefined;
     readonly fetcher: typeof fetch;
     /** Sent on every request, e.g. `Nylorun-Subject` and `Nylorun-Scopes` (`withHeaders`). */
     readonly headers: Readonly<Record<string, string>>;
     private readonly check;
-    constructor(options?: Destination, role?: "server" | "executor");
+    constructor(options?: Destination);
     /**
      * The same destination with `headers` added to every request. The copy shares this
      * transport's compatibility check, so a copy made per request does not repeat `/health`.
      */
     withHeaders(headers: Readonly<Record<string, string>>): Transport;
+    /**
+     * The same destination with another bearer (a delivery token for an Action endpoint's
+     * callbacks). Like `withHeaders`, the copy shares this transport's compatibility check.
+     */
+    withKey(key: string): Transport;
     /** Clears the cached Host compatibility result (used after a 426). */
     clearCompatibilityCache(): void;
     private ensureCompatible;
+    /** Throws `IncompatibleRuntimeError` before anything is sent when the Host lacks `feature`. */
+    requireFeature(feature: string, signal?: AbortSignal): Promise<void>;
     /** The Host's protocol features, including optional ones, from its `/health`. */
     hostFeatures(signal?: AbortSignal): Promise<readonly string[]>;
     private authHeaders;
     request(path: string, init?: RequestInit, options?: {
         retried426?: boolean;
+        retried401?: boolean;
     }): Promise<Response>;
+    /**
+     * Sends a request with this client's credentials and returns the Runtime's response as it
+     * is, errors included (an app server passing a response through, e.g. the AG-UI handler).
+     */
+    forward(path: string, init?: RequestInit): Promise<Response>;
     json<T>(path: string, method?: string, body?: unknown, signal?: AbortSignal): Promise<T>;
 }
 export declare const id: () => `${string}-${string}-${string}-${string}-${string}`;

package/dist/http.js

@@ -1,4 +1,4 @@
-import { PROTOCOL_FEATURES, PROTOCOL_HEADER, PROTOCOL_VERSION, TENANT_HEADER, checkCompatibility, } from "@nylorun/core/compatibility";
+import { PROTOCOL_FEATURES, PROTOCOL_HEADER, PROTOCOL_VERSION, PUBLISHABLE_KEY_HEADER, TENANT_HEADER, checkCompatibility, } from "@nylorun/core/compatibility";
 export function env(name) {
     return typeof process !== "undefined" ? process.env[name] : undefined;
 }
@@ -54,28 +54,41 @@ function parseProtocolRange(value) {
 }
 export class Transport {
     url;
+    /** The Tenant key; empty for a client that uses subject tokens. */
     key;
+    /** The Tenant id; empty when a publishable key names it. */
     tenant;
+    token;
+    publishableKey;
     fetcher;
     /** Sent on every request, e.g. `Nylorun-Subject` and `Nylorun-Scopes` (`withHeaders`). */
     headers = {};
     check = { compatible: false, features: [] };
-    constructor(options = {}, role = "server") {
+    constructor(options = {}) {
         const url = options.url ?? env("NYLORUN_RUNTIME_URL");
-        const key = options.key ??
-            env(role === "server" ? "NYLORUN_SERVER_KEY" : "NYLORUN_EXECUTOR_KEY");
-        const tenant = options.tenant ?? env("NYLORUN_TENANT");
-        if (!url || !key)
-            throw new Error(`Set Runtime url and ${role} key explicitly or via NYLORUN_RUNTIME_URL / NYLORUN_${role.toUpperCase()}_KEY`);
-        if (!tenant)
+        const token = options.token;
+        const key = token ? "" : options.key ?? env("NYLORUN_SERVER_KEY");
+        const tenant = options.tenant ?? (token ? undefined : env("NYLORUN_TENANT"));
+        if (!url || (!token && !key))
+            throw new Error("Set Runtime url and server key explicitly or via NYLORUN_RUNTIME_URL / NYLORUN_SERVER_KEY");
+        if (token && options.key)
+            throw new Error("Use a Tenant key or subject tokens, not both");
+        if (!tenant && !options.publishableKey)
             throw new Error("Set tenant explicitly or via NYLORUN_TENANT");
         const parsed = new URL(url);
         if (!["http:", "https:"].includes(parsed.protocol))
             throw new Error("Runtime requires an HTTP(S) URL");
         this.url = url.replace(/\/$/, "");
         this.key = key;
-        this.tenant = tenant;
-        this.fetcher = options.fetch ?? globalThis.fetch;
+        this.tenant = tenant ?? "";
+        this.token = token;
+        this.publishableKey = options.publishableKey;
+        // Browsers may not call `/health` (it refuses `Origin`); token clients rely on `426`.
+        if (token)
+            this.check.compatible = true;
+        // Called as a method on a page's window would otherwise lose `this`.
+        const fetcher = options.fetch ?? globalThis.fetch;
+        this.fetcher = options.fetch ? fetcher : (input, init) => fetcher(input, init);
     }
     /**
      * The same destination with `headers` added to every request. The copy shares this
@@ -87,6 +100,14 @@ export class Transport {
             headers: Object.freeze({ ...this.headers, ...headers }),
         });
     }
+    /**
+     * The same destination with another bearer (a delivery token for an Action endpoint's
+     * callbacks). Like `withHeaders`, the copy shares this transport's compatibility check.
+     */
+    withKey(key) {
+        const copy = Object.create(Transport.prototype);
+        return Object.assign(copy, this, { key });
+    }
     /** Clears the cached Host compatibility result (used after a 426). */
     clearCompatibilityCache() {
         this.check.compatible = false;
@@ -123,19 +144,37 @@ export class Transport {
         if (!result.ok)
             throw new IncompatibleRuntimeError(result);
         this.check.features = [...protocol.features];
+        this.check.range = protocol;
         this.check.compatible = true;
     }
+    /** Throws `IncompatibleRuntimeError` before anything is sent when the Host lacks `feature`. */
+    async requireFeature(feature, signal) {
+        const features = await this.hostFeatures(signal);
+        if (!features.includes(feature))
+            throw new IncompatibleRuntimeError({
+                ok: false,
+                reason: "feature",
+                missing: [feature],
+                host: this.check.range ?? { min: 0, max: 0, features },
+            });
+    }
     /** The Host's protocol features, including optional ones, from its `/health`. */
     async hostFeatures(signal) {
         await this.ensureCompatible(signal);
         return this.check.features;
     }
-    authHeaders(init = {}) {
+    async authHeaders(init = {}) {
         const headers = new Headers(init.headers);
         for (const [name, value] of Object.entries(this.headers))
             headers.set(name, value);
-        headers.set("Authorization", `Bearer ${this.key}`);
-        headers.set(TENANT_HEADER, this.tenant);
+        const bearer = this.token
+            ? await this.token.get(init.signal ?? undefined)
+            : this.key;
+        headers.set("Authorization", `Bearer ${bearer}`);
+        if (this.tenant)
+            headers.set(TENANT_HEADER, this.tenant);
+        if (this.publishableKey)
+            headers.set(PUBLISHABLE_KEY_HEADER, this.publishableKey);
         headers.set(PROTOCOL_HEADER, String(PROTOCOL_VERSION));
         if (init.body)
             headers.set("Content-Type", "application/json");
@@ -145,9 +184,18 @@ export class Transport {
         await this.ensureCompatible(init.signal === null ? undefined : init.signal);
         const response = await this.fetcher(this.url + path, {
             ...init,
-            headers: this.authHeaders(init),
+            headers: await this.authHeaders(init),
             redirect: "error",
         });
+        // An expired or revoked subject token: get a new one and try once more.
+        if (response.status === 401 && this.token && !options.retried401) {
+            const body = (await response.clone().json().catch(() => undefined));
+            if (body?.code === "token_expired") {
+                await response.body?.cancel().catch(() => { });
+                this.token.invalidate();
+                return this.request(path, init, { ...options, retried401: true });
+            }
+        }
         if (response.status === 426) {
             this.clearCompatibilityCache();
             if (!options.retried426) {
@@ -185,6 +233,18 @@ export class Transport {
         }
         return response;
     }
+    /**
+     * Sends a request with this client's credentials and returns the Runtime's response as it
+     * is, errors included (an app server passing a response through, e.g. the AG-UI handler).
+     */
+    async forward(path, init = {}) {
+        await this.ensureCompatible(init.signal === null ? undefined : init.signal);
+        return this.fetcher(this.url + path, {
+            ...init,
+            headers: await this.authHeaders(init),
+            redirect: "error",
+        });
+    }
     async json(path, method = "GET", body, signal) {
         const response = await this.request(path, {
             method,

package/dist/index.d.ts

@@ -4,18 +4,21 @@ export { Agent, AgentBuilder } from "./builder.js";
 export { AgentBuildError, AgentLifecycleError, Loop, Chain, Switch, Parallel, Map, VerdictSchema, isVerdict, withInstructions, withoutTools, WorkflowBuildError, isBuiltWorkflow, capability, CapabilityBuilder, flow, tool, defineSchema, ToolError, } from "@nylorun/core/define";
 export type { FlowAgentBuilder, Flow, Named, StageArgs, NestedStageArgs, CapabilityIdentity, } from "@nylorun/core/define";
 export type { AgentOptions, AgentManifest, BuiltAgent, BuiltWorkflow, LoopOptions, LoopDecideArgs, LoopVerifyArgs, LoopDecision, ChainOptions, SwitchOptions, ParallelOptions, MapOptions, Verdict, WorkflowBinding, WorkflowManifest, ToolDefinition, ToolExecutionContext, ToolOutcome, Patch, Decision, TurnDecision, HookScope, BeforeHook, AfterHook, JsonValue, JsonObject, } from "@nylorun/core/define";
-export type { LiveEvent, SessionCommand, Action, ActionOutcome, CredentialInfo, CredentialSelection, VaultInfo, SubjectScope, } from "@nylorun/core/contracts";
+export type { LiveEvent, SessionEvent, SessionEventOf, EventType, SessionCommand, Action, ActionOutcome, CredentialInfo, CredentialSelection, VaultInfo, SubjectScope, } from "@nylorun/core/contracts";
 export { SUBJECT_SCOPES } from "@nylorun/core/contracts";
 export { AgentsClient, SessionClient, createClient } from "./client.js";
 export type { ActAsOptions, AgentSource, SessionView, CommandOptions, SessionSandbox, } from "./client.js";
-export { connectAgents } from "./executor.js";
-export type { ConnectOptions, AgentConnection } from "./executor.js";
+export { AccessClient, PublishableKeysClient, SigningKeysClient, TokensClient, } from "./access.js";
+export type { CreateTokenOptions } from "./access.js";
+export { createTokenEndpoint } from "./token-endpoint.js";
+export type { TokenEndpointOptions } from "./token-endpoint.js";
+export { createActionHandler } from "./action-handler.js";
+export type { ActionHandler, ActionHandlerOptions, RegisterOptions, } from "./action-handler.js";
 export type { ExecuteActionOptions, ExecutableDefinition, } from "./execute-action.js";
 export { resolveConnection, ConnectionError } from "./connection.js";
 export type { ResolvedConnection } from "./connection.js";
-export { deriveExecutorToken } from "./derived-credentials.js";
 export { RuntimeError, IncompatibleRuntimeError } from "./http.js";
-export type { Destination, IncompatibleReason } from "./http.js";
+export type { Destination, IncompatibleReason, TokenSource } from "./http.js";
 export { plugin } from "./plugins/plugin.js";
 export type { PluginCapability } from "./plugins/plugin.js";
 export { loadPlugin, PluginError } from "./plugins/load.js";
@@ -26,6 +29,5 @@ export { skills, loadSkillsFromDirectory, resolveSkillsRoot, parseSkill, SkillsE
 export type { SkillsCapability, SkillsOptions, SkillDiagnostic, } from "./skills/index.js";
 export { mcp, McpError } from "./mcp/index.js";
 export type { McpCapability, McpOptions, McpServerSpec } from "./mcp/index.js";
-export { sandbox, SandboxError } from "./sandbox/index.js";
-export type { SandboxCapability, SandboxCapabilityOptions, SandboxOptions, ActionSandbox, ActionSandboxToolResult, CreateActionSandboxOptions, } from "./sandbox/index.js";
+export type { ActionSandbox, ActionSandboxToolResult, CreateActionSandboxOptions, } from "./sandbox/index.js";
 export { createActionSandbox, definitionDeclaresSandbox, isActionSandboxTool, } from "./sandbox/index.js";

package/dist/index.js

@@ -4,14 +4,14 @@ export { Agent, AgentBuilder } from "./builder.js";
 export { AgentBuildError, AgentLifecycleError, Loop, Chain, Switch, Parallel, Map, VerdictSchema, isVerdict, withInstructions, withoutTools, WorkflowBuildError, isBuiltWorkflow, capability, CapabilityBuilder, flow, tool, defineSchema, ToolError, } from "@nylorun/core/define";
 export { SUBJECT_SCOPES } from "@nylorun/core/contracts";
 export { AgentsClient, SessionClient, createClient } from "./client.js";
-export { connectAgents } from "./executor.js";
+export { AccessClient, PublishableKeysClient, SigningKeysClient, TokensClient, } from "./access.js";
+export { createTokenEndpoint } from "./token-endpoint.js";
+export { createActionHandler } from "./action-handler.js";
 export { resolveConnection, ConnectionError } from "./connection.js";
-export { deriveExecutorToken } from "./derived-credentials.js";
 export { RuntimeError, IncompatibleRuntimeError } from "./http.js";
 export { plugin } from "./plugins/plugin.js";
 export { loadPlugin, PluginError } from "./plugins/load.js";
 export { prepareStdioLaunch, expandPluginPlaceholders } from "./plugins/launch.js";
 export { skills, loadSkillsFromDirectory, resolveSkillsRoot, parseSkill, SkillsError, formatSkillCatalog, SKILLS_USAGE, } from "./skills/index.js";
 export { mcp, McpError } from "./mcp/index.js";
-export { sandbox, SandboxError } from "./sandbox/index.js";
 export { createActionSandbox, definitionDeclaresSandbox, isActionSandboxTool, } from "./sandbox/index.js";

package/dist/sandbox/client.d.ts

@@ -1,6 +1,6 @@
 /**
- * Claim-scoped sandbox client for executor actions (`ctx.sandbox`).
- * Calls `POST /v1/actions/:id/sandbox/:tool` with the live claim.
+ * Action-scoped sandbox client (`ctx.sandbox`). Calls `POST /v1/actions/:id/sandbox/:tool`
+ * over a transport whose credential is the Action's delivery token.
  */
 import { type SandboxToolName } from "@nylorun/core/define";
 import { type Transport } from "../http.js";
@@ -45,13 +45,12 @@ export type ActionSandbox = {
     }) => Promise<ActionSandboxToolResult>;
 };
 export type CreateActionSandboxOptions = {
+    /** The transport's key is the delivery token, which names the Action and its generation. */
     readonly transport: Transport;
     readonly actionId: string;
-    readonly claimId: string;
-    readonly generation: number;
     readonly signal?: AbortSignal;
 };
-/** Build `ctx.sandbox` for one claimed action. Undefined callers skip when the session has none. */
+/** Build `ctx.sandbox` for one delivered action. Callers skip it when the session has none. */
 export declare function createActionSandbox(options: CreateActionSandboxOptions): ActionSandbox;
 export declare function isActionSandboxTool(name: string): name is SandboxToolName;
 /** True when the executable declares a sandbox the Runtime can share. */

package/dist/sandbox/client.js

@@ -1,16 +1,12 @@
 /**
- * Claim-scoped sandbox client for executor actions (`ctx.sandbox`).
- * Calls `POST /v1/actions/:id/sandbox/:tool` with the live claim.
+ * Action-scoped sandbox client (`ctx.sandbox`). Calls `POST /v1/actions/:id/sandbox/:tool`
+ * over a transport whose credential is the Action's delivery token.
  */
 import { SANDBOX_TOOL_NAMES, } from "@nylorun/core/define";
 import { segment } from "../http.js";
-/** Build `ctx.sandbox` for one claimed action. Undefined callers skip when the session has none. */
+/** Build `ctx.sandbox` for one delivered action. Callers skip it when the session has none. */
 export function createActionSandbox(options) {
-    const call = (tool, input) => options.transport.json(`/v1/actions/${segment(options.actionId)}/sandbox/${tool}`, "POST", {
-        claimId: options.claimId,
-        generation: options.generation,
-        ...input,
-    }, options.signal);
+    const call = (tool, input) => options.transport.json(`/v1/actions/${segment(options.actionId)}/sandbox/${tool}`, "POST", input, options.signal);
     const sandbox = {
         bash: (input) => call("bash", input),
         read: (input) => call("read", input),

package/dist/sandbox/index.d.ts

@@ -1,4 +1,2 @@
-export { sandbox, SandboxError } from "@nylorun/core/define";
-export type { SandboxCapability, SandboxCapabilityOptions, SandboxOptions, } from "@nylorun/core/define";
 export { createActionSandbox, definitionDeclaresSandbox, isActionSandboxTool, } from "./client.js";
 export type { ActionSandbox, ActionSandboxToolResult, CreateActionSandboxOptions, } from "./client.js";

package/dist/sandbox/index.js

@@ -1,2 +1 @@
-export { sandbox, SandboxError } from "@nylorun/core/define";
 export { createActionSandbox, definitionDeclaresSandbox, isActionSandboxTool, } from "./client.js";

package/dist/served-definitions.d.ts

@@ -0,0 +1,20 @@
+import { type BuiltWorkflow } from "@nylorun/core/define";
+import { type AgentSource } from "./client.js";
+import type { ExecutableDefinition } from "./execute-action.js";
+/** The implementation version to register: the option, `NYLORUN_IMPLEMENTATION_VERSION`, or `dev`. */
+export declare function implementationVersionOf(options: {
+    implementationVersion?: string;
+}): string;
+/** The ids among `agents` that are saved only as part of another definition. */
+export declare function embeddedIn(agents: Map<string, ExecutableDefinition>): ReadonlySet<string>;
+/**
+ * Every definition `sources` serves, by id: the agents and workflows passed in, the agents
+ * a v2 workflow embeds, and flow agents used as tools. `owner` names the caller in errors.
+ */
+export declare function buildAgents(sources: readonly (AgentSource | BuiltWorkflow)[], owner: string): Map<string, ExecutableDefinition>;
+/**
+ * The manifest hash served for a workflow's flow actions. A run is pinned to one workflow
+ * manifest, and its stage keys may shift between deploys, so flow actions for another hash
+ * are left for whoever serves it.
+ */
+export declare function flowManifestHash(agent: ExecutableDefinition): string | undefined;

package/dist/served-definitions.js

@@ -0,0 +1,100 @@
+/** The definitions an application serves Actions for (`createActionHandler`). */
+import { AgentManifestSchema } from "@nylorun/core/contracts";
+import { agentFrom, delegateOf, hashManifest, isFlowDelegate, isBuiltWorkflow, } from "@nylorun/core/define";
+import { assertNoMiddlewareClosures } from "./client.js";
+import { env } from "./http.js";
+/** The implementation version to register: the option, `NYLORUN_IMPLEMENTATION_VERSION`, or `dev`. */
+export function implementationVersionOf(options) {
+    return (options.implementationVersion ??
+        env("NYLORUN_IMPLEMENTATION_VERSION") ??
+        "dev");
+}
+/** Agents embedded in a v2 workflow: served here, but saved only as part of the workflow. */
+const embeddedAgents = new WeakMap();
+/** The ids among `agents` that are saved only as part of another definition. */
+export function embeddedIn(agents) {
+    return embeddedAgents.get(agents) ?? new Set();
+}
+/**
+ * Every definition `sources` serves, by id: the agents and workflows passed in, the agents
+ * a v2 workflow embeds, and flow agents used as tools. `owner` names the caller in errors.
+ */
+export function buildAgents(sources, owner) {
+    const agents = new Map();
+    const embedded = new Set();
+    /**
+     * Agents embedded in another definition (a v2 flow's agents, a flow agent used as a
+     * tool) may be reached from more than one place; the same definition is served once.
+     */
+    const sameAsServed = (id, manifest) => {
+        const served = agents.get(id);
+        if (!served)
+            return false;
+        if (hashManifest(served.manifest) === hashManifest(manifest))
+            return true;
+        throw new Error(`Duplicate connected agent ${id}`);
+    };
+    const addAgent = (built, shared = false) => {
+        assertNoMiddlewareClosures(built);
+        AgentManifestSchema.parse(built.manifest);
+        if (shared ? sameAsServed(built.id, built.manifest) : agents.has(built.id)) {
+            if (!shared)
+                throw new Error(`Duplicate connected agent ${built.id}`);
+            return;
+        }
+        agents.set(built.id, built);
+        for (const tool of built.getBinding().tools) {
+            const delegate = delegateOf(tool);
+            if (!delegate || !isFlowDelegate(delegate))
+                continue;
+            // A flow agent used as a tool runs in its own linked session: serve its code too.
+            if (!delegate.workflow)
+                throw new Error(`Flow agent '${delegate.manifest.id}' is used as a tool by '${built.id}' but has no local implementation`);
+            addWorkflow(delegate.workflow, true);
+            embedded.add(delegate.workflow.id);
+        }
+    };
+    const addWorkflow = (workflow, shared = false) => {
+        if (shared ? sameAsServed(workflow.id, workflow.manifest) : agents.has(workflow.id)) {
+            if (!shared)
+                throw new Error(`Duplicate connected agent ${workflow.id}`);
+            return;
+        }
+        agents.set(workflow.id, workflow);
+        const v2 = workflow.manifest.workflowSchemaVersion === 2;
+        for (const binding of Object.values(workflow.getBinding().agents)) {
+            addAgent(agentFrom(binding.manifest, binding.implementations), v2);
+            if (v2)
+                embedded.add(binding.manifest.id);
+        }
+    };
+    for (const source of sources) {
+        if (isBuiltWorkflow(source)) {
+            addWorkflow(source);
+            continue;
+        }
+        const built = source.build?.() ?? source;
+        if (isBuiltWorkflow(built)) {
+            addWorkflow(built);
+            continue;
+        }
+        addAgent(built);
+    }
+    if (!agents.size)
+        throw new Error(`${owner} requires at least one agent`);
+    // A definition passed in directly is saved on its own, even if another one embeds it.
+    for (const source of sources)
+        embedded.delete(source.id);
+    embeddedAgents.set(agents, embedded);
+    return agents;
+}
+/**
+ * The manifest hash served for a workflow's flow actions. A run is pinned to one workflow
+ * manifest, and its stage keys may shift between deploys, so flow actions for another hash
+ * are left for whoever serves it.
+ */
+export function flowManifestHash(agent) {
+    return isBuiltWorkflow(agent) && agent.manifest.workflowSchemaVersion === 2
+        ? hashManifest(agent.manifest)
+        : undefined;
+}