@nimbus-sh/worker 0.9.0 → 0.11.0

package/dist/hosted/commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/hosted/commands.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAuB5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAGvE,oFAAoF;AACpF,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,eAAe,EACnD,oBAAoB,GAAG,gBAAgB,GAAG,cAAc,GAAG,eAAe,GAAG,YAAY,GAAG,oBAAoB,GAAG,oBAAoB,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,cAAc,GAAG,cAAc,GAAG,WAAW,GAAG,iBAAiB,GAAG,UAAU,GAAG,cAAc,GAAG,eAAe,GAAG,0BAA0B,CAClV,GAAG;IACF,QAAQ,CAAC,GAAG,EAAE,kBAAkB,CAAC;IACjC,QAAQ,CAAC,GAAG,EAAE,iBAAiB,CAAC;IAChC,aAAa,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC;IAChD,sBAAsB,EAAE,eAAe,CAAC,wBAAwB,CAAC,CAAC;CACnE,CAAC;AAEF,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,kBAAkB,EAAE,SAAS,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CA6qDhH"}
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/hosted/commands.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAwB5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAGvE,oFAAoF;AACpF,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,eAAe,EACnD,oBAAoB,GAAG,gBAAgB,GAAG,cAAc,GAAG,eAAe,GAAG,YAAY,GAAG,oBAAoB,GAAG,oBAAoB,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,cAAc,GAAG,cAAc,GAAG,WAAW,GAAG,iBAAiB,GAAG,UAAU,GAAG,cAAc,GAAG,eAAe,GAAG,0BAA0B,CAClV,GAAG;IACF,QAAQ,CAAC,GAAG,EAAE,kBAAkB,CAAC;IACjC,QAAQ,CAAC,GAAG,EAAE,iBAAiB,CAAC;IAChC,aAAa,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC;IAChD,sBAAsB,EAAE,eAAe,CAAC,wBAAwB,CAAC,CAAC;CACnE,CAAC;AAEF,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,kBAAkB,EAAE,SAAS,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CA0/ChH"}

package/dist/hosted/commands.js

@@ -1,13 +1,15 @@
-import { Shell, createCurlCommand, createNpmCommand, NPM_VERSION, createTopCommand, createWatchCommand, createHelpCommand, rehydrateGlobalPackages } from '@nimbus-sh/core/substrate/lifo/index.js';
+import { Shell, createCurlCommand, createNpmCommand, NPM_VERSION, createTopCommand, createWatchCommand, createHelpCommand } from '@nimbus-sh/core/substrate/lifo/index.js';
 import { createKillCommand } from '@nimbus-sh/core/substrate/lifo/commands/system/kill.js';
+import { exitCodeForSignal, signalDisposition } from '@nimbus-sh/core/substrate/lifo/shell/signals.js';
 import { textSink } from '@nimbus-sh/core/_shared/bytes.js';
 import { BASH_RUNNER, CRED_KERNEL, requireVfsCred } from '@nimbus-sh/core/runtime/os-contracts.js';
-import { ExecutionFs } from '@nimbus-sh/core/shell/execution-fs.js';
-import { EsbuildService } from '@nimbus-sh/core/runtime/esbuild-service.js';
+import { ProcessView } from '@nimbus-sh/core/runtime/process-files.js';
+import { makeEsbuildCommand } from '@nimbus-sh/core/runtime/esbuild-cli.js';
+import { runEsbuildCli, supervisorEsbuildService } from '../facets/esbuild-transform.js';
 import { runFresh } from '../runtime/node-runner.js';
 import { runBunScript, BUN_VERSION } from '../runtime/bun-runner.js';
 import { buildRuntimeHandler, resolveRuntimeScriptPath } from '@nimbus-sh/core/runtime/runtime-registry.js';
-import { normalizeVfsPath, parentVfsPath, resolveVfsPath } from '@nimbus-sh/core/vfs/path.js';
+import { normalizeVfsPath, resolveVfsPath } from '@nimbus-sh/core/vfs/path.js';
 import { NimbusWrangler } from '../wrangler/nimbus-wrangler.js';
 import { filterWranglerFlags, detectBundlerBin, checkNodeModulesGuard, detectUnsupportedWranglerConfig, refusedNextSubcommand, NEXT_REFUSAL_MESSAGE } from '../session/helpers.js';
 import { createViteCommand } from '../session/vite-command.js';
@@ -28,6 +30,7 @@ import { makeNimbusVerbHandler } from '@nimbus-sh/core/runtime/nimbus-command.js
 export async function registerHostedCommands(self, workspace) {
     const sqliteFs = workspace.vfs;
     const kernelFs = sqliteFs.as(CRED_KERNEL);
+    const namespaceFs = workspace.filesystem.namespaceFs(CRED_KERNEL);
     const kernel = workspace.kernel;
     const shell = workspace.shell;
     const registry = workspace.registry;
@@ -44,6 +47,48 @@ export async function registerHostedCommands(self, workspace) {
         setUmask: (mask) => self.processes.setUmask(pid, mask),
         runAs: runAsProcess,
     });
+    // `kill` is the shell's builtin; the session's own processes (resident
+    // servers, the vite shim), numbered in this table's pid space, are reached
+    // through here, and their teardown releases what they hold.
+    const hostSignals = {
+        isLive: (pid) => self._viteShimPid === pid || self.processes.get(pid)?.state === 'running',
+        async signal(pid, signal, stderr) {
+            // Ending one is the only thing a resident's teardown can do: it has no
+            // stop, continue or handler delivery behind it.
+            if (signalDisposition(signal) !== 'terminate')
+                return 'unsupported';
+            // runtime primitive support (P11): the vite shim PID (registered by
+            // P5's long-running spawn) also tears down the in-process
+            // viteDevServer / cirrusReal — facetManager.kill only handles real
+            // Worker-Loader facets, and would leave the shim running with its port
+            // registered against a dead PID.
+            if (self._viteShimPid === pid) {
+                try {
+                    if (self.cirrusReal?.isRunning) {
+                        self.cirrusReal.stop(self.ctx);
+                        self.cirrusReal = null;
+                    }
+                    if (self.viteDevServer?.isRunning) {
+                        self.viteDevServer.stop();
+                        self.viteDevServer = null;
+                        await self.ctx.storage.delete(VITE_CONFIG_KEY);
+                    }
+                }
+                catch (error) {
+                    await stderr.write(`kill: while stopping vite shim: ${error instanceof Error ? error.message : String(error)}\n`);
+                }
+                const code = exitCodeForSignal(signal);
+                self.portRegistry.unregisterByPid(pid);
+                self.processes.kill(pid, code);
+                notifyTerminalEvent(terminal, { type: 'exit', pid, code, reason: `SIG${signal}`, command: 'vite' });
+                self._viteShimPid = null;
+                self._viteShimPort = null;
+                return 'delivered';
+            }
+            return facetMgr.kill(pid, signal) ? 'delivered' : 'no-such-process';
+        },
+    };
+    shell.setHostProcessSignals(hostSignals);
     self._setCpRegistry(registry);
     registry.register('chsh', makeChshCommand({
         isBashInstalled: async (home) => (await listInstalledRuntimes(sqliteFs, home)).some((runtime) => runtime.name === 'bash'),
@@ -210,7 +255,7 @@ export async function registerHostedCommands(self, workspace) {
                         cred,
                         setUmask: (mask) => ctx.setUmask(mask),
                         runAs: (targetCred, argv) => ctx.runAs(targetCred, argv),
-                        vfs: new ExecutionFs(workspace.filesystem.bind({ pid, cred })),
+                        vfs: new ProcessView(workspace.filesystem.bind({ pid, cred })),
                         signal: new AbortController().signal,
                         stdout,
                         stderr,
@@ -282,7 +327,7 @@ export async function registerHostedCommands(self, workspace) {
             getEsbuild: () => {
                 if (!self.esbuildService) {
                     self.ensureSqliteFs();
-                    self.esbuildService = new EsbuildService(kernelFs);
+                    self.esbuildService = supervisorEsbuildService(self.ctx, self.env, namespaceFs);
                 }
                 return self.esbuildService;
             },
@@ -430,7 +475,7 @@ export async function registerHostedCommands(self, workspace) {
             getEsbuild: () => {
                 if (!self.esbuildService) {
                     self.ensureSqliteFs();
-                    self.esbuildService = new EsbuildService(kernelFs);
+                    self.esbuildService = supervisorEsbuildService(self.ctx, self.env, namespaceFs);
                 }
                 return self.esbuildService;
             },
@@ -474,7 +519,7 @@ export async function registerHostedCommands(self, workspace) {
                     getEsbuild: () => {
                         if (!self.esbuildService) {
                             self.ensureSqliteFs();
-                            self.esbuildService = new EsbuildService(kernelFs);
+                            self.esbuildService = supervisorEsbuildService(self.ctx, self.env, namespaceFs);
                         }
                         return self.esbuildService;
                     },
@@ -489,170 +534,11 @@ export async function registerHostedCommands(self, workspace) {
         registry.register('curl', createCurlCommand(kernel));
     }
     catch { }
-    // ── df with SQLite stats + cache + process metrics ──────────────────
-    registry.register('df', async (ctx) => {
-        const stats = sqliteFs.getStats();
-        const pstats = facetMgr.stats;
-        const used = stats.usedBytes;
-        const cap = stats.capacityBytes;
-        const avail = cap - used;
-        const pct = ((used / cap) * 100).toFixed(0);
-        const fmt = (b) => {
-            if (b >= 1e9)
-                return (b / 1e9).toFixed(1) + 'G';
-            if (b >= 1e6)
-                return (b / 1e6).toFixed(1) + 'M';
-            if (b >= 1e3)
-                return (b / 1e3).toFixed(1) + 'K';
-            return b + 'B';
-        };
-        ctx.stdout.write('Filesystem      Size  Used Avail Use% Mounted on\n');
-        ctx.stdout.write('sqlite         ' + fmt(cap).padStart(5) + ' ' + fmt(used).padStart(5) +
-            ' ' + fmt(avail).padStart(5) + ' ' + pct.padStart(3) + '% /\n');
-        ctx.stdout.write('\nCache: ' + stats.cache.entries + '/' + stats.cache.maxEntries +
-            ' slots | hit rate: ' + stats.cache.hitRate +
-            '% | evictions: ' + stats.cache.evictions + '\n');
-        ctx.stdout.write('Procs: ' + pstats.running + ' running, ' +
-            pstats.exited + ' exited, ' +
-            pstats.total + ' total (next PID: ' + pstats.nextPid + ')\n');
-        return 0;
-    });
-    // ── esbuild command: transform/bundle via esbuild facet ───────────────
-    // Lazy-creates the EsbuildService on first use (esbuild-wasm is ~10MB).
-    registry.register('esbuild', async (ctx) => {
-        const args = ctx.args || [];
-        if (args.includes('--version')) {
-            ctx.stdout.write('0.24.2 (esbuild-wasm, bundled)\n');
-            return 0;
-        }
-        if (args.includes('--help') || args.length === 0) {
-            ctx.stdout.write('Usage: esbuild [options] [entry points]\n\n');
-            ctx.stdout.write('Options:\n');
-            ctx.stdout.write('  --bundle           Bundle all dependencies into output\n');
-            ctx.stdout.write('  --outfile=<path>   Write output to a file\n');
-            ctx.stdout.write('  --outdir=<path>    Write output to a directory\n');
-            ctx.stdout.write('  --format=esm|cjs   Output format (default: esm)\n');
-            ctx.stdout.write('  --platform=browser|node  Target platform\n');
-            ctx.stdout.write('  --minify           Minify output\n');
-            ctx.stdout.write('  --sourcemap        Generate source maps\n');
-            ctx.stdout.write('  --target=<target>  JS target (default: esnext)\n');
-            ctx.stdout.write('  --loader=<loader>  Force file loader (ts, tsx, jsx, css)\n');
-            ctx.stdout.write('  --version          Show version\n');
-            ctx.stdout.write('\nPowered by esbuild-wasm (bundled in supervisor).\n');
-            return 0;
-        }
-        // Lazy-init esbuild service
-        if (!self.esbuildService) {
-            self.ensureSqliteFs();
-            self.esbuildService = new EsbuildService(kernelFs);
-        }
-        // Parse flags
-        const flags = {};
-        const entryPoints = [];
-        for (const arg of args) {
-            if (arg.startsWith('--')) {
-                const eqIdx = arg.indexOf('=');
-                if (eqIdx > 0) {
-                    flags[arg.substring(2, eqIdx)] = arg.substring(eqIdx + 1);
-                }
-                else {
-                    flags[arg.substring(2)] = 'true';
-                }
-            }
-            else {
-                entryPoints.push(arg);
-            }
-        }
-        // Transform-only mode (single file, no --bundle)
-        if (entryPoints.length === 1 && !flags['bundle']) {
-            // Read the file and transform it
-            const filePath = resolveVfsPath(entryPoints[0], ctx.cwd || '/home/user');
-            let code;
-            try {
-                code = kernelFs.readFileString(filePath);
-            }
-            catch {
-                ctx.stderr.write(`esbuild: could not read file: ${entryPoints[0]}\n`);
-                return 1;
-            }
-            try {
-                ctx.stderr.write('Transforming...\n');
-                const result = await self.esbuildService.transform(code, {
-                    loader: flags['loader'] || (() => {
-                        const ext = filePath.split('.').pop()?.toLowerCase();
-                        return { ts: 'ts', tsx: 'tsx', jsx: 'jsx', js: 'js', mts: 'ts', mjs: 'js', css: 'css', json: 'json' }[ext || ''];
-                    })(),
-                    format: flags['format'] || 'esm',
-                    target: flags['target'] || 'esnext',
-                    sourcemap: flags['sourcemap'] === 'true',
-                    minify: flags['minify'] === 'true',
-                });
-                if (flags['outfile']) {
-                    const outPath = resolveVfsPath(flags['outfile'], ctx.cwd || '/home/user');
-                    const parent = parentVfsPath(outPath);
-                    if (parent && !kernelFs.exists(parent))
-                        kernelFs.mkdir(parent, { recursive: true });
-                    kernelFs.writeFile(outPath, result.code);
-                    ctx.stdout.write(`  ${outPath}  ${result.code.length} bytes\n`);
-                }
-                else {
-                    ctx.stdout.write(result.code);
-                }
-                for (const w of result.warnings || []) {
-                    ctx.stderr.write(`warning: ${w.text}\n`);
-                }
-                return 0;
-            }
-            catch (e) {
-                ctx.stderr.write(`esbuild error: ${e?.message || e}\n`);
-                return 1;
-            }
-        }
-        // Bundle mode
-        if (entryPoints.length === 0) {
-            ctx.stderr.write('esbuild: no entry points specified\n');
-            return 1;
-        }
-        // Resolve entry points relative to cwd
-        const resolvedEntryPoints = entryPoints.map(ep => resolveVfsPath(ep, ctx.cwd || '/home/user'));
-        try {
-            ctx.stderr.write('Bundling...\n');
-            const result = await self.esbuildService.build(resolvedEntryPoints, {
-                bundle: flags['bundle'] === 'true',
-                format: flags['format'] || 'esm',
-                target: flags['target'] || 'esnext',
-                platform: flags['platform'] || 'browser',
-                outdir: flags['outfile'] ? undefined : (flags['outdir'] || '/dist'),
-                outfile: flags['outfile'],
-                sourcemap: flags['sourcemap'] === 'true',
-                minify: flags['minify'] === 'true',
-                external: flags['external']?.split(','),
-            });
-            for (const e of result.errors || []) {
-                ctx.stderr.write(`error: ${e.text}\n`);
-            }
-            for (const w of result.warnings || []) {
-                ctx.stderr.write(`warning: ${w.text}\n`);
-            }
-            if (result.errors?.length)
-                return 1;
-            // Write output files to VFS
-            for (const f of result.outputFiles || []) {
-                const outPath = normalizeVfsPath(f.path);
-                const parent = parentVfsPath(outPath);
-                if (parent && !kernelFs.exists(parent))
-                    kernelFs.mkdir(parent, { recursive: true });
-                kernelFs.writeFile(outPath, f.contents);
-                ctx.stdout.write(`  ${outPath}  ${f.contents.length} bytes\n`);
-            }
-            ctx.stderr.write(`Done (${result.outputFiles?.length || 0} output files)\n`);
-            return 0;
-        }
-        catch (e) {
-            ctx.stderr.write(`esbuild error: ${e?.message || e}\n`);
-            return 1;
-        }
-    });
+    // ── esbuild: the real esbuild CLI, in the session's esbuild facet ─────
+    // See @nimbus-sh/core runtime/esbuild-cli.ts.
+    registry.register('esbuild', makeEsbuildCommand({
+        run: (args, ctx, output) => runEsbuildCli(self.ctx, self.env, ctx.pid, args, output),
+    }));
     // ── vite command: start/stop the dev server ──────────────────────────
     registry.register('vite', createViteCommand(self));
     // ── nimbus-wrangler / wrangler command: Worker dev server ─────────────
@@ -715,7 +601,7 @@ export async function registerHostedCommands(self, workspace) {
         // Lazy-init esbuild
         if (!self.esbuildService) {
             self.ensureSqliteFs();
-            self.esbuildService = new EsbuildService(kernelFs);
+            self.esbuildService = supervisorEsbuildService(self.ctx, self.env, namespaceFs);
         }
         // Parse --root flag; default to the shell cwd so `npm run dev` from
         // a project directory picks up that project's wrangler.jsonc.
@@ -821,7 +707,7 @@ export async function registerHostedCommands(self, workspace) {
         await self.ensureNpmInstaller((msg) => {
             ctx.stdout.write('[npm] ' + msg + '\n');
         });
-        const result = await self.npmInstaller.install(cwd, { packages, pid: ctx.pid });
+        const result = await self.npmInstaller.install(cwd, { packages, pid: ctx.pid, registry: ctx.env?.NPM_REGISTRY });
         if (result.failed.length > 0) {
             ctx.stderr.write('\x1b[31mFailed: ' + result.failed.join(', ') + '\x1b[0m\n');
         }
@@ -886,6 +772,7 @@ export async function registerHostedCommands(self, workspace) {
                 const identity = commandIdentityFor(childProcess.pid);
                 const terminal = new HeadlessTerminal();
                 const childShell = new Shell(terminal, workspace.filesystem, registry, { ...env, ...(options?.env || {}) }, processRegistry, identity);
+                childShell.setHostProcessSignals(hostSignals);
                 HeredocHandler.install(childShell, terminal);
                 if (options?.cwd)
                     childShell.setCwd(options.cwd);
@@ -916,7 +803,7 @@ export async function registerHostedCommands(self, workspace) {
         if (opts.longRunning)
             self.processes.setLongRunning(pid);
         const startedAt = Date.now();
-        // Spawn banner — matches facet-manager.ts onSpawn format.
+        // Spawn banner — matches facets/manager.ts onSpawn format.
         if (terminal) {
             const label = opts.longRunning ? 'started (long-running)' : 'started';
             terminal.write(`\x1b[2m[shell ${label}: pid=${pid} cmd="${cmd}"]\x1b[0m\r\n`);
@@ -1374,7 +1261,7 @@ export async function registerHostedCommands(self, workspace) {
         await self.ensureNpmInstaller((msg) => ctx.stdout.write('[npm] ' + msg + '\n'));
         self.ensureSqliteFs();
         const installer = self.npmInstaller;
-        const resolveResult = await resolveNpxBinary(installer, sqliteFs.as(requireVfsCred(ctx.cred, 'npx')), ctx.cwd || '/home/user', npxArgs, (msg) => ctx.stdout.write(msg + '\n'), ctx.pid);
+        const resolveResult = await resolveNpxBinary(installer, sqliteFs.as(requireVfsCred(ctx.cred, 'npx')), ctx.cwd || '/home/user', npxArgs, (msg) => ctx.stdout.write(msg + '\n'), ctx.pid, ctx.env?.NPM_REGISTRY);
         if (resolveResult.ok && resolveResult.binPath) {
             const nodeCmd = await registry.resolve('node');
             if (nodeCmd) {
@@ -1572,76 +1459,8 @@ export async function registerHostedCommands(self, workspace) {
         }
         return 0;
     });
-    const shellKillCommand = createKillCommand(processRegistry);
-    registry.register('kill', async (ctx) => {
-        const pidArg = ctx.args[0];
-        if (!pidArg) {
-            ctx.stderr.write('Usage: kill <pid>\n');
-            return 1;
-        }
-        if (pidArg.startsWith('-') || pidArg.startsWith('%')) {
-            return shellKillCommand(ctx);
-        }
-        const pid = parseInt(pidArg);
-        if (isNaN(pid)) {
-            ctx.stderr.write('kill: invalid pid\n');
-            return 1;
-        }
-        if (processRegistry.get(pid)) {
-            return shellKillCommand(ctx);
-        }
-        // runtime primitive support (P11): if the target is the vite shim PID
-        // (registered by P5's long-running spawn), tear down the
-        // in-process viteDevServer / cirrusReal too — facetManager.kill
-        // only handles real Worker-Loader facets, and would leave the
-        // shim running with its port registered against a dead PID.
-        if (self._viteShimPid === pid) {
-            try {
-                if (self.cirrusReal?.isRunning) {
-                    self.cirrusReal.stop(self.ctx);
-                    self.cirrusReal = null;
-                }
-                if (self.viteDevServer?.isRunning) {
-                    self.viteDevServer.stop();
-                    self.viteDevServer = null;
-                    try {
-                        await self.ctx.storage.delete(VITE_CONFIG_KEY);
-                    }
-                    catch { }
-                }
-            }
-            catch (e) {
-                ctx.stderr.write('kill: while stopping vite shim: ' + (e?.message || e) + '\n');
-            }
-            try {
-                self.portRegistry.unregisterByPid(pid);
-            }
-            catch { }
-            try {
-                self.processes.kill(pid);
-            }
-            catch { }
-            notifyTerminalEvent(terminal, {
-                type: 'exit', pid, code: 137, command: 'vite',
-            });
-            self._viteShimPid = null;
-            self._viteShimPort = null;
-            ctx.stdout.write(`Process ${pid} killed.\n`);
-            return 0;
-        }
-        if (facetMgr?.kill(pid)) {
-            ctx.stdout.write(`Process ${pid} killed.\n`);
-            return 0;
-        }
-        ctx.stderr.write(`kill: no such process: ${pid}\n`);
-        return 1;
-    });
+    registry.register('kill', createKillCommand(processRegistry, hostSignals));
     registry.register('top', createTopCommand(processRegistry));
     registry.register('watch', createWatchCommand(registry));
     registry.register('help', createHelpCommand(registry));
-    // ── Rehydrate globally-installed npm packages ──
-    try {
-        rehydrateGlobalPackages(kernel.vfs, registry);
-    }
-    catch { }
 }

package/dist/hosted/runtime.d.ts

@@ -2,15 +2,17 @@ import type { NimbusWorkspace } from '@nimbus-sh/core/workspace';
 import type { PortRegistry } from '@nimbus-sh/core/runtime/port-registry.js';
 import type { ProcessLogReadOptions } from '@nimbus-sh/core/runtime/process-logs.js';
 import type { VfsCred } from '@nimbus-sh/core/runtime/os-contracts.js';
-import type { SandboxFs } from '@nimbus-sh/core/substrate/lifo/sandbox/types.js';
+import { ProcessView } from '@nimbus-sh/core/runtime/process-files.js';
 import { type SupervisorOpEnvelope } from '@nimbus-sh/core/workspace/supervisor-op.js';
-import type { FacetManagerHostHooks } from '../facets/compose.js';
+import type { ComposedFacetManager, FacetManagerHostHooks } from '../facets/compose.js';
 import { WebSocketTerminal } from '../facets/ws-terminal.js';
 import * as operations from '../session/programmatic.js';
 import * as services from './services.js';
+import { HostedSession, type HostedSessionScope } from './session.js';
 import { z } from 'zod/v4';
 declare const HostedTask: z.ZodEnum<{
     "resident-launch": "resident-launch";
+    "resident-keepalive": "resident-keepalive";
     "log-flush": "log-flush";
     "log-janitor": "log-janitor";
 }>;
@@ -30,23 +32,28 @@ export interface HostedRuntimeOptions {
     basePath?: string;
     origin?: string;
 }
-export interface RuntimeFiles extends SandboxFs {
+/** The namespace as one credential sees it (a `VFS`, absolute paths), and the same for another. */
+export type RuntimeFiles = ProcessView & {
     as(cred: VfsCred): RuntimeFiles;
-}
+};
 export declare function composeHostedRuntime(options: HostedRuntimeOptions): Promise<{
-    workspace: NimbusWorkspace;
-    terminal: WebSocketTerminal;
-    files: RuntimeFiles;
-    runtimes: import("@nimbus-sh/core/runtime/runtime-manager.js").RuntimeManager;
+    supervisorOp: (envelope: SupervisorOpEnvelope) => Promise<unknown>;
+    /** The SDK's session surface for `Nimbus.fromSession`, optionally bound to one shell and identity. */
+    session: (scope?: HostedSessionScope) => HostedSession;
+    onScheduled: (task: HostedRuntimeTask) => Promise<void>;
+    terminalClose: (ws: WebSocket) => void;
+    close: () => Promise<void>;
+    facets: () => ComposedFacetManager;
     ready: (options?: operations.ProgrammaticReadyOptions | undefined) => Promise<{
         ok: true;
         preinstalled: string[];
     }>;
-    exec: (command: string, options?: operations.ProgrammaticExecOptions | undefined) => Promise<operations.ProgrammaticExecResult>;
+    exec: (command: string, options?: operations.ProgrammaticExecOptions | undefined) => Promise<import("@nimbus-sh/core/runtime/exec-stream.js").ExecOutput>;
+    execStream: (command: string, options?: operations.ProgrammaticExecOptions | undefined) => Promise<import("@nimbus-sh/core/runtime/exec-stream.js").ExecStream>;
     runCode: (code: string, options?: (operations.ProgrammaticExecOptions & {
         language?: "javascript" | "typescript" | "python" | "ruby" | "shell";
         install?: "never" | "ifMissing";
-    }) | undefined) => Promise<operations.ProgrammaticExecResult>;
+    }) | undefined) => Promise<import("@nimbus-sh/core/runtime/exec-stream.js").ExecOutput>;
     startProcess: (command: string, options?: operations.ProgrammaticExecOptions | undefined) => Promise<operations.ProgrammaticStartResult>;
     listProcesses: () => Promise<operations.SerializedProcess[]>;
     killProcess: (pid: number) => Promise<{
@@ -121,14 +128,14 @@ export declare function composeHostedRuntime(options: HostedRuntimeOptions): Pro
         installed: import("@nimbus-sh/core/runtime/installed-runtimes.js").RuntimeSummary[];
         available: import("@nimbus-sh/core/runtime/runtime-package.js").RuntimeAvailability[];
     }>;
-    spawnWorker: (workerCode: string, command: string, cwd: string, opts?: import("../facets/manager.js").LongRunningWorkerSpawnOptions | undefined) => Promise<import("../facets/manager.js").SpawnedWorker>;
+    spawnWorker: (workerCode: string, command: string, cwd: string, opts?: import("../workspace-host.js").LongRunningWorkerSpawnOptions | undefined) => Promise<import("../facets/manager.js").SpawnedWorker>;
     routeCapabilityPort: (port: number, capability: string, request: Request<unknown, CfProperties<unknown>>, innerPath: string) => Promise<Response>;
-    supervisorOp: (envelope: SupervisorOpEnvelope) => Promise<unknown>;
-    onScheduled: (task: HostedRuntimeTask) => Promise<void>;
     attachTerminal: (ws: WebSocket) => Promise<void>;
     terminalFrame: (ws: WebSocket, message: string | ArrayBuffer) => Promise<void>;
-    terminalClose: (ws: WebSocket) => void;
-    close: () => Promise<void>;
+    workspace: NimbusWorkspace;
+    terminal: WebSocketTerminal;
+    files: RuntimeFiles;
+    runtimes: import("@nimbus-sh/core/runtime/runtime-manager.js").RuntimeManager;
 }>;
 export type HostedRuntime = Awaited<ReturnType<typeof composeHostedRuntime>>;
 export {};

package/dist/hosted/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/hosted/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAEjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,KAAK,EAA6B,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAIlG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iDAAiD,CAAC;AACjF,OAAO,EAAqD,KAAK,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAE1I,OAAO,KAAK,EAAwB,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AASxF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAO7D,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AACzD,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAI3B,QAAA,MAAM,UAAU;;;;EAA0D,CAAC;AAC3E,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,CAAC;AAE3D,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,iBAAiB,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/D,MAAM,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClD;AAED,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,eAAe,CAAC;IAC3B,GAAG,EAAE,kBAAkB,CAAC;IACxB,GAAG,EAAE,QAAQ,CAAC,gBAAgB,CAAC;IAC/B,KAAK,EAAE,YAAY,CAAC;IACpB,SAAS,EAAE,sBAAsB,CAAC;IAClC,mBAAmB,CAAC,EAAE,qBAAqB,CAAC,qBAAqB,CAAC,CAAC;IACnE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,YAAa,SAAQ,SAAS;IAC7C,EAAE,CAAC,IAAI,EAAE,OAAO,GAAG,YAAY,CAAC;CACjC;AAqRD,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uBAkBjD,MAAM,YAAY,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BAiBjC,oBAAoB;wBACzB,iBAAiB;yBAChB,SAAS;wBACV,SAAS,WAAW,MAAM,GAAG,WAAW;wBACxC,SAAS;;GAGhC;AAED,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/hosted/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAEjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,KAAK,EAA6B,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAElG,OAAO,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AACvE,OAAO,EAAqD,KAAK,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAG1I,OAAO,KAAK,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AASxF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAQ7D,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AACzD,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,aAAa,EAAE,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAK3B,QAAA,MAAM,UAAU;;;;;EAAgF,CAAC;AACjG,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,CAAC;AAE3D,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,iBAAiB,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/D,MAAM,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClD;AAED,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,eAAe,CAAC;IAC3B,GAAG,EAAE,kBAAkB,CAAC;IACxB,GAAG,EAAE,QAAQ,CAAC,gBAAgB,CAAC;IAC/B,KAAK,EAAE,YAAY,CAAC;IACpB,SAAS,EAAE,sBAAsB,CAAC;IAClC,mBAAmB,CAAC,EAAE,qBAAqB,CAAC,qBAAqB,CAAC,CAAC;IACnE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,mGAAmG;AACnG,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG;IAAE,EAAE,CAAC,IAAI,EAAE,OAAO,GAAG,YAAY,CAAA;CAAE,CAAC;AAuU7E,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,oBAAoB;6BA2C3C,oBAAoB;IAC7C,sGAAsG;sBACrF,kBAAkB;wBAIf,iBAAiB;wBACjB,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uBAjCV,MAAM,YAAY,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBAiBrC,SAAS;wBACV,SAAS,WAAW,MAAM,GAAG,WAAW;;;;;GAkB/D;AAED,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC"}