bashkit 0.1.20__tar.gz → 0.1.21__tar.gz

{bashkit-0.1.20 → bashkit-0.1.21}/Cargo.lock

@@ -167,7 +167,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -178,7 +178,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -304,7 +304,7 @@ checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
 
 [[package]]
 name = "bashkit"
-version = "0.1.20"
+version = "0.1.21"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -349,7 +349,7 @@ dependencies = [
 
 [[package]]
 name = "bashkit-bench"
-version = "0.1.20"
+version = "0.1.21"
 dependencies = [
  "anyhow",
  "bashkit",
@@ -363,7 +363,7 @@ dependencies = [
 
 [[package]]
 name = "bashkit-cli"
-version = "0.1.20"
+version = "0.1.21"
 dependencies = [
  "anyhow",
  "bashkit",
@@ -379,7 +379,7 @@ dependencies = [
 
 [[package]]
 name = "bashkit-eval"
-version = "0.1.20"
+version = "0.1.21"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -395,7 +395,7 @@ dependencies = [
 
 [[package]]
 name = "bashkit-js"
-version = "0.1.20"
+version = "0.1.21"
 dependencies = [
  "bashkit",
  "napi",
@@ -408,7 +408,7 @@ dependencies = [
 
 [[package]]
 name = "bashkit-python"
-version = "0.1.20"
+version = "0.1.21"
 dependencies = [
  "bashkit",
  "num-bigint",
@@ -810,7 +810,7 @@ version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1400,7 +1400,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1417,7 +1417,7 @@ checksum = "fe5e43d0f78a42ad591453aedb1d7ae631ce7ee445c7643691055a9ed8d3b01c"
 dependencies = [
  "log",
  "once_cell",
- "rand 0.8.5",
+ "rand 0.8.6",
 ]
 
 [[package]]
@@ -2276,7 +2276,7 @@ dependencies = [
  "portable-atomic",
  "portable-atomic-util",
  "serde_core",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2732,7 +2732,7 @@ dependencies = [
  "num-integer",
  "num-iter",
  "num-traits",
- "rand 0.8.5",
+ "rand 0.8.6",
  "serde",
  "smallvec",
 ]
@@ -3073,7 +3073,7 @@ dependencies = [
  "delegate",
  "futures",
  "log",
- "rand 0.8.5",
+ "rand 0.8.6",
  "sha2 0.10.9",
  "thiserror 1.0.69",
  "tokio",
@@ -3207,7 +3207,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
 dependencies = [
  "phf_shared 0.11.3",
- "rand 0.8.5",
+ "rand 0.8.6",
 ]
 
 [[package]]
@@ -3725,9 +3725,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
 dependencies = [
  "libc",
  "rand_chacha 0.3.1",
@@ -4043,9 +4043,9 @@ dependencies = [
 
 [[package]]
 name = "russh"
-version = "0.60.0"
+version = "0.60.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b530252dc3ff163b73a7e48c97b925450d2ca53edcb466a46ad0a231e45f998"
+checksum = "d937f3f4a79bffd67fc12fd437785effdfc8b94edc89ab90392f9ac9e11cc9fc"
 dependencies = [
  "aes 0.8.4",
  "aws-lc-rs",
@@ -4177,7 +4177,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4234,7 +4234,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4245,9 +4245,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.12"
+version = "0.103.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8279bb85272c9f10811ae6a6c547ff594d6a7f3c6c6b02ee9726d1d0dcfcdd06"
+checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e"
 dependencies = [
  "aws-lc-rs",
  "ring",
@@ -4676,7 +4676,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -4870,7 +4870,7 @@ dependencies = [
  "getrandom 0.4.2",
  "once_cell",
  "rustix",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4880,7 +4880,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "230a1b821ccbd75b185820a1f1ff7b14d21da1e442e22c0863ea5f08771a8874"
 dependencies = [
  "rustix",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -5214,7 +5214,7 @@ dependencies = [
  "getopts",
  "log",
  "phf_codegen",
- "rand 0.8.5",
+ "rand 0.8.6",
 ]
 
 [[package]]
@@ -5490,7 +5490,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]

{bashkit-0.1.20 → bashkit-0.1.21}/Cargo.toml

@@ -7,7 +7,7 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.1.20"
+version = "0.1.21"
 edition = "2024"
 license = "MIT"
 authors = ["Everruns"]
@@ -105,5 +105,7 @@ napi-build = "2"
 [profile.release]
 lto = "thin"
 codegen-units = 1
-panic = "abort"
+# Security: interpreter relies on catch_unwind around builtins.
+# Keep release unwinding enabled so panic containment works.
+panic = "unwind"
 strip = "symbols"

{bashkit-0.1.20 → bashkit-0.1.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bashkit
-Version: 0.1.20
+Version: 0.1.21
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -10,6 +10,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Rust
 Classifier: Topic :: Software Development :: Interpreters
 Classifier: Topic :: Security
@@ -334,10 +335,22 @@ print(result.stdout)  # widget
 ```
 
 Callbacks receive a `BuiltinContext` object with raw `argv` tokens, optional
-pipeline `stdin`, the current `cwd`, and visible `env`, and must return the
-builtin stdout string. Async callbacks are also supported. `BashTool` exposes
-the same `custom_builtins` constructor kwarg and includes registered command
-names in `help()` output for LLM-facing metadata.
+pipeline `stdin`, the current `cwd`, and visible `env`. They may return either
+the builtin stdout string directly or a `BuiltinResult(stdout=..., stderr=...,
+exit_code=...)` for explicit shell-shaped failures. Raise an exception for
+unexpected callback failures. Async callbacks support the same return shapes.
+`BashTool` exposes the same `custom_builtins` constructor kwarg and includes
+registered command names in `help()` output for LLM-facing metadata.
+
+```python
+from bashkit import BuiltinResult
+
+
+def view_image(ctx):
+    if not ctx.argv:
+        return BuiltinResult(stderr="view-image: missing path\n", exit_code=1)
+    return BuiltinResult(stdout="")
+```
 
 When you use `await bash.execute(...)` or `await bash_tool.execute(...)`,
 async callbacks are scheduled back onto the caller's active asyncio loop, so
@@ -503,7 +516,7 @@ from bashkit.deepagents import BashkitBackend, BashkitMiddleware
 - Linux: `x86_64`, `aarch64` (glibc and musl wheels)
 - macOS: `x86_64`, `aarch64`
 - Windows: `x86_64`
-- Python: `3.9` through `3.13`
+- Python: `3.9` through `3.14`
 
 ## How It Works
 

{bashkit-0.1.20/crates/bashkit-python → bashkit-0.1.21}/README.md

@@ -298,10 +298,22 @@ print(result.stdout)  # widget
 ```
 
 Callbacks receive a `BuiltinContext` object with raw `argv` tokens, optional
-pipeline `stdin`, the current `cwd`, and visible `env`, and must return the
-builtin stdout string. Async callbacks are also supported. `BashTool` exposes
-the same `custom_builtins` constructor kwarg and includes registered command
-names in `help()` output for LLM-facing metadata.
+pipeline `stdin`, the current `cwd`, and visible `env`. They may return either
+the builtin stdout string directly or a `BuiltinResult(stdout=..., stderr=...,
+exit_code=...)` for explicit shell-shaped failures. Raise an exception for
+unexpected callback failures. Async callbacks support the same return shapes.
+`BashTool` exposes the same `custom_builtins` constructor kwarg and includes
+registered command names in `help()` output for LLM-facing metadata.
+
+```python
+from bashkit import BuiltinResult
+
+
+def view_image(ctx):
+    if not ctx.argv:
+        return BuiltinResult(stderr="view-image: missing path\n", exit_code=1)
+    return BuiltinResult(stdout="")
+```
 
 When you use `await bash.execute(...)` or `await bash_tool.execute(...)`,
 async callbacks are scheduled back onto the caller's active asyncio loop, so
@@ -467,7 +479,7 @@ from bashkit.deepagents import BashkitBackend, BashkitMiddleware
 - Linux: `x86_64`, `aarch64` (glibc and musl wheels)
 - macOS: `x86_64`, `aarch64`
 - Windows: `x86_64`
-- Python: `3.9` through `3.13`
+- Python: `3.9` through `3.14`
 
 ## How It Works
 

{bashkit-0.1.20 → bashkit-0.1.21}/bashkit/__init__.py

@@ -48,6 +48,7 @@ from bashkit._bashkit import (
     BashError,
     BashTool,
     BuiltinContext,
+    BuiltinResult,
     ExecResult,
     FileSystem,
     ScriptedTool,
@@ -61,6 +62,7 @@ __all__ = [
     "Bash",
     "BashError",
     "BuiltinContext",
+    "BuiltinResult",
     "BashTool",
     "ExecResult",
     "FileSystem",

{bashkit-0.1.20 → bashkit-0.1.21}/bashkit/_bashkit.pyi

@@ -23,7 +23,25 @@ class BuiltinContext:
     env: dict[str, str]
     cwd: str
 
-BuiltinCallback = Callable[[BuiltinContext], str | Awaitable[str]]
+class BuiltinResult:
+    """Shell-facing result for a custom builtin callback.
+
+    Attributes:
+        stdout: Text written to stdout.
+        stderr: Text written to stderr.
+        exit_code: Shell exit status.
+    """
+
+    stdout: str
+    stderr: str
+    exit_code: int
+
+    def __init__(self, stdout: str = "", stderr: str = "", exit_code: int = 0) -> None: ...
+
+BuiltinCallback = Callable[
+    [BuiltinContext],
+    str | BuiltinResult | Awaitable[str | BuiltinResult],
+]
 
 class FileSystem:
     """Direct access to BashKit's virtual filesystem or a standalone mountable FS.
@@ -358,7 +376,7 @@ class Bash:
         external_handler: ExternalHandler | None = None,
         files: dict[str, str | Callable[[], str]] | None = None,
         mounts: list[dict[str, Any]] | None = None,
-        custom_builtins: dict[str, BuiltinCallback] | None = None,
+        custom_builtins: Mapping[str, BuiltinCallback] | None = None,
     ) -> None:
         """Create a new Bash interpreter.
 
@@ -380,9 +398,10 @@ class Bash:
             custom_builtins: Constructor-time Python callbacks exposed as
                 bash builtins. Each callback receives a ``BuiltinContext``
                 with raw ``argv`` tokens and optional pipeline ``stdin``,
-                and must return a stdout string or await one. Async callbacks
-                run on the caller's active asyncio loop for ``await execute()``
-                and on a private loop for ``execute_sync()``.
+                and must return a stdout string, a ``BuiltinResult``, or
+                await either. Async callbacks run on the caller's active
+                asyncio loop for ``await execute()`` and on a private loop
+                for ``execute_sync()``.
 
         Example::
 
@@ -424,6 +443,10 @@ class Bash:
         Not supported when ``external_handler`` is configured — use
         ``execute()`` (async) instead. ``on_output`` must be synchronous.
         Async ``custom_builtins`` callbacks run on a private loop here.
+        When called from inside a running event loop (e.g. Jupyter / IPython),
+        callbacks are dispatched to a background thread with their own loop so
+        that asyncio's "cannot run while another loop is running" restriction
+        is not triggered.
 
         Example::
 
@@ -552,7 +575,7 @@ class Bash:
         external_handler: ExternalHandler | None = None,
         files: dict[str, str] | None = None,
         mounts: list[dict[str, Any]] | None = None,
-        custom_builtins: dict[str, BuiltinCallback] | None = None,
+        custom_builtins: Mapping[str, BuiltinCallback] | None = None,
     ) -> Bash:
         """Create a new ``Bash`` from snapshot bytes and optional constructor kwargs."""
         ...
@@ -727,7 +750,7 @@ class BashTool:
         timeout_seconds: float | None = None,
         files: dict[str, str | Callable[[], str]] | None = None,
         mounts: list[dict[str, Any]] | None = None,
-        custom_builtins: dict[str, BuiltinCallback] | None = None,
+        custom_builtins: Mapping[str, BuiltinCallback] | None = None,
     ) -> None:
         """Create a new BashTool.
 
@@ -742,9 +765,10 @@ class BashTool:
             mounts: List of real host directory mount configs.
             custom_builtins: Constructor-time Python callbacks exposed as
                 bash builtins. Each callback receives a ``BuiltinContext``
-                and must return a stdout string or await one. Async callbacks
-                run on the caller's active asyncio loop for ``await execute()``
-                and on a private loop for ``execute_sync()``.
+                and must return a stdout string, a ``BuiltinResult``, or
+                await either. Async callbacks run on the caller's active
+                asyncio loop for ``await execute()`` and on a private loop
+                for ``execute_sync()``.
 
         Example::
 
@@ -778,6 +802,10 @@ class BashTool:
         """Execute bash commands synchronously (blocking).
 
         Async ``custom_builtins`` callbacks run on a private loop here.
+        When called from inside a running event loop (e.g. Jupyter / IPython),
+        callbacks are dispatched to a background thread with their own loop so
+        that asyncio's "cannot run while another loop is running" restriction
+        is not triggered.
 
         ``on_output`` must be synchronous.
 
@@ -962,7 +990,7 @@ class BashTool:
         timeout_seconds: float | None = None,
         files: dict[str, str] | None = None,
         mounts: list[dict[str, Any]] | None = None,
-        custom_builtins: dict[str, BuiltinCallback] | None = None,
+        custom_builtins: Mapping[str, BuiltinCallback] | None = None,
     ) -> BashTool:
         """Create a new ``BashTool`` from snapshot bytes and optional constructor kwargs."""
         ...

{bashkit-0.1.20 → bashkit-0.1.21}/crates/bashkit/README.md

@@ -273,7 +273,8 @@ Path('/tmp/data.txt').write_text('hello from python')
 bash.exec("cat /tmp/data.txt").await?; // "hello from python"
 ```
 
-Stdlib modules: `math`, `re`, `pathlib`, `os` (getenv/environ), `sys`, `typing`.
+Stdlib modules: `math`, `pathlib`, `os` (getenv/environ), `sys`, `typing`.
+Security note: `re` is intentionally disabled due to regex backtracking DoS risk.
 Limitations: no `open()` (use `pathlib.Path`), no network, no classes, no third-party imports.
 See [crates/bashkit/docs/python.md](crates/bashkit/docs/python.md) for the full guide.
 

{bashkit-0.1.20 → bashkit-0.1.21}/crates/bashkit/docs/python.md

@@ -23,7 +23,10 @@ use bashkit::Bash;
 
 # #[tokio::main]
 # async fn main() -> bashkit::Result<()> {
-let mut bash = Bash::builder().python().build();
+let mut bash = Bash::builder()
+    .python()
+    .env("BASHKIT_ALLOW_INPROCESS_PYTHON", "1")
+    .build();
 
 let result = bash.exec("python3 -c \"print('hello from Monty')\"").await?;
 assert_eq!(result.stdout, "hello from Monty\n");
@@ -187,7 +190,10 @@ Monty has no network primitives and no OsCall variants for network operations.
 **No classes.** Class definitions are not yet supported by Monty (planned upstream).
 
 **No third-party imports.** Only builtin modules (`sys`, `typing`, `os`, `pathlib`,
-`math`, `re`, `json`, `datetime`) are available. No `pip install`, no `import numpy`.
+`math`, `json`, `datetime`) are available. No `pip install`, no `import numpy`.
+
+**No `re` module.** Disabled due to catastrophic backtracking DoS risk in
+untrusted code execution.
 
 **No `str.format()`.** Use f-strings instead: `f"value={x}"` not `"value={}".format(x)`.
 

{bashkit-0.1.20 → bashkit-0.1.21}/crates/bashkit/docs/threat-model.md

@@ -109,6 +109,7 @@ through configurable limits.
 | Unbounded builtin output (TM-DOS-058) | `seq 1 1000000` produces 1M lines | Add `max_stdout_bytes` limit | **OPEN** |
 | Param expansion bomb (TM-DOS-059) | `${x//a/bigstring}` multiplicative amplification | `max_total_variable_bytes` + `max_stdout_bytes` | MITIGATED |
 | Sparse array huge-index (TM-DOS-060) | `arr[999999999]=x` | HashMap storage; `max_array_entries` | MITIGATED |
+| Snapshot restore bypasses function/parser limits (TM-DOS-061) | Crafted snapshot with oversized/deep function bodies | Re-parse restored function source under current limits; re-check function memory budget | MITIGATED |
 
 **Configuration:**
 ```rust

{bashkit-0.1.20 → bashkit-0.1.21}/crates/bashkit/examples/python_external_functions.rs

@@ -32,6 +32,7 @@ async fn main() -> Result<()> {
 
     let mut bash = Bash::builder()
         .python_with_external_handler(PythonLimits::default(), vec!["add".to_string()], handler)
+        .env("BASHKIT_ALLOW_INPROCESS_PYTHON", "1")
         .build();
 
     let result = bash.exec("python3 -c \"print(add(20, 22))\"").await?;

{bashkit-0.1.20 → bashkit-0.1.21}/crates/bashkit/examples/python_scripts.rs

@@ -13,7 +13,10 @@ use bashkit::Bash;
 async fn main() -> anyhow::Result<()> {
     println!("=== BashKit Python Integration ===\n");
 
-    let mut bash = Bash::builder().python().build();
+    let mut bash = Bash::builder()
+        .python()
+        .env("BASHKIT_ALLOW_INPROCESS_PYTHON", "1")
+        .build();
 
     // --- 1. Inline expressions ---
     println!("--- Inline Expressions ---");