@nimbus-sh/core 0.7.0 → 0.8.0

package/dist/runtime/esbuild-service.js

@@ -21,6 +21,7 @@ import { normalizeVfsPath, stripLeadingSlashes } from '../vfs/path.js';
 import { errorText } from '../_shared/error-text.js';
 import { tokenizer, tokTypes } from 'acorn';
 import { literalStringValue, nodeList, nodeName, nodeProp, parseJavaScriptModule, } from './javascript-ast.js';
+import { scanJsSource } from './comment-strip.js';
 /**
  * Bundler version tag. BUMP THIS whenever bundling semantics change —
  * the esbuild plugin's resolver logic, the shared-externals rules, the
@@ -195,203 +196,14 @@ function hasEsmExports(src) {
     return /^[ \t]*export\b/m.test(stripped);
 }
 /**
- * Strip `//` and `/* * /` comments and string / template literals from
- * source, replacing each with a single space. The result is byte-aligned
- * with the input on a per-line basis (newlines are preserved), so error
- * line numbers from downstream parsers still align with the original.
- * Shared by the import/export classifiers. Pure function — no caching needed
- * for the small entry points that reach the true-TLA fallback.
+ * Strip `//` and `/* *\/` comments and string / template literals from
+ * source for the import/export classifiers — one scanner shared with
+ * prefetch's import detection in `comment-strip.ts`. The result is
+ * byte-aligned with the input per line (comment and literal newlines are
+ * preserved), so error line numbers still match the original.
  */
 function stripCommentsAndStrings(src) {
-    let stripped = '';
-    let i = 0;
-    const N = src.length;
-    // Track the last non-whitespace non-comment output character so we
-    // can disambiguate `/` as division (after identifier/literal/`)`/`]`)
-    // vs regex-literal opener (after operator / punctuator / keyword /
-    // start-of-file). Pre-fix the stripper had no regex awareness, so
-    // patterns like `var X = /^(?:'…)/` contained an unmatched `'` that
-    // bit it as a string opener that didn't close until many lines
-    // later — corrupting the import/export classifiers. Real-world bite:
-    // sv-utils@0.0.3 index.mjs has dozens of these regex literals.
-    let lastNonWsChar = '';
-    const recordOut = (ch) => {
-        if (ch !== ' ' && ch !== '\t' && ch !== '\n' && ch !== '\r') {
-            lastNonWsChar = ch;
-        }
-    };
-    // Identifier-suffix detection on lastNonWsChar: any of these means
-    // `/` is division. Anything else means `/` opens a regex.
-    // Includes ascii word chars + `)` `]` to cover `foo()/x` `a[i]/y`.
-    const DIVISION_AFTER = /[A-Za-z0-9_$\)\]]/;
-    while (i < N) {
-        const c = src[i];
-        if (c === '/' && src[i + 1] === '/') {
-            while (i < N && src[i] !== '\n')
-                i++;
-            stripped += ' ';
-            continue;
-        }
-        if (c === '/' && src[i + 1] === '*') {
-            i += 2;
-            while (i < N && !(src[i] === '*' && src[i + 1] === '/')) {
-                // Preserve newlines so line numbers stay aligned.
-                if (src[i] === '\n')
-                    stripped += '\n';
-                i++;
-            }
-            i += 2;
-            stripped += ' ';
-            continue;
-        }
-        // Regex literal: `/` not followed by `/` or `*` (already handled
-        // above), AND preceded by something that makes regex valid here.
-        // The classifier looks at lastNonWsChar — for `(`, `,`, `=`, `;`,
-        // `{`, `[`, `:`, `!`, `&`, `|`, `?`, operators, or start-of-file,
-        // a slash is a regex opener.
-        if (c === '/' && !DIVISION_AFTER.test(lastNonWsChar)) {
-            stripped += ' ';
-            i++;
-            while (i < N) {
-                const rc = src[i];
-                if (rc === '\\') {
-                    i += 2;
-                    continue;
-                }
-                // Regex character class [...]: `/` inside it is content.
-                if (rc === '[') {
-                    i++;
-                    while (i < N && src[i] !== ']') {
-                        if (src[i] === '\\') {
-                            i += 2;
-                            continue;
-                        }
-                        if (src[i] === '\n') {
-                            stripped += '\n';
-                        }
-                        i++;
-                    }
-                    if (i < N)
-                        i++; // consume ']'
-                    continue;
-                }
-                if (rc === '/') {
-                    i++;
-                    break;
-                }
-                if (rc === '\n') {
-                    // Regex literals can't span newlines. If we hit one without
-                    // finding the closing `/`, this was probably NOT a regex —
-                    // bail out gracefully (rare in practice; better than getting
-                    // stuck in a wrong state).
-                    break;
-                }
-                i++;
-            }
-            // Skip regex flags (g, i, m, s, u, y, d).
-            while (i < N && /[gimsuyd]/.test(src[i]))
-                i++;
-            recordOut('/');
-            continue;
-        }
-        if (c === '"' || c === "'" || c === '`') {
-            const q = c;
-            stripped += ' ';
-            i++;
-            while (i < N) {
-                const cc = src[i];
-                if (cc === '\\') {
-                    i += 2;
-                    continue;
-                }
-                if (cc === q) {
-                    i++;
-                    break;
-                }
-                // Template interpolation: ${...} — preserve the inner
-                // expression as raw code so the caller's depth-tracker can
-                // see `await` etc. inside it. Strip the wrapping `${`/`}`
-                // (those don't affect brace-depth from the caller's POV).
-                //
-                // CRITICAL: inside the interpolation expression, we must
-                // recognise NESTED strings (`'}'`, `"}"`, `` `${...}` ``) so
-                // their internal `}` characters don't decrement the depth
-                // counter — otherwise we exit the interpolation early and
-                // start consuming code as string content, eventually parsing
-                // the rest of the file as one massive unclosed string. This
-                // bit sv-utils/dist/index.mjs: multi-line backticks with
-                // `${url.replace('}', '_')}`-style interpolations corrupted
-                // line classification downstream. Recursive-by-loop here.
-                if (q === '`' && cc === '$' && src[i + 1] === '{') {
-                    stripped += '${';
-                    i += 2;
-                    let depth = 1;
-                    while (i < N && depth > 0) {
-                        const ic = src[i];
-                        // Nested string inside interpolation: skip its content.
-                        if (ic === '"' || ic === "'" || ic === '`') {
-                            const iq = ic;
-                            stripped += ' ';
-                            i++;
-                            while (i < N) {
-                                const icc = src[i];
-                                if (icc === '\\') {
-                                    i += 2;
-                                    continue;
-                                }
-                                if (icc === iq) {
-                                    i++;
-                                    break;
-                                }
-                                // Nested template inside interpolation can also have its
-                                // own ${...} — recurse once more (the practical depth
-                                // observed in real code never exceeds 2; deeper nesting
-                                // falls back to brace counting which is a best-effort).
-                                if (iq === '`' && icc === '$' && src[i + 1] === '{') {
-                                    stripped += '${';
-                                    i += 2;
-                                    let d2 = 1;
-                                    while (i < N && d2 > 0) {
-                                        const i2 = src[i];
-                                        if (i2 === '{')
-                                            d2++;
-                                        else if (i2 === '}')
-                                            d2--;
-                                        if (d2 > 0)
-                                            stripped += i2;
-                                        i++;
-                                    }
-                                    stripped += '}';
-                                    continue;
-                                }
-                                if (icc === '\n')
-                                    stripped += '\n';
-                                i++;
-                            }
-                            continue;
-                        }
-                        if (ic === '{')
-                            depth++;
-                        else if (ic === '}')
-                            depth--;
-                        if (depth > 0)
-                            stripped += ic;
-                        i++;
-                    }
-                    stripped += '}';
-                    continue;
-                }
-                if (cc === '\n')
-                    stripped += '\n';
-                i++;
-            }
-            continue;
-        }
-        stripped += c;
-        recordOut(c);
-        i++;
-    }
-    return stripped;
+    return scanJsSource(src, 'blank');
 }
 /**
  * Convert ESM `import` statements at the top of `src` to CJS
@@ -1196,6 +1008,9 @@ async function transformWithEsbuild(esbuildApi, source, options) {
 /** Source needed by the slim Worker Loader transform isolate. */
 export function generateEsbuildTransformRuntimeSource() {
     return [
+        // scanJsSource is self-contained — its constants live in the body —
+        // so this serialized copy carries the whole scanner.
+        scanJsSource.toString(),
         stripCommentsAndStrings.toString(),
         hasEsmImports.toString(),
         hasEsmExports.toString(),

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

@@ -88,6 +88,7 @@ export interface RubyFacetResult {
  * no degraded version — it gets none, and says so.
  */
 export type RubyResidentStart = (spawn: {
+    argv: string[];
     /** VFS path of the interpreter. By path, not by value: it is 34.3 MiB. */
     wasmVfsPath: string;
     startArgs: RubyFacetCallArgs;

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

@@ -1 +1 @@
-{"version":3,"file":"ruby-runner.d.ts","sourceRoot":"","sources":["../../src/runtime/ruby-runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAmB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,OAAO,EAAkB,MAAM,qCAAqC,CAAC;AAGnF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAA8B,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAiBrF,KAAK,iBAAiB,GAAG,CACvB,QAAQ,EAAE,eAAe,EACzB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,SAAS,KACxB,OAAO,CAAC;AAEb;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE;IAC1C,MAAM,EAAE,SAAS,CAAC;IAClB,GAAG,EAAE,SAAS,CAAC;IACf,QAAQ,CAAC,EAAE;QACT,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;QAC/C,OAAO,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;KAC1F,CAAC;IACF,8EAA8E;IAC9E,aAAa,CAAC,EAAE,iBAAiB,CAAC;CACnC,GAAG,iBAAiB,CA6LpB;AA2TD,2EAA2E;AAC3E,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,cAAc,CAAC;CAC5B;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;GAQG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE;IACtC,0EAA0E;IAC1E,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,iBAAiB,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB,KAAK,OAAO,CAAC,eAAe,CAAC,CAAC;AAS/B;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,OAAO,GAAG,eAAe,GAAG,IAAI,CAS7E;AAgGD;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CA2B1C;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,yBAAyB,q4kCAgrBrC,CAAC"}
+{"version":3,"file":"ruby-runner.d.ts","sourceRoot":"","sources":["../../src/runtime/ruby-runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAmB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,OAAO,EAAkB,MAAM,qCAAqC,CAAC;AAGnF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAA8B,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAiBrF,KAAK,iBAAiB,GAAG,CACvB,QAAQ,EAAE,eAAe,EACzB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,SAAS,KACxB,OAAO,CAAC;AAEb;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE;IAC1C,MAAM,EAAE,SAAS,CAAC;IAClB,GAAG,EAAE,SAAS,CAAC;IACf,QAAQ,CAAC,EAAE;QACT,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;QAC/C,OAAO,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;KAC1F,CAAC;IACF,8EAA8E;IAC9E,aAAa,CAAC,EAAE,iBAAiB,CAAC;CACnC,GAAG,iBAAiB,CA8LpB;AA2TD,2EAA2E;AAC3E,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,cAAc,CAAC;CAC5B;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;GAQG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE;IACtC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,0EAA0E;IAC1E,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,iBAAiB,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB,KAAK,OAAO,CAAC,eAAe,CAAC,CAAC;AAS/B;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,OAAO,GAAG,eAAe,GAAG,IAAI,CAS7E;AAgGD;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CA2B1C;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,yBAAyB,q4kCAgrBrC,CAAC"}

package/dist/runtime/ruby-runner.js

@@ -220,6 +220,7 @@ export function makeRubyRunnerFactory(deps) {
                     startArgs: toRubyCallArgs(facetArgs),
                     cwd,
                     command: formatRubyCommand(binName, argv),
+                    argv: [binName, ...argv],
                 });
             }
             else {

package/dist/substrate/lifo/commands/system/npm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"npm.d.ts","sourceRoot":"","sources":["../../../../../src/substrate/lifo/commands/system/npm.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAuB,MAAM,aAAa,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAapD,eAAO,MAAM,WAAW,WAAW,CAAC;AAIpC,UAAU,WAAW;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CACnC;AAED,MAAM,MAAM,cAAc,GAAG,CAC5B,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,cAAc,KACf,OAAO,CAAC,MAAM,CAAC,CAAC;AAErB,kFAAkF;AAClF,MAAM,WAAW,cAAc;IAC9B,OAAO,CACN,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,GAClE,OAAO,CAAC;QACV,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,MAAM,EAAE,MAAM,EAAE,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC,CAAC;CACH;AAED,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC;CACpC;AAuLD,wBAAgB,aAAa,CAAC,GAAG,EAAE,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAMtE;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAaxH;AAomBD,wBAAgB,gBAAgB,CAC/B,QAAQ,EAAE,eAAe,EACzB,YAAY,CAAC,EAAE,cAAc,EAC7B,MAAM,CAAC,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,cAAc,GACnB,OAAO,CA+CT;AAiCD,wBAAgB,gBAAgB,CAC/B,QAAQ,EAAE,eAAe,EACzB,YAAY,CAAC,EAAE,cAAc,GAC3B,OAAO,CAyGT;AAED,wBAAsB,gBAAgB,CACrC,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,cAAc,EACnB,QAAQ,EAAE,eAAe,EACzB,MAAM,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CA2BjB"}
+{"version":3,"file":"npm.d.ts","sourceRoot":"","sources":["../../../../../src/substrate/lifo/commands/system/npm.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAuB,MAAM,aAAa,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAapD,eAAO,MAAM,WAAW,WAAW,CAAC;AAIpC,UAAU,WAAW;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CACnC;AAED,MAAM,MAAM,cAAc,GAAG,CAC5B,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,cAAc,KACf,OAAO,CAAC,MAAM,CAAC,CAAC;AAErB,kFAAkF;AAClF,MAAM,WAAW,cAAc;IAC9B,OAAO,CACN,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,GAClE,OAAO,CAAC;QACV,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,MAAM,EAAE,MAAM,EAAE,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC,CAAC;CACH;AAED,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC;CACpC;AAuLD,wBAAgB,aAAa,CAAC,GAAG,EAAE,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAMtE;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAaxH;AAimBD,wBAAgB,gBAAgB,CAC/B,QAAQ,EAAE,eAAe,EACzB,YAAY,CAAC,EAAE,cAAc,EAC7B,MAAM,CAAC,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,cAAc,GACnB,OAAO,CA+CT;AAiCD,wBAAgB,gBAAgB,CAC/B,QAAQ,EAAE,eAAe,EACzB,YAAY,CAAC,EAAE,cAAc,GAC3B,OAAO,CAyGT;AAED,wBAAsB,gBAAgB,CACrC,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,cAAc,EACnB,QAAQ,EAAE,eAAe,EACzB,MAAM,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CA2BjB"}

package/dist/substrate/lifo/commands/system/npm.js

@@ -186,10 +186,9 @@ async function installSinglePackage(name, version, targetBase, vfs, npmRegistry,
     }
     stdout.write(`  ${name}${version ? '@' + version : ''}...\n`);
     const info = await fetchPackageInfo(npmRegistry, name, version, signal);
-    const written = await fetchAndStreamPackage(info.dist.tarball, targetDir, vfs, signal);
-    if (written.files === 0 || !vfs.exists(join(targetDir, 'package.json'))) {
-        throw new Error(`${name}: extraction wrote ${written.files} files and left no package.json in ${targetDir}`);
-    }
+    // writeTarballStream throws when the archive carried no manifest and writes
+    // package.json last, so a return here is a complete package on disk.
+    await fetchAndStreamPackage(info.dist.tarball, targetDir, vfs, signal);
     let installed = 1;
     // Global install: link binaries
     if (isGlobal) {

package/dist/workspace/nimbus-workspace.d.ts

@@ -41,8 +41,14 @@ export interface NimbusWorkspaceOptions {
      * Every atomic write in the filesystem rests on this being a real
      * transaction. An implementation that merely calls the callback converts
      * each one into a torn write that reports success.
+     *
+     * `NimbusWorkspace.create` is a first-write-wins composition root beside
+     * `worker/index.ts` and `loom/actor.ts`: when `ctxExports` is absent the
+     * host's ctx `exports` bag is adopted as the isolate's.
      */
-    readonly transactions?: TransactionHost;
+    readonly transactions?: TransactionHost & {
+        readonly exports?: CtxExports;
+    };
     /**
      * The filesystem already open over `sql`, for a host that has one.
      *

package/dist/workspace/nimbus-workspace.d.ts.map

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

package/dist/workspace/nimbus-workspace.js

@@ -86,8 +86,7 @@ export class NimbusWorkspace {
     static async create(options) {
         if (options.fabric)
             composeFabric(options.fabric);
-        const exports = options.ctxExports
-            ?? options.transactions?.exports;
+        const exports = options.ctxExports ?? options.transactions?.exports;
         if (exports)
             adoptCtxExports(exports);
         const vfs = options.vfs ?? openFilesystem(options);

package/dist/workspace/supervisor-op.d.ts

@@ -1,23 +1,107 @@
 import type { SqliteVFS } from '../vfs/sqlite-vfs.js';
+import { type VfsCred } from '../runtime/os-contracts.js';
+import { SqliteRuntimeFsBridge } from '../runtime/sqlite-runtime-fs-bridge.js';
 import type { SessionProcessSupervisor } from '../runtime/session-process-supervisor.js';
 /** Identity comes from the supervisor binding, never from facet arguments. */
 export interface SupervisorOpEnvelope {
-    readonly op: string;
+    readonly op: SupervisorOpName;
     readonly args?: readonly unknown[];
     readonly pid?: number;
     readonly writerId?: string;
     readonly mutationOwner?: string;
     readonly stream?: ReadableStream<Uint8Array>;
 }
-export type SupervisorOpHandler = (envelope: SupervisorOpEnvelope) => unknown;
+export type SupervisorOpHandler = (envelope: SupervisorOpEnvelope, tools: SupervisorOpTools) => unknown;
 export interface SupervisorOpDeps {
     readonly vfs: SqliteVFS;
     /** Absent a process table, operations use the unprivileged session user. */
     readonly processes?: SessionProcessSupervisor;
     readonly output?: (stream: 'stdout' | 'stderr', pid: number, data: string) => void;
-    /** Host handlers override defaults, for example to account for stream drains. */
-    readonly extend?: Readonly<Record<string, SupervisorOpHandler>>;
+    /**
+     * The host's `_rpc*` surface for ops beyond the native set — an in-process
+     * workspace's dispatch record, or the session itself for
+     * `sessionSupervisorOps`. A native op never consults it.
+     */
+    readonly host?: SupervisorOpHost;
+    /**
+     * A pid-keyed bridge cache to serve the native ops from. Supplied by the
+     * session so `supervisorBridge` hands callers the same bridges the handler
+     * uses; in-process workspaces let the handler build its own.
+     */
+    readonly bridge?: SupervisorOpBridgeStore;
+    readonly extend?: Partial<Record<SupervisorOpName, SupervisorOpHandler>>;
 }
+/**
+ * One slot in an op's argument plan: a number takes `envelope.args[n]`, a
+ * name takes the envelope's identity field (`pid`, `writerId`, `stream`,
+ * `mutationOwner`). The envelope is always the shape — a host never
+ * re-parses it.
+ */
+export type SupervisorOpArg = number | 'pid' | 'writerId' | 'stream' | 'mutationOwner';
+export interface SupervisorOpRoute {
+    /** The host method this op dispatches to. */
+    readonly method: string;
+    /** Positional plan for the host call — envelope fields, not raw args. */
+    readonly args: readonly SupervisorOpArg[];
+}
+/**
+ * The embedder's dispatch surface — the `_rpc*` methods SUPERVISOR_OP_ROUTES
+ * names. The session satisfies it with its own class; an in-process
+ * workspace supplies its host object.
+ */
+export interface SupervisorOpHost {
+    readonly [method: string]: unknown;
+}
+/**
+ * The canonical supervisor op set — every operation the supervisor RPC
+ * serves. Three consumers key on these names:
+ *
+ *   - `sessionSupervisorOp` (worker): the DO's host — `extend` overrides for
+ *     hosted accounting plus the non-filesystem ops it answers itself.
+ *   - `createSupervisorOpHandler`: an in-process workspace — filesystem ops
+ *     run against the VFS directly; every other op dispatches to
+ *     `deps.host` through SUPERVISOR_OP_ROUTES, the embedder's `_rpc*`
+ *     surface.
+ *   - `supervisor-host-dispatch`: the test — derives every case's delegate
+ *     and expected arguments from SUPERVISOR_OP_ROUTES, not a copied list.
+ *
+ * An op absent here is not served, on any host.
+ */
+export declare const SUPERVISOR_OPS: readonly ["readFile", "readFileBytes", "writeFile", "stat", "lstat", "hasLegacySymlinkUnder", "utimes", "chmod", "access", "chown", "setUmask", "readdir", "exists", "mkdir", "rmdir", "rename", "unlink", "readlink", "symlink", "fsAcquire", "fsRevision", "fsList", "wsOpen", "wsPoll", "wsSend", "wsClose", "fsOpen", "fsRead", "fsWrite", "fsClose", "fsReadRange", "fsReadRangeUncached", "fsReadBatch", "fsWriteRange", "fsAppend", "fsAppendAck", "fsTruncate", "writeBatch", "writeBatchStream", "putRegistryEntries", "stdout", "stderr", "prefetch", "registerPort", "unregisterPort", "reportExit", "routeLoopback", "transform", "cpSpawn", "cpStdinWrite", "cpStdinEnd", "cpReadStdin", "cpReadOutput", "cpDrainOutput", "cpKill", "cpWait", "cpDispatchInline"];
+export type SupervisorOpName = (typeof SUPERVISOR_OPS)[number];
+/**
+ * What the shared handler hands a host override: the pid-keyed bridge and
+ * the deps it was built with, so an override that wraps a filesystem op
+ * (read-allocation accounting, stream-drain timing) reuses the same bridge
+ * the default handler would have used instead of caching its own.
+ */
+export interface SupervisorOpTools {
+    readonly bridge: (pid?: number) => SqliteRuntimeFsBridge;
+    readonly vfs: SqliteVFS;
+    readonly cred: (pid?: number) => VfsCred;
+    readonly output?: (stream: 'stdout' | 'stderr', pid: number, data: string) => void;
+}
+/** The host-side argument plan per op — how an envelope becomes an _rpc* call. */
+export declare const SUPERVISOR_OP_ROUTES: Readonly<Record<SupervisorOpName, SupervisorOpRoute>>;
+/**
+ * The ops `createSupervisorOpHandler` serves natively — one pid-keyed
+ * filesystem bridge, plus the output stream. A session's `extend` overrides
+ * never cover these by accident: `sessionSupervisorOps` builds its delegate
+ * set from this name list, not a hand-copied table.
+ */
+export declare const SUPERVISOR_NATIVE_OPS: ReadonlySet<string>;
+/** The pid-keyed bridge cache behind the native filesystem ops. */
+export interface SupervisorOpBridgeStore {
+    readonly bridge: (pid?: number) => SqliteRuntimeFsBridge;
+    /** Drop a pid's bridge — a process exit ends its credential's validity. */
+    readonly forget: (pid: number) => void;
+}
+/**
+ * Exported so the session's `supervisorBridge` — used by RPC bodies the
+ * envelope delegates back to (fsOpen, fsAppend, writeBatch, …) — is the
+ * same cache the handler's native ops serve from, never a second one.
+ */
+export declare function createSupervisorBridgeStore(deps: Pick<SupervisorOpDeps, 'vfs' | 'processes'>): SupervisorOpBridgeStore;
 /** One dispatch method lets any host serve its workspace to process facets. */
 export declare function createSupervisorOpHandler(deps: SupervisorOpDeps): (envelope: SupervisorOpEnvelope) => Promise<unknown>;
 //# sourceMappingURL=supervisor-op.d.ts.map

package/dist/workspace/supervisor-op.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"supervisor-op.d.ts","sourceRoot":"","sources":["../../src/workspace/supervisor-op.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAItD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AAEzF,8EAA8E;AAC9E,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,OAAO,EAAE,CAAC;IACnC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,MAAM,CAAC,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;CAC9C;AAED,MAAM,MAAM,mBAAmB,GAAG,CAAC,QAAQ,EAAE,oBAAoB,KAAK,OAAO,CAAC;AAE9E,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;IACxB,4EAA4E;IAC5E,QAAQ,CAAC,SAAS,CAAC,EAAE,wBAAwB,CAAC;IAC9C,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,GAAG,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACnF,iFAAiF;IACjF,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC;CACjE;AAiCD,+EAA+E;AAC/E,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,gBAAgB,GACrB,CAAC,QAAQ,EAAE,oBAAoB,KAAK,OAAO,CAAC,OAAO,CAAC,CAuDtD"}
+{"version":3,"file":"supervisor-op.d.ts","sourceRoot":"","sources":["../../src/workspace/supervisor-op.ts"],"names":[],"mappings":"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"}

package/dist/workspace/supervisor-op.js

@@ -31,20 +31,138 @@ function credFor(deps, pid) {
     }
     return deps.processes ? deps.processes.cred(pid) : CRED_SESSION_USER;
 }
+/**
+ * The canonical supervisor op set — every operation the supervisor RPC
+ * serves. Three consumers key on these names:
+ *
+ *   - `sessionSupervisorOp` (worker): the DO's host — `extend` overrides for
+ *     hosted accounting plus the non-filesystem ops it answers itself.
+ *   - `createSupervisorOpHandler`: an in-process workspace — filesystem ops
+ *     run against the VFS directly; every other op dispatches to
+ *     `deps.host` through SUPERVISOR_OP_ROUTES, the embedder's `_rpc*`
+ *     surface.
+ *   - `supervisor-host-dispatch`: the test — derives every case's delegate
+ *     and expected arguments from SUPERVISOR_OP_ROUTES, not a copied list.
+ *
+ * An op absent here is not served, on any host.
+ */
+export const SUPERVISOR_OPS = [
+    'readFile', 'readFileBytes', 'writeFile', 'stat', 'lstat',
+    'hasLegacySymlinkUnder', 'utimes', 'chmod', 'access', 'chown', 'setUmask',
+    'readdir', 'exists', 'mkdir', 'rmdir', 'rename', 'unlink', 'readlink',
+    'symlink', 'fsAcquire', 'fsRevision', 'fsList', 'wsOpen', 'wsPoll',
+    'wsSend', 'wsClose', 'fsOpen', 'fsRead', 'fsWrite', 'fsClose',
+    'fsReadRange', 'fsReadRangeUncached', 'fsReadBatch', 'fsWriteRange',
+    'fsAppend', 'fsAppendAck', 'fsTruncate', 'writeBatch', 'writeBatchStream',
+    'putRegistryEntries', 'stdout', 'stderr', 'prefetch', 'registerPort',
+    'unregisterPort', 'reportExit', 'routeLoopback', 'transform', 'cpSpawn',
+    'cpStdinWrite', 'cpStdinEnd', 'cpReadStdin', 'cpReadOutput',
+    'cpDrainOutput', 'cpKill', 'cpWait', 'cpDispatchInline',
+];
+/** The host-side argument plan per op — how an envelope becomes an _rpc* call. */
+export const SUPERVISOR_OP_ROUTES = {
+    readFile: { method: '_rpcReadFile', args: [0, 'pid'] },
+    readFileBytes: { method: '_rpcReadFileBytes', args: [0, 'pid'] },
+    writeFile: { method: '_rpcWriteFile', args: [0, 1, 'pid'] },
+    stat: { method: '_rpcStat', args: [0, 'pid'] },
+    lstat: { method: '_rpcLstat', args: [0, 'pid'] },
+    hasLegacySymlinkUnder: { method: '_rpcHasLegacySymlinkUnder', args: [0, 'pid'] },
+    utimes: { method: '_rpcUtimes', args: [0, 1, 2, 'pid'] },
+    chmod: { method: '_rpcChmod', args: [0, 1, 'pid'] },
+    access: { method: '_rpcAccess', args: [0, 1, 'pid'] },
+    chown: { method: '_rpcChown', args: [0, 1, 2, 'pid', 3] },
+    setUmask: { method: '_rpcSetUmask', args: [0, 'pid'] },
+    readdir: { method: '_rpcReaddir', args: [0, 'pid'] },
+    exists: { method: '_rpcExists', args: [0, 'pid'] },
+    mkdir: { method: '_rpcMkdir', args: [0, 'pid'] },
+    rmdir: { method: '_rpcRmdir', args: [0, 'pid'] },
+    rename: { method: '_rpcRename', args: [0, 1, 'pid'] },
+    unlink: { method: '_rpcUnlink', args: [0, 'pid'] },
+    readlink: { method: '_rpcReadlink', args: [0, 'pid'] },
+    symlink: { method: '_rpcSymlink', args: [0, 1, 'pid'] },
+    fsAcquire: { method: '_rpcFsAcquire', args: [0, 1, 'pid'] },
+    fsRevision: { method: '_rpcFsRevision', args: [0, 'pid'] },
+    fsList: { method: '_rpcFsList', args: [0, 1, 'pid'] },
+    wsOpen: { method: '_rpcWsOpen', args: [0, 1, 'pid'] },
+    wsPoll: { method: '_rpcWsPoll', args: [0, 1, 'pid'] },
+    wsSend: { method: '_rpcWsSend', args: [0, 1, 2, 'pid'] },
+    wsClose: { method: '_rpcWsClose', args: [0, 1, 2, 'pid'] },
+    fsOpen: { method: '_rpcFsOpen', args: [0, 1, 'pid'] },
+    fsRead: { method: '_rpcFsRead', args: [0, 1, 2, 'pid'] },
+    fsWrite: { method: '_rpcFsWrite', args: [0, 1, 2, 'pid'] },
+    fsClose: { method: '_rpcFsClose', args: [0, 'pid'] },
+    fsReadRange: { method: '_rpcFsReadRange', args: [0, 1, 2, 'pid'] },
+    fsReadRangeUncached: { method: '_rpcFsReadRangeUncached', args: [0, 1, 2, 'pid'] },
+    fsReadBatch: { method: '_rpcFsReadBatch', args: [0, 'pid'] },
+    fsWriteRange: { method: '_rpcFsWriteRange', args: [0, 1, 2, 'pid'] },
+    fsAppend: { method: '_rpcFsAppend', args: [0, 'writerId', 1, 2, 3, 'pid'] },
+    fsAppendAck: { method: '_rpcFsAppendAck', args: ['writerId', 0, 1, 'pid'] },
+    fsTruncate: { method: '_rpcFsTruncate', args: [0, 1, 'pid'] },
+    writeBatch: { method: '_rpcWriteBatch', args: [0, 'pid'] },
+    writeBatchStream: { method: '_rpcWriteBatchStream', args: ['stream', 'mutationOwner', 'pid'] },
+    putRegistryEntries: { method: '_rpcPutRegistryEntries', args: [0] },
+    stdout: { method: '_rpcStdout', args: ['pid', 0] },
+    stderr: { method: '_rpcStderr', args: ['pid', 0] },
+    prefetch: { method: '_rpcPrefetch', args: [0, 1] },
+    registerPort: { method: '_rpcRegisterPort', args: ['pid', 0] },
+    unregisterPort: { method: '_rpcUnregisterPort', args: [0] },
+    reportExit: { method: '_rpcReportExit', args: ['pid', 0, 1] },
+    routeLoopback: { method: '_rpcRouteLoopback', args: [0, 1] },
+    transform: { method: '_rpcTransform', args: [0, 1] },
+    cpSpawn: { method: '_rpcCpSpawn', args: [0] },
+    cpStdinWrite: { method: '_rpcCpStdinWrite', args: [0, 1] },
+    cpStdinEnd: { method: '_rpcCpStdinEnd', args: [0] },
+    cpReadStdin: { method: '_rpcCpReadStdin', args: [0, 1] },
+    cpReadOutput: { method: '_rpcCpReadOutput', args: [0, 1, 2, 3] },
+    cpDrainOutput: { method: '_rpcCpDrainOutput', args: [0] },
+    cpKill: { method: '_rpcCpKill', args: [0, 1] },
+    cpWait: { method: '_rpcCpWait', args: [0, 1] },
+    cpDispatchInline: { method: '_rpcCpDispatchInline', args: [0, 1] },
+};
+/**
+ * The ops `createSupervisorOpHandler` serves natively — one pid-keyed
+ * filesystem bridge, plus the output stream. A session's `extend` overrides
+ * never cover these by accident: `sessionSupervisorOps` builds its delegate
+ * set from this name list, not a hand-copied table.
+ */
+export const SUPERVISOR_NATIVE_OPS = new Set([
+    'readFile', 'readFileBytes', 'stat', 'lstat', 'exists', 'readdir',
+    'readlink', 'fsReadRange', 'fsReadRangeUncached', 'fsRevision',
+    'hasLegacySymlinkUnder', 'writeFile', 'mkdir', 'rmdir', 'unlink',
+    'rename', 'symlink', 'chmod', 'utimes', 'fsTruncate',
+    'writeBatchStream', 'stdout', 'stderr',
+]);
+/**
+ * Exported so the session's `supervisorBridge` — used by RPC bodies the
+ * envelope delegates back to (fsOpen, fsAppend, writeBatch, …) — is the
+ * same cache the handler's native ops serve from, never a second one.
+ */
+export function createSupervisorBridgeStore(deps) {
+    const bridges = new Map();
+    return {
+        bridge: (pid) => {
+            const key = pid ?? 0;
+            const credentialed = deps.vfs.as(credFor(deps, pid));
+            const held = bridges.get(key);
+            if (held) {
+                held.updateCredential(credentialed);
+                return held;
+            }
+            const built = new SqliteRuntimeFsBridge(credentialed, deps.vfs);
+            bridges.set(key, built);
+            return built;
+        },
+        forget: (pid) => { bridges.delete(pid); },
+    };
+}
 /** One dispatch method lets any host serve its workspace to process facets. */
 export function createSupervisorOpHandler(deps) {
-    const bridges = new Map();
-    const bridgeFor = (pid) => {
-        const key = pid ?? 0;
-        const credentialed = deps.vfs.as(credFor(deps, pid));
-        const held = bridges.get(key);
-        if (held) {
-            held.updateCredential(credentialed);
-            return held;
-        }
-        const built = new SqliteRuntimeFsBridge(credentialed, deps.vfs);
-        bridges.set(key, built);
-        return built;
+    const bridgeFor = deps.bridge?.bridge ?? createSupervisorBridgeStore(deps).bridge;
+    const tools = {
+        bridge: bridgeFor,
+        vfs: deps.vfs,
+        cred: (pid) => credFor(deps, pid),
+        output: deps.output,
     };
     const ops = {
         readFile: async (e) => {
@@ -83,10 +201,24 @@ export function createSupervisorOpHandler(deps) {
         if (!envelope || typeof envelope.op !== 'string') {
             throw new Error('supervisor op: envelope names no operation');
         }
+        // Priority: the embedder's own handler → the native filesystem op → the
+        // canonical route table onto the host's _rpc* methods. An op in none of
+        // these is not served by this host.
         const handler = Object.hasOwn(extend, envelope.op) ? extend[envelope.op]
             : Object.hasOwn(ops, envelope.op) ? ops[envelope.op] : undefined;
-        if (!handler)
+        if (handler)
+            return handler(envelope, tools);
+        const route = Object.hasOwn(SUPERVISOR_OP_ROUTES, envelope.op)
+            ? SUPERVISOR_OP_ROUTES[envelope.op] : undefined;
+        if (!route)
             throw new Error(`supervisor op: '${envelope.op}' is not served by this host`);
-        return handler(envelope);
+        const host = deps.host;
+        if (!host)
+            throw new Error(`supervisor op: '${envelope.op}' needs a host that this workspace does not have`);
+        const method = host[route.method];
+        if (typeof method !== 'function')
+            throw new Error(`supervisor op: missing host method ${route.method}`);
+        const args = route.args.map((slot) => typeof slot === 'number' ? envelope.args?.[slot] : envelope[slot]);
+        return Reflect.apply(method, host, args);
     };
 }