bashkit 0.18.0__tar.gz → 0.18.1__tar.gz

{bashkit-0.18.0 → bashkit-0.18.1}/Cargo.lock

@@ -342,13 +342,13 @@ checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
 
 [[package]]
 name = "bashkit"
-version = "0.18.0"
+version = "0.18.1"
 dependencies = [
  "anyhow",
  "async-trait",
  "base64 0.23.1",
  "bigdecimal",
- "bitflags 2.13.1",
+ "bitflags 2.13.2",
  "bzip2",
  "chrono",
  "chrono-tz",
@@ -356,7 +356,7 @@ dependencies = [
  "criterion",
  "ed25519-dalek",
  "fail",
- "fancy-regex 0.19.0",
+ "fancy-regex 0.19.2",
  "flate2",
  "futures-core",
  "futures-util",
@@ -404,7 +404,7 @@ dependencies = [
 
 [[package]]
 name = "bashkit-bench"
-version = "0.18.0"
+version = "0.18.1"
 dependencies = [
  "anyhow",
  "bashkit",
@@ -419,7 +419,7 @@ dependencies = [
 
 [[package]]
 name = "bashkit-capi"
-version = "0.18.0"
+version = "0.18.1"
 dependencies = [
  "bashkit",
  "serde",
@@ -429,7 +429,7 @@ dependencies = [
 
 [[package]]
 name = "bashkit-cli"
-version = "0.18.0"
+version = "0.18.1"
 dependencies = [
  "anyhow",
  "bashkit",
@@ -443,7 +443,7 @@ dependencies = [
 
 [[package]]
 name = "bashkit-coreutils-port"
-version = "0.18.0"
+version = "0.18.1"
 dependencies = [
  "anyhow",
  "prettyplease",
@@ -457,7 +457,7 @@ dependencies = [
 
 [[package]]
 name = "bashkit-eval"
-version = "0.18.0"
+version = "0.18.1"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -474,7 +474,7 @@ dependencies = [
 
 [[package]]
 name = "bashkit-js"
-version = "0.18.0"
+version = "0.18.1"
 dependencies = [
  "bashkit",
  "napi",
@@ -486,7 +486,7 @@ dependencies = [
 
 [[package]]
 name = "bashkit-python"
-version = "0.18.0"
+version = "0.18.1"
 dependencies = [
  "bashkit",
  "num-bigint 0.4.8",
@@ -498,7 +498,7 @@ dependencies = [
 
 [[package]]
 name = "bashkit-wasm"
-version = "0.18.0"
+version = "0.18.1"
 dependencies = [
  "bashkit",
  "console_error_panic_hook",
@@ -561,9 +561,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.13.1"
+version = "2.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da"
+checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06"
 
 [[package]]
 name = "bitvec"
@@ -911,7 +911,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]]
@@ -976,9 +976,9 @@ checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c"
 
 [[package]]
 name = "convert_case"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "affbf0190ed2caf063e3def54ff444b449371d55c58e513a95ab98eca50adb49"
+checksum = "1af709f1f33454bf52eadfc8c78b3b9ef9cb26fb54d16dc9cd9a7299f899fd1b"
 dependencies = [
  "unicode-segmentation",
 ]
@@ -1475,7 +1475,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]]
@@ -1514,9 +1514,9 @@ dependencies = [
 
 [[package]]
 name = "fancy-regex"
-version = "0.19.0"
+version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "476de73bddf2ef8490aa4ee8f1cf40b430bf1d56c48c22080e5186952cd580e6"
+checksum = "d301f5bf187b3c295fce6468d3875037a0bccc5f6b151c63cac2f85babf21912"
 dependencies = [
  "bit-set",
  "regex-automata",
@@ -2938,11 +2938,11 @@ dependencies = [
 
 [[package]]
 name = "napi"
-version = "3.12.2"
+version = "3.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58c5f4d5375213fdb7be2655e152386e82f026f9a5ba36a75556e11359aafe09"
+checksum = "3d2c1d080c842ec1347ebf3cfb9347c15f8c2262f143cc30eea41ddf1c7da720"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.13.2",
  "ctor",
  "futures",
  "libc",
@@ -2955,15 +2955,15 @@ dependencies = [
 
 [[package]]
 name = "napi-build"
-version = "2.4.1"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60fdf9b392c50e7c4170fa633bd909490ed7835cea4c046776d1a4dd8d2ae0ab"
+checksum = "860e7c40864f95cfb83cde99f9ebadd88ef3d9bdccd7dd2cee0cc96a2dd4ffa7"
 
 [[package]]
 name = "napi-derive"
-version = "3.6.3"
+version = "3.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa55ea69990c90b888e9e77044410e304ce7f35de599dc6d0b5c1923d2e59af"
+checksum = "350057056a30368aa76c11a0d406b0aa61321710be2c36656ab4f6efe0b785a2"
 dependencies = [
  "convert_case",
  "ctor",
@@ -2975,9 +2975,9 @@ dependencies = [
 
 [[package]]
 name = "napi-derive-backend"
-version = "6.1.2"
+version = "6.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df4056ac7c18e4438ccf0edaed4340ca0d269278c8ec19284f7b23cb039fd0ae"
+checksum = "4c1c87a71568f3fe5c736b10878ff55064b250bb4ea4b48c8055713e07b9e463"
 dependencies = [
  "convert_case",
  "proc-macro2",
@@ -2988,9 +2988,9 @@ dependencies = [
 
 [[package]]
 name = "napi-sys"
-version = "3.3.0"
+version = "3.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85fbf1fa9f1babfe396d74bbbf52b3643770243e8f5b0b46715d4caf7f0dfc9a"
+checksum = "4d29a242104e456960e6c6479847570be731c1a92b8f8c05ddfb5439e5c09915"
 dependencies = [
  "libloading 0.9.0",
 ]
@@ -3010,7 +3010,7 @@ version = "0.31.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.13.2",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -3176,7 +3176,7 @@ version = "0.117.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4222e4e7a1ab01b2a20420a5a65798377a748ea37ee7ece4d7a6b733f86eb61"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.13.2",
  "oxc_allocator",
  "oxc_ast_macros",
  "oxc_data_structures",
@@ -3254,7 +3254,7 @@ version = "0.117.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3278d4f34d01cdaf85a2391d7b12daba1d95c20c1ff2ac9316d3c28f36353e4e"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.13.2",
  "cow-utils",
  "memchr",
  "num-bigint 0.4.8",
@@ -3277,7 +3277,7 @@ version = "0.117.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3d680252672b22c24abbaf6e401eace0be9f53072a03411936204625ff349d0"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.13.2",
  "oxc_allocator",
  "oxc_ast_macros",
  "oxc_diagnostics",
@@ -3319,7 +3319,7 @@ version = "0.117.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e0f1617f0aa890517fb61ffa1d2d73a8497aca52e84ef6f027fad1e93250eccc"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.13.2",
  "cow-utils",
  "dragonbox_ecma",
  "nonmax",
@@ -3846,7 +3846,7 @@ checksum = "4b45fcc2344c680f5025fe57779faef368840d0bd1f42f216291f0dc4ace4744"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.13.1",
+ "bitflags 2.13.2",
  "num-traits",
  "rand 0.9.5",
  "rand_chacha 0.9.0",
@@ -4124,7 +4124,7 @@ version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.13.2",
 ]
 
 [[package]]
@@ -4164,11 +4164,11 @@ checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
 
 [[package]]
 name = "reqwest"
-version = "0.13.4"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3"
+checksum = "16a1cfa75cc186dd73d5818e510e042e40927bccc9c236b061cea97e1eb08029"
 dependencies = [
- "base64 0.22.1",
+ "base64 0.23.1",
  "bytes",
  "futures-core",
  "futures-util",
@@ -4262,7 +4262,7 @@ checksum = "a10ab966362319801f5e85ce5c6aeac69f0cf50936a31e888f5d004e9279f337"
 dependencies = [
  "aho-corasick",
  "arrayvec",
- "bitflags 2.13.1",
+ "bitflags 2.13.2",
  "compact_str",
  "get-size2",
  "is-macro",
@@ -4281,7 +4281,7 @@ version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4e3b8436fb010636ea79ce545acc3e391296ef4e804f7cef336dd5f9c8a4aa3a"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.13.2",
  "bstr",
  "compact_str",
  "get-size2",
@@ -4303,7 +4303,7 @@ version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c8860927bf42efdabb31ccb2ac9b8f98ee43897b45536f8023e217b158e49a4"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.13.2",
  "unicode-ident",
 ]
 
@@ -4340,13 +4340,13 @@ dependencies = [
 
 [[package]]
 name = "russh"
-version = "0.63.2"
+version = "0.63.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e134e2480f4e86f83e4aa45b4c0a9723f84beaffa694c54bdf056e74efdd7dd"
+checksum = "036204edbd199552a5b3832f63c60dcdf395dc44c7f06b4af1c0e8139cc11bce"
 dependencies = [
  "aes 0.9.3",
  "aws-lc-rs",
- "bitflags 2.13.1",
+ "bitflags 2.13.2",
  "block-padding",
  "byteorder",
  "bytes",
@@ -4464,18 +4464,18 @@ version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.13.2",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.43"
+version = "0.23.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0283386ce02abc0151e1761d08802dfe86c173b0b494af5cbc086574e453da06"
+checksum = "0d41d731c7d2f962d1ccc364cec258de3c0e93b38c2fb3ba97ac74513048d634"
 dependencies = [
  "aws-lc-rs",
  "log",
@@ -4526,7 +4526,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4571,7 +4571,7 @@ version = "18.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53f6a737db68eb1a8ccff86b584b2fc13eca6a7bb6f78ebc7c529547e3ab9684"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.13.2",
  "cfg-if",
  "clipboard-win",
  "home",
@@ -4664,7 +4664,7 @@ version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.13.2",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -5256,7 +5256,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5434,9 +5434,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "1.1.5+spec-1.1.0"
+version = "1.1.6+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12c0ba9680044b4ce98d391a62094047eada0d64860b80166c39f4a6b5640785"
+checksum = "920602543f0911ab71da12c50d59701da54c196d1a2bf5cb4b75667f137a406a"
 dependencies = [
  "indexmap",
  "serde_core",
@@ -5492,7 +5492,7 @@ version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.13.2",
  "bytes",
  "futures-util",
  "http",
@@ -5585,9 +5585,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "turso_core"
-version = "0.8.0-pre.8"
+version = "0.8.0-pre.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8aa9df0e2dd9894ddc61cf6c35e0726f4fc26dd08c584afebd319c1969aaf504"
+checksum = "6bf193fe886c15bb3466800b159e80e558b06e44fab96d796c2584334d80f679"
 dependencies = [
  "aegis",
  "aes 0.8.4",
@@ -5597,7 +5597,7 @@ dependencies = [
  "arc-swap",
  "aristo",
  "bigdecimal",
- "bitflags 2.13.1",
+ "bitflags 2.13.2",
  "branches",
  "bumpalo",
  "bytemuck",
@@ -5657,9 +5657,9 @@ dependencies = [
 
 [[package]]
 name = "turso_ext"
-version = "0.8.0-pre.8"
+version = "0.8.0-pre.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27e351e5f30b21d186a62895761a59a944e209111ea7ba84bf8c611068d87fc"
+checksum = "f01dfa5cc29747c04cae1f76257d1252b5631b4160dd905481abd0aef70dd42f"
 dependencies = [
  "chrono",
  "getrandom 0.4.3",
@@ -5668,9 +5668,9 @@ dependencies = [
 
 [[package]]
 name = "turso_macros"
-version = "0.8.0-pre.8"
+version = "0.8.0-pre.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5c30032b9cd45798d5ed012a3728d9cf4e39a8dbb7d820d82908facb4b665dc"
+checksum = "a7d4b454ff6b89682e5e539ab554c1ead3037e898add8a7a339cce5219019f59"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5679,11 +5679,11 @@ dependencies = [
 
 [[package]]
 name = "turso_parser"
-version = "0.8.0-pre.8"
+version = "0.8.0-pre.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6823c91624d12ae67d6c6dfc819406a279265ca8879307f92c12d7de77bc6846"
+checksum = "fd21798abc4af80114f4da13e5684e2a0c1a50feec3c55e115886701d4e9d3d1"
 dependencies = [
- "bitflags 2.13.1",
+ "bitflags 2.13.2",
  "memchr",
  "miette",
  "strum 0.26.3",
@@ -6067,7 +6067,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.18.0 → bashkit-0.18.1}/Cargo.toml

@@ -7,7 +7,7 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.18.0"
+version = "0.18.1"
 edition = "2024"
 license = "MIT"
 authors = ["Mykhailo Chalyi <mike@chaliy.name>", "Everruns"]

{bashkit-0.18.0 → bashkit-0.18.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bashkit
-Version: 0.18.0
+Version: 0.18.1
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License

{bashkit-0.18.0 → bashkit-0.18.1}/crates/bashkit/README.md

@@ -431,7 +431,7 @@ Enable the `sqlite` feature to embed [Turso](https://github.com/tursodatabase/tu
 
 ```toml
 [dependencies]
-bashkit = { version = "0.18.0", features = ["sqlite"] }
+bashkit = { version = "0.18.1", features = ["sqlite"] }
 ```
 
 ```rust
@@ -615,6 +615,10 @@ precompiled binaries for macOS / Linux (x86-64 + ARM64). It offers stateless
 execution plus persistent sessions backed by the in-memory VFS. Published on
 Hex as `ex_bashkit`. Independent community project, unaffiliated with Everruns.
 
+### .NET (community)
+
+[computerwelt](https://github.com/theolivenbaum/computerwelt) — Community .NET binding for Bashkit. Independent community project, unaffiliated with Everruns.
+
 ## Security
 
 Bashkit is built for running untrusted scripts from AI agents and users. Security is a core design goal, not an afterthought.

{bashkit-0.18.0 → bashkit-0.18.1}/crates/bashkit/docs/logging.md

@@ -14,7 +14,7 @@ Add the `logging` feature to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-bashkit = { version = "0.18.0", features = ["logging"] }
+bashkit = { version = "0.18.1", features = ["logging"] }
 tracing-subscriber = "0.3"  # or your preferred subscriber
 ```
 

{bashkit-0.18.0 → bashkit-0.18.1}/crates/bashkit/docs/sqlite.md

@@ -13,7 +13,7 @@ the `sqlite` feature. The engine is [Turso](https://github.com/tursodatabase/tur
 
 ```toml
 # Cargo.toml
-bashkit = { version = "0.18.0", features = ["sqlite"] }
+bashkit = { version = "0.18.1", features = ["sqlite"] }
 ```
 
 ```rust,ignore

bashkit-0.18.1/crates/bashkit/examples/scripted_tool_clap_builtin.rs

@@ -0,0 +1,120 @@
+//! Clap-backed builtin inside a ScriptedTool.
+//!
+//! Run with:
+//!   cargo run --example scripted_tool_clap_builtin --features scripted_tool
+//!
+//! `ToolDef` + `parse_flags` covers `--key value` argument shapes. A control-plane
+//! command tree that wants positionals, short flags, `--`, or required-argument
+//! checking needs a real CLI parser. `ScriptedToolBuilder::builtin` registers a
+//! raw-argv `Builtin` — including any `ClapBuiltin` — alongside the `ToolDef`
+//! tools, without giving up the logic-only shell's disabled filesystem.
+
+use async_trait::async_trait;
+use bashkit::clap::Parser;
+use bashkit::{BashkitContext, ClapBuiltin, ScriptedTool, Tool, ToolArgs, ToolDef};
+
+#[derive(Parser)]
+#[command(name = "get_agent", about = "Fetch one agent by id")]
+struct GetAgentArgs {
+    /// Positional id — `parse_flags` cannot express this at all.
+    id: String,
+
+    /// Short flag — `parse_flags` has no short-flag syntax.
+    #[arg(short, long, default_value = "text")]
+    format: String,
+}
+
+struct GetAgent;
+
+#[async_trait]
+impl ClapBuiltin for GetAgent {
+    type Args = GetAgentArgs;
+
+    async fn execute_clap(
+        &self,
+        args: Self::Args,
+        ctx: &mut BashkitContext<'_>,
+    ) -> bashkit::Result<()> {
+        ctx.write_stdout(format!("agent={} format={}\n", args.id, args.format));
+        Ok(())
+    }
+}
+
+async fn run(tool: &ScriptedTool, commands: &str) -> anyhow::Result<(String, String, i64)> {
+    let output = tool
+        .execution(serde_json::json!({ "commands": commands }))?
+        .execute()
+        .await?;
+    let result = &output.result;
+    Ok((
+        result["stdout"].as_str().unwrap_or_default().to_string(),
+        result["stderr"].as_str().unwrap_or_default().to_string(),
+        result["exit_code"].as_i64().unwrap_or_default(),
+    ))
+}
+
+#[tokio::main]
+async fn main() -> anyhow::Result<()> {
+    let tool = ScriptedTool::builder("control_plane")
+        .short_description("Control-plane command tree")
+        // Raw-argv builtin: clap owns parsing for this command.
+        .builtin("get_agent", Box::new(GetAgent))
+        // ToolDef command: schema-driven flags, now rejecting typos.
+        .tool_fn(
+            ToolDef::new("list_agents", "List agents").with_schema(serde_json::json!({
+                "type": "object",
+                "properties": { "limit": { "type": "integer" } },
+                "additionalProperties": false
+            })),
+            |args: &ToolArgs| Ok(format!("limit={}\n", args.param_i64("limit").unwrap_or(10))),
+        )
+        .build();
+
+    println!("=== clap builtin inside a ScriptedTool ===\n");
+
+    // Positional argument — impossible through `parse_flags`.
+    let (stdout, _, code) = run(&tool, "get_agent a-42").await?;
+    println!("$ get_agent a-42\n{stdout}");
+    assert_eq!(code, 0);
+    assert_eq!(stdout, "agent=a-42 format=text\n");
+
+    // Short flag — impossible through `parse_flags`.
+    let (stdout, _, _) = run(&tool, "get_agent a-42 -f json").await?;
+    println!("$ get_agent a-42 -f json\n{stdout}");
+    assert_eq!(stdout, "agent=a-42 format=json\n");
+
+    // Missing required argument fails at parse time, with usage.
+    let (_, stderr, code) = run(&tool, "get_agent").await?;
+    println!("$ get_agent\n{stderr}");
+    assert_ne!(code, 0);
+    assert!(stderr.contains("Usage: get_agent"));
+    assert!(!stderr.contains('\u{1b}'), "no ANSI in tool output");
+
+    // Composes with shell logic and the ToolDef commands.
+    let (stdout, _, _) = run(
+        &tool,
+        r#"for id in a-1 a-2; do get_agent "$id" -f json; done; list_agents --limit 2"#,
+    )
+    .await?;
+    println!("$ <loop over get_agent, then list_agents>\n{stdout}");
+    assert_eq!(
+        stdout,
+        "agent=a-1 format=json\nagent=a-2 format=json\nlimit=2\n"
+    );
+
+    // `additionalProperties: false` makes a typo an error rather than a
+    // silently dropped argument — the same rule the tool registry already
+    // applies to structured calls.
+    let (_, stderr, code) = run(&tool, "list_agents --limti 2").await?;
+    println!("$ list_agents --limti 2\n{stderr}");
+    assert_ne!(code, 0);
+    assert!(stderr.contains("unknown flag"));
+
+    // The logic-only filesystem posture is unchanged by the custom builtin.
+    let (_, stderr, code) = run(&tool, "cat /etc/passwd").await?;
+    println!("$ cat /etc/passwd\n{stderr}");
+    assert_ne!(code, 0);
+
+    println!("All assertions passed.");
+    Ok(())
+}