@poe-platform/safe-bash 0.1.821 → 0.1.823

package/dist/safe-bash/command-chunks/{chunk-CJIFJ45R.js → chunk-QBCEAYQT.js}

@@ -8,7 +8,7 @@ import {
 } from "./chunk-E47FFS5M.js";
 import {
   sourceBytes
-} from "./chunk-QX3WKBLI.js";
+} from "./chunk-36FV6BAG.js";
 import {
   jsonValue
 } from "./chunk-GNPPPYDF.js";

package/dist/safe-bash/command-chunks/{chunk-4Q3HP33O.js → chunk-RGKHTSUY.js}

@@ -2,6 +2,7 @@ import {
   installPythonShellModule
 } from "./chunk-FXWKMNX2.js";
 import {
+  installPythonPackages,
   parsePythonInvocation,
   pythonDirectoryEntries,
   pythonExecution,
@@ -9,7 +10,7 @@ import {
   pythonRuntimeRelocation,
   pythonStatProjection,
   pythonTreeCleanup
-} from "./chunk-5EFNQ6FY.js";
+} from "./chunk-64HIOP7Q.js";
 import {
   pythonJspiSignatures
 } from "./chunk-P56KGNW7.js";
@@ -30,6 +31,7 @@ import { createPythonNativeSyscalls } from "@poe-platform/safe-fs/core";
 function installPythonJspiRunSync(runtime) {
   runtime.runPython(`
 import pyodide.ffi as _safe_jspi_ffi
+import pyodide.webloop as _safe_jspi_webloop
 def _safe_jspi_run_sync(awaitable, _original=_safe_jspi_ffi.run_sync):
  async def capture():
   try:
@@ -41,7 +43,10 @@ def _safe_jspi_run_sync(awaitable, _original=_safe_jspi_ffi.run_sync):
   return value
  raise value
 _safe_jspi_ffi.run_sync = _safe_jspi_run_sync
-del _safe_jspi_ffi, _safe_jspi_run_sync
+# WebLoop captures this import during runtime initialization. asyncio.run()
+# must use the same exception envelope as explicit synchronous model calls.
+_safe_jspi_webloop.run_sync = _safe_jspi_run_sync
+del _safe_jspi_ffi, _safe_jspi_webloop, _safe_jspi_run_sync
 `);
 }
 
@@ -366,7 +371,6 @@ function createPythonJspiExecutor(options) {
     let hostCleanupFailure;
     try {
       signal.throwIfAborted();
-      if (start.packages?.requirements.length || start.installOnly) throw new PythonFailure("runtime-assets", { cause: new Error("JSPI runtime requires statically qualified packages") });
       runtime = await options.loadRuntime({
         jsglobals: /* @__PURE__ */ Object.create(null),
         args: configuration.startupArgs,
@@ -415,116 +419,134 @@ function createPythonJspiExecutor(options) {
       qualified = true;
       runtime._api.config.enableRunUntilComplete = true;
       signal.throwIfAborted();
-      runtime.runPython("import sys, os, json, runpy, traceback, types, warnings, textwrap, io, struct, linecache, importlib.machinery, shutil, stat, pyodide.ffi");
-      runtime.globals.set("_safe_runtime_mount", start.runtimeMount);
-      const filesystem = runtime.FS;
-      const bootstrap = filesystem.root;
-      filesystem.root = null;
-      filesystem.mount(filesystem.filesystems.MEMFS, {}, "/");
-      filesystem.mkdir(start.runtimeMount);
-      filesystem.mount({ mount: () => bootstrap }, {}, start.runtimeMount);
-      runtime.runPython(pythonRuntimeRelocation);
-      filesystem.currentPath = start.invocation.cwd;
-      native = createPythonNativeSyscalls({
-        getUmask: () => guestMask,
-        runtime: runtime._module,
-        cwd: start.invocation.cwd,
-        runtimeMount: start.runtimeMount,
-        maxTransferBytes: start.maxTransferBytes,
-        signal,
-        dispatch: start.dispatch,
-        original: (name, args) => originals[name](...args)
-      });
-      const errno = JSON.parse(runtime.runPython("__import__('json').dumps({name:value for name,value in vars(__import__('errno')).items() if name.startswith('E') and isinstance(value,int)})"));
-      const encode = async (operation) => {
-        try {
-          return JSON.stringify(await operation());
-        } catch (error) {
-          return JSON.stringify({ errno: signal.aborted ? errno.EINTR : error.errno ?? errno[error.code ?? ""] ?? errno.EIO });
-        }
+      if (start.packages) await installPythonPackages(
+        runtime,
+        start.packages,
+        (op, ...args) => start.dispatch({ op, args }),
+        start.maxTransferBytes
+      );
+      const unavailablePackage = () => {
+        throw new Error("Python package transport is only available during installation");
       };
-      const absolute = (path) => path.startsWith("/") ? path : filesystem.cwd() + "/" + path;
-      const bootstrapPath = (path) => path === start.runtimeMount || path.startsWith(start.runtimeMount + "/");
-      const module = runtime._module;
-      const send = async (pointer) => {
-        let response = await encode(async () => {
-          const payload = JSON.parse(module.UTF8ToString(pointer));
-          if (payload[0] === "host") {
-            try {
-              if (!start.host || !acceptingHostCalls) throw new Error("Python host capability unavailable");
-              return { value: await start.host.request(payload[1]) };
-            } catch (error) {
-              return { errorCode: pythonHostFailureCode(error), error: signal.aborted ? "Python host operation cancelled" : "Python host operation failed" };
-            }
-          }
-          signal.throwIfAborted();
-          const [operation, path, follow] = payload;
-          if (operation === "stat") return native.metadata(path, follow);
-          if (typeof path !== "string") throw Object.assign(new Error("Invalid native Python path"), { code: "EINVAL" });
-          const target = absolute(path);
-          if (operation === "directory") {
-            const entries = bootstrapPath(target) ? filesystem.readdir(target).filter((name) => name !== "." && name !== "..") : (await start.dispatch({ op: "readdir", args: [target] })).map((entry) => entry.name);
-            return { entries };
+      if ("loadPackage" in runtime) runtime.loadPackage = unavailablePackage;
+      if (runtime._api.packageManager) runtime._api.packageManager.downloadPackage = unavailablePackage;
+      if (start.installOnly) {
+        start.onReady();
+        const message = new TextEncoder().encode(start.packages?.uninstall ? "" : "Successfully installed requested Python packages\n");
+        for (let offset = 0; offset < message.length; offset += start.maxTransferBytes) {
+          await start.dispatch({ op: "stdout", args: [Array.from(message.subarray(offset, offset + start.maxTransferBytes))] });
+        }
+      } else {
+        runtime.runPython("import sys, os, json, runpy, traceback, types, warnings, textwrap, io, struct, linecache, importlib.machinery, shutil, stat, pyodide.ffi");
+        runtime.globals.set("_safe_runtime_mount", start.runtimeMount);
+        const filesystem = runtime.FS;
+        const bootstrap = filesystem.root;
+        filesystem.root = null;
+        filesystem.mount(filesystem.filesystems.MEMFS, {}, "/");
+        filesystem.mkdir(start.runtimeMount);
+        filesystem.mount({ mount: () => bootstrap }, {}, start.runtimeMount);
+        runtime.runPython(pythonRuntimeRelocation);
+        filesystem.currentPath = start.invocation.cwd;
+        native = createPythonNativeSyscalls({
+          getUmask: () => guestMask,
+          runtime: runtime._module,
+          cwd: start.invocation.cwd,
+          runtimeMount: start.runtimeMount,
+          maxTransferBytes: start.maxTransferBytes,
+          signal,
+          dispatch: start.dispatch,
+          original: (name, args) => originals[name](...args)
+        });
+        const errno = JSON.parse(runtime.runPython("__import__('json').dumps({name:value for name,value in vars(__import__('errno')).items() if name.startswith('E') and isinstance(value,int)})"));
+        const encode = async (operation) => {
+          try {
+            return JSON.stringify(await operation());
+          } catch (error) {
+            return JSON.stringify({ errno: signal.aborted ? errno.EINTR : error.errno ?? errno[error.code ?? ""] ?? errno.EIO });
           }
-          if (operation === "tree") {
-            if (bootstrapPath(target) || !await start.dispatch({ op: "rmtreeSupported", args: [target] })) return { supported: false };
-            try {
-              await start.dispatch({ op: "rmtree", args: [target] });
-              return { supported: true };
-            } catch (error) {
-              return { supported: true, errno: errno[error.code ?? ""] ?? errno.EIO };
+        };
+        const absolute = (path) => path.startsWith("/") ? path : filesystem.cwd() + "/" + path;
+        const bootstrapPath = (path) => path === start.runtimeMount || path.startsWith(start.runtimeMount + "/");
+        const module = runtime._module;
+        const send = async (pointer) => {
+          let response = await encode(async () => {
+            const payload = JSON.parse(module.UTF8ToString(pointer));
+            if (payload[0] === "host") {
+              try {
+                if (!start.host || !acceptingHostCalls) throw new Error("Python host capability unavailable");
+                return { value: await start.host.request(payload[1]) };
+              } catch (error) {
+                return { errorCode: pythonHostFailureCode(error), error: signal.aborted ? "Python host operation cancelled" : "Python host operation failed" };
+              }
             }
-          }
-          throw Object.assign(new Error("Invalid native Python operation"), { code: "EINVAL" });
+            signal.throwIfAborted();
+            const [operation, path, follow] = payload;
+            if (operation === "stat") return native.metadata(path, follow);
+            if (typeof path !== "string") throw Object.assign(new Error("Invalid native Python path"), { code: "EINVAL" });
+            const target = absolute(path);
+            if (operation === "directory") {
+              const entries = bootstrapPath(target) ? filesystem.readdir(target).filter((name) => name !== "." && name !== "..") : (await start.dispatch({ op: "readdir", args: [target] })).map((entry) => entry.name);
+              return { entries };
+            }
+            if (operation === "tree") {
+              if (bootstrapPath(target) || !await start.dispatch({ op: "rmtreeSupported", args: [target] })) return { supported: false };
+              try {
+                await start.dispatch({ op: "rmtree", args: [target] });
+                return { supported: true };
+              } catch (error) {
+                return { supported: true, errno: errno[error.code ?? ""] ?? errno.EIO };
+              }
+            }
+            throw Object.assign(new Error("Invalid native Python operation"), { code: "EINVAL" });
+          });
+          if (response.length > 1048576) response = JSON.stringify({ errno: errno.EFBIG });
+          let bytes = new TextEncoder().encode(response);
+          if (bytes.length > 1048576) bytes = new TextEncoder().encode(JSON.stringify({ errno: errno.EFBIG }));
+          const output = module._malloc(bytes.length + 1);
+          if (!output) return 0;
+          module.HEAPU8.set(bytes, output);
+          module.HEAPU8[output + bytes.length] = 0;
+          return output;
+        };
+        const nativeCall = new engine.Instance(options.nativeCall, {
+          python: {
+            utf8: module._PyUnicode_AsUTF8,
+            unicode: module._PyUnicode_FromString,
+            free: module._free,
+            noMemory: module._PyErr_NoMemory
+          },
+          request: { send },
+          shutdown: { send: new engine.Suspending(send) },
+          control: { active, syncify }
         });
-        if (response.length > 1048576) response = JSON.stringify({ errno: errno.EFBIG });
-        let bytes = new TextEncoder().encode(response);
-        if (bytes.length > 1048576) bytes = new TextEncoder().encode(JSON.stringify({ errno: errno.EFBIG }));
-        const output = module._malloc(bytes.length + 1);
-        if (!output) return 0;
-        module.HEAPU8.set(bytes, output);
-        module.HEAPU8[output + bytes.length] = 0;
-        return output;
-      };
-      const nativeCall = new engine.Instance(options.nativeCall, {
-        python: {
-          utf8: module._PyUnicode_AsUTF8,
-          unicode: module._PyUnicode_FromString,
-          free: module._free,
-          noMemory: module._PyErr_NoMemory
-        },
-        request: { send },
-        shutdown: { send: new engine.Suspending(send) },
-        control: { active, syncify }
-      });
-      methodPointer = module.addFunction(nativeCall.exports.call, "iii");
-      methodDefinition = module._malloc(128);
-      if (!methodDefinition) throw new PythonFailure("runtime-assets");
-      module.HEAPU8.fill(0, methodDefinition, methodDefinition + 128);
-      module.HEAPU8.set(new TextEncoder().encode("request\0_safe_native_fs\0"), methodDefinition + 16);
-      module.HEAPU32.set([methodDefinition + 16, methodPointer, 8, 0], methodDefinition / 4);
-      const extension = module._PyImport_AddModule(methodDefinition + 24);
-      const callable = module._PyCFunction_NewEx(methodDefinition, 0, 0);
-      if (!extension || !callable || module._PyModule_AddObject(extension, methodDefinition + 16, callable) < 0) throw new PythonFailure("runtime-abi");
-      const fields = Number(runtime.runPython("os.stat_result.n_fields"));
-      const statResult = new engine.Instance(options.statResult, { python: {
-        fields: new engine.Global({ value: "i32" }, fields),
-        create: module._PyStructSequence_New,
-        size: module._PyTuple_Size,
-        item: module._PyTuple_GetItem,
-        retain: module._Py_IncRef,
-        set: module._PyStructSequence_SetItem,
-        invalid: module._PyErr_BadArgument
-      } });
-      statPointer = module.addFunction(statResult.exports.construct, "iii");
-      module.HEAPU8.set(new TextEncoder().encode("stat_result\0os\0"), methodDefinition + 80);
-      module.HEAPU32.set([methodDefinition + 80, statPointer, 8, 0], (methodDefinition + 64) / 4);
-      const osModule = module._PyImport_AddModule(methodDefinition + 92);
-      const statType = module._PyObject_GetAttrString(osModule, methodDefinition + 80);
-      const constructStat = module._PyCFunction_NewEx(methodDefinition + 64, statType, 0);
-      module._Py_DecRef(statType);
-      if (!constructStat || module._PyModule_AddObject(extension, methodDefinition + 80, constructStat) < 0) throw new PythonFailure("runtime-abi");
-      runtime.runPython(`
+        methodPointer = module.addFunction(nativeCall.exports.call, "iii");
+        methodDefinition = module._malloc(128);
+        if (!methodDefinition) throw new PythonFailure("runtime-assets");
+        module.HEAPU8.fill(0, methodDefinition, methodDefinition + 128);
+        module.HEAPU8.set(new TextEncoder().encode("request\0_safe_native_fs\0"), methodDefinition + 16);
+        module.HEAPU32.set([methodDefinition + 16, methodPointer, 8, 0], methodDefinition / 4);
+        const extension = module._PyImport_AddModule(methodDefinition + 24);
+        const callable = module._PyCFunction_NewEx(methodDefinition, 0, 0);
+        if (!extension || !callable || module._PyModule_AddObject(extension, methodDefinition + 16, callable) < 0) throw new PythonFailure("runtime-abi");
+        const fields = Number(runtime.runPython("os.stat_result.n_fields"));
+        const statResult = new engine.Instance(options.statResult, { python: {
+          fields: new engine.Global({ value: "i32" }, fields),
+          create: module._PyStructSequence_New,
+          size: module._PyTuple_Size,
+          item: module._PyTuple_GetItem,
+          retain: module._Py_IncRef,
+          set: module._PyStructSequence_SetItem,
+          invalid: module._PyErr_BadArgument
+        } });
+        statPointer = module.addFunction(statResult.exports.construct, "iii");
+        module.HEAPU8.set(new TextEncoder().encode("stat_result\0os\0"), methodDefinition + 80);
+        module.HEAPU32.set([methodDefinition + 80, statPointer, 8, 0], (methodDefinition + 64) / 4);
+        const osModule = module._PyImport_AddModule(methodDefinition + 92);
+        const statType = module._PyObject_GetAttrString(osModule, methodDefinition + 80);
+        const constructStat = module._PyCFunction_NewEx(methodDefinition + 64, statType, 0);
+        module._Py_DecRef(statType);
+        if (!constructStat || module._PyModule_AddObject(extension, methodDefinition + 80, constructStat) < 0) throw new PythonFailure("runtime-abi");
+        runtime.runPython(`
 from _safe_native_fs import request as _safe_native_request
 def _safe_stat_projection(path, follow):
  return _safe_native_request(json.dumps(['stat', path, follow]))
@@ -535,8 +557,8 @@ def _safe_directory_entries(path):
 def _safe_tree_cleanup(path):
  return _safe_native_request(json.dumps(['tree', path]))
 `);
-      for (const script of [pythonImportMetadata, pythonDirectoryEntries, pythonStatProjection, pythonTreeCleanup]) runtime.runPython(script);
-      runtime.runPython(`
+        for (const script of [pythonImportMetadata, pythonDirectoryEntries, pythonStatProjection, pythonTreeCleanup]) runtime.runPython(script);
+        runtime.runPython(`
 from _safe_native_fs import stat_result as _safe_construct_stat
 _safe_stat_fields = os.stat_result.n_fields
 _safe_stat_probe = os.stat_result(tuple(range(_safe_stat_fields)))
@@ -549,18 +571,18 @@ def _safe_native_stat_type(values, extras):
  return _safe_construct_stat(tuple(fields))
 _safe_stat_type = _safe_native_stat_type
 `);
-      runtime.runPython(pythonHostModule);
-      installPythonLlmModule(runtime);
-      installPythonShellModule(runtime);
-      installPythonJspiRunSync(runtime);
-      runtime.runPython(pythonLibraryAdapter);
-      runtime.runPython("import tempfile; tempfile.tempdir = None");
-      runtime.globals.set("_safe_invocation_json", JSON.stringify(start.invocation));
-      runtime.globals.set("_safe_execution_code", pythonExecution);
-      runtime.globals.set("_safe_is_cancelled", () => signal.aborted);
-      active.value = 1;
-      start.onReady();
-      exitCode = Number(await runtime.runPythonAsync(`
+        runtime.runPython(pythonHostModule);
+        installPythonLlmModule(runtime);
+        installPythonShellModule(runtime);
+        installPythonJspiRunSync(runtime);
+        runtime.runPython(pythonLibraryAdapter);
+        runtime.runPython("import tempfile; tempfile.tempdir = None");
+        runtime.globals.set("_safe_invocation_json", JSON.stringify(start.invocation));
+        runtime.globals.set("_safe_execution_code", pythonExecution);
+        runtime.globals.set("_safe_is_cancelled", () => signal.aborted);
+        active.value = 1;
+        start.onReady();
+        exitCode = Number(await runtime.runPythonAsync(`
 try:
  exec(_safe_execution_code)
 except BaseException:
@@ -569,6 +591,7 @@ except BaseException:
  _safe_exit = 130
 _safe_exit
 `)) & 255;
+      }
     } finally {
       try {
         if (qualified) {

package/dist/safe-bash/command-chunks/{chunk-I7MEH76L.js → chunk-UYNJF5QN.js}

@@ -1,6 +1,6 @@
 import {
   isPythonWhitespace
-} from "./chunk-BZLLQWRK.js";
+} from "./chunk-E5CDHXFA.js";
 
 // packages/safe-bash-command-llm/src/import-json-document.ts
 import { jsonValues } from "../../safe-bash-query-engine/input.js";

package/dist/safe-bash/command-chunks/{chunk-IAHYG67O.js → chunk-V5ZBRM5R.js}

@@ -5,7 +5,7 @@ import {
   openAiToolCallsJson,
   openAiTools,
   openAiUsage
-} from "./chunk-CJIFJ45R.js";
+} from "./chunk-QBCEAYQT.js";
 import {
   openAiBytes,
   openAiError,
@@ -29,7 +29,7 @@ import {
 } from "./chunk-GDH7OVYK.js";
 import {
   base64Stream
-} from "./chunk-GQV5RWMN.js";
+} from "./chunk-ZFXHSFTU.js";
 import {
   jsonDictionaryKeys,
   parseLlmNumericOption,
@@ -43,7 +43,7 @@ import {
 } from "./chunk-E47FFS5M.js";
 import {
   sourceBytes
-} from "./chunk-QX3WKBLI.js";
+} from "./chunk-36FV6BAG.js";
 import {
   jsonValue
 } from "./chunk-GNPPPYDF.js";