bashkit 0.4.1__tar.gz → 0.6.0__tar.gz

{bashkit-0.4.1 → bashkit-0.6.0}/Cargo.lock

@@ -345,11 +345,12 @@ checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
 
 [[package]]
 name = "bashkit"
-version = "0.4.1"
+version = "0.6.0"
 dependencies = [
  "anyhow",
  "async-trait",
  "base64",
+ "bigdecimal",
  "chrono",
  "clap",
  "criterion",
@@ -359,6 +360,7 @@ dependencies = [
  "flate2",
  "futures-core",
  "futures-util",
+ "getrandom 0.4.2",
  "hmac 0.13.0",
  "insta",
  "jaq-core",
@@ -366,6 +368,8 @@ dependencies = [
  "jaq-std",
  "md-5",
  "monty",
+ "num-traits",
+ "os_display",
  "pretty_assertions",
  "proptest",
  "rand 0.10.1",
@@ -386,6 +390,7 @@ dependencies = [
  "tower",
  "tracing",
  "turso_core",
+ "unit-prefix",
  "url",
  "zapcode-core",
  "zeroize",
@@ -393,7 +398,7 @@ dependencies = [
 
 [[package]]
 name = "bashkit-bench"
-version = "0.4.1"
+version = "0.6.0"
 dependencies = [
  "anyhow",
  "bashkit",
@@ -407,7 +412,7 @@ dependencies = [
 
 [[package]]
 name = "bashkit-cli"
-version = "0.4.1"
+version = "0.6.0"
 dependencies = [
  "anyhow",
  "bashkit",
@@ -421,9 +426,23 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "bashkit-coreutils-port"
+version = "0.6.0"
+dependencies = [
+ "anyhow",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "syn",
+ "tempfile",
+ "toml",
+]
+
 [[package]]
 name = "bashkit-eval"
-version = "0.4.1"
+version = "0.6.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -440,7 +459,7 @@ dependencies = [
 
 [[package]]
 name = "bashkit-js"
-version = "0.4.1"
+version = "0.6.0"
 dependencies = [
  "bashkit",
  "napi",
@@ -453,7 +472,7 @@ dependencies = [
 
 [[package]]
 name = "bashkit-python"
-version = "0.4.1"
+version = "0.6.0"
 dependencies = [
  "bashkit",
  "num-bigint",
@@ -1802,11 +1821,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "r-efi 6.0.0",
  "rand_core 0.10.1",
  "wasip2",
  "wasip3",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -3034,6 +3055,15 @@ dependencies = [
  "indexmap",
 ]
 
+[[package]]
+name = "os_display"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad5fd71b79026fb918650dde6d125000a233764f1c2f1659a1c71118e33ea08f"
+dependencies = [
+ "unicode-width 0.2.2",
+]
+
 [[package]]
 name = "owo-colors"
 version = "3.5.0"
@@ -4770,6 +4800,15 @@ dependencies = [
  "zmij",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
+dependencies = [
+ "serde_core",
+]
+
 [[package]]
 name = "serdect"
 version = "0.4.2"
@@ -5352,9 +5391,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.52.1"
+version = "1.52.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6"
+checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe"
 dependencies = [
  "bytes",
  "libc",
@@ -5422,6 +5461,45 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "toml"
+version = "1.1.2+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee"
+dependencies = [
+ "indexmap",
+ "serde_core",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_parser",
+ "toml_writer",
+ "winnow",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "1.1.1+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.1.2+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
+dependencies = [
+ "winnow",
+]
+
+[[package]]
+name = "toml_writer"
+version = "1.1.1+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db"
+
 [[package]]
 name = "tower"
 version = "0.5.3"
@@ -5744,6 +5822,12 @@ dependencies = [
  "rand 0.8.6",
 ]
 
+[[package]]
+name = "unit-prefix"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81e544489bf3d8ef66c953931f56617f423cd4b5494be343d9b9d3dda037b9a3"
+
 [[package]]
 name = "universal-hash"
 version = "0.5.1"
@@ -6226,6 +6310,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "winnow"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ee1708bef14716a11bae175f579062d4554d95be2c6829f518df847b7b3fdd0"
+
 [[package]]
 name = "wit-bindgen"
 version = "0.51.0"

{bashkit-0.4.1 → bashkit-0.6.0}/Cargo.toml

@@ -7,7 +7,7 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.4.1"
+version = "0.6.0"
 edition = "2024"
 license = "MIT"
 authors = ["Everruns"]
@@ -69,7 +69,19 @@ ed25519-dalek = { version = "2", features = ["rand_core"] }
 rand = "0.10"
 zeroize = "1"
 
+# CSPRNG for placeholder token generation (security-grade randomness).
+# Important decision: enable `wasm_js` so the public `wasm32-unknown-unknown`
+# build gate stays green; bashkit targets JS-backed wasm for that triple.
+# Used by the credential placeholder generator; getrandom is the lowest-level
+# CSPRNG primitive and is already transitively in the dep tree via reqwest/rustls.
+getrandom = { version = "0.4", features = ["wasm_js"] }
+
 # CLI
+# Intentionally NOT enabling clap's `env` feature: it makes `Arg::env(...)`
+# read defaults from `std::env`, which would tunnel host process state into
+# the bashkit sandbox (TM-INF-023). The coreutils-args-port codegen strips
+# `.env(...)` chains from vendored Arg builders; dropping the feature here
+# is defence-in-depth so any re-introduction fails to compile.
 clap = { version = "4", features = ["derive"] }
 
 # Testing

{bashkit-0.4.1 → bashkit-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bashkit
-Version: 0.4.1
+Version: 0.6.0
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -41,6 +41,8 @@ Project-URL: Repository, https://github.com/everruns/bashkit
 
 Sandboxed bash interpreter for Python. Native bindings to the `bashkit` Rust core for fast, in-process execution with a virtual filesystem.
 
+Homepage: [bashkit.sh](https://bashkit.sh)
+
 ## Features
 
 - Sandboxed execution in-process, without containers or subprocess orchestration

{bashkit-0.4.1/crates/bashkit-python → bashkit-0.6.0}/README.md

@@ -4,6 +4,8 @@
 
 Sandboxed bash interpreter for Python. Native bindings to the `bashkit` Rust core for fast, in-process execution with a virtual filesystem.
 
+Homepage: [bashkit.sh](https://bashkit.sh)
+
 ## Features
 
 - Sandboxed execution in-process, without containers or subprocess orchestration

{bashkit-0.4.1 → bashkit-0.6.0}/crates/bashkit/Cargo.toml

@@ -68,6 +68,9 @@ ed25519-dalek = { workspace = true, optional = true }
 rand = { workspace = true, optional = true }
 zeroize = { workspace = true, optional = true }
 
+# CSPRNG for credential placeholder generation
+getrandom = { workspace = true }
+
 # Checksums (for md5sum, sha1sum, sha256sum builtins)
 md-5 = { workspace = true }
 sha1 = { workspace = true }
@@ -77,8 +80,18 @@ hmac = "0.13"
 # Logging/tracing (optional)
 tracing = { workspace = true, optional = true }
 
-# CLI-style argument parsing for custom builtins.
-clap = { workspace = true, optional = true }
+# CLI-style argument parsing for custom builtins and ported coreutils
+# argument surfaces. Always on — see specs/coreutils-args-port.md.
+clap = { workspace = true }
+
+# Pinned to uutils' workspace versions. Used by the vendored
+# uucore::format module (see crates/bashkit/src/builtins/generated/format)
+# that backs `printf`. Kept platform-clean — no rustix / errno
+# transitive deps — so wasm32 stays buildable.
+bigdecimal = "0.4"
+num-traits = "0.2"
+unit-prefix = "0.5"
+os_display = "0.1.3"
 
 # Embedded Python interpreter (optional)
 monty = { git = "https://github.com/pydantic/monty", rev = "49faa4c", optional = true }
@@ -91,9 +104,7 @@ zapcode-core = { version = "1.5", optional = true }
 turso_core = { workspace = true, optional = true }
 
 [features]
-default = ["clap-builtins"]
-# Enable `ClapBuiltin` for custom builtins with `#[derive(clap::Parser)]`.
-clap-builtins = ["dep:clap"]
+default = []
 # Enable jq builtin via embedded jaq interpreter
 # Usage: cargo build --features jq
 jq = ["dep:jaq-core", "dep:jaq-std", "dep:jaq-json"]

{bashkit-0.4.1 → bashkit-0.6.0}/crates/bashkit/README.md

@@ -8,6 +8,8 @@
 
 Awesomely fast virtual sandbox with bash and file system. Written in Rust.
 
+Homepage: [bashkit.sh](https://bashkit.sh)
+
 ## Features
 
 - **Secure by default** - No process spawning, no filesystem access, no network access unless explicitly enabled. [250+ threats](specs/threat-model.md) analyzed and mitigated
@@ -21,7 +23,6 @@ Awesomely fast virtual sandbox with bash and file system. Written in Rust.
 - **LLM tool contract** - `BashTool` with discovery metadata, streaming output, and system prompts
 - **Snapshotting** - Serialize shell state and VFS contents for checkpoint/resume workflows
 - **Scripted tool orchestration** - Compose ToolDef+callback pairs into multi-tool bash scripts (`scripted_tool` feature)
-- **MCP server** - Model Context Protocol endpoint via `bashkit mcp`
 - **Async-first** - Built on tokio
 - **Language bindings** - Python (PyO3) and JavaScript/TypeScript (NAPI-RS) for Node.js, Bun, and Deno
 - **Experimental: Git support** - Virtual git operations on the virtual filesystem (`git` feature)
@@ -372,17 +373,15 @@ mountable.mount("/data", Arc::new(InMemoryFs::new()));
 
 ```bash
 # Run a script
-bashkit run script.sh
+bashkit script.sh
 
 # Interactive REPL
-bashkit repl
+bashkit
 
-# MCP server (Model Context Protocol)
-bashkit mcp
 
 # Mount real filesystem (read-only or read-write)
-bashkit run script.sh --mount-ro /data
-bashkit run script.sh --mount-rw /workspace
+bashkit --mount-ro /data script.sh
+bashkit --mount-rw /workspace script.sh
 ```
 
 ## Development

{bashkit-0.4.1 → bashkit-0.6.0}/crates/bashkit/docs/clap-builtins.md

@@ -3,21 +3,8 @@
 `ClapBuiltin` lets Rust applications define custom Bashkit commands with
 `#[derive(clap::Parser)]` argument structs. Handlers receive a
 `BashkitContext` that captures stdout, stderr, and exit code for the virtual
-shell. The feature is enabled by default through `clap-builtins`.
-
-Disable it for a smaller library dependency surface:
-
-```toml
-[dependencies]
-bashkit = { version = "0.3", default-features = false }
-```
-
-Enable it explicitly when default features are off:
-
-```toml
-[dependencies]
-bashkit = { version = "0.3", default-features = false, features = ["clap-builtins"] }
-```
+shell. `clap` is an unconditional dependency of `bashkit`, so this trait is
+always available.
 
 ## Basic Usage
 
@@ -146,6 +133,6 @@ async fn main() -> bashkit::Result<()> {
 
 ## See Also
 
-- [`crates/bashkit/examples/clap_builtin.rs`](../crates/bashkit/examples/clap_builtin.rs)
-- [`crates/bashkit/examples/clap_builtin_subcommands.rs`](../crates/bashkit/examples/clap_builtin_subcommands.rs)
-- [`crates/bashkit/docs/custom_builtins.md`](../crates/bashkit/docs/custom_builtins.md)
+- [`crates/bashkit/examples/clap_builtin.rs`](../examples/clap_builtin.rs)
+- [`crates/bashkit/examples/clap_builtin_subcommands.rs`](../examples/clap_builtin_subcommands.rs)
+- [`crates/bashkit/docs/custom_builtins.md`](./custom_builtins.md)

{bashkit-0.4.1 → bashkit-0.6.0}/crates/bashkit/docs/custom_builtins.md

@@ -7,7 +7,7 @@ virtual filesystem.
 
 **See also:**
 - [API Documentation](https://docs.rs/bashkit) - Full API reference
-- [Clap Builtins](../../../docs/clap-builtins.md) - Derive parser structs for custom builtin args
+- [Clap Builtins](./clap-builtins.md) - Derive parser structs for custom builtin args
 - [Hooks](./hooks.md) - Interceptor hooks for the execution pipeline
 - [Compatibility Reference](./compatibility.md) - Supported bash features
 - [Threat Model](./threat-model.md) - Security considerations
@@ -156,10 +156,9 @@ Arguments are passed as a slice of strings, excluding the command name itself:
 let first_arg = ctx.args.first().map(|s| s.as_str()).unwrap_or("default");
 ```
 
-For custom builtins with richer flags, options, or subcommands, enable the
-default `clap-builtins` feature and implement `ClapBuiltin` with a
-`#[derive(clap::Parser)]` argument type. See the `clap_builtins_guide` rustdoc
-module for tested examples.
+For custom builtins with richer flags, options, or subcommands, implement
+`ClapBuiltin` with a `#[derive(clap::Parser)]` argument type. See the
+`clap_builtins_guide` rustdoc module for tested examples.
 
 ### Environment Variables
 

bashkit-0.6.0/crates/bashkit/src/builtins/cat.rs

@@ -0,0 +1,193 @@
+//! cat builtin.
+//!
+//! Argument surface is generated from uutils/coreutils' `uu_app()` via the
+//! `bashkit-coreutils-port` codegen tool — see `generated/cat_args.rs` and
+//! `crates/bashkit-coreutils-port/`. Behaviour is implemented locally
+//! against the bashkit VFS.
+
+use async_trait::async_trait;
+use std::ffi::OsString;
+use std::path::Path;
+
+use super::generated::cat_args::cat_command;
+use super::{Builtin, Context, read_text_file};
+use crate::error::Result;
+use crate::interpreter::ExecResult;
+
+pub struct Cat;
+
+#[async_trait]
+impl Builtin for Cat {
+    async fn execute(&self, ctx: Context<'_>) -> Result<ExecResult> {
+        // clap expects argv[0] = program name; bashkit's ctx.args excludes it.
+        let argv: Vec<OsString> = std::iter::once(OsString::from("cat"))
+            .chain(ctx.args.iter().map(OsString::from))
+            .collect();
+
+        // GNU coreutils' help layout opens with the usage line; clap's
+        // default template leads with the `about`. uutils handles this via
+        // uucore's `localized_help_template`, which we drop during codegen
+        // because it pulls in Fluent. Re-apply a GNU-equivalent template.
+        let cmd = cat_command().help_template("Usage: {usage}\n{about}\n\n{all-args}\n");
+        let matches = match cmd.try_get_matches_from(argv) {
+            Ok(m) => m,
+            Err(e) => {
+                let kind = e.kind();
+                let rendered = e.render().to_string();
+                if matches!(
+                    kind,
+                    clap::error::ErrorKind::DisplayHelp | clap::error::ErrorKind::DisplayVersion
+                ) {
+                    return Ok(ExecResult::ok(rendered));
+                }
+                return Ok(ExecResult::err(rendered, 2));
+            }
+        };
+
+        // Composite flags: -A = -vET, -e = -vE, -t = -vT.
+        let g = |k: &str| matches.get_flag(k);
+        let show_all = g("show-all");
+        let number_nonblank = g("number-nonblank");
+        let nonprint_ends = g("e");
+        let nonprint_tabs = g("t");
+        let show_ends = g("show-ends") || show_all || nonprint_ends;
+        let show_tabs = g("show-tabs") || show_all || nonprint_tabs;
+        let show_nonprinting = g("show-nonprinting") || show_all || nonprint_ends || nonprint_tabs;
+        let number_all = g("number") && !number_nonblank;
+        let squeeze = g("squeeze-blank");
+
+        // GNU `cat` reads stdin when FILE is "-" or absent. clap defaults
+        // FILE to "-" so absence and "-" are unified.
+        let files: Vec<String> = matches
+            .get_many::<OsString>("file")
+            .map(|vs| vs.map(|v| v.to_string_lossy().into_owned()).collect())
+            .unwrap_or_default();
+
+        let mut raw = String::new();
+        for file in &files {
+            if file == "-" {
+                if let Some(stdin) = ctx.stdin {
+                    raw.push_str(stdin);
+                }
+            } else {
+                let path = if Path::new(file).is_absolute() {
+                    file.clone()
+                } else {
+                    ctx.cwd.join(file).to_string_lossy().into_owned()
+                };
+                match read_text_file(&*ctx.fs, Path::new(&path), "cat").await {
+                    Ok(t) => raw.push_str(&t),
+                    Err(e) => return Ok(e),
+                }
+            }
+        }
+
+        let output = render(
+            &raw,
+            show_ends,
+            show_tabs,
+            show_nonprinting,
+            number_all,
+            number_nonblank,
+            squeeze,
+        );
+        Ok(ExecResult::ok(output))
+    }
+}
+
+/// Apply cat's display transforms in a single pass.
+///
+/// One pass because numbering interacts with squeezing — squeezed blank
+/// lines must not be numbered. Two passes mis-number `cat -ns`.
+fn render(
+    raw: &str,
+    show_ends: bool,
+    show_tabs: bool,
+    show_nonprinting: bool,
+    number_all: bool,
+    number_nonblank: bool,
+    squeeze: bool,
+) -> String {
+    use std::fmt::Write;
+
+    let mut out = String::with_capacity(raw.len());
+    let mut counter: u64 = 0;
+    let mut prev_blank = false;
+
+    let mut iter = raw.split_inclusive('\n').peekable();
+    if iter.peek().is_none() {
+        return out;
+    }
+
+    for chunk in iter {
+        let (body, sep): (&str, &str) = match chunk.strip_suffix('\n') {
+            Some(b) => (b, "\n"),
+            None => (chunk, ""),
+        };
+        let is_blank = body.is_empty();
+
+        if squeeze && is_blank && prev_blank {
+            continue;
+        }
+        prev_blank = is_blank;
+
+        if number_all || (number_nonblank && !is_blank) {
+            counter += 1;
+            let _ = write!(out, "{counter:>6}\t");
+        }
+
+        if show_nonprinting || show_tabs {
+            for b in body.bytes() {
+                emit_byte(&mut out, b, show_tabs, show_nonprinting);
+            }
+        } else {
+            out.push_str(body);
+        }
+
+        if show_ends && !sep.is_empty() {
+            out.push('$');
+        }
+        out.push_str(sep);
+    }
+    out
+}
+
+/// GNU cat -v style byte rendering.
+///
+/// - tab (0x09): literal '\t' unless `show_tabs` (then `^I`).
+/// - bytes < 0x20 (other than tab/newline): `^X` (X = byte + 64) when
+///   show_nonprinting; passed through otherwise.
+/// - 0x7F (DEL): `^?`.
+/// - 0x80..=0xFF (high bit set): `M-` prefix + low-7-bit rendered same way.
+fn emit_byte(out: &mut String, b: u8, show_tabs: bool, show_nonprinting: bool) {
+    match b {
+        b'\t' if show_tabs => {
+            out.push('^');
+            out.push('I');
+        }
+        b'\t' => out.push('\t'),
+        b'\n' => out.push('\n'),
+        0..=31 if show_nonprinting => {
+            out.push('^');
+            out.push((b + 64) as char);
+        }
+        0x7f if show_nonprinting => {
+            out.push('^');
+            out.push('?');
+        }
+        128..=255 if show_nonprinting => {
+            out.push_str("M-");
+            let low = b & 0x7f;
+            if (0..32).contains(&low) {
+                out.push('^');
+                out.push((low + 64) as char);
+            } else if low == 0x7f {
+                out.push('^');
+                out.push('?');
+            } else {
+                out.push(low as char);
+            }
+        }
+        _ => out.push(b as char),
+    }
+}