@nimbus-sh/worker 0.2.0 → 0.2.2

package/dist/runtime/cpython-resident.js

@@ -0,0 +1,133 @@
+/**
+ * cpython-resident.ts — a Python program that keeps serving, as a Durable
+ * Object facet.
+ *
+ * The half of the CPython runtime that names workerd. Everything about running
+ * the interpreter is in `@nimbus-sh/core`; this is the substrate a program that
+ * outlives its invocation needs — an actor that stays alive between requests,
+ * with inbound HTTP routed into the socket the program bound. A host without
+ * one supplies no {@link CPythonResidentStart} and such a program is refused
+ * rather than quietly run as a one-shot that dies with the call.
+ */
+import { z } from 'zod/v4';
+import { buildCPythonPreamble, } from '@nimbus-sh/core/runtime/cpython-runner.js';
+/**
+ * The worker source for a resident Python process. Same shape as
+ * buildRubySocketProcessWorker: the socket kernel and the interpreter live in a
+ * DurableObject, startProcess runs the program until it stops, and inbound
+ * requests arrive on handleHttpRequest and are dispatched into the server the
+ * program registered before exiting.
+ */
+export function buildCPythonSocketProcessWorker(preamble) {
+    return [
+        'import { DurableObject } from "cloudflare:workers";',
+        // The module arrives by path (vfsWasmModules) and has to be published where
+        // the preamble looks for it. Without this the facet boots and the first
+        // thing it says is "python.wasm was not supplied to this facet".
+        "import __NIMBUS_WASM_python from './python.wasm';",
+        'globalThis.__NIMBUS_WASM = globalThis.__NIMBUS_WASM || {};',
+        "globalThis.__NIMBUS_WASM['python.wasm'] = __NIMBUS_WASM_python;",
+        '',
+        preamble,
+        '',
+        // Only adopt a real binding: routed fetch hops resolve the entrypoint
+        // without a supervisor, and overwriting with undefined would drop the live
+        // stub the process needs for its whole lifetime.
+        'function __nimbusAdoptPySupervisor(env) {',
+        '  const supervisor = env && env.SUPERVISOR;',
+        '  if (supervisor) globalThis.__nimbusPySupervisor = supervisor;',
+        '  __wasiAdoptSupervisor(supervisor);',
+        '}',
+        // A resident process answers between requests, and that is the only moment
+        // "durable while running" can be made true: by the time the caller holds a
+        // response, everything the request wrote has reached the VFS.
+        'async function __nimbusParkPy(value) {',
+        '  await __wasiDrainPersist();',
+        '  await __wasiRevalidateFS();',
+        '  return value;',
+        '}',
+        'async function __nimbusStartPyProcess(args) {',
+        '  const result = await globalThis.__cpythonStartProcess(args || {});',
+        '  const ports = await globalThis.__cpythonListeningPorts();',
+        '  const registrations = globalThis.__nimbusVirtualPortRegistrationPromises || [];',
+        '  if (registrations.length > 0) await Promise.allSettled(registrations.splice(0));',
+        '  if (ports.length > 0) {',
+        '    return { state: "listening", port: ports[0], stdout: result.stdout, stderr: result.stderr };',
+        '  }',
+        '  return { state: "exited", result, stdout: result.stdout, stderr: result.stderr };',
+        '}',
+        'export class NimbusProcess extends DurableObject {',
+        '  async startProcess(args) {',
+        '    __nimbusAdoptPySupervisor(this.env);',
+        '    return __nimbusParkPy(await __nimbusStartPyProcess(args || {}));',
+        '  }',
+        '  async fetch(request) {',
+        '    __nimbusAdoptPySupervisor(this.env);',
+        '    return this.handleHttpRequest(request);',
+        '  }',
+        '  async handleHttpRequest(request) {',
+        '    __nimbusAdoptPySupervisor(this.env);',
+        '    const hinted = Number(request.headers.get("X-Nimbus-Port") || 0);',
+        '    const port = hinted || Array.from(globalThis.__nimbusVirtualSockets.listeners.keys())[0];',
+        '    if (!port) return new Response("Nimbus Python process has no listening virtual socket", { status: 502 });',
+        '    return __nimbusParkPy(await globalThis.__nimbusVirtualSockets.handleHttpRequest(port, request));',
+        '  }',
+        '}',
+    ].join('\n');
+}
+const CPythonBootSchema = z.object({
+    state: z.string().optional(),
+    port: z.number().optional(),
+    stdout: z.string().optional(),
+    stderr: z.string().optional(),
+    result: z.object({ exitCode: z.number().optional() }).passthrough().optional(),
+}).passthrough();
+/**
+ * Start a program that binds a port as its own process, so it outlives the
+ * invocation that started it. Mirrors spawnRubySocketProcess.
+ */
+export function cpythonResidentStart(facetMgr) {
+    return async function startResidentCPython(args) {
+        const command = args.command;
+        const workerCode = buildCPythonSocketProcessWorker(buildCPythonPreamble());
+        const spawned = await facetMgr.spawnWorker(workerCode, command, args.cwd, {
+            compatibilityFlags: ['nodejs_compat'],
+            // By path, not by value: the interpreter is 10.6 MiB, more than a single
+            // RPC value may carry, so whichever host runs this process reads it itself.
+            vfsWasmModules: { 'python.wasm': args.wasmVfsPath },
+            startArgs: args.startArgs,
+        }).catch(() => null);
+        if (!spawned)
+            return { exitCode: 1, stdout: '', stderr: 'python process boot failed\n' };
+        const boot = CPythonBootSchema.safeParse(spawned.boot);
+        if (!boot.success) {
+            facetMgr.finishProcess(spawned.pid, 1, 'python process boot failed');
+            return { exitCode: 1, stdout: '', stderr: 'python process boot failed\n' };
+        }
+        const data = boot.data;
+        if (data.state === 'listening' && typeof data.port === 'number' && data.port > 0) {
+            facetMgr.registerPort(spawned.pid, data.port);
+            const routeable = await facetMgr.waitForRouteablePorts(spawned.pid);
+            const port = routeable.includes(data.port) ? data.port : routeable[0];
+            if (!port) {
+                facetMgr.kill(spawned.pid);
+                return {
+                    exitCode: 1,
+                    stdout: data.stdout || '',
+                    stderr: `${data.stderr || ''}python: virtual socket port ${data.port} failed to attach a route handler\n`,
+                };
+            }
+            return {
+                exitCode: 0,
+                stdout: `${data.stdout || ''}\x1b[2m[started (long-running): pid=${spawned.pid} cmd="${command}" port=${port}]\x1b[0m\n`,
+                stderr: data.stderr || '',
+                spawnedPid: spawned.pid,
+                port,
+            };
+        }
+        const result = data.result;
+        const exitCode = typeof result?.exitCode === 'number' ? result.exitCode : 0;
+        facetMgr.finishProcess(spawned.pid, exitCode, data.stderr || 'python process exited');
+        return { exitCode, stdout: data.stdout || '', stderr: data.stderr || '' };
+    };
+}

package/dist/runtime/facet-loader-host.d.ts

@@ -1,3 +1,17 @@
+/**
+ * The workerd {@link FacetHost}: a facet is a dynamic worker.
+ *
+ * The whole adapter is the option renames below, because `NimbusLoaderPool`
+ * already IS the port's shape — `submit` and `dispose`, with the same meanings.
+ * The one thing it spells differently is the supervisor capability, which it
+ * takes as a pid plus a separate flag saying whether to bind one at all; the
+ * port collapses the pair, since a facet with the binding and no pid can read
+ * the session and never write to it. `reuse` is the pool's `cacheScope` under
+ * the name the port gives it: who a warm facet may answer for.
+ */
+import type { FacetHost } from '@nimbus-sh/core/runtime/facet-host.js';
+import type { FacetManager } from '../facets/manager.js';
+export declare function loaderFacetHost(env: unknown, ctx: DurableObjectState): FacetHost;
 /**
  * The two objects a NimbusLoaderPool needs from a FacetManager.
  *
@@ -7,9 +21,10 @@
  * checked here once, and a FacetManager built on something other than a
  * DurableObjectState fails with a sentence instead of at the first RPC.
  */
-import type { FacetManager } from '../facets/manager.js';
 export declare function getFacetManagerLoaderHost(facetMgr: FacetManager): {
     env: unknown;
     ctx: DurableObjectState;
 };
+/** The facet host a runtime reached through a FacetManager runs on. */
+export declare function facetHostForManager(facetMgr: FacetManager): FacetHost;
 //# sourceMappingURL=facet-loader-host.d.ts.map

package/dist/runtime/facet-loader-host.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"facet-loader-host.d.ts","sourceRoot":"","sources":["../../src/runtime/facet-loader-host.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,YAAY,GACrB;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,kBAAkB,CAAA;CAAE,CAO3C"}
+{"version":3,"file":"facet-loader-host.d.ts","sourceRoot":"","sources":["../../src/runtime/facet-loader-host.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,EAIV,SAAS,EAEV,MAAM,uCAAuC,CAAC;AAG/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGzD,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,kBAAkB,GAAG,SAAS,CA6BhF;AAED;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,YAAY,GACrB;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,kBAAkB,CAAA;CAAE,CAO3C;AAED,uEAAuE;AACvE,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,YAAY,GAAG,SAAS,CAGrE"}

package/dist/runtime/facet-loader-host.js

@@ -1,3 +1,40 @@
+import { manifestVfs } from '@nimbus-sh/core/runtime/vfs-manifest.js';
+import { NimbusLoaderPool } from '../loaders/loader-pool.js';
+export function loaderFacetHost(env, ctx) {
+    return {
+        // workerd suspends a guest through JSPI, which is what lets a syscall reach
+        // back to the session mid-instruction.
+        parking: 'jspi',
+        /**
+         * A manifest, not a copy: sizes and modes, with the facet demand-loading
+         * whatever the program opens through its supervisor. It has to be — the
+         * whole seed crosses one RPC, and a session filesystem does not fit in one.
+         */
+        seedFilesystem(vfs, root, options) {
+            return manifestVfs(vfs, root, options);
+        },
+        open(spec) {
+            return new NimbusLoaderPool(env, ctx, {
+                tag: spec.tag,
+                concurrency: spec.concurrency,
+                preamble: spec.preamble,
+                wasmModules: spec.wasmModules,
+                omitSupervisor: spec.syscalls === undefined,
+                supervisorPid: spec.syscalls?.pid,
+                cacheScope: spec.reuse,
+            });
+        },
+    };
+}
+/**
+ * The two objects a NimbusLoaderPool needs from a FacetManager.
+ *
+ * FacetManager does not expose its `env` and `ctx` in its type, but a loader
+ * pool is constructed from exactly those, so every runtime that spawns facets
+ * needs the same reach-through. Reflect.get rather than a cast: the shape is
+ * checked here once, and a FacetManager built on something other than a
+ * DurableObjectState fails with a sentence instead of at the first RPC.
+ */
 export function getFacetManagerLoaderHost(facetMgr) {
     const env = Reflect.get(facetMgr, 'env');
     const ctx = Reflect.get(facetMgr, 'ctx');
@@ -6,6 +43,11 @@ export function getFacetManagerLoaderHost(facetMgr) {
     }
     return { env, ctx };
 }
+/** The facet host a runtime reached through a FacetManager runs on. */
+export function facetHostForManager(facetMgr) {
+    const { env, ctx } = getFacetManagerLoaderHost(facetMgr);
+    return loaderFacetHost(env, ctx);
+}
 function isDurableObjectState(value) {
     if (typeof value !== 'object' || value === null)
         return false;

package/dist/runtime/package-manager.d.ts

@@ -25,9 +25,11 @@
  *
  * Errors throw and bubble up to the user as a single diagnostic line.
  */
-import { type RuntimeCatalogEnv, type RuntimeManifest, type ManifestEntrypoint } from './runtime-catalog.js';
+import { type RuntimeCatalogEnv } from './runtime-catalog.js';
+import { type RuntimeManifest } from '@nimbus-sh/core/runtime/runtime-manifest.js';
 import type { SqliteVFS } from '@nimbus-sh/core/vfs/sqlite-vfs.js';
 import { type RuntimePackageAbi } from '@nimbus-sh/core/runtime/os-contracts.js';
+import { type MinShellRegistry } from '@nimbus-sh/core/runtime/installed-runtimes.js';
 import type { CommandContext } from '@nimbus-sh/core/substrate/lifo/commands/types.js';
 /** Minimal shell ctx shape we depend on (matches existing handlers). */
 export interface ShellCtx extends Pick<CommandContext, 'pid' | 'cred' | 'setUmask' | 'runAs'> {
@@ -41,12 +43,6 @@ export interface ShellCtx extends Pick<CommandContext, 'pid' | 'cred' | 'setUmas
         write(s: string): void;
     };
 }
-/** Minimal shell-registry shape we depend on. */
-export interface MinShellRegistry {
-    register(name: string, handler: (ctx: any) => Promise<number>): void;
-    unregister?(name: string): void;
-    resolve?(name: string): any;
-}
 export interface RuntimeWarmTarget {
     name: string;
     version: string;
@@ -54,29 +50,12 @@ export interface RuntimeWarmTarget {
     manifest: RuntimeManifest;
 }
 export type RuntimeWarmHook = (target: RuntimeWarmTarget, ctx: ShellCtx) => Promise<void>;
-/** Runner-factory contract. Each registered runner produces a shell-
- *  command handler given the manifest + the installed root dir. The
- *  package manager invokes the factory at install-time + at boot-time
- *  rehydration. */
-export type RunnerFactory = (manifest: RuntimeManifest, installRoot: string, binName: string, binKind: string | undefined) => (ctx: any) => Promise<number>;
-export declare function registerRunnerFactory(key: string, factory: RunnerFactory): void;
-export declare function getRegisteredRunners(): string[];
 export interface RuntimeInstallSummary {
     spec: string;
     exitCode: number;
     stdout: string;
     stderr: string;
 }
-export interface RuntimeSummary {
-    name: string;
-    version: string;
-    root: string;
-    abi: RuntimePackageAbi;
-    bins: string[];
-    sizeBytes: number;
-    license: string;
-}
-export declare function runtimeAbiForManifest(manifest: RuntimeManifest): RuntimePackageAbi;
 export interface RuntimeInstallTarget {
     runtimeName: string;
     versionOverride: string | null;
@@ -87,41 +66,7 @@ export interface RuntimeCommandHint {
     runtimeName: string;
     installSpec: string;
 }
-/**
- * Commands a runtime provides beyond its manifest entrypoints. The
- * python/ruby package-manager front-ends (pip, gem, bundler) ride the
- * language runner rather than shipping as manifest files, and already-
- * deployed R2 manifests cannot retroactively declare them.
- *
- * This is the ONE hand-maintained command table: install aliasing
- * (`nimbus install pip` → python), command-not-found hints, and bin
- * registration all derive from `runtimeEntrypoints`, which merges this
- * with the catalog manifest. Catalog-declared aliases (python3, ruby3,
- * wasm-ld, …) come from manifest entrypoints and must NOT be repeated
- * here. Mechanically validated against `NIMBUS_RUNTIME_ABIS` by
- * tests/unit/runtime-command-aliases.mjs.
- */
-export declare const RUNTIME_EXTRA_ENTRYPOINTS: Readonly<Record<string, readonly ManifestEntrypoint[]>>;
 export declare function createRuntimeCommandHintResolver(env: RuntimeCatalogEnv): (command: string) => Promise<RuntimeCommandHint | null>;
-/** Compute the per-user install root for (name, version). Uses
- *  `process.env.HOME` if present; falls back to `/home/user`. */
-export declare function installRoot(homeDir: string, name: string, version: string): string;
-/** Read all installed manifests off SqliteFS. Used by both `--list`
- *  and boot-time rehydration. */
-export declare function listInstalledManifests(vfs: SqliteVFS, homeDir: string): Array<{
-    root: string;
-    manifest: RuntimeManifest;
-}>;
-/**
- * Re-register every installed runtime's entrypoints in the shell
- * registry. Call once at session-init time after all runner factories
- * are registered (init.ts:registerRunnerFactory blocks).
- */
-export declare function rehydrateInstalledRuntimes(vfs: SqliteVFS, registry: MinShellRegistry, homeDir: string): {
-    count: number;
-    bins: string[];
-};
-export declare function listInstalledRuntimes(vfs: SqliteVFS, homeDir: string): RuntimeSummary[];
 export declare function listAvailableRuntimes(env: RuntimeCatalogEnv): Promise<Array<{
     name: string;
     abi: RuntimePackageAbi;

package/dist/runtime/package-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"package-manager.d.ts","sourceRoot":"","sources":["../../src/runtime/package-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"package-manager.d.ts","sourceRoot":"","sources":["../../src/runtime/package-manager.ts"],"names":[],"mappings":"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"}

package/dist/runtime/package-manager.js

@@ -25,73 +25,13 @@
  *
  * Errors throw and bubble up to the user as a single diagnostic line.
  */
-import { fetchCatalog, fetchManifest, fetchBlob, parseRuntimeManifest } from './runtime-catalog.js';
-import { CRED_KERNEL, NIMBUS_ABI_TARGET, NIMBUS_RUNTIME_ABIS, NATIVE_UNSUPPORTED_ABI } from '@nimbus-sh/core/runtime/os-contracts.js';
-/** Map of runner-key → factory. Populated by init.ts before install. */
-const runnerFactories = {};
-export function registerRunnerFactory(key, factory) {
-    runnerFactories[key] = factory;
-}
-export function getRegisteredRunners() {
-    return Object.keys(runnerFactories);
-}
-export function runtimeAbiForManifest(manifest) {
-    const byName = NIMBUS_RUNTIME_ABIS[manifest.name];
-    if (byName)
-        return byName;
-    if (manifest.wasi_namespace)
-        return NIMBUS_ABI_TARGET;
-    if (manifest.entrypoints.some((entrypoint) => entrypoint.runner === 'clang-runner')) {
-        return NIMBUS_ABI_TARGET;
-    }
-    return NATIVE_UNSUPPORTED_ABI;
-}
+import { fetchCatalog, fetchManifest, fetchBlob } from './runtime-catalog.js';
+import { parseRuntimeManifest } from '@nimbus-sh/core/runtime/runtime-manifest.js';
+import { CRED_KERNEL, NIMBUS_RUNTIME_ABIS, NATIVE_UNSUPPORTED_ABI } from '@nimbus-sh/core/runtime/os-contracts.js';
+import { installRoot, listInstalledManifestsView, rehydrateInstalledRuntimesView, runnerFactoryFor, runtimeAbiForManifest, runtimeEntrypoints, } from '@nimbus-sh/core/runtime/installed-runtimes.js';
 function runtimeAbiForCatalogName(name) {
     return NIMBUS_RUNTIME_ABIS[name] ?? NATIVE_UNSUPPORTED_ABI;
 }
-/**
- * Commands a runtime provides beyond its manifest entrypoints. The
- * python/ruby package-manager front-ends (pip, gem, bundler) ride the
- * language runner rather than shipping as manifest files, and already-
- * deployed R2 manifests cannot retroactively declare them.
- *
- * This is the ONE hand-maintained command table: install aliasing
- * (`nimbus install pip` → python), command-not-found hints, and bin
- * registration all derive from `runtimeEntrypoints`, which merges this
- * with the catalog manifest. Catalog-declared aliases (python3, ruby3,
- * wasm-ld, …) come from manifest entrypoints and must NOT be repeated
- * here. Mechanically validated against `NIMBUS_RUNTIME_ABIS` by
- * tests/unit/runtime-command-aliases.mjs.
- */
-export const RUNTIME_EXTRA_ENTRYPOINTS = {
-    bash: [
-        { binName: '/bin/bash', runner: 'bash-runner', args: [] },
-        { binName: '/usr/bin/bash', runner: 'bash-runner', args: [] },
-    ],
-    // `pip` belongs to whichever runtime provides the interpreter, and only one
-    // may claim it. The python row went with python-runner: Pyodide's manifest
-    // still names that runner, so it could not serve pip even if it were listed.
-    cpython: [
-        { binName: 'pip', runner: 'cpython-runner', kind: 'pip', args: [] },
-        { binName: 'pip3', runner: 'cpython-runner', kind: 'pip', args: [] },
-    ],
-    ruby: [
-        { binName: 'gem', runner: 'ruby-runner', kind: 'gem', args: [] },
-        { binName: 'bundle', runner: 'ruby-runner', kind: 'bundle', args: [] },
-        { binName: 'bundler', runner: 'ruby-runner', kind: 'bundle', args: [] },
-    ],
-};
-function runtimeEntrypoints(manifest) {
-    const out = [...manifest.entrypoints];
-    const seen = new Set(out.map((ep) => ep.binName));
-    for (const ep of RUNTIME_EXTRA_ENTRYPOINTS[manifest.name] ?? []) {
-        if (seen.has(ep.binName))
-            continue;
-        out.push({ ...ep });
-        seen.add(ep.binName);
-    }
-    return out;
-}
 function splitRuntimeSpec(spec) {
     const atIdx = spec.indexOf('@');
     return {
@@ -212,83 +152,6 @@ export function createRuntimeCommandHintResolver(env) {
         return hints.get(command) ?? null;
     };
 }
-/** Compute the per-user install root for (name, version). Uses
- *  `process.env.HOME` if present; falls back to `/home/user`. */
-export function installRoot(homeDir, name, version) {
-    // Strip leading slash so SqliteFS sees a relative-looking VFS path,
-    // matching the convention used elsewhere in src/session/init.ts.
-    const home = homeDir.replace(/^\/+/, '').replace(/\/+$/, '');
-    return `${home}/.nimbus/runtimes/${name}/${version}`;
-}
-/** Read all installed manifests off SqliteFS. Used by both `--list`
- *  and boot-time rehydration. */
-export function listInstalledManifests(vfs, homeDir) {
-    return listInstalledManifestsView(vfs.as(CRED_KERNEL), homeDir);
-}
-function listInstalledManifestsView(fs, homeDir) {
-    const home = homeDir.replace(/^\/+/, '').replace(/\/+$/, '');
-    const runtimesRoot = `${home}/.nimbus/runtimes`;
-    const out = [];
-    if (!fs.exists(runtimesRoot))
-        return out;
-    // Each entry under runtimesRoot is a <name>; each entry under that
-    // is a <version>; each <version> dir has a manifest.json.
-    for (const nameEntry of fs.readdir(runtimesRoot)) {
-        if (nameEntry.type !== 'directory')
-            continue;
-        const nameDir = `${runtimesRoot}/${nameEntry.name}`;
-        for (const verEntry of fs.readdir(nameDir)) {
-            if (verEntry.type !== 'directory')
-                continue;
-            const verDir = `${nameDir}/${verEntry.name}`;
-            const manifestPath = `${verDir}/manifest.json`;
-            if (!fs.exists(manifestPath))
-                continue;
-            try {
-                const manifest = parseRuntimeManifest(JSON.parse(fs.readFileString(manifestPath)));
-                out.push({ root: verDir, manifest });
-            }
-            catch {
-                // Malformed manifest — skip silently. Surfacing via stderr
-                // would require a ctx we don't have at boot-time rehydration.
-            }
-        }
-    }
-    return out;
-}
-/**
- * Re-register every installed runtime's entrypoints in the shell
- * registry. Call once at session-init time after all runner factories
- * are registered (init.ts:registerRunnerFactory blocks).
- */
-export function rehydrateInstalledRuntimes(vfs, registry, homeDir) {
-    return rehydrateInstalledRuntimesView(vfs.as(CRED_KERNEL), registry, homeDir);
-}
-function rehydrateInstalledRuntimesView(vfs, registry, homeDir) {
-    const bins = [];
-    for (const { root, manifest } of listInstalledManifestsView(vfs, homeDir)) {
-        for (const ep of runtimeEntrypoints(manifest)) {
-            const factory = runnerFactories[ep.runner];
-            if (!factory)
-                continue; // runner not registered yet — skip
-            const handler = factory(manifest, root, ep.binName, ep.kind);
-            registry.register(ep.binName, handler);
-            bins.push(ep.binName);
-        }
-    }
-    return { count: bins.length, bins };
-}
-export function listInstalledRuntimes(vfs, homeDir) {
-    return listInstalledManifests(vfs, homeDir).map(({ root, manifest }) => ({
-        name: manifest.name,
-        version: manifest.version,
-        root,
-        abi: runtimeAbiForManifest(manifest),
-        bins: runtimeEntrypoints(manifest).map((e) => e.binName),
-        sizeBytes: manifest.files.reduce((a, f) => a + f.size, 0),
-        license: manifest.license,
-    }));
-}
 export async function listAvailableRuntimes(env) {
     const catalog = await fetchCatalog(env);
     return Object.entries(catalog.runtimes)
@@ -409,7 +272,7 @@ async function runInstall(args, ctx, deps) {
         // manifest's presence implies the install completed; we trust it.
         ctx.stdout.write(`[${name}] already installed at ${root} (use --reinstall to refetch)\n`);
         // Still re-register bins in case the registry lost them — idempotent.
-        rehydrateInstalledRuntimesView(deps.vfs, deps.registry, home);
+        rehydrateInstalledRuntimesView(deps.vfs, deps.registry, home, runnerFactoryFor);
         let manifest = null;
         try {
             manifest = parseRuntimeManifest(JSON.parse(deps.vfs.readFileString(`${root}/manifest.json`)));
@@ -505,7 +368,7 @@ async function runInstall(args, ctx, deps) {
     await Promise.all(workers);
     // Register entrypoints.
     for (const ep of runtimeEntrypoints(manifest)) {
-        const factory = runnerFactories[ep.runner];
+        const factory = runnerFactoryFor(ep.runner);
         if (!factory) {
             ctx.stderr.write(`[${name}] warning: runner '${ep.runner}' not registered; bin '${ep.binName}' will not be invokable\n`);
             continue;

package/dist/runtime/python-repl.d.ts

@@ -22,7 +22,7 @@
 import type { SqliteVFS } from '@nimbus-sh/core/vfs/sqlite-vfs.js';
 import type { FacetManager } from '../facets/manager.js';
 import type { WebSocketTerminal } from '../facets/ws-terminal.js';
-import type { RuntimeManifest } from './runtime-catalog.js';
+import type { RuntimeManifest } from '@nimbus-sh/core/runtime/runtime-manifest.js';
 export interface PythonReplDeps {
     facetMgr: FacetManager;
     vfs: SqliteVFS;

package/dist/runtime/python-repl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"python-repl.d.ts","sourceRoot":"","sources":["../../src/runtime/python-repl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAoB5D,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,YAAY,CAAC;IACvB,GAAG,EAAE,SAAS,CAAC;IACf,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,mFAAmF;IACnF,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,eAAe,CAAC;IAC1B;;;;;;;;;OASG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;;;;;OAQG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AA0QD,wBAAsB,aAAa,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAIzE;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,IAAI,CAAC,cAAc,EAAE,UAAU,GAAG,KAAK,GAAG,aAAa,GAAG,UAAU,CAAC,GAC1E,OAAO,CAAC,IAAI,CAAC,CAIf"}
+{"version":3,"file":"python-repl.d.ts","sourceRoot":"","sources":["../../src/runtime/python-repl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAoBnF,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,YAAY,CAAC;IACvB,GAAG,EAAE,SAAS,CAAC;IACf,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,mFAAmF;IACnF,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,eAAe,CAAC;IAC1B;;;;;;;;;OASG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;;;;;OAQG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AA0QD,wBAAsB,aAAa,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAIzE;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,IAAI,CAAC,cAAc,EAAE,UAAU,GAAG,KAAK,GAAG,aAAa,GAAG,UAAU,CAAC,GAC1E,OAAO,CAAC,IAAI,CAAC,CAIf"}

package/dist/runtime/python-repl.js

@@ -20,8 +20,8 @@
  * deciding what counts as a result.
  */
 import { ReplSession } from './repl-session.js';
-import { sessionUsesSciVariant } from './python-pip.js';
-import { buildCPythonPreamble } from './cpython-runner.js';
+import { sessionUsesSciVariant } from '@nimbus-sh/core/runtime/python-pip.js';
+import { buildCPythonPreamble } from '@nimbus-sh/core/runtime/cpython-runner.js';
 import { getFacetManagerLoaderHost } from './facet-loader-host.js';
 import { CRED_KERNEL } from '@nimbus-sh/core/runtime/os-contracts.js';
 /** Written by the driver when the source so far cannot yet be run. */

package/dist/runtime/ruby-repl.js

@@ -25,7 +25,7 @@
  *   - irb history pickling.
  */
 import { ReplSession } from './repl-session.js';
-import { buildRubyPreamble } from './ruby-runner.js';
+import { buildRubyPreamble } from '@nimbus-sh/core/runtime/ruby-runner.js';
 import { CRED_KERNEL } from '@nimbus-sh/core/runtime/os-contracts.js';
 class RubyReplAdapter {
     pool = null;

package/dist/runtime/ruby-resident.d.ts

@@ -0,0 +1,20 @@
+/**
+ * ruby-resident.ts — a Ruby program that keeps serving, as a Durable Object
+ * facet.
+ *
+ * The half of the Ruby runtime that names workerd. Everything about running
+ * the interpreter is in `@nimbus-sh/core`; this is the substrate a program
+ * that outlives its invocation needs — an actor that stays alive between
+ * requests, with inbound HTTP routed into the socket the program bound. A
+ * host without one supplies no {@link RubyResidentStart}, and such a program
+ * is refused rather than quietly run as a one-shot that dies with the call.
+ */
+import { type RubyResidentStart } from '@nimbus-sh/core/runtime/ruby-runner.js';
+import type { FacetManager } from '../facets/manager.js';
+/**
+ * Start a Ruby program that binds a port as its own process, so it outlives
+ * the invocation that started it.
+ */
+export declare function rubyResidentStart(facetMgr: FacetManager): RubyResidentStart;
+export declare function buildRubySocketProcessWorker(preamble: string): string;
+//# sourceMappingURL=ruby-resident.d.ts.map

package/dist/runtime/ruby-resident.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ruby-resident.d.ts","sourceRoot":"","sources":["../../src/runtime/ruby-resident.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,wCAAwC,CAAC;AAEhD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAezD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,YAAY,GAAG,iBAAiB,CA8E3E;AAED,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAiLrE"}