@nimbus-sh/worker 0.1.5 → 0.1.6

package/dist/facets/process.js

@@ -42,6 +42,7 @@ export const CHILD_PROCESS_MAX_DEPTH = 8;
  * signal (real Node would return false from .write).
  */
 const STDIN_QUEUE_MAX_BYTES = 256 * 1024; // 256 KiB
+const STDIN_ATTACH_WAIT_MS = 500;
 /**
  * How long the parent's cpReadOutput long-poll waits for new chunks
  * before returning empty. 250ms is the plan §3 target.
@@ -52,6 +53,80 @@ const READ_OUTPUT_DEFAULT_WAIT_MS = 250;
  * polls by the caller.
  */
 const WAIT_MAX_MS = 30_000;
+function basenameOfCommand(command) {
+    const text = String(command || '').trim();
+    if (!text)
+        return '';
+    const slash = text.lastIndexOf('/');
+    return slash >= 0 ? text.slice(slash + 1) : text;
+}
+function isShellCommand(command) {
+    const base = basenameOfCommand(command);
+    return base === 'sh' || base === 'bash';
+}
+function normalizeVirtualCommand(command) {
+    const text = String(command || '').trim();
+    if (!text.startsWith('/'))
+        return text;
+    const base = basenameOfCommand(text);
+    const dir = text.slice(0, Math.max(0, text.length - base.length));
+    if (dir === '/bin/' || dir === '/usr/bin/' || dir === '/usr/local/bin/') {
+        return base;
+    }
+    return text;
+}
+function parseShellCommandArgs(args) {
+    const argv = Array.isArray(args) ? args.map(String) : [];
+    for (let i = 0; i < argv.length; i++) {
+        const arg = argv[i];
+        if (arg === '--')
+            continue;
+        if (arg === '-c') {
+            const commandLine = argv[i + 1];
+            return typeof commandLine === 'string'
+                ? { commandLine, args: argv.slice(i + 2) }
+                : null;
+        }
+        if (arg.startsWith('-') && arg.length > 2) {
+            for (let j = 1; j < arg.length; j++) {
+                if (arg[j] === 'c') {
+                    const commandLine = argv[i + 1];
+                    return typeof commandLine === 'string'
+                        ? { commandLine, args: argv.slice(i + 2) }
+                        : null;
+                }
+            }
+            continue;
+        }
+        if (!arg.startsWith('-'))
+            return null;
+    }
+    return null;
+}
+function quoteShellToken(value) {
+    const text = String(value);
+    if (text.length === 0)
+        return "''";
+    let simple = true;
+    for (let i = 0; i < text.length; i++) {
+        const code = text.charCodeAt(i);
+        const ch = text[i];
+        const ok = (code >= 48 && code <= 57) ||
+            (code >= 65 && code <= 90) ||
+            (code >= 97 && code <= 122) ||
+            ch === '_' || ch === '-' || ch === '.' || ch === '/' || ch === ':' || ch === '=';
+        if (!ok) {
+            simple = false;
+            break;
+        }
+    }
+    if (simple)
+        return text;
+    return "'" + text.split("'").join("'\\''") + "'";
+}
+function shellLineFromSpawn(command, args) {
+    return [command, ...(Array.isArray(args) ? args : [])].map((part) => quoteShellToken(String(part))).join(' ');
+}
 export class FacetProcessManager {
     children = new Map();
     nextPid = 10_000; // child PIDs start above ProcessTable's range
@@ -107,18 +182,26 @@ export class FacetProcessManager {
             this.deps.processTable.spawn(`${req.command} ${req.args.join(' ')}`.trim(), req.args, req.cwd);
         }
         catch { /* ignore */ }
+        const shellPlan = this._shellPlanFor(req);
+        const normalizedCommand = shellPlan ? 'sh' : normalizeVirtualCommand(req.command);
+        const dispatchReq = shellPlan
+            ? { ...req, command: 'sh', args: ['-c', shellPlan.commandLine, ...shellPlan.args] }
+            : { ...req, command: normalizedCommand };
         // Resolve command kind. Resolution failure → exit 127 (command not
         // found), no facet at all. Same shell semantics.
-        const reg = this.deps.commandRegistry.resolve(req.command);
+        const reg = shellPlan ? { kind: 'shell-direct' } : this.deps.commandRegistry.resolve(normalizedCommand);
         const kind = reg ? reg.kind : 'unknown';
-        // Dispatch — fire-and-forget. The promise resolves when the command
-        // completes, at which point we stamp the exit slot.
-        void this._dispatch(child, kind, req).catch((e) => {
-            // Last-resort: if both runners somehow throw, exit 1 with the error
-            // on stderr.
-            this._appendOutput(child, 2, `Error: ${e?.message || String(e)}\n`);
-            this._stampExit(child, 1, null);
-        });
+        // Dispatch after the cpSpawn RPC has had a chance to return to the
+        // parent facet. That lets immediate child.stdin.write(); child.stdin.end()
+        // calls land in the stdin queue before a preseeded child runtime starts.
+        setTimeout(() => {
+            void this._dispatch(child, kind, dispatchReq).catch((e) => {
+                // Last-resort: if both runners somehow throw, exit 1 with the error
+                // on stderr.
+                this._appendOutput(child, 2, `Error: ${e?.message || String(e)}\n`);
+                this._stampExit(child, 1, null);
+            });
+        }, 0);
         return { childPid: pid };
     }
     /** Dispatch by kind. */
@@ -140,17 +223,19 @@ export class FacetProcessManager {
         // pure-builtin / facet-direct correctness; only the dispatch
         // envelope moves to a fresh isolate).
         if (this.deps.spawnPool) {
-            // Pure-builtins consume stdin; drain before dispatch. facet-direct
-            // reads stdin lazily via cpReadStdin so we don't block on it here.
-            const stdin = kind === 'pure-builtin'
-                ? await this._drainStdinForBuiltin(child)
-                : '';
+            const liveStdin = kind === 'facet-direct' || kind === 'shell-direct';
+            // Pure builtins consume stdin from the request payload. Facet-direct
+            // commands receive live stdin through NIMBUS_CP_CHILD_PID and
+            // supervisor cpReadStdin, which matches Node child_process pipes.
+            const stdin = liveStdin ? '' : await this._drainStdinForBuiltin(child);
             // Single-ownership: build a fresh request payload (not a reference
             // to the caller's req) at the boundary.
             const reqCopy = {
                 command: String(req.command),
                 args: Array.isArray(req.args) ? [...req.args] : [],
-                env: { ...child.env },
+                env: liveStdin
+                    ? { ...child.env, NIMBUS_CP_CHILD_PID: String(child.pid) }
+                    : { ...child.env },
                 cwd: String(req.cwd),
                 stdio: req.stdio,
                 detached: !!req.detached,
@@ -170,6 +255,10 @@ export class FacetProcessManager {
             return;
         }
         // ── Legacy in-supervisor dispatch (unit-test path) ─────────────
+        if (kind === 'shell-direct') {
+            await this._dispatchShell(child, req, hooks);
+            return;
+        }
         if (kind === 'pure-builtin') {
             // Drain stdin synchronously — pure builtins are sync-style; they
             // expect a complete stdin string. The parent must call stdinEnd()
@@ -193,9 +282,9 @@ export class FacetProcessManager {
         const payload = JSON.stringify({
             command: req.command,
             args: req.args,
-            env: child.env,
+            env: { ...child.env, NIMBUS_CP_CHILD_PID: String(child.pid) },
             cwd: req.cwd,
-            stdin: '', // facet-direct reads stdin via cpReadStdin RPC at runtime
+            stdin: '',
         });
         // Register the facet-slot so kill() can find the abort handle.
         child.facetSlot = { abort: undefined, killed: false };
@@ -234,6 +323,20 @@ export class FacetProcessManager {
         const childEnv = {
             ...(req.env || {}),
         };
+        if (kind === 'shell-direct') {
+            try {
+                const plan = this._shellPlanFor(req);
+                if (!plan) {
+                    return { exitCode: 127, stdout: '', stderr: `${req.command}: unsupported shell invocation\n` };
+                }
+                const code = await this._runShellLine(plan.commandLine, childEnv, String(req.cwd || '/home/user'), '', hooks);
+                return { exitCode: typeof code === 'number' ? code : 0, stdout: stdoutBuf, stderr: stderrBuf };
+            }
+            catch (e) {
+                stderrBuf += `shell error: ${e?.message || String(e)}\n`;
+                return { exitCode: 1, stdout: stdoutBuf, stderr: stderrBuf };
+            }
+        }
         if (kind === 'pure-builtin') {
             try {
                 const code = await this.deps.commandRegistry.runPureBuiltin(req.command, req.args, childEnv, String(req.cwd || '/home/user'), typeof req.stdin === 'string' ? req.stdin : '', hooks);
@@ -250,7 +353,7 @@ export class FacetProcessManager {
             args: req.args,
             env: childEnv,
             cwd: String(req.cwd || '/home/user'),
-            stdin: typeof req.stdin === 'string' ? req.stdin : '',
+            stdin: '',
         });
         try {
             const code = await this.deps.facetMgr.execStream(payload, 
@@ -270,13 +373,76 @@ export class FacetProcessManager {
      * on full stdin so we have to commit upfront — the parent should have
      * called stdinEnd() before the wait ticks expire.
      */
+    async _waitForStdinEvent(child, waitMs) {
+        if (child.stdinClosed)
+            return;
+        await new Promise((resolve) => {
+            const timer = setTimeout(() => {
+                const idx = child.stdinWaiters.indexOf(wrapped);
+                if (idx >= 0)
+                    child.stdinWaiters.splice(idx, 1);
+                resolve();
+            }, Math.max(0, waitMs));
+            const wrapped = () => {
+                clearTimeout(timer);
+                resolve();
+            };
+            child.stdinWaiters.push(wrapped);
+        });
+    }
     async _drainStdinForBuiltin(child) {
-        const t0 = Date.now();
-        while (!child.stdinClosed && Date.now() - t0 < 50) {
-            await new Promise((r) => setTimeout(r, 5));
+        if (!child.stdinClosed && child.stdinChunks.length === 0) {
+            await this._waitForStdinEvent(child, STDIN_ATTACH_WAIT_MS);
+        }
+        if (!child.stdinClosed && child.stdinChunks.length > 0) {
+            await this._waitForStdinEvent(child, STDIN_ATTACH_WAIT_MS);
         }
         return child.stdinChunks.join('');
     }
+    _shellPlanFor(req) {
+        const args = Array.isArray(req.args) ? req.args.map(String) : [];
+        if (req.shell) {
+            if (isShellCommand(req.command))
+                return parseShellCommandArgs(args);
+            return { commandLine: shellLineFromSpawn(String(req.command), args), args: [] };
+        }
+        if (!isShellCommand(req.command))
+            return null;
+        return parseShellCommandArgs(args);
+    }
+    async _dispatchShell(child, req, hooks) {
+        const plan = this._shellPlanFor(req);
+        if (!plan) {
+            this._appendOutput(child, 2, `${req.command}: unsupported shell invocation\n`);
+            this._stampExit(child, 127, null);
+            return;
+        }
+        try {
+            const stdin = await this._drainStdinForShell(child);
+            const code = await this._runShellLine(plan.commandLine, child.env, req.cwd, stdin, hooks);
+            this._stampExit(child, typeof code === 'number' ? code : 0, null);
+        }
+        catch (e) {
+            this._appendOutput(child, 2, `shell error: ${e?.message || String(e)}\n`);
+            this._stampExit(child, 1, null);
+        }
+    }
+    async _drainStdinForShell(child) {
+        if (!child.stdinClosed && child.stdinChunks.length === 0) {
+            await this._waitForStdinEvent(child, STDIN_ATTACH_WAIT_MS);
+        }
+        if (!child.stdinClosed && child.stdinChunks.length > 0) {
+            await this._waitForStdinEvent(child, STDIN_ATTACH_WAIT_MS);
+        }
+        return child.stdinChunks.join('');
+    }
+    async _runShellLine(commandLine, env, cwd, stdin, hooks) {
+        if (!this.deps.shellExecutor) {
+            hooks.onStderr('sh: shell executor unavailable\n');
+            return 127;
+        }
+        return this.deps.shellExecutor.execute(commandLine, env, cwd || '/home/user', stdin, hooks);
+    }
     // ── stdin queue ─────────────────────────────────────────────────────────
     stdinWrite(childPid, data) {
         const child = this.children.get(childPid);

package/dist/facets/vite-dev-server.d.ts

@@ -213,6 +213,8 @@ export declare class ViteDevServer {
     handleRequest(request: Request, pathname: string): Promise<Response>;
     private _handleRequestInner;
     private serveIndexHtml;
+    private getBarrelModuleCacheInfo;
+    private cachedModuleMatchesBarrelInput;
     private serveModule;
     /**
      * Cold path of serveModule: package resolution → on-demand facet

package/dist/facets/vite-dev-server.d.ts.map

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

package/dist/facets/vite-dev-server.js

@@ -24,7 +24,7 @@
 import { getSharedRuntimeExternals, BUNDLER_VERSION } from '../runtime/esbuild-service.js';
 import { NpmCache } from '../npm/cache.js';
 import { countPackageFiles, BARREL_PKG_FILE_THRESHOLD, packageNameFromSpecifier } from '../runtime/barrel-detect.js';
-import { scanNamedImports, buildSyntheticEntry, buildScopedSliceForSynthetic, syntheticEntryPath, } from '../runtime/barrel-synthesizer.js';
+import { scanNamedImports, namedImportSignature, buildSyntheticEntry, buildScopedSliceForSynthetic, syntheticEntryPath, } from '../runtime/barrel-synthesizer.js';
 import { resolvePackageEntry, resolveExports } from '../_shared/exports-resolver.js';
 import { injectRouterBasename, shouldProcessForRouter } from '../runtime/router-basename.js';
 import { TAILWIND_PLAY_BUNDLE, TAILWIND_PLAY_VERSION, } from '../tailwind-play.generated.js';
@@ -1678,16 +1678,41 @@ export class ViteDevServer {
         });
     }
     // ── Module serving (/@modules/<pkg>) ──────────────────────────────────
+    getBarrelModuleCacheInfo(specifier) {
+        const pkgName = packageNameFromSpecifier(specifier);
+        if (specifier !== pkgName)
+            return null;
+        const pkgDir = this.root + '/node_modules/' + pkgName;
+        const fileCount = countPackageFiles(this.vfs, pkgDir);
+        if (fileCount <= BARREL_PKG_FILE_THRESHOLD)
+            return null;
+        const names = scanNamedImports(this.vfs, this.root).get(pkgName) ?? null;
+        return {
+            pkgName,
+            fileCount,
+            names,
+            inputHash: namedImportSignature(pkgName, names),
+        };
+    }
+    cachedModuleMatchesBarrelInput(inputHash, barrelInfo) {
+        if (!barrelInfo)
+            return true;
+        return !!barrelInfo.inputHash && inputHash === barrelInfo.inputHash;
+    }
     async serveModule(specifier, headers) {
         const JS_CT = 'application/javascript; charset=utf-8';
         const cacheKey = `@modules/${specifier}`;
+        const barrelInfo = this.getBarrelModuleCacheInfo(specifier);
         // 1. In-memory cache (hot path — already bundled)
         const memCached = this.moduleCache.get(cacheKey);
-        if (memCached) {
+        if (memCached && this.cachedModuleMatchesBarrelInput(memCached.inputHash, barrelInfo)) {
             return new Response(memCached.code, {
                 headers: { ...headers, 'Content-Type': JS_CT },
             });
         }
+        else if (memCached) {
+            this.moduleCache.delete(cacheKey);
+        }
         // 2. SQLite pre-bundle cache (warm path — from npm install pre-bundling)
         //    Pre-bundled modules may contain leaked bare imports if they were built
         //    with `external` peer deps (see npm-installer.prebundleUsedModules).
@@ -1699,14 +1724,16 @@ export class ViteDevServer {
             // Only use cached bundles built with the current bundler version.
             // Stale bundles (from older bundler versions) are treated as missing
             // and re-bundled on the cold path.
-            if (esmBundle && esmBundle.bundleHash === BUNDLER_VERSION) {
+            if (esmBundle &&
+                esmBundle.bundleHash === BUNDLER_VERSION &&
+                this.cachedModuleMatchesBarrelInput(esmBundle.inputHash, barrelInfo)) {
                 let code = esmBundle.esmCode;
                 // Rewrite __require("external") calls to ESM imports so externalized
                 // packages (react, scheduler) actually work in the browser.
                 code = rewriteExternalRequires(code, this.basePath);
                 code = rewriteAllImports(code, this.aliases, this.basePath);
                 code = synthesizeCjsNamedExports(code);
-                this.moduleCache.set(cacheKey, { code, timestamp: Date.now() });
+                this.moduleCache.set(cacheKey, { code, timestamp: Date.now(), inputHash: esmBundle.inputHash });
                 return new Response(code, {
                     headers: { ...headers, 'Content-Type': JS_CT },
                 });
@@ -1728,7 +1755,7 @@ export class ViteDevServer {
             this.onDemandQueue = new Promise((res) => { releaseSlot = res; });
             try {
                 await prev;
-                return await this.serveModuleCold(specifier, headers);
+                return await this.serveModuleCold(specifier, headers, barrelInfo);
             }
             finally {
                 releaseSlot();
@@ -1750,7 +1777,7 @@ export class ViteDevServer {
      * + semaphore wrapper in serveModule() reads cleanly. Always runs
      * inside the on-demand semaphore — see serveModule's wrapper.
      */
-    async serveModuleCold(specifier, headers) {
+    async serveModuleCold(specifier, headers, knownBarrelInfo = null) {
         const JS_CT = 'application/javascript; charset=utf-8';
         const cacheKey = `@modules/${specifier}`;
         // 3. On-demand bundle (cold path — resolve from node_modules, bundle via esbuild)
@@ -1776,8 +1803,9 @@ export class ViteDevServer {
         if (resolved) {
             const pkgName = packageNameFromSpecifier(specifier);
             const pkgDir = this.root + '/node_modules/' + pkgName;
-            const fileCount = countPackageFiles(this.vfs, pkgDir);
-            const isBarrel = fileCount > BARREL_PKG_FILE_THRESHOLD && specifier === pkgName;
+            const barrelInfo = knownBarrelInfo ?? this.getBarrelModuleCacheInfo(specifier);
+            const fileCount = barrelInfo?.fileCount ?? countPackageFiles(this.vfs, pkgDir);
+            const isBarrel = !!barrelInfo && specifier === pkgName;
             let bundled = null;
             const externals = getSharedRuntimeExternals(specifier);
             const onDemandPool = await this.ensureOnDemandPool().catch(() => null);
@@ -1790,8 +1818,7 @@ export class ViteDevServer {
             let synthetic = false;
             let syntheticReferencedFiles = null;
             if (isBarrel) {
-                const namedImports = scanNamedImports(this.vfs, this.root);
-                const names = namedImports.get(pkgName);
+                const names = barrelInfo.names;
                 if (!names || names.size === 0) {
                     // No statically-resolvable imports. We refuse to CDN-fallback
                     // (100% edge contract) AND we refuse to bundle the whole
@@ -1979,12 +2006,12 @@ export class ViteDevServer {
                             bundleHash: BUNDLER_VERSION,
                             esmCode: code,
                             builtAt: Date.now(),
-                            inputHash: '',
+                            inputHash: barrelInfo?.inputHash ?? '',
                         });
                     }
                     catch { /* non-fatal */ }
                 }
-                this.moduleCache.set(cacheKey, { code, timestamp: Date.now() });
+                this.moduleCache.set(cacheKey, { code, timestamp: Date.now(), inputHash: barrelInfo?.inputHash ?? '' });
                 return new Response(code, {
                     headers: { ...headers, 'Content-Type': JS_CT },
                 });

package/dist/index.d.ts

@@ -27,6 +27,8 @@ import { CirrusHmrRPC } from './facets/real-vite-hmr.js';
 export { createNimbusHandler } from './router/index.js';
 export type { NimbusHandler, NimbusHooks, NimbusHookContext, CustomRoutes, CreateNimbusHandlerOptions, AuthMode, NimbusAuthConfig, NimbusRemoteApiConfig, NimbusRuntimePolicy, NimbusSandboxProfile, NimbusSdkConfig, NimbusSdkRouterConfig, } from './router/index.js';
 export { issueNimbusToken, verifyNimbusToken, NimbusAuthError, } from './auth/index.js';
+export { generateSessionId, isValidSessionId, } from './_shared/session-id.js';
+export { base64Utf8, base64Url, base64UrlDecode, decodeJsonBase64Url, encodeJsonBase64Url, pkceChallenge, randomBase64Url, sealJson, sha256Base64Url, unsealJson, } from './_shared/crypto.js';
 export type { NimbusAuthEnv, NimbusTokenClaims, VerifiedNimbusToken, } from './auth/index.js';
 export { NimbusSession, SupervisorRPC, NimbusAssetsRPC, NimbusLoaderRPC, NimbusLoadedWorker, NimbusLoadedEntrypoint, NimbusDurableObjectNamespace, NimbusDOStub, CirrusHmrRPC, };
 /**

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EACL,aAAa,EACb,eAAe,EACf,eAAe,EACf,kBAAkB,EAClB,sBAAsB,EACtB,4BAA4B,EAC5B,YAAY,EACb,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAUzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,YAAY,EACV,aAAa,EACb,WAAW,EACX,iBAAiB,EACjB,YAAY,EACZ,0BAA0B,EAC1B,QAAQ,EACR,gBAAgB,EAChB,qBAAqB,EACrB,mBAAmB,EACnB,oBAAoB,EACpB,eAAe,EACf,qBAAqB,GACtB,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,eAAe,GAChB,MAAM,iBAAiB,CAAC;AACzB,YAAY,EACV,aAAa,EACb,iBAAiB,EACjB,mBAAmB,GACpB,MAAM,iBAAiB,CAAC;AAmBzB,OAAO,EACL,aAAa,EACb,aAAa,EACb,eAAe,EACf,eAAe,EACf,kBAAkB,EAClB,sBAAsB,EACtB,4BAA4B,EAC5B,YAAY,EACZ,YAAY,GACb,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,aAAa,IAAI,GAAG,CAEnC;;AAOD,wBAAqC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EACL,aAAa,EACb,eAAe,EACf,eAAe,EACf,kBAAkB,EAClB,sBAAsB,EACtB,4BAA4B,EAC5B,YAAY,EACb,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAUzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,YAAY,EACV,aAAa,EACb,WAAW,EACX,iBAAiB,EACjB,YAAY,EACZ,0BAA0B,EAC1B,QAAQ,EACR,gBAAgB,EAChB,qBAAqB,EACrB,mBAAmB,EACnB,oBAAoB,EACpB,eAAe,EACf,qBAAqB,GACtB,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,eAAe,GAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,iBAAiB,EACjB,gBAAgB,GACjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,UAAU,EACV,SAAS,EACT,eAAe,EACf,mBAAmB,EACnB,mBAAmB,EACnB,aAAa,EACb,eAAe,EACf,QAAQ,EACR,eAAe,EACf,UAAU,GACX,MAAM,qBAAqB,CAAC;AAC7B,YAAY,EACV,aAAa,EACb,iBAAiB,EACjB,mBAAmB,GACpB,MAAM,iBAAiB,CAAC;AAmBzB,OAAO,EACL,aAAa,EACb,aAAa,EACb,eAAe,EACf,eAAe,EACf,kBAAkB,EAClB,sBAAsB,EACtB,4BAA4B,EAC5B,YAAY,EACZ,YAAY,GACb,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,aAAa,IAAI,GAAG,CAEnC;;AAOD,wBAAqC"}

package/dist/index.js

@@ -37,6 +37,8 @@ export { createNimbusHandler } from './router/index.js';
 // to mint tokens from custom routes. `@nimbus-sh/sdk/token` re-exports
 // from the dedicated auth subpath for application callers.
 export { issueNimbusToken, verifyNimbusToken, NimbusAuthError, } from './auth/index.js';
+export { generateSessionId, isValidSessionId, } from './_shared/session-id.js';
+export { base64Utf8, base64Url, base64UrlDecode, decodeJsonBase64Url, encodeJsonBase64Url, pkceChallenge, randomBase64Url, sealJson, sha256Base64Url, unsealJson, } from './_shared/crypto.js';
 // W6.5: install the default registry-event sink at module top so events
 // emitted from any code path (supervisor BFS, facet drain, applyW6Registry)
 // land in `wrangler tail` as one JSON line per event. When F-observability

package/dist/loaders/child-process/spawn-facet.d.ts

@@ -18,14 +18,12 @@ export interface SpawnInIsolateSpec {
         stdin?: string;
     };
     /** Pre-resolved kind from FacetProcessManager._dispatch. */
-    kind: 'pure-builtin' | 'facet-direct' | 'unknown';
+    kind: 'pure-builtin' | 'facet-direct' | 'shell-direct' | 'unknown';
     /** Stable id the parent captured for the spawn (for hooks-routing). */
     parentChildId: number | string;
 }
 export interface SpawnInIsolateResult {
     exitCode: number;
-    /** Per-isolate token line used by diagnostics that verify isolate routing. */
-    marker: string;
     stdout: string;
     stderr: string;
 }

package/dist/loaders/child-process/spawn-facet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spawn-facet.d.ts","sourceRoot":"","sources":["../../../src/loaders/child-process/spawn-facet.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,WAAW,kBAAkB;IACjC,wDAAwD;IACxD,GAAG,EAAE;QACH,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,EAAE,CAAC;QACf,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC5B,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,CAAC,EAAE,GAAG,CAAC;QACZ,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;QACzB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,4DAA4D;IAC5D,IAAI,EAAE,cAAc,GAAG,cAAc,GAAG,SAAS,CAAC;IAClD,uEAAuE;IACvE,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,8EAA8E;IAC9E,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAC5B,MAAM,kBAAkB,EACxB,KAAK;IACH,UAAU,EAAE;QACV,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;YAChD,QAAQ,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;SAClD,CAAC,CAAC;KACJ,CAAC;CACH,KACA,OAAO,CAAC,oBAAoB,CAoD9B,CAAC"}
+{"version":3,"file":"spawn-facet.d.ts","sourceRoot":"","sources":["../../../src/loaders/child-process/spawn-facet.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,WAAW,kBAAkB;IACjC,wDAAwD;IACxD,GAAG,EAAE;QACH,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,EAAE,CAAC;QACf,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC5B,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,CAAC,EAAE,GAAG,CAAC;QACZ,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;QACzB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,4DAA4D;IAC5D,IAAI,EAAE,cAAc,GAAG,cAAc,GAAG,cAAc,GAAG,SAAS,CAAC;IACnE,uEAAuE;IACvE,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAC5B,MAAM,kBAAkB,EACxB,KAAK;IACH,UAAU,EAAE;QACV,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;YAChD,QAAQ,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;SAClD,CAAC,CAAC;KACJ,CAAC;CACH,KACA,OAAO,CAAC,oBAAoB,CAwC9B,CAAC"}

package/dist/loaders/child-process/spawn-facet.js

@@ -10,20 +10,12 @@
  * the task as `fn(item, env)`.
  */
 export const runSpawnInIsolate = async function runSpawnInIsolate(spec, env) {
-    // Mint or reuse the per-isolate token.
-    const g = globalThis;
-    if (typeof g.__nimbus_g3_token__ !== 'string') {
-        g.__nimbus_g3_token__ = Math.random().toString(36).slice(2, 10) +
-            Math.random().toString(36).slice(2, 6);
-    }
-    const marker = '[g3-spawn-isolate] tok=' + g.__nimbus_g3_token__ + '\n';
     if (!spec || !spec.req) {
-        return { exitCode: 1, marker, stdout: '', stderr: 'spawn-facet: missing spec.req\n' };
+        return { exitCode: 1, stdout: '', stderr: 'spawn-facet: missing spec.req\n' };
     }
     if (spec.kind === 'unknown') {
         return {
             exitCode: 127,
-            marker,
             stdout: '',
             stderr: spec.req.command + ': command not found\n',
         };
@@ -36,7 +28,6 @@ export const runSpawnInIsolate = async function runSpawnInIsolate(spec, env) {
     if (!env || !env.SUPERVISOR || typeof env.SUPERVISOR.cpDispatchInline !== 'function') {
         return {
             exitCode: 1,
-            marker,
             stdout: '',
             stderr: 'spawn-facet: env.SUPERVISOR.cpDispatchInline missing\n',
         };
@@ -45,7 +36,6 @@ export const runSpawnInIsolate = async function runSpawnInIsolate(spec, env) {
         const r = await env.SUPERVISOR.cpDispatchInline(spec.req, spec.kind);
         return {
             exitCode: typeof r.exitCode === 'number' ? r.exitCode : 1,
-            marker,
             stdout: typeof r.stdout === 'string' ? r.stdout : '',
             stderr: typeof r.stderr === 'string' ? r.stderr : '',
         };
@@ -53,7 +43,6 @@ export const runSpawnInIsolate = async function runSpawnInIsolate(spec, env) {
     catch (e) {
         return {
             exitCode: 1,
-            marker,
             stdout: '',
             stderr: 'spawn-facet error: ' + (e && e.message ? e.message : String(e)) + '\n',
         };

package/dist/loaders/child-process/spawn-pool.d.ts

@@ -66,6 +66,6 @@ export declare class ChildProcessSpawnPool {
      *
      * Returns the exit code.
      */
-    runOne(req: SpawnPoolReq, kind: 'pure-builtin' | 'facet-direct' | 'unknown', hooks: SpawnPoolHooks, childId: number | string): Promise<number>;
+    runOne(req: SpawnPoolReq, kind: 'pure-builtin' | 'facet-direct' | 'shell-direct' | 'unknown', hooks: SpawnPoolHooks, childId: number | string): Promise<number>;
 }
 //# sourceMappingURL=spawn-pool.d.ts.map

package/dist/loaders/child-process/spawn-pool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spawn-pool.d.ts","sourceRoot":"","sources":["../../../src/loaders/child-process/spawn-pool.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,qBAAqB;IAChC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAM;IAC1B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAqB;IACzC;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAmB;IACxC;;;;;OAKG;IACH,OAAO,CAAC,KAAK,CAAuC;gBAExC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,kBAAkB;IAW7C;;;;;;;;OAQG;IACG,MAAM,CACV,GAAG,EAAE,YAAY,EACjB,IAAI,EAAE,cAAc,GAAG,cAAc,GAAG,SAAS,EACjD,KAAK,EAAE,cAAc,EACrB,OAAO,EAAE,MAAM,GAAG,MAAM,GACvB,OAAO,CAAC,MAAM,CAAC;CAyDnB"}
+{"version":3,"file":"spawn-pool.d.ts","sourceRoot":"","sources":["../../../src/loaders/child-process/spawn-pool.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,qBAAqB;IAChC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAM;IAC1B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAqB;IACzC;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAmB;IACxC;;;;;OAKG;IACH,OAAO,CAAC,KAAK,CAAuC;gBAExC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,kBAAkB;IAW7C;;;;;;;;OAQG;IACG,MAAM,CACV,GAAG,EAAE,YAAY,EACjB,IAAI,EAAE,cAAc,GAAG,cAAc,GAAG,cAAc,GAAG,SAAS,EAClE,KAAK,EAAE,cAAc,EACrB,OAAO,EAAE,MAAM,GAAG,MAAM,GACvB,OAAO,CAAC,MAAM,CAAC;CAqDnB"}

package/dist/loaders/child-process/spawn-pool.js

@@ -94,7 +94,7 @@ export class ChildProcessSpawnPool {
             }
             catch (e) {
                 const msg = (e && e.message) ? String(e.message) : String(e);
-                return { exitCode: 1, marker: '', stdout: '', stderr: 'spawn-pool: ' + msg + '\n' };
+                return { exitCode: 1, stdout: '', stderr: 'spawn-pool: ' + msg + '\n' };
             }
         });
         // Update the chain BEFORE awaiting so the next caller serializes
@@ -108,11 +108,6 @@ export class ChildProcessSpawnPool {
             return 1;
         }
         const r = results[0];
-        // Emit the per-isolate marker FIRST so the probe sees it ahead of
-        // any user-command stderr. The probe's regex `[g3-spawn-isolate]
-        // tok=…` matches this exact line.
-        if (r.marker)
-            hooks.onStderr(r.marker);
         if (r.stdout)
             hooks.onStdout(r.stdout);
         if (r.stderr)

package/dist/npm/installer.d.ts.map

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