feat: US-059 - Fix setupFsFacade to use getter-based delegation

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: NathanFlurry

packages/secure-exec-core/isolate-runtime/src/inject/setup-fs-facade.ts

@@ -2,26 +2,30 @@ import { getRuntimeExposeCustomGlobal } from "../common/global-exposure";
 
 const __runtimeExposeCustomGlobal = getRuntimeExposeCustomGlobal();
 
-const __fsFacade: Record<string, unknown> = {
-	readFile: globalThis._fsReadFile,
-	writeFile: globalThis._fsWriteFile,
-	readFileBinary: globalThis._fsReadFileBinary,
-	writeFileBinary: globalThis._fsWriteFileBinary,
-	readDir: globalThis._fsReadDir,
-	mkdir: globalThis._fsMkdir,
-	rmdir: globalThis._fsRmdir,
-	exists: globalThis._fsExists,
-	stat: globalThis._fsStat,
-	unlink: globalThis._fsUnlink,
-	rename: globalThis._fsRename,
-	chmod: globalThis._fsChmod,
-	chown: globalThis._fsChown,
-	link: globalThis._fsLink,
-	symlink: globalThis._fsSymlink,
-	readlink: globalThis._fsReadlink,
-	lstat: globalThis._fsLstat,
-	truncate: globalThis._fsTruncate,
-	utimes: globalThis._fsUtimes,
-};
+// Getter-based delegation: each _fs property resolves globalThis._fsXxx at
+// call time, not setup time. This allows snapshot-restored contexts to pick
+// up replaced bridge function globals after restore.
+const __fsFacade: Record<string, unknown> = {};
+Object.defineProperties(__fsFacade, {
+	readFile: { get() { return globalThis._fsReadFile; }, enumerable: true },
+	writeFile: { get() { return globalThis._fsWriteFile; }, enumerable: true },
+	readFileBinary: { get() { return globalThis._fsReadFileBinary; }, enumerable: true },
+	writeFileBinary: { get() { return globalThis._fsWriteFileBinary; }, enumerable: true },
+	readDir: { get() { return globalThis._fsReadDir; }, enumerable: true },
+	mkdir: { get() { return globalThis._fsMkdir; }, enumerable: true },
+	rmdir: { get() { return globalThis._fsRmdir; }, enumerable: true },
+	exists: { get() { return globalThis._fsExists; }, enumerable: true },
+	stat: { get() { return globalThis._fsStat; }, enumerable: true },
+	unlink: { get() { return globalThis._fsUnlink; }, enumerable: true },
+	rename: { get() { return globalThis._fsRename; }, enumerable: true },
+	chmod: { get() { return globalThis._fsChmod; }, enumerable: true },
+	chown: { get() { return globalThis._fsChown; }, enumerable: true },
+	link: { get() { return globalThis._fsLink; }, enumerable: true },
+	symlink: { get() { return globalThis._fsSymlink; }, enumerable: true },
+	readlink: { get() { return globalThis._fsReadlink; }, enumerable: true },
+	lstat: { get() { return globalThis._fsLstat; }, enumerable: true },
+	truncate: { get() { return globalThis._fsTruncate; }, enumerable: true },
+	utimes: { get() { return globalThis._fsUtimes; }, enumerable: true },
+});
 
 __runtimeExposeCustomGlobal("_fs", __fsFacade);

packages/secure-exec-core/src/generated/isolate-runtime.ts

@@ -15,7 +15,7 @@ export const ISOLATE_RUNTIME_SOURCES = {
 	"setCommonjsFileGlobals": "\"use strict\";\n(() => {\n  // isolate-runtime/src/common/global-exposure.ts\n  function defineRuntimeGlobalBinding(name, value, mutable) {\n    Object.defineProperty(globalThis, name, {\n      value,\n      writable: mutable,\n      configurable: mutable,\n      enumerable: true\n    });\n  }\n  function createRuntimeGlobalExposer(mutable) {\n    return (name, value) => {\n      defineRuntimeGlobalBinding(name, value, mutable);\n    };\n  }\n  function getRuntimeExposeMutableGlobal() {\n    if (typeof globalThis.__runtimeExposeMutableGlobal === \"function\") {\n      return globalThis.__runtimeExposeMutableGlobal;\n    }\n    return createRuntimeGlobalExposer(true);\n  }\n\n  // isolate-runtime/src/inject/set-commonjs-file-globals.ts\n  var __runtimeExposeMutableGlobal = getRuntimeExposeMutableGlobal();\n  var __commonJsFileConfig = globalThis.__runtimeCommonJsFileConfig ?? {};\n  var __filePath = typeof __commonJsFileConfig.filePath === \"string\" ? __commonJsFileConfig.filePath : \"/<entry>.js\";\n  var __dirname = typeof __commonJsFileConfig.dirname === \"string\" ? __commonJsFileConfig.dirname : \"/\";\n  __runtimeExposeMutableGlobal(\"__filename\", __filePath);\n  __runtimeExposeMutableGlobal(\"__dirname\", __dirname);\n  var __currentModule = globalThis._currentModule;\n  if (__currentModule) {\n    __currentModule.dirname = __dirname;\n    __currentModule.filename = __filePath;\n  }\n})();\n",
 	"setStdinData": "\"use strict\";\n(() => {\n  // isolate-runtime/src/inject/set-stdin-data.ts\n  if (typeof globalThis._stdinData !== \"undefined\") {\n    globalThis._stdinData = globalThis.__runtimeStdinData;\n    globalThis._stdinPosition = 0;\n    globalThis._stdinEnded = false;\n    globalThis._stdinFlowMode = false;\n  }\n})();\n",
 	"setupDynamicImport": "\"use strict\";\n(() => {\n  // isolate-runtime/src/common/global-access.ts\n  function isObjectLike(value) {\n    return value !== null && (typeof value === \"object\" || typeof value === \"function\");\n  }\n\n  // isolate-runtime/src/common/global-exposure.ts\n  function defineRuntimeGlobalBinding(name, value, mutable) {\n    Object.defineProperty(globalThis, name, {\n      value,\n      writable: mutable,\n      configurable: mutable,\n      enumerable: true\n    });\n  }\n  function createRuntimeGlobalExposer(mutable) {\n    return (name, value) => {\n      defineRuntimeGlobalBinding(name, value, mutable);\n    };\n  }\n  function getRuntimeExposeCustomGlobal() {\n    if (typeof globalThis.__runtimeExposeCustomGlobal === \"function\") {\n      return globalThis.__runtimeExposeCustomGlobal;\n    }\n    return createRuntimeGlobalExposer(false);\n  }\n\n  // isolate-runtime/src/inject/setup-dynamic-import.ts\n  var __runtimeExposeCustomGlobal = getRuntimeExposeCustomGlobal();\n  var __dynamicImportConfig = globalThis.__runtimeDynamicImportConfig ?? {};\n  var __fallbackReferrer = typeof __dynamicImportConfig.referrerPath === \"string\" && __dynamicImportConfig.referrerPath.length > 0 ? __dynamicImportConfig.referrerPath : \"/\";\n  var __dynamicImportHandler = async function(specifier, fromPath) {\n    const request = String(specifier);\n    const referrer = typeof fromPath === \"string\" && fromPath.length > 0 ? fromPath : __fallbackReferrer;\n    const allowRequireFallback = request.endsWith(\".cjs\") || request.endsWith(\".json\");\n    const namespace = await globalThis._dynamicImport(request, referrer);\n    if (namespace !== null) {\n      return namespace;\n    }\n    if (!allowRequireFallback) {\n      throw new Error(\"Cannot find module '\" + request + \"'\");\n    }\n    const runtimeRequire = globalThis.require;\n    if (typeof runtimeRequire !== \"function\") {\n      throw new Error(\"Cannot find module '\" + request + \"'\");\n    }\n    const mod = runtimeRequire(request);\n    const namespaceFallback = { default: mod };\n    if (isObjectLike(mod)) {\n      for (const key of Object.keys(mod)) {\n        if (!(key in namespaceFallback)) {\n          namespaceFallback[key] = mod[key];\n        }\n      }\n    }\n    return namespaceFallback;\n  };\n  __runtimeExposeCustomGlobal(\"__dynamicImport\", __dynamicImportHandler);\n})();\n",
-	"setupFsFacade": "\"use strict\";\n(() => {\n  // isolate-runtime/src/common/global-exposure.ts\n  function defineRuntimeGlobalBinding(name, value, mutable) {\n    Object.defineProperty(globalThis, name, {\n      value,\n      writable: mutable,\n      configurable: mutable,\n      enumerable: true\n    });\n  }\n  function createRuntimeGlobalExposer(mutable) {\n    return (name, value) => {\n      defineRuntimeGlobalBinding(name, value, mutable);\n    };\n  }\n  function getRuntimeExposeCustomGlobal() {\n    if (typeof globalThis.__runtimeExposeCustomGlobal === \"function\") {\n      return globalThis.__runtimeExposeCustomGlobal;\n    }\n    return createRuntimeGlobalExposer(false);\n  }\n\n  // isolate-runtime/src/inject/setup-fs-facade.ts\n  var __runtimeExposeCustomGlobal = getRuntimeExposeCustomGlobal();\n  var __fsFacade = {\n    readFile: globalThis._fsReadFile,\n    writeFile: globalThis._fsWriteFile,\n    readFileBinary: globalThis._fsReadFileBinary,\n    writeFileBinary: globalThis._fsWriteFileBinary,\n    readDir: globalThis._fsReadDir,\n    mkdir: globalThis._fsMkdir,\n    rmdir: globalThis._fsRmdir,\n    exists: globalThis._fsExists,\n    stat: globalThis._fsStat,\n    unlink: globalThis._fsUnlink,\n    rename: globalThis._fsRename,\n    chmod: globalThis._fsChmod,\n    chown: globalThis._fsChown,\n    link: globalThis._fsLink,\n    symlink: globalThis._fsSymlink,\n    readlink: globalThis._fsReadlink,\n    lstat: globalThis._fsLstat,\n    truncate: globalThis._fsTruncate,\n    utimes: globalThis._fsUtimes\n  };\n  __runtimeExposeCustomGlobal(\"_fs\", __fsFacade);\n})();\n",
+	"setupFsFacade": "\"use strict\";\n(() => {\n  // isolate-runtime/src/common/global-exposure.ts\n  function defineRuntimeGlobalBinding(name, value, mutable) {\n    Object.defineProperty(globalThis, name, {\n      value,\n      writable: mutable,\n      configurable: mutable,\n      enumerable: true\n    });\n  }\n  function createRuntimeGlobalExposer(mutable) {\n    return (name, value) => {\n      defineRuntimeGlobalBinding(name, value, mutable);\n    };\n  }\n  function getRuntimeExposeCustomGlobal() {\n    if (typeof globalThis.__runtimeExposeCustomGlobal === \"function\") {\n      return globalThis.__runtimeExposeCustomGlobal;\n    }\n    return createRuntimeGlobalExposer(false);\n  }\n\n  // isolate-runtime/src/inject/setup-fs-facade.ts\n  var __runtimeExposeCustomGlobal = getRuntimeExposeCustomGlobal();\n  var __fsFacade = {};\n  Object.defineProperties(__fsFacade, {\n    readFile: { get() {\n      return globalThis._fsReadFile;\n    }, enumerable: true },\n    writeFile: { get() {\n      return globalThis._fsWriteFile;\n    }, enumerable: true },\n    readFileBinary: { get() {\n      return globalThis._fsReadFileBinary;\n    }, enumerable: true },\n    writeFileBinary: { get() {\n      return globalThis._fsWriteFileBinary;\n    }, enumerable: true },\n    readDir: { get() {\n      return globalThis._fsReadDir;\n    }, enumerable: true },\n    mkdir: { get() {\n      return globalThis._fsMkdir;\n    }, enumerable: true },\n    rmdir: { get() {\n      return globalThis._fsRmdir;\n    }, enumerable: true },\n    exists: { get() {\n      return globalThis._fsExists;\n    }, enumerable: true },\n    stat: { get() {\n      return globalThis._fsStat;\n    }, enumerable: true },\n    unlink: { get() {\n      return globalThis._fsUnlink;\n    }, enumerable: true },\n    rename: { get() {\n      return globalThis._fsRename;\n    }, enumerable: true },\n    chmod: { get() {\n      return globalThis._fsChmod;\n    }, enumerable: true },\n    chown: { get() {\n      return globalThis._fsChown;\n    }, enumerable: true },\n    link: { get() {\n      return globalThis._fsLink;\n    }, enumerable: true },\n    symlink: { get() {\n      return globalThis._fsSymlink;\n    }, enumerable: true },\n    readlink: { get() {\n      return globalThis._fsReadlink;\n    }, enumerable: true },\n    lstat: { get() {\n      return globalThis._fsLstat;\n    }, enumerable: true },\n    truncate: { get() {\n      return globalThis._fsTruncate;\n    }, enumerable: true },\n    utimes: { get() {\n      return globalThis._fsUtimes;\n    }, enumerable: true }\n  });\n  __runtimeExposeCustomGlobal(\"_fs\", __fsFacade);\n})();\n",
 } as const;
 
 export type IsolateRuntimeSourceId = keyof typeof ISOLATE_RUNTIME_SOURCES;