@nylorun/runtime 0.24.0-beta → 0.25.0-beta

package/dist/tenant/sessions.js

@@ -9,8 +9,8 @@ import { approvalRefusal, codeToolRefusal } from "@nylorun/core/define";
 import { aggregateWaits, isWorkflowManifest } from "../core/flow-host.js";
 import { canonical } from "../store/canonical.js";
 import { sandboxSpecOf } from "../sandbox/resolve.js";
-import { withPlatformTools, withSandboxCapability } from "../sandbox/session-sandbox.js";
-import { declaredSandboxes } from "../sandbox/share.js";
+import { withRuntimeTools, withSandbox } from "../sandbox/session-sandbox.js";
+import { authoredRuntimeBlocks, declaredSandboxes } from "../sandbox/share.js";
 import { effectiveSandboxConfig, readSandboxConfig } from "../sandbox/tenant-config.js";
 import { HARNESS_ID, checkPlacement, requirePods } from "../sandbox/placement.js";
 import { openEnvironment, recordAttachment } from "./environments.js";
@@ -51,7 +51,7 @@ export async function listAgentsPublic(ctx, agents) {
         })),
     };
 }
-export async function putDefinition(ctx, agentId, body) {
+export async function putDefinition(ctx, agentId, body, options = {}) {
     if (body.manifest.id !== agentId)
         fail(400, "Agent id mismatch");
     DefinitionDocumentSchema.parse(body.manifest);
@@ -66,6 +66,9 @@ export async function putDefinition(ctx, agentId, body) {
     const declared = declaredSandboxes(body.manifest);
     if (declared.length > 0)
         fail(400, `${declared.join(", ")} declares a sandbox. Agents no longer declare one: remove .sandbox(), create an Environment with the sandbox (PUT /v1/environments/{id}) and open the session on it, createSession({ environment }). See MIGRATION.md.`);
+    const runtime = authoredRuntimeBlocks(body.manifest);
+    if (runtime.length > 0)
+        fail(400, `${runtime.join(", ")} sets runtime, which only the Runtime writes when it pins a session's agent. Remove it and register the manifest your builder makes.`);
     const definition = {
         ...body,
         manifestHash: hashManifest(body.manifest),
@@ -75,6 +78,8 @@ export async function putDefinition(ctx, agentId, body) {
         const missing = await missingDefinitionFiles(t, body.manifest);
         if (missing.length > 0)
             fail(400, `The definition names ${missing.length} file(s) the Runtime does not hold; upload each with PUT /v1/files/<sha256> first: ${missing.join(", ")}`, { code: "definition_files_missing", details: { missing } });
+        if (options.dryRun)
+            return;
         await t.put("definitions", agentId, definition);
         await t.insertDefinitionFileUses(agentId, definition.manifestHash, files);
     });
@@ -82,6 +87,7 @@ export async function putDefinition(ctx, agentId, body) {
         agentId,
         manifestHash: definition.manifestHash,
         implementationVersion: body.implementationVersion,
+        ...(options.dryRun ? { dryRun: true } : {}),
     };
 }
 /**
@@ -150,6 +156,8 @@ export async function putSession(ctx, id, body, access, options = {}) {
                 ownerUserId: body.ownerUserId,
                 opaque,
             });
+        if (!isWorkflowManifest(definition.manifest))
+            await checkRequirements(t, definition.manifest, environment);
         const config = await readSandboxConfig(t);
         // The harness the session runs for its life (R4.1): its Environment's, else ours. A flow
         // runs in core and our engine, whatever its Environment names.
@@ -163,7 +171,7 @@ export async function putSession(ctx, id, body, access, options = {}) {
         const spec = environment === undefined || environment.kind === "none"
             ? undefined
             : sandboxSpecOf(environment.applied, effectiveSandboxConfig(config).limits.idle);
-        const pinned = spec === undefined ? platformTools(definition) : pin(definition, spec);
+        const pinned = spec === undefined ? runtimeTools(definition) : pin(definition, spec);
         const created = {
             id,
             agentId: body.agentId,
@@ -189,25 +197,50 @@ export async function putSession(ctx, id, body, access, options = {}) {
     });
 }
 /**
- * The manifest a session without a sandbox pins: its agents' `read_artifact` (R2b C11), when
- * one has a remote MCP server or an HTTP tool; nothing otherwise, and for a workflow.
+ * Refuses a session whose agent requires what its Environment lacks (protocol 14, D65): a
+ * sandbox (`any`: kind `virtual` or `pod`), a pod, or a secret its vault does not hold. Every
+ * gap is named in one `409 environment_unsuitable`.
  */
-function platformTools(definition) {
+async function checkRequirements(t, manifest, environment) {
+    const requires = manifest.requires;
+    if (requires === undefined)
+        return;
+    const missing = [];
+    const kind = environment?.kind;
+    if (requires.sandbox === "any" && kind !== "virtual" && kind !== "pod")
+        missing.push("sandbox");
+    if (requires.sandbox === "pod" && kind !== "pod")
+        missing.push("pod");
+    if (requires.secrets?.length) {
+        const vault = environment === undefined ? undefined : await t.vaultOfEnvironment(environment.id);
+        const held = new Set(vault ? (await t.credentialsForVault(vault.id)).map((row) => row.name) : []);
+        for (const name of requires.secrets)
+            if (!held.has(name))
+                missing.push(`secret:${name}`);
+    }
+    if (missing.length === 0)
+        return;
+    const where = environment === undefined ? "the session names no Environment" : `Environment ${environment.id} lacks it`;
+    fail(409, `Agent ${manifest.id} requires ${missing.map((gap) => (gap.startsWith("secret:") ? `the secret ${gap.slice(7)}` : gap === "pod" ? "a pod Environment" : "a sandbox")).join(", ")}, and ${where}.`, { code: "environment_unsuitable", details: { missing } });
+}
+/**
+ * The manifest a session without a sandbox pins: each agent's `runtime` block, with
+ * `read_artifact` (R2b C11) and its skill tools; nothing for a workflow.
+ */
+function runtimeTools(definition) {
     if (isWorkflowManifest(definition.manifest))
         return {};
-    const pinned = withPlatformTools(definition.manifest);
-    if (pinned === undefined)
-        return {};
+    const pinned = withRuntimeTools(definition.manifest);
     if (!pinned.ok)
         return fail(400, pinned.message);
     return { manifest: pinned.manifest, manifestHash: pinned.manifestHash };
 }
-/** The manifest a session with a sandbox pins: the definition with the sandbox capability. */
+/** The manifest a session with a sandbox pins: the definition with the sandbox in its `runtime` block. */
 function pin(definition, spec) {
     // A workflow's manifest stays as registered: its agents inherit the sandbox when they start.
     if (isWorkflowManifest(definition.manifest))
         return {};
-    const sandboxed = withSandboxCapability(definition.manifest, spec);
+    const sandboxed = withSandbox(definition.manifest, spec);
     if (!sandboxed.ok)
         return fail(400, sandboxed.message);
     return { manifest: sandboxed.manifest, manifestHash: sandboxed.manifestHash };

package/dist/tenant/skill-tool.d.ts

@@ -1,11 +1,11 @@
 /**
- * The skill tools (track R2 M4): `load_skill` and `read_skill_resource`, which the build gives
- * the first capability with skills. The Runtime runs them itself, like `save_artifact`, from the
+ * The skill tools (track R2 M4): `load_skill` and `read_skill_resource`, which the Runtime pins
+ * in the `runtime` block of an agent with skills. The Runtime runs them itself, like `save_artifact`, from the
  * definition files uploaded with the agent: no developer process is involved.
  *
  * - `load_skill`: the skill's instructions (its `SKILL.md` after the frontmatter), the paths of
  *   its other files, and, when the session has a sandbox, where they are in it
- *   (`/skills/<name>/`, read-only).
+ *   (`/skills/<name>@<hash>/`, read-only, D66).
  * - `read_skill_resource`: one text file of the skill. A binary file is refused: the model reads
  *   it in the sandbox, when there is one.
  *

package/dist/tenant/skill-tool.js

@@ -1,19 +1,14 @@
-import { LOAD_SKILL_TOOL, SANDBOX_CAPABILITY_ID, SKILL_ENTRY, SKILLS_MOUNT, isSkillTool, skillInstructions, } from "@nylorun/core/define";
-import { sandboxCapabilityOf } from "../sandbox/capability.js";
+import { LOAD_SKILL_TOOL, SKILL_ENTRY, skillFolderOf, isSkillTool, skillInstructions, } from "@nylorun/core/define";
+import { sandboxToolSpec } from "../sandbox/runtime-tools.js";
 import { readDefinitionFile } from "./definition-files.js";
 const failed = (code, message) => ({ kind: "failed", code, message });
 /** True when `request` calls a skill tool the Runtime serves for `manifest`'s agent. */
 export function isSkillToolCall(manifest, request) {
-    return (request.kind === "tool" &&
-        isSkillTool(manifest?.capabilities.find((capability) => capability.id === request.capabilityId), request.toolName));
+    return request.kind === "tool" && isSkillTool(manifest, request.toolName);
 }
 /** Every skill of the agent, by name. */
 function skillsOf(manifest) {
-    const skills = new Map();
-    for (const capability of manifest.capabilities)
-        for (const skill of Object.values(capability.skills ?? {}))
-            skills.set(skill.name, skill);
-    return skills;
+    return new Map(Object.values(manifest.skills ?? {}).map((skill) => [skill.name, skill]));
 }
 /** UTF-8 text, or undefined for bytes that are not (a NUL byte, or invalid UTF-8). */
 function textOf(bytes) {
@@ -35,8 +30,8 @@ export async function callSkillTool(ctx, manifest, request, signal) {
         return request.toolName === LOAD_SKILL_TOOL
             ? { kind: "completed", output: { unknown: name, available: [...skills.keys()].sort() } }
             : failed("skill.unknown", `There is no skill '${name}'.`);
-    const sandboxed = sandboxCapabilityOf(manifest, SANDBOX_CAPABILITY_ID, "bash") !== undefined;
-    const directory = `${SKILLS_MOUNT}/${skill.name}/`;
+    const sandboxed = sandboxToolSpec(manifest, "bash") !== undefined;
+    const directory = `${skillFolderOf(skill)}/`;
     const read = async (path) => {
         const bytes = await readDefinitionFile(ctx.blobs, skill.files[path], signal);
         if (!bytes)

package/dist/tenant/sweep.js

@@ -29,7 +29,7 @@
  *    wiped (§17.11), or a parked outbox row.
  * 4. **Sandboxes.** Idle sandboxes are stopped, records of compute no longer held are marked
  *    stopped, and sandboxes whose session or Environment is gone are removed, by the
- *    workspace capability (`harness-api/workspace.ts`: here, or in the harness that serves
+ *    workspace feature (`harness-api/workspace.ts`: here, or in the harness that serves
  *    workspaces). Idle MCP connections of the in-process harness are closed. As often as the
  *    orphan scan, pod Environments whose change stalled get a reconcile (`reconcileStalePods`).
  *    Environments unused for their `lifecycle.deleteAfter` are deleted

package/dist/tenant/tool-results.js

@@ -170,7 +170,7 @@ async function shapeBinary(shaping, part, index) {
         kept.size <= MODEL_FILE_MAX_BYTES)
         shaping.files.push({
             mediaType: contentType,
-            reference: { artifactId: kept.artifactId, version: kept.version, name },
+            reference: { artifactId: kept.artifactId, version: kept.version, name, size: kept.size },
         });
     return {
         type: part.type,

package/dist/tenant/tool-search.d.ts

@@ -1,16 +1,12 @@
-/**
- * `tool_search` (R2b C10, Q20): core finds an agent's deferred MCP tools in the session's pinned
- * snapshot, ranked with BM25 over their names and descriptions, and returns each match's name,
- * description and `inputSchema`, for the model to run with `tool_call`. It reads only the pinned
- * snapshot, so the same query finds the same tools for the session's life; a tool the turn's
- * manifest disables is never found.
- */
-import { type AgentManifest } from "@nylorun/core/define";
 import type { HostEffect } from "@nylorun/harness/run";
-import { type McpToolRecord } from "../mcp/snapshot.js";
+import { type McpSnapshot, type McpToolRecord } from "../mcp/snapshot.js";
 import { type TenantContext } from "./context.js";
-/** True when `request` calls `tool_search` of the `nylorun.tools` capability `manifest` has. */
-export declare function isToolSearchCall(manifest: AgentManifest | undefined, request: HostEffect): boolean;
+/**
+ * True when `request` calls `tool_search`, the session tool an agent gets when the session's
+ * pinned snapshot holds deferred tools of its own. The name is reserved: no tool of the agent's
+ * own takes it.
+ */
+export declare function isToolSearchCall(snapshot: McpSnapshot | undefined, request: HostEffect): boolean;
 /** Runs `tool_search` for the run's agent. */
 export declare function callToolSearch(ctx: TenantContext, request: HostEffect): Promise<{
     output?: undefined;

package/dist/tenant/tool-search.js

@@ -5,19 +5,22 @@
  * snapshot, so the same query finds the same tools for the session's life; a tool the turn's
  * manifest disables is never found.
  */
-import { TOOL_SEARCH_DEFAULT_LIMIT, TOOL_SEARCH_MAX_LIMIT, TOOL_SEARCH_TOOL, TOOLS_CAPABILITY_ID, } from "@nylorun/core/define";
+import { TOOL_SEARCH_DEFAULT_LIMIT, TOOL_SEARCH_MAX_LIMIT, TOOL_SEARCH_TOOL, } from "@nylorun/core/define";
 import { isEnabledIn } from "../mcp/snapshot.js";
 import { sessionOf } from "./context.js";
 import { turnManifestOf } from "./session.js";
 /** BM25's term saturation and length normalization, the usual values. */
 const K1 = 1.2;
 const B = 0.75;
-/** True when `request` calls `tool_search` of the `nylorun.tools` capability `manifest` has. */
-export function isToolSearchCall(manifest, request) {
+/**
+ * True when `request` calls `tool_search`, the session tool an agent gets when the session's
+ * pinned snapshot holds deferred tools of its own. The name is reserved: no tool of the agent's
+ * own takes it.
+ */
+export function isToolSearchCall(snapshot, request) {
     return (request.kind === "tool" &&
-        request.capabilityId === TOOLS_CAPABILITY_ID &&
         request.toolName === TOOL_SEARCH_TOOL &&
-        manifest?.capabilities.some((capability) => capability.id === TOOLS_CAPABILITY_ID) === true);
+        snapshot?.mcpTools.some((tool) => tool.deferred === true && tool.agentId === request.agent?.id) === true);
 }
 /** Runs `tool_search` for the run's agent. */
 export async function callToolSearch(ctx, request) {

package/dist/tenant/transcript.d.ts

@@ -4,6 +4,7 @@
  * Payload schemas: `@nylorun/core/contracts` (`parseTranscriptEvent`).
  */
 import type { HostEffect } from "@nylorun/harness/run";
+import type { PluginLabel } from "@nylorun/core/define";
 import type { TOOL_CALL_KINDS, TOOL_CALL_STATUSES } from "@nylorun/core/contracts";
 export type ToolCallStatus = (typeof TOOL_CALL_STATUSES)[number];
 export type ToolCallKind = (typeof TOOL_CALL_KINDS)[number];
@@ -136,6 +137,8 @@ export interface ToolCallFacts {
     readonly status: ToolCallStatus;
     readonly kind?: ToolCallKind;
     readonly server?: string;
+    readonly skill?: string;
+    readonly plugin?: PluginLabel;
     readonly attempts?: number;
     readonly durationMs?: number;
     readonly effectId?: string;
@@ -156,11 +159,12 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     };
     output?: undefined;
     redacted: number;
-    capabilityId: string;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
     server?: string | undefined;
+    skill?: string | undefined;
+    plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
     durationMs?: number | undefined;
     effectId?: string | undefined;
@@ -176,11 +180,12 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     };
     output?: undefined;
     redacted: number;
-    capabilityId: string;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
     server?: string | undefined;
+    skill?: string | undefined;
+    plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
     durationMs?: number | undefined;
     effectId?: string | undefined;
@@ -196,11 +201,12 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     };
     output?: undefined;
     redacted?: undefined;
-    capabilityId: string;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
     server?: string | undefined;
+    skill?: string | undefined;
+    plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
     durationMs?: number | undefined;
     effectId?: string | undefined;
@@ -216,11 +222,12 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     };
     output?: undefined;
     redacted?: undefined;
-    capabilityId: string;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
     server?: string | undefined;
+    skill?: string | undefined;
+    plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
     durationMs?: number | undefined;
     effectId?: string | undefined;
@@ -231,11 +238,12 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     error?: undefined;
     output: unknown;
     redacted: number;
-    capabilityId: string;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
     server?: string | undefined;
+    skill?: string | undefined;
+    plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
     durationMs?: number | undefined;
     effectId?: string | undefined;
@@ -246,11 +254,12 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     error?: undefined;
     output: unknown;
     redacted: number;
-    capabilityId: string;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
     server?: string | undefined;
+    skill?: string | undefined;
+    plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
     durationMs?: number | undefined;
     effectId?: string | undefined;
@@ -261,11 +270,12 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     error?: undefined;
     output: unknown;
     redacted?: undefined;
-    capabilityId: string;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
     server?: string | undefined;
+    skill?: string | undefined;
+    plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
     durationMs?: number | undefined;
     effectId?: string | undefined;
@@ -276,11 +286,12 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     error?: undefined;
     output: unknown;
     redacted?: undefined;
-    capabilityId: string;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
     server?: string | undefined;
+    skill?: string | undefined;
+    plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
     durationMs?: number | undefined;
     effectId?: string | undefined;
@@ -298,11 +309,12 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     };
     output?: undefined;
     redacted: number;
-    capabilityId: string;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
     server?: string | undefined;
+    skill?: string | undefined;
+    plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
     durationMs?: number | undefined;
     effectId?: string | undefined;
@@ -320,11 +332,12 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     };
     output?: undefined;
     redacted: number;
-    capabilityId: string;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
     server?: string | undefined;
+    skill?: string | undefined;
+    plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
     durationMs?: number | undefined;
     effectId?: string | undefined;
@@ -342,11 +355,12 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     };
     output?: undefined;
     redacted?: undefined;
-    capabilityId: string;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
     server?: string | undefined;
+    skill?: string | undefined;
+    plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
     durationMs?: number | undefined;
     effectId?: string | undefined;
@@ -364,11 +378,12 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     };
     output?: undefined;
     redacted?: undefined;
-    capabilityId: string;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
     server?: string | undefined;
+    skill?: string | undefined;
+    plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
     durationMs?: number | undefined;
     effectId?: string | undefined;
@@ -381,11 +396,12 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     error?: undefined;
     output: unknown;
     redacted: number;
-    capabilityId: string;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
     server?: string | undefined;
+    skill?: string | undefined;
+    plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
     durationMs?: number | undefined;
     effectId?: string | undefined;
@@ -398,11 +414,12 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     error?: undefined;
     output: unknown;
     redacted: number;
-    capabilityId: string;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
     server?: string | undefined;
+    skill?: string | undefined;
+    plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
     durationMs?: number | undefined;
     effectId?: string | undefined;
@@ -415,11 +432,12 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     error?: undefined;
     output: unknown;
     redacted?: undefined;
-    capabilityId: string;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
     server?: string | undefined;
+    skill?: string | undefined;
+    plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
     durationMs?: number | undefined;
     effectId?: string | undefined;
@@ -432,11 +450,12 @@ export declare function toolCompleted(request: HostEffect, value: unknown, facts
     error?: undefined;
     output: unknown;
     redacted?: undefined;
-    capabilityId: string;
     toolName: string;
     status?: "cancelled" | "completed" | "failed" | undefined;
-    kind?: "http" | "mcp" | "platform" | "sandbox" | undefined;
+    kind?: "harness" | "http" | "mcp" | "platform" | "sandbox" | undefined;
     server?: string | undefined;
+    skill?: string | undefined;
+    plugin?: PluginLabel | undefined;
     attempts?: number | undefined;
     durationMs?: number | undefined;
     effectId?: string | undefined;

package/dist/tenant/transcript.js

@@ -158,13 +158,14 @@ export function toolCompleted(request, value, facts) {
         : {};
     return {
         ...ids,
-        capabilityId: request.capabilityId,
         toolName: request.toolName,
         ...(facts
             ? {
                 status: facts.status,
                 ...(facts.kind === undefined ? {} : { kind: facts.kind }),
                 ...(facts.server === undefined ? {} : { server: facts.server }),
+                ...(facts.skill === undefined ? {} : { skill: facts.skill }),
+                ...(facts.plugin === undefined ? {} : { plugin: facts.plugin }),
                 ...(facts.attempts === undefined ? {} : { attempts: facts.attempts }),
                 ...(facts.durationMs === undefined ? {} : { durationMs: facts.durationMs }),
                 ...(facts.effectId === undefined ? {} : { effectId: facts.effectId }),

package/dist/traces/ids.d.ts

@@ -3,7 +3,6 @@ export type TraceKey = Buffer;
 export declare function traceIdOf(key: TraceKey, tenantId: string, sessionId: string, turnId: string): string;
 export declare function turnSpanOf(key: TraceKey, turnId: string): string;
 export declare function effectSpanOf(key: TraceKey, effectId: string): string;
-export declare function egressSpanOf(key: TraceKey, sessionId: string, seq: number): string;
 export declare function eventSpanOf(key: TraceKey, sessionId: string, seq: number): string;
 /** W3C trace context (R7.4): `traceparent`, and `tracestate` when the caller sent one. */
 export interface TraceContext {

package/dist/traces/ids.js

@@ -8,7 +8,6 @@
  *   (R7.4): then that trace id.
  * - **turn span**: `span|turn|<turn>`; every crossing's span is its child.
  * - **effect span**: `span|effect|<effect id>`, for a model or tool call or a flow stage.
- * - **egress span**: `span|egress|<session>|<seq>`, for one `egress.connection` row.
  * - **event span**: `span|event|<session>|<seq>`, for a marker or a row without an effect id.
  */
 import { createHmac } from "node:crypto";
@@ -26,9 +25,6 @@ export function turnSpanOf(key, turnId) {
 export function effectSpanOf(key, effectId) {
     return hmacHex(key, `span|effect|${effectId}`, 8);
 }
-export function egressSpanOf(key, sessionId, seq) {
-    return hmacHex(key, `span|egress|${sessionId}|${seq}`, 8);
-}
 export function eventSpanOf(key, sessionId, seq) {
     return hmacHex(key, `span|event|${sessionId}|${seq}`, 8);
 }

package/dist/traces/map.d.ts

@@ -10,7 +10,6 @@
  * | `tool.completed` | `execute_tool {toolName}` (INTERNAL) |
  * | `node.completed` | `execute_tool {key}`, a flow's HTTP stage (INTERNAL) |
  * | `effect.uncertain` | the call's span, with an error status |
- * | `egress.connection` | `CONNECT {host}` (CLIENT) |
  * | `turn.paused`, `command.approve`, `command.respond` | a marker with no length |
  *
  * Every other row, and every row without a turn, makes none. Every child's parent is the turn's
@@ -18,7 +17,8 @@
  *
  * Timing: a span with a gate's own measurement (`gate`, R7.1) is that measurement; any other ends
  * at the row's time and starts `durationMs` before it (the journal's window, exported as
- * `nylorun.effect.window_ms`). An egress span is the gate's: `startedAt` plus `durationMs`.
+ * `nylorun.effect.window_ms`). Egress has no span: a connection is the Environment's, not a
+ * turn's (D67), and is read from the Environment's events.
  *
  * Attribute names follow the OTel GenAI conventions at `GENAI_SEMCONV` (still in Development
  * status), recorded on the resource as `nylorun.semconv.genai`; the rest are `nylorun.*`. A span

package/dist/traces/map.js

@@ -1,4 +1,4 @@
-import { effectSpanOf, egressSpanOf, eventSpanOf, parseTraceparent, traceIdOf, turnSpanOf } from "./ids.js";
+import { effectSpanOf, eventSpanOf, parseTraceparent, traceIdOf, turnSpanOf } from "./ids.js";
 /** The commit of open-telemetry/semantic-conventions-genai whose attribute names spans use. */
 export const GENAI_SEMCONV = "open-telemetry/semantic-conventions-genai@6fd0d763a092db245a54104fc1124031eb3c51d2";
 /**
@@ -188,34 +188,6 @@ export function spanOf(row, turn, settings) {
                 status: errorStatus(content("errors", p.message)),
             };
         }
-        case "egress.connection": {
-            const refused = p.outcome === "refused";
-            const started = Date.parse(String(p.startedAt));
-            const attributes = base
-                .str("server.address", p.host)
-                .int("server.port", p.port)
-                .str("nylorun.environment.id", p.environmentId)
-                .str("nylorun.egress.outcome", p.outcome)
-                .str("nylorun.egress.mode", p.mode)
-                .bool("nylorun.egress.credential_bound", p.credentialBound)
-                .strings("nylorun.egress.credential_ids", p.credentialIds)
-                .int("nylorun.egress.requests", p.requests)
-                .int("nylorun.egress.bytes_up", p.bytesUp)
-                .int("nylorun.egress.bytes_down", p.bytesDown)
-                .int("nylorun.egress.status", p.status)
-                .str("error.type", refused ? (p.reason ?? "refused") : undefined);
-            const times = Number.isFinite(started)
-                ? { start: started, end: started + Math.max(0, Math.round(Number(p.durationMs) || 0)) }
-                : undefined;
-            return {
-                ...child(egressSpanOf(settings.key, row.sessionId, row.seq), `CONNECT ${String(p.host)}`, SPAN_KIND.client),
-                ...(times
-                    ? { startTimeUnixNano: nanos(times.start), endTimeUnixNano: nanos(times.end) }
-                    : window(row.time, undefined)),
-                attributes: attributes.list,
-                status: refused ? errorStatus(undefined) : { code: STATUS.unset },
-            };
-        }
         case "turn.paused":
         case "command.approve":
         case "command.respond": {

package/dist/vault/coverage.js

@@ -18,19 +18,17 @@ export function credentialNeeds(manifest) {
     };
     const owner = (agentId) => (agentId === undefined ? {} : { agentId });
     const agent = (manifest, agentId) => {
-        for (const capability of manifest.capabilities) {
-            for (const server of Object.values(capability.mcpServers ?? {}))
-                add({ kind: "mcp", ...owner(agentId), name: server.name, serverName: server.name, url: server.url });
-            for (const tool of capability.tools ?? [])
-                if (tool.http?.credential !== undefined)
-                    add({
-                        kind: "http",
-                        ...owner(agentId),
-                        name: tool.name,
-                        serverName: tool.http.credential,
-                        url: tool.http.url,
-                    });
-        }
+        for (const tool of manifest.tools ?? [])
+            if (tool.http?.credential !== undefined)
+                add({
+                    kind: "http",
+                    ...owner(agentId),
+                    name: tool.name,
+                    serverName: tool.http.credential,
+                    url: tool.http.url,
+                });
+        for (const server of Object.values(manifest.mcpServers ?? {}))
+            add({ kind: "mcp", ...owner(agentId), name: server.name, serverName: server.name, url: server.url });
         for (const child of delegatesOf(manifest))
             agent(child.manifest, child.manifest.id);
         for (const child of flowDelegatesOf(manifest))