@nylorun/runtime 0.21.1-beta → 0.23.0-beta

package/dist/management-openapi.json

@@ -2,7 +2,7 @@
   "openapi": "3.2.0",
   "info": {
     "title": "Nylorun Management API",
-    "version": "0.21.1-beta",
+    "version": "0.23.0-beta",
     "x-nylorun-protocol": {
       "min": 4,
       "max": 10,
@@ -97,6 +97,7 @@
               "definition_files_missing",
               "credential_rejected",
               "mcp_preview_failed",
+              "credential_conflict",
               "internal_error"
             ]
           },
@@ -2113,7 +2114,9 @@
             "type": "string",
             "enum": [
               "bearer",
-              "headers"
+              "headers",
+              "environment_secret",
+              "environment_variable"
             ]
           },
           "binding": {
@@ -2121,11 +2124,41 @@
             "properties": {
               "url": {
                 "type": "string"
+              },
+              "secretName": {
+                "type": "string"
+              },
+              "allowedHosts": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              "inject": {
+                "type": "object",
+                "properties": {
+                  "header": {
+                    "type": "string",
+                    "pattern": "^[!#$%&'*+.^_`|~0-9A-Za-z-]+$"
+                  },
+                  "format": {
+                    "type": "string",
+                    "minLength": 1
+                  }
+                },
+                "required": [
+                  "header",
+                  "format"
+                ],
+                "additionalProperties": false
+              },
+              "variableName": {
+                "type": "string"
+              },
+              "variableValue": {
+                "type": "string"
               }
             },
-            "required": [
-              "url"
-            ],
             "additionalProperties": false
           },
           "headerNames": {
@@ -2269,6 +2302,85 @@
                   "headers"
                 ],
                 "additionalProperties": false
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "type": {
+                    "type": "string",
+                    "enum": [
+                      "environment_secret"
+                    ]
+                  },
+                  "secretName": {
+                    "type": "string",
+                    "pattern": "^[A-Za-z_][A-Za-z0-9_]{0,127}$"
+                  },
+                  "secretValue": {
+                    "type": "string",
+                    "minLength": 1,
+                    "maxLength": 8192
+                  },
+                  "allowedHosts": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    },
+                    "minItems": 1,
+                    "maxItems": 32
+                  },
+                  "inject": {
+                    "type": "object",
+                    "properties": {
+                      "header": {
+                        "type": "string",
+                        "pattern": "^[!#$%&'*+.^_`|~0-9A-Za-z-]+$"
+                      },
+                      "format": {
+                        "type": "string",
+                        "minLength": 1
+                      }
+                    },
+                    "required": [
+                      "header",
+                      "format"
+                    ],
+                    "additionalProperties": false
+                  }
+                },
+                "required": [
+                  "type",
+                  "secretName",
+                  "secretValue",
+                  "allowedHosts"
+                ],
+                "additionalProperties": false
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "type": {
+                    "type": "string",
+                    "enum": [
+                      "environment_variable"
+                    ]
+                  },
+                  "variableName": {
+                    "type": "string",
+                    "pattern": "^[A-Za-z_][A-Za-z0-9_]{0,127}$"
+                  },
+                  "variableValue": {
+                    "type": "string",
+                    "minLength": 1,
+                    "maxLength": 8192
+                  }
+                },
+                "required": [
+                  "type",
+                  "variableName",
+                  "variableValue"
+                ],
+                "additionalProperties": false
               }
             ]
           }
@@ -2302,7 +2414,9 @@
                   "type": "string",
                   "enum": [
                     "bearer",
-                    "headers"
+                    "headers",
+                    "environment_secret",
+                    "environment_variable"
                   ]
                 },
                 "binding": {
@@ -2310,11 +2424,41 @@
                   "properties": {
                     "url": {
                       "type": "string"
+                    },
+                    "secretName": {
+                      "type": "string"
+                    },
+                    "allowedHosts": {
+                      "type": "array",
+                      "items": {
+                        "type": "string"
+                      }
+                    },
+                    "inject": {
+                      "type": "object",
+                      "properties": {
+                        "header": {
+                          "type": "string",
+                          "pattern": "^[!#$%&'*+.^_`|~0-9A-Za-z-]+$"
+                        },
+                        "format": {
+                          "type": "string",
+                          "minLength": 1
+                        }
+                      },
+                      "required": [
+                        "header",
+                        "format"
+                      ],
+                      "additionalProperties": false
+                    },
+                    "variableName": {
+                      "type": "string"
+                    },
+                    "variableValue": {
+                      "type": "string"
                     }
                   },
-                  "required": [
-                    "url"
-                  ],
                   "additionalProperties": false
                 },
                 "headerNames": {
@@ -2463,6 +2607,48 @@
                   "headers"
                 ],
                 "additionalProperties": false
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "type": {
+                    "type": "string",
+                    "enum": [
+                      "environment_secret"
+                    ]
+                  },
+                  "secretValue": {
+                    "type": "string",
+                    "minLength": 1,
+                    "maxLength": 8192
+                  }
+                },
+                "required": [
+                  "type",
+                  "secretValue"
+                ],
+                "additionalProperties": false
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "type": {
+                    "type": "string",
+                    "enum": [
+                      "environment_variable"
+                    ]
+                  },
+                  "variableValue": {
+                    "type": "string",
+                    "minLength": 1,
+                    "maxLength": 8192
+                  }
+                },
+                "required": [
+                  "type",
+                  "variableValue"
+                ],
+                "additionalProperties": false
               }
             ]
           }

package/dist/openapi.json

@@ -2,7 +2,7 @@
   "openapi": "3.2.0",
   "info": {
     "title": "Nylorun Runtime API",
-    "version": "0.21.1-beta",
+    "version": "0.23.0-beta",
     "x-nylorun-protocol": {
       "min": 4,
       "max": 10,
@@ -6338,6 +6338,7 @@
               "definition_files_missing",
               "credential_rejected",
               "mcp_preview_failed",
+              "credential_conflict",
               "internal_error"
             ]
           },

package/dist/retry.d.ts

@@ -0,0 +1,21 @@
+/** Waits `ms`, or until `signal` aborts; resolves either way and never rejects. */
+export declare function sleep(ms: number, signal?: AbortSignal): Promise<void>;
+export interface RetryOptions {
+    /** The first wait after a failure. Doubled after each, up to `maxMs`. */
+    minMs: number;
+    maxMs: number;
+    /** Attempts, the first included, before giving up. Default: no limit. */
+    attempts?: number;
+    /** Gives up when the next wait would end later than this long after the first attempt. */
+    deadlineMs?: number;
+    /** Gives up when it aborts, after the attempt or wait under way. */
+    signal?: AbortSignal;
+    /** Called with each failure that is retried, and how many attempts have failed so far. */
+    onError?: (error: unknown, failures: number) => void;
+}
+/**
+ * Runs `attempt` until it resolves, waiting between failures with exponential backoff
+ * (`minMs`, doubling to `maxMs`). Rejects with the last failure once `attempts`, `deadlineMs`
+ * or `signal` ends the retries.
+ */
+export declare function retry<T>(attempt: () => Promise<T>, options: RetryOptions): Promise<T>;

package/dist/retry.js

@@ -0,0 +1,34 @@
+/**
+ * Waiting and retrying, shared by the Runtime's background loops and its calls to other
+ * services. Nothing here logs or decides what is worth retrying: callers do.
+ */
+import { setTimeout as delay } from "node:timers/promises";
+/** Waits `ms`, or until `signal` aborts; resolves either way and never rejects. */
+export function sleep(ms, signal) {
+    return delay(ms, undefined, signal ? { signal } : undefined).catch(() => undefined);
+}
+/**
+ * Runs `attempt` until it resolves, waiting between failures with exponential backoff
+ * (`minMs`, doubling to `maxMs`). Rejects with the last failure once `attempts`, `deadlineMs`
+ * or `signal` ends the retries.
+ */
+export async function retry(attempt, options) {
+    const deadline = options.deadlineMs === undefined ? Infinity : Date.now() + options.deadlineMs;
+    let wait = options.minMs;
+    for (let failures = 1;; failures += 1) {
+        try {
+            return await attempt();
+        }
+        catch (error) {
+            if (failures >= (options.attempts ?? Infinity) ||
+                Date.now() + wait > deadline ||
+                options.signal?.aborted)
+                throw error;
+            options.onError?.(error, failures);
+            await sleep(wait, options.signal);
+            if (options.signal?.aborted)
+                throw error;
+            wait = Math.min(wait * 2, options.maxMs);
+        }
+    }
+}

package/dist/sandbox/join.d.ts

@@ -15,6 +15,8 @@ export interface HostJoinAnswer {
     readonly epoch: number;
     /** ISO time the tokens expire. */
     readonly expiresAt: string;
+    /** The egress CA certificate (PEM) the sandbox trusts (R2c). */
+    readonly caCertificate: string;
 }
 /** A refused join, renewal or host connection. */
 export declare class HostAuthError extends Error {

package/dist/sandbox/join.js

@@ -24,6 +24,10 @@
  * and the pod (`tenant/host-token.ts`). `renew` mints a new pair at the same epoch while the
  * host is current; it is refused once the epoch moved.
  *
+ * The answer also carries the installation's egress CA certificate (R2c, D50): the engine adds it
+ * to the trust bundle every command gets, so a host egress-gate terminates TLS for (one an
+ * `environment_secret` is bound to) is trusted. Only the certificate: its key stays in keys.
+ *
  * Every refusal answers the same 401 (the reason is logged), so a caller learns nothing about
  * which check failed.
  */
@@ -53,13 +57,14 @@ function sameHash(a, b) {
     const right = Buffer.from(b, "hex");
     return left.length === right.length && left.length > 0 && timingSafeEqual(left, right);
 }
-function answerOf(grant) {
+function answerOf(grant, caCertificate) {
     return {
         hostToken: grant.hostToken,
         egressToken: grant.egressToken,
         sandboxId: grant.claims.sandboxId,
         epoch: grant.claims.epoch,
         expiresAt: new Date(grant.claims.expiresAt).toISOString(),
+        caCertificate,
     };
 }
 export function hostAuthority(ctx) {
@@ -129,6 +134,9 @@ export function hostAuthority(ctx) {
                     const reason = "The sandbox's volume was replaced: its files are gone";
                     await t.updateSandboxPod(sandboxId, { observed: "lost", reason, hostEpoch: epoch }, now);
                     await t.sandboxEvent(sandboxId, "sandbox.lost", { reason });
+                    // Its Sandbox is deleted; only a reset brings the sandbox back.
+                    await t.signal({ type: "host.revoked", sandboxId, epoch });
+                    await t.signalSandbox(sandboxId, { kind: "reconcile" });
                     return { lost: epoch };
                 }
                 await t.updateSandboxPod(sandboxId, {
@@ -143,22 +151,18 @@ export function hostAuthority(ctx) {
                     else
                         await t.sandboxEvent(sandboxId, "sandbox.running", { hostEpoch: epoch });
                 }
+                // The previous host's connection (an older epoch) serves nothing more, on any process.
+                await t.signal({ type: "host.revoked", sandboxId, epoch });
                 return epoch;
             });
-            if (typeof joined === "object") {
-                ctx.harness.revokeHost(sandboxId, joined.lost);
-                // Its Sandbox is deleted; only a reset brings the sandbox back.
-                await ctx.sandboxSignal(sandboxId, { kind: "reconcile" });
+            if (typeof joined === "object")
                 return refuse("the volume was replaced: the sandbox is lost");
-            }
-            // The previous host's connection (an older epoch) serves nothing more.
-            ctx.harness.revokeHost(sandboxId, joined);
             ctx.config.logger.info("sandbox host joined", { sandboxId, epoch: joined });
-            return answerOf(await mintHostTokens(ctx, { sandboxId, epoch: joined, podUid }));
+            return answerOf(await mintHostTokens(ctx, { sandboxId, epoch: joined, podUid }), await ctx.keys.egressCa());
         },
         async renew(hostToken) {
             const claims = await verified(hostToken);
-            return answerOf(await mintHostTokens(ctx, claims));
+            return answerOf(await mintHostTokens(ctx, claims), await ctx.keys.egressCa());
         },
         verify: verified,
     };

package/dist/sandbox/manager.d.ts

@@ -34,6 +34,8 @@ export interface SandboxSessionRef {
      * so every session attached to it shares the files; absent, the workspace is the session's.
      */
     readonly sandboxId?: string;
+    /** Variables every command of the call gets (R2c): secret names set to the sentinel, plain values. */
+    readonly environment?: Readonly<Record<string, string>>;
     /**
      * Who the call's events are claimed for, passed back to `emit`: in a harness, the run that
      * made the call (its run id).

package/dist/sandbox/manager.js

@@ -285,7 +285,7 @@ export class SandboxManager {
         try {
             const outcome = await runSandboxTool(live.handle, toolName, (input ?? {}), signal, (value) => {
                 report = value;
-            });
+            }, session.environment);
             await this.options.emit(session.id, session.activeTurnId, "sandbox.exec", {
                 tool: toolName,
                 ...report,

package/dist/sandbox/pods/reconcile.js

@@ -135,7 +135,9 @@ export async function reconcileSandbox(ctx, sandboxId, trigger) {
             await t.updateSandboxPod(sandboxId, finalPatch, new Date().toISOString());
         for (const item of decision.events)
             await t.sandboxEvent(sandboxId, item.type, item.payload);
-        return { kind: "written", epoch: epochMoved ? current.pod.hostEpoch + 1 : undefined };
+        if (epochMoved)
+            await t.signal({ type: "host.revoked", sandboxId, epoch: finalPatch.hostEpoch });
+        return { kind: "written" };
     });
     if (written.kind === "changed")
         return { retryAfterMs: 0 };
@@ -143,8 +145,6 @@ export async function reconcileSandbox(ctx, sandboxId, trigger) {
         await ctx.sandbox.removeSandbox(sandboxId).catch(() => undefined);
         return {};
     }
-    if (written.kind === "written" && written.epoch !== undefined)
-        ctx.harness.revokeHost(sandboxId, written.epoch);
     return {
         ...(decision.retryAfterMs === undefined ? {} : { retryAfterMs: decision.retryAfterMs }),
         ...(decision.arm.length > 0 ? { arm: decision.arm } : {}),

package/dist/sandbox/tools.d.ts

@@ -20,4 +20,6 @@ export declare function truncateMiddle(value: string, limit?: number): {
     text: string;
     truncated: boolean;
 };
-export declare function runSandboxTool(handle: SandboxHandle, name: SandboxToolName, input: Record<string, any>, signal: AbortSignal, report: (value: SandboxToolReport) => void): Promise<SandboxToolOutcome>;
+export declare function runSandboxTool(handle: SandboxHandle, name: SandboxToolName, input: Record<string, any>, signal: AbortSignal, report: (value: SandboxToolReport) => void, 
+/** Variables every command gets (R2c): secret names set to the sentinel, plain values. */
+environment?: Readonly<Record<string, string>>): Promise<SandboxToolOutcome>;

package/dist/sandbox/tools.js

@@ -39,10 +39,12 @@ const failed = (code, message) => ({
     code,
     message,
 });
-export async function runSandboxTool(handle, name, input, signal, report) {
+export async function runSandboxTool(handle, name, input, signal, report, 
+/** Variables every command gets (R2c): secret names set to the sentinel, plain values. */
+environment) {
     const workspace = handle.workspace ?? SANDBOX_WORKSPACE;
     const resolvePath = (path) => resolveSandboxPath(path, workspace);
-    const exec = (command, timeoutMs = 60_000) => handle.exec({ command, cwd: workspace, timeoutMs }, signal);
+    const exec = (command, timeoutMs = 60_000) => handle.exec({ command, cwd: workspace, timeoutMs, ...(environment ? { env: environment } : {}) }, signal);
     switch (name) {
         case "bash": {
             const command = String(input.command);

package/dist/sandbox/types.d.ts

@@ -36,6 +36,11 @@ export interface ExecRequest {
     readonly command: string;
     readonly cwd: string;
     readonly timeoutMs: number;
+    /**
+     * Variables this command gets on top of the backend's own (R2c): never a secret. The backend's
+     * proxy and trust variables win over them.
+     */
+    readonly env?: Readonly<Record<string, string>>;
 }
 export interface ExecResult {
     readonly exitCode: number;

package/dist/store/postgres/control.js

@@ -1,7 +1,8 @@
 /**
  * The control bus on Postgres (blueprint D21, D48): how one process tells the others with the
  * Tenant open to act now. `session.cancel` aborts the advance of a cancelled turn;
- * `sessions.reset` moves the session streams to the Tenant's new basin generation. Nothing
+ * `sessions.reset` moves the session streams to the Tenant's new basin generation;
+ * `host.revoked` closes a pod sandbox's host connections of an older epoch. Nothing
  * internal goes through S2, which only serves API listeners.
  *
  * - **Write.** `writeSignal` inserts a `control_signals` row and calls `pg_notify` on
@@ -36,6 +37,8 @@ const SIGNAL = {
     sessionId: controlSignals.sessionId,
     turnId: controlSignals.turnId,
     generation: controlSignals.generation,
+    sandboxId: controlSignals.sandboxId,
+    epoch: controlSignals.epoch,
 };
 /** Puts `signal` on the bus in the transaction `db` runs: a row, notified at commit. */
 export async function writeSignal(db, signal) {
@@ -46,6 +49,8 @@ export async function writeSignal(db, signal) {
         sessionId: signal.type === "session.cancel" ? signal.sessionId : null,
         turnId: signal.type === "session.cancel" ? (signal.turnId ?? null) : null,
         generation: signal.type === "sessions.reset" ? signal.generation : null,
+        sandboxId: signal.type === "host.revoked" ? signal.sandboxId : null,
+        epoch: signal.type === "host.revoked" ? signal.epoch : null,
     })
         .returning({ id: controlSignals.id });
     // The payload is only the id: a follower reads the rows back either way.
@@ -183,5 +188,7 @@ function signalOf(row) {
         };
     if (row.kind === "sessions.reset" && row.generation !== null)
         return { type: "sessions.reset", generation: row.generation };
+    if (row.kind === "host.revoked" && row.sandboxId !== null && row.epoch !== null)
+        return { type: "host.revoked", sandboxId: row.sandboxId, epoch: row.epoch };
     return undefined;
 }

package/dist/store/postgres/drizzle/0018_wake_outbox_retries.sql

@@ -0,0 +1,3 @@
+ALTER TABLE "nylorun"."wakes" ADD COLUMN "attempts" integer DEFAULT 0 NOT NULL;--> statement-breakpoint
+ALTER TABLE "nylorun"."wakes" ADD COLUMN "retry_at" timestamp with time zone;--> statement-breakpoint
+ALTER TABLE "nylorun"."wakes" ADD COLUMN "parked_at" timestamp with time zone;

package/dist/store/postgres/drizzle/0019_sandbox_signal_outbox.sql

@@ -0,0 +1,18 @@
+CREATE TABLE "nylorun"."sandbox_signals" (
+	"id" text COLLATE "C" PRIMARY KEY NOT NULL,
+	"sandbox_id" text COLLATE "C" NOT NULL,
+	"kind" text NOT NULL,
+	"timer" text,
+	"at" bigint,
+	"created_at" timestamp with time zone DEFAULT clock_timestamp() NOT NULL,
+	"attempts" integer DEFAULT 0 NOT NULL,
+	"retry_at" timestamp with time zone,
+	"parked_at" timestamp with time zone,
+	CONSTRAINT "sandbox_signals_kind_check" CHECK ("nylorun"."sandbox_signals"."kind" IN ('reconcile', 'arm'))
+);
+--> statement-breakpoint
+ALTER TABLE "nylorun"."control_signals" DROP CONSTRAINT "control_signals_kind_check";--> statement-breakpoint
+ALTER TABLE "nylorun"."control_signals" ADD COLUMN "sandbox_id" text COLLATE "C";--> statement-breakpoint
+ALTER TABLE "nylorun"."control_signals" ADD COLUMN "epoch" integer;--> statement-breakpoint
+CREATE INDEX "sandbox_signals_created_at" ON "nylorun"."sandbox_signals" USING btree ("created_at");--> statement-breakpoint
+ALTER TABLE "nylorun"."control_signals" ADD CONSTRAINT "control_signals_kind_check" CHECK ("nylorun"."control_signals"."kind" IN ('session.cancel', 'sessions.reset', 'host.revoked'));

package/dist/store/postgres/drizzle/meta/_journal.json

@@ -127,6 +127,20 @@
       "when": 1791455573196,
       "tag": "0017_wake_outbox",
       "breakpoints": true
+    },
+    {
+      "idx": 18,
+      "version": "7",
+      "when": 1791529391438,
+      "tag": "0018_wake_outbox_retries",
+      "breakpoints": true
+    },
+    {
+      "idx": 19,
+      "version": "7",
+      "when": 1791530515498,
+      "tag": "0019_sandbox_signal_outbox",
+      "breakpoints": true
     }
   ]
 }