@skaile/forge-agent-runtime 1.1.0 → 1.1.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.1.1
+
+- `app-runner-host`: a run whose `skaile serve` child exits, or whose connection is found dead on a command (`410`), is torn down immediately: credentials erased, scratch directory removed, listener closed, later requests `404`. The final error event is still delivered to `onEvent`. Before, the run stayed registered until its lease expired.
+- `POST /runs` answers `400` when `model` does not name an enabled `llm` provider of the snapshot (`<providerId>/<modelId>`), before any directory or process is created. Before it surfaced as an opaque `503` after startup.
+- Native tools stay disabled through `tools.allowed: ["WebFetch"]`, because the Workspaces schema has no explicit empty form; a test now asserts that `buildOmpToolArgs` turns the written agent definition into `--no-tools`.
+- Internal: the registry shape is validated once (`requireRegistryShape`) and `StartRunRequest.registry` is typed; routing uses one method table; the provider snapshot throws a domain error that the host maps to `400` instead of depending on the HTTP request module.
+
 ## 1.1.0
 
 - New entry `@skaile/forge-agent-runtime/app-runner-host`: `createAppRunnerHost({ rootDir, authenticate, onEvent, appTools })`, an authenticated HTTP host that runs one isolated `omp` agent per request for an app that deploys it privately next to itself. Node-only; it imports no Nuxt, database or settings UI code, and the package root is unchanged.

package/README.md

@@ -71,14 +71,14 @@ destination. `host.close()` terminates every run.
 
 | Request | Behaviour |
 |---|---|
-| `POST /runs` | Body `{ id, model, registry, credentialEnv, systemPrompt, mcpAuthorization, expiresAt }`. `id` is a UUID, `expiresAt` an ISO-8601 time or epoch milliseconds in the future, `mcpAuthorization` the full `Authorization` header value for the app MCP endpoint. `400` invalid, `409` id already active, `503` the runtime did not start, `201` started. |
-| `POST /runs/:id/commands` | One Workspaces command: `prompt`, `cancel`, `reply`, `capability_register`, `capability_deregister` or `capability_result`. `400` any other type or a malformed field, `404` no such run, `410` lease expired (except `cancel`), `202` sent. `capability_register` accepts only the declared `browserActionNames`. |
+| `POST /runs` | Body `{ id, model, registry, credentialEnv, systemPrompt, mcpAuthorization, expiresAt }`. `id` is a UUID, `expiresAt` an ISO-8601 time or epoch milliseconds in the future, `mcpAuthorization` the full `Authorization` header value for the app MCP endpoint. `400` invalid, including a `model` whose `<providerId>` is not an enabled `llm` entry of the `registry` (refused before any directory or process exists), `409` id already active, `503` the runtime did not start, `201` started. |
+| `POST /runs/:id/commands` | One Workspaces command: `prompt`, `cancel`, `reply`, `capability_register`, `capability_deregister` or `capability_result`. `400` any other type or a malformed field, `404` no such run, `410` lease expired (except `cancel`) or the run's process has ended, `202` sent. `capability_register` accepts only the declared `browserActionNames`. |
 | `PATCH /runs/:id/lease` | Body `{ expiresAt }`. `400` not in the future, `404` no such run, `410` already expired. |
 | `DELETE /runs/:id` | Idempotent `204`. Stops the process and its listener, erases the run's credentials and removes its scratch directory. |
 
 `authenticate` is called first. `false` answers `401` and a throw `500`; the body
 is never read in either case. When a lease expires the turn is cancelled, further
-commands answer `410`, and the run is torn down a few seconds later.
+commands answer `410`, and the run is torn down a few seconds later. A run whose child process exits (or whose connection is found dead) is torn down at once: credentials erased, scratch removed, later requests answer `404`.
 
 What a run is:
 

package/dist/app-runner-host/index.mjs

@@ -2,8 +2,8 @@ import { randomBytes } from 'node:crypto';
 import { join, resolve } from 'node:path';
 import { consola } from 'consola';
 import { P as ProcessManagerAdapter } from '../shared/forge-agent-runtime.B1LZr0Sl.mjs';
-import { rm, mkdir, writeFile } from 'node:fs/promises';
 import { registryEntries, isEntryEnabled, entryPolicyRefusal, providerCredentialEnvName, parseCredentialRef, writeProviderLayer } from '@skaile/forge-settings/server';
+import { rm, mkdir, writeFile } from 'node:fs/promises';
 import 'node:events';
 import 'node:child_process';
 import 'node:fs';
@@ -42,6 +42,10 @@ function hostAllowedFor(tools) {
   return [`mcp__${tools.mcpName}__*`, ...tools.browserActionNames];
 }
 
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
 class RequestError extends Error {
   constructor(status, message) {
     super(message);
@@ -53,8 +57,21 @@ const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 function isUuid(value) {
   return typeof value === "string" && UUID.test(value);
 }
-function isRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
+function requireRegistryShape(registry) {
+  if (!isRecord(registry)) throw new RequestError(400, "'registry' must be an object");
+  if (Array.isArray(registry.order) && !isRecord(registry.providers)) {
+    throw new RequestError(400, "'registry.providers' must be an object");
+  }
+  const view = registry;
+  for (const [id, entry] of registryEntries(view)) {
+    if (!isRecord(entry) || typeof entry.kind !== "string") {
+      throw new RequestError(400, `registry entry '${id}' needs a 'kind'`);
+    }
+    if (entry.credential !== void 0 && !isRecord(entry.credential)) {
+      throw new RequestError(400, `registry entry '${id}': 'credential' must be an object`);
+    }
+  }
+  return view;
 }
 function requireRecord(body) {
   if (!isRecord(body)) throw new RequestError(400, "request body must be a JSON object");
@@ -85,7 +102,7 @@ function parseStartRequest(body, now) {
   if (/\s/.test(model) || model.startsWith("-")) {
     throw new RequestError(400, "'model' must be '<providerId>/<modelId>' without whitespace");
   }
-  if (!isRecord(record.registry)) throw new RequestError(400, "'registry' must be an object");
+  const registry = requireRegistryShape(record.registry);
   const credentialEnv = record.credentialEnv;
   if (!isRecord(credentialEnv)) throw new RequestError(400, "'credentialEnv' must be an object");
   for (const [name, value] of Object.entries(credentialEnv)) {
@@ -103,7 +120,7 @@ function parseStartRequest(body, now) {
   return {
     id,
     model,
-    registry: record.registry,
+    registry,
     credentialEnv: { ...credentialEnv },
     systemPrompt: record.systemPrompt,
     mcpAuthorization,
@@ -210,37 +227,26 @@ async function createRunDirs(paths) {
 async function removeRunDirs(paths) {
   await rm(paths.root, { recursive: true, force: true, maxRetries: 3 });
 }
-function requireRegistryShape(registry) {
-  if (!isRecord(registry)) throw new RequestError(400, "'registry' must be an object");
-  if (Array.isArray(registry.order) && !isRecord(registry.providers)) {
-    throw new RequestError(400, "'registry.providers' must be an object");
-  }
-  const view = registry;
-  for (const [id, entry] of registryEntries(view)) {
-    if (!isRecord(entry) || typeof entry.kind !== "string") {
-      throw new RequestError(400, `registry entry '${id}' needs a 'kind'`);
-    }
-    if (entry.credential !== void 0 && !isRecord(entry.credential)) {
-      throw new RequestError(400, `registry entry '${id}': 'credential' must be an object`);
-    }
+class SnapshotError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "SnapshotError";
   }
-  return view;
 }
 function prepareProviderSnapshot(registry, credentialEnv) {
   const providers = {};
   const env = {};
   const names = /* @__PURE__ */ new Set();
-  for (const [id, entry] of registryEntries(requireRegistryShape(registry))) {
+  for (const [id, entry] of registryEntries(registry)) {
     if (entry.kind !== "llm" || !isEntryEnabled(entry)) continue;
     const interpolation = entryPolicyRefusal(
       { ...entry, credential: void 0 },
       { envNames: [] }
     );
-    if (interpolation) throw new RequestError(400, `registry entry '${id}': ${interpolation}`);
+    if (interpolation) throw new SnapshotError(`registry entry '${id}': ${interpolation}`);
     const canonical = providerCredentialEnvName(id);
     if (names.has(canonical)) {
-      throw new RequestError(
-        400,
+      throw new SnapshotError(
         `registry entry '${id}' collides with another entry's credential name`
       );
     }
@@ -252,8 +258,7 @@ function prepareProviderSnapshot(registry, credentialEnv) {
     }
     const parsed = parseCredentialRef(ref);
     if (parsed?.form !== "env") {
-      throw new RequestError(
-        400,
+      throw new SnapshotError(
         `registry entry '${id}': only env: credential references are allowed`
       );
     }
@@ -266,10 +271,17 @@ function prepareProviderSnapshot(registry, credentialEnv) {
   }
   const providerIds = Object.keys(providers);
   if (providerIds.length === 0) {
-    throw new RequestError(400, "'registry' has no enabled llm provider");
+    throw new SnapshotError("'registry' has no enabled llm provider");
   }
   return { providers, providerIds, credentialEnv: env };
 }
+function requireModelProvider(model, snapshot) {
+  if (!snapshot.providerIds.some((id) => model.startsWith(`${id}/`) && model.length > id.length + 1)) {
+    throw new SnapshotError(
+      "'model' must name an enabled llm provider of the registry: '<providerId>/<modelId>'"
+    );
+  }
+}
 async function writeRunWorkspace(paths, input) {
   const { appTools } = input;
   const skaileYaml = {
@@ -382,7 +394,7 @@ function createAppRunnerHost(options) {
   async function pump(run) {
     try {
       for await (const event of run.adapter.listen()) {
-        if (run.teardown) return;
+        if (run.teardown && !run.exited) return;
         await onEvent(run.id, event);
       }
     } catch (err) {
@@ -413,8 +425,7 @@ function createAppRunnerHost(options) {
       log.warn(`[${run.id}] cancel on expiry failed: ${err.message}`);
     }
   }
-  async function start(request) {
-    const snapshot = prepareProviderSnapshot(request.registry, request.credentialEnv);
+  async function start(request, snapshot) {
     const paths = runPaths(rootDir, request.id);
     const wsAuthToken = randomBytes(32).toString("base64url");
     const mcpEnv = { [APP_MCP_AUTHORIZATION_ENV]: request.mcpAuthorization };
@@ -448,6 +459,12 @@ function createAppRunnerHost(options) {
         wsAuthToken
       });
       if (run.teardown) throw new Error("run was terminated while starting");
+      if (!run.adapter.isConnected()) throw new Error("runtime exited while starting");
+      run.adapter.getProcessManager().on(`error:${paths.workspace}`, () => {
+        log.warn(`[${run.id}] runtime process exited; tearing the run down`);
+        run.exited = true;
+        void tearDown(run);
+      });
       run.state = "running";
       armLease(run);
     })();
@@ -463,11 +480,18 @@ function createAppRunnerHost(options) {
   async function startRun(req, res) {
     const request = parseStartRequest(await readJson(req), Date.now());
     if (runs.has(request.id)) throw new RequestError(409, "a run with this id is already active");
+    let snapshot;
     try {
-      const run = await start(request);
-      json(res, 201, { id: run.id, expiresAt: new Date(run.expiresAt).toISOString() });
+      snapshot = prepareProviderSnapshot(request.registry, request.credentialEnv);
+      requireModelProvider(request.model, snapshot);
     } catch (err) {
-      if (err instanceof RequestError) throw err;
+      if (err instanceof SnapshotError) throw new RequestError(400, err.message);
+      throw err;
+    }
+    try {
+      const run = await start(request, snapshot);
+      json(res, 201, { id: run.id, expiresAt: new Date(run.expiresAt).toISOString() });
+    } catch {
       json(res, 503, { error: "runner could not be started" });
     }
   }
@@ -486,7 +510,8 @@ function createAppRunnerHost(options) {
     try {
       await run.adapter.sendCommand(command);
     } catch {
-      throw new RequestError(409, "run process is not connected");
+      void tearDown(run);
+      throw new RequestError(410, "run process has ended");
     }
     json(res, 202, { accepted: true });
   }
@@ -499,35 +524,31 @@ function createAppRunnerHost(options) {
     armLease(run);
     json(res, 200, { expiresAt: new Date(expiresAt).toISOString() });
   }
-  async function deleteRun(res, id) {
+  async function deleteRun(_req, res, id) {
     if (!isUuid(id)) throw new RequestError(404, "no such run");
     const run = runs.get(id);
     if (run) await terminate(run);
     json(res, 204);
   }
+  const collectionRoutes = /* @__PURE__ */ new Map([["POST", startRun]]);
+  const runRoutes = /* @__PURE__ */ new Map([["DELETE", deleteRun]]);
+  const leafRoutes = /* @__PURE__ */ new Map([
+    ["commands", /* @__PURE__ */ new Map([["POST", sendCommand]])],
+    // /runs/:id/commands
+    ["lease", /* @__PURE__ */ new Map([["PATCH", renewLease]])]
+    // /runs/:id/lease
+  ]);
   async function route(req, res) {
     const segments = new URL(req.url ?? "/", "http://runner.invalid").pathname.split("/").filter((segment) => segment !== "");
-    const method = req.method ?? "GET";
     const [root, id, leaf] = segments;
     if (root !== "runs" || segments.length > 3) throw new RequestError(404, "not found");
-    if (id === void 0) {
-      if (method !== "POST") throw new RequestError(405, "method not allowed");
-      return startRun(req, res);
-    }
-    const runId = decodeURIComponent(id);
-    if (leaf === void 0) {
-      if (method !== "DELETE") throw new RequestError(405, "method not allowed");
-      return deleteRun(res, runId);
-    }
-    if (leaf === "commands") {
-      if (method !== "POST") throw new RequestError(405, "method not allowed");
-      return sendCommand(req, res, runId);
-    }
-    if (leaf === "lease") {
-      if (method !== "PATCH") throw new RequestError(405, "method not allowed");
-      return renewLease(req, res, runId);
-    }
-    throw new RequestError(404, "not found");
+    let methods;
+    if (id === void 0) methods = collectionRoutes;
+    else methods = leaf === void 0 ? runRoutes : leafRoutes.get(leaf);
+    if (!methods) throw new RequestError(404, "not found");
+    const handler = methods.get(req.method ?? "GET");
+    if (!handler) throw new RequestError(405, "method not allowed");
+    return handler(req, res, id === void 0 ? "" : decodeURIComponent(id));
   }
   return {
     async handler(req, res) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skaile/forge-agent-runtime",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Agent process lifecycle for Skaile forge apps: spawns `skaile serve`, connects over WebSocket, and exposes the AgentAdapter, harness registry and session manager. Node-only.",
   "type": "module",
   "packageManager": "bun@1.3.9",