chore: reorg

Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
-members = ["crates/*"]
-exclude = ["crates/brush-core-vendored", "crates/brush-builtins-vendored"]
+members = ["crates/pi-*", "crates/vendor/*"]
+exclude = ["crates/vendor/brush-core", "crates/vendor/brush-builtins"]
 resolver = "3"
 
 [workspace.package]
@@ -12,8 +12,8 @@ homepage = "https://omp.sh/"
 repository = "https://github.com/can1357/oh-my-pi"
 
 [patch.crates-io]
-brush-core = { path = "crates/brush-core-vendored" }
-brush-builtins = { path = "crates/brush-builtins-vendored" }
+brush-core = { path = "crates/vendor/brush-core" }
+brush-builtins = { path = "crates/vendor/brush-builtins" }
 
 [profile.release]
 opt-level = 3
@@ -166,8 +166,8 @@ too_many_lines = "allow"     # Arbitrary limits don't account for necessary comp
 pi-ast = { path = "crates/pi-ast" }
 pi-iso = { path = "crates/pi-iso" }
 pi-shell = { path = "crates/pi-shell" }
-brush-core = { path = "crates/brush-core-vendored" }
-brush-builtins = { path = "crates/brush-builtins-vendored" }
+brush-core = { path = "crates/vendor/brush-core" }
+brush-builtins = { path = "crates/vendor/brush-builtins" }
 
 # ──────────────────────────────────────────────────────────────────────────────
 # Async Runtime & Concurrency

README.md

@@ -536,14 +536,14 @@ For architecture and contribution guidelines, see [packages/coding-agent/DEVELOP
 
 ### Rust Crates
 
-| Crate                                                         | Description                                                                                         |
-| ------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- |
-| **[pi-natives](crates/pi-natives)**                           | Core Rust native addon (N-API `cdylib`) used by `@oh-my-pi/pi-natives`; aggregates the crates below |
-| **[pi-shell](crates/pi-shell)**                               | Embedded shell / PTY / process management split out of `pi-natives` (wraps `brush-*`)               |
-| **[pi-ast](crates/pi-ast)**                                   | tree-sitter-based code summarizer and AST utilities (50+ language grammars)                         |
-| **[pi-iso](crates/pi-iso)**                                   | Task isolation backend resolver: APFS clones, btrfs/zfs reflinks, overlayfs, projfs, rcopy          |
-| **[brush-core-vendored](crates/brush-core-vendored)**         | Vendored fork of [brush-shell](https://github.com/reubeno/brush) for embedded bash execution        |
-| **[brush-builtins-vendored](crates/brush-builtins-vendored)** | Vendored bash builtins (cd, echo, test, printf, read, export, etc.)                                 |
+| Crate                                              | Description                                                                                         |
+| -------------------------------------------------- | --------------------------------------------------------------------------------------------------- |
+| **[pi-natives](crates/pi-natives)**                | Core Rust native addon (N-API `cdylib`) used by `@oh-my-pi/pi-natives`; aggregates the crates below |
+| **[pi-shell](crates/pi-shell)**                    | Embedded shell / PTY / process management split out of `pi-natives` (wraps `brush-*`)               |
+| **[pi-ast](crates/pi-ast)**                        | tree-sitter-based code summarizer and AST utilities (50+ language grammars)                         |
+| **[pi-iso](crates/pi-iso)**                        | Task isolation backend resolver: APFS clones, btrfs/zfs reflinks, overlayfs, projfs, rcopy          |
+| **[brush-core](crates/vendor/brush-core)**         | Vendored fork of [brush-shell](https://github.com/reubeno/brush) for embedded bash execution        |
+| **[brush-builtins](crates/vendor/brush-builtins)** | Vendored bash builtins (cd, echo, test, printf, read, export, etc.)                                 |
 
 ## Contributing
 

crates/pi-shell/Cargo.toml

@@ -27,18 +27,18 @@ tokio-util.workspace = true
 toml.workspace = true
 xxhash-rust.workspace = true
 pi-uutils-ctx = { path = "../pi-uutils-ctx" }
-uu_mkdir = { path = "../uu-mkdir-vendored" }
-uu_head = { path = "../uu-head-vendored" }
-uu_sort = { path = "../uu-sort-vendored" }
-uu_wc = { path = "../uu-wc-vendored" }
-uu_tail = { path = "../uu-tail-vendored" }
-uu_rm = { path = "../uu-rm-vendored" }
-uu_mv = { path = "../uu-mv-vendored" }
-uu_ls = { path = "../uu-ls-vendored" }
-uu_find = { path = "../uu-find-vendored" }
+uu_mkdir = { path = "../vendor/uu-mkdir" }
+uu_head = { path = "../vendor/uu-head" }
+uu_sort = { path = "../vendor/uu-sort" }
+uu_wc = { path = "../vendor/uu-wc" }
+uu_tail = { path = "../vendor/uu-tail" }
+uu_rm = { path = "../vendor/uu-rm" }
+uu_mv = { path = "../vendor/uu-mv" }
+uu_ls = { path = "../vendor/uu-ls" }
+uu_find = { path = "../vendor/uu-find" }
 pi_uu_grep = { path = "../pi-uu-grep" }
-uu_cat = { path = "../uu-cat-vendored" }
-uu_uniq = { path = "../uu-uniq-vendored" }
+uu_cat = { path = "../vendor/uu-cat" }
+uu_uniq = { path = "../vendor/uu-uniq" }
 
 [target.'cfg(unix)'.dependencies]
 libc.workspace = true