diff --git a/Cargo.toml b/Cargo.toml index fa4fdb039..101fbcb11 100644 --- a/Cargo.toml +++ b/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 diff --git a/README.md b/README.md index 8c000fa56..ab6e6682c 100644 --- a/README.md +++ b/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 diff --git a/crates/pi-shell/Cargo.toml b/crates/pi-shell/Cargo.toml index 1b68df629..b697d8cd7 100644 --- a/crates/pi-shell/Cargo.toml +++ b/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 diff --git a/crates/brush-builtins-vendored/Cargo.lock b/crates/vendor/brush-builtins/Cargo.lock similarity index 100% rename from crates/brush-builtins-vendored/Cargo.lock rename to crates/vendor/brush-builtins/Cargo.lock diff --git a/crates/brush-builtins-vendored/Cargo.toml b/crates/vendor/brush-builtins/Cargo.toml similarity index 100% rename from crates/brush-builtins-vendored/Cargo.toml rename to crates/vendor/brush-builtins/Cargo.toml diff --git a/crates/brush-builtins-vendored/LICENSE b/crates/vendor/brush-builtins/LICENSE similarity index 100% rename from crates/brush-builtins-vendored/LICENSE rename to crates/vendor/brush-builtins/LICENSE diff --git a/crates/brush-builtins-vendored/README.md b/crates/vendor/brush-builtins/README.md similarity index 100% rename from crates/brush-builtins-vendored/README.md rename to crates/vendor/brush-builtins/README.md diff --git a/crates/brush-builtins-vendored/src/alias.rs b/crates/vendor/brush-builtins/src/alias.rs similarity index 100% rename from crates/brush-builtins-vendored/src/alias.rs rename to crates/vendor/brush-builtins/src/alias.rs diff --git a/crates/brush-builtins-vendored/src/bg.rs b/crates/vendor/brush-builtins/src/bg.rs similarity index 100% rename from crates/brush-builtins-vendored/src/bg.rs rename to crates/vendor/brush-builtins/src/bg.rs diff --git a/crates/brush-builtins-vendored/src/bind.rs b/crates/vendor/brush-builtins/src/bind.rs similarity index 100% rename from crates/brush-builtins-vendored/src/bind.rs rename to crates/vendor/brush-builtins/src/bind.rs diff --git a/crates/brush-builtins-vendored/src/break_.rs b/crates/vendor/brush-builtins/src/break_.rs similarity index 100% rename from crates/brush-builtins-vendored/src/break_.rs rename to crates/vendor/brush-builtins/src/break_.rs diff --git a/crates/brush-builtins-vendored/src/builder.rs b/crates/vendor/brush-builtins/src/builder.rs similarity index 100% rename from crates/brush-builtins-vendored/src/builder.rs rename to crates/vendor/brush-builtins/src/builder.rs diff --git a/crates/brush-builtins-vendored/src/builtin_.rs b/crates/vendor/brush-builtins/src/builtin_.rs similarity index 100% rename from crates/brush-builtins-vendored/src/builtin_.rs rename to crates/vendor/brush-builtins/src/builtin_.rs diff --git a/crates/brush-builtins-vendored/src/caller.rs b/crates/vendor/brush-builtins/src/caller.rs similarity index 100% rename from crates/brush-builtins-vendored/src/caller.rs rename to crates/vendor/brush-builtins/src/caller.rs diff --git a/crates/brush-builtins-vendored/src/cd.rs b/crates/vendor/brush-builtins/src/cd.rs similarity index 100% rename from crates/brush-builtins-vendored/src/cd.rs rename to crates/vendor/brush-builtins/src/cd.rs diff --git a/crates/brush-builtins-vendored/src/colon.rs b/crates/vendor/brush-builtins/src/colon.rs similarity index 100% rename from crates/brush-builtins-vendored/src/colon.rs rename to crates/vendor/brush-builtins/src/colon.rs diff --git a/crates/brush-builtins-vendored/src/command.rs b/crates/vendor/brush-builtins/src/command.rs similarity index 100% rename from crates/brush-builtins-vendored/src/command.rs rename to crates/vendor/brush-builtins/src/command.rs diff --git a/crates/brush-builtins-vendored/src/complete.rs b/crates/vendor/brush-builtins/src/complete.rs similarity index 100% rename from crates/brush-builtins-vendored/src/complete.rs rename to crates/vendor/brush-builtins/src/complete.rs diff --git a/crates/brush-builtins-vendored/src/continue_.rs b/crates/vendor/brush-builtins/src/continue_.rs similarity index 100% rename from crates/brush-builtins-vendored/src/continue_.rs rename to crates/vendor/brush-builtins/src/continue_.rs diff --git a/crates/brush-builtins-vendored/src/declare.rs b/crates/vendor/brush-builtins/src/declare.rs similarity index 100% rename from crates/brush-builtins-vendored/src/declare.rs rename to crates/vendor/brush-builtins/src/declare.rs diff --git a/crates/brush-builtins-vendored/src/dirs.rs b/crates/vendor/brush-builtins/src/dirs.rs similarity index 100% rename from crates/brush-builtins-vendored/src/dirs.rs rename to crates/vendor/brush-builtins/src/dirs.rs diff --git a/crates/brush-builtins-vendored/src/dot.rs b/crates/vendor/brush-builtins/src/dot.rs similarity index 100% rename from crates/brush-builtins-vendored/src/dot.rs rename to crates/vendor/brush-builtins/src/dot.rs diff --git a/crates/brush-builtins-vendored/src/echo.rs b/crates/vendor/brush-builtins/src/echo.rs similarity index 100% rename from crates/brush-builtins-vendored/src/echo.rs rename to crates/vendor/brush-builtins/src/echo.rs diff --git a/crates/brush-builtins-vendored/src/enable.rs b/crates/vendor/brush-builtins/src/enable.rs similarity index 100% rename from crates/brush-builtins-vendored/src/enable.rs rename to crates/vendor/brush-builtins/src/enable.rs diff --git a/crates/brush-builtins-vendored/src/eval.rs b/crates/vendor/brush-builtins/src/eval.rs similarity index 100% rename from crates/brush-builtins-vendored/src/eval.rs rename to crates/vendor/brush-builtins/src/eval.rs diff --git a/crates/brush-builtins-vendored/src/exec.rs b/crates/vendor/brush-builtins/src/exec.rs similarity index 100% rename from crates/brush-builtins-vendored/src/exec.rs rename to crates/vendor/brush-builtins/src/exec.rs diff --git a/crates/brush-builtins-vendored/src/exit.rs b/crates/vendor/brush-builtins/src/exit.rs similarity index 100% rename from crates/brush-builtins-vendored/src/exit.rs rename to crates/vendor/brush-builtins/src/exit.rs diff --git a/crates/brush-builtins-vendored/src/export.rs b/crates/vendor/brush-builtins/src/export.rs similarity index 100% rename from crates/brush-builtins-vendored/src/export.rs rename to crates/vendor/brush-builtins/src/export.rs diff --git a/crates/brush-builtins-vendored/src/factory.rs b/crates/vendor/brush-builtins/src/factory.rs similarity index 100% rename from crates/brush-builtins-vendored/src/factory.rs rename to crates/vendor/brush-builtins/src/factory.rs diff --git a/crates/brush-builtins-vendored/src/false_.rs b/crates/vendor/brush-builtins/src/false_.rs similarity index 100% rename from crates/brush-builtins-vendored/src/false_.rs rename to crates/vendor/brush-builtins/src/false_.rs diff --git a/crates/brush-builtins-vendored/src/fc.rs b/crates/vendor/brush-builtins/src/fc.rs similarity index 100% rename from crates/brush-builtins-vendored/src/fc.rs rename to crates/vendor/brush-builtins/src/fc.rs diff --git a/crates/brush-builtins-vendored/src/fg.rs b/crates/vendor/brush-builtins/src/fg.rs similarity index 100% rename from crates/brush-builtins-vendored/src/fg.rs rename to crates/vendor/brush-builtins/src/fg.rs diff --git a/crates/brush-builtins-vendored/src/getopts.rs b/crates/vendor/brush-builtins/src/getopts.rs similarity index 100% rename from crates/brush-builtins-vendored/src/getopts.rs rename to crates/vendor/brush-builtins/src/getopts.rs diff --git a/crates/brush-builtins-vendored/src/hash.rs b/crates/vendor/brush-builtins/src/hash.rs similarity index 100% rename from crates/brush-builtins-vendored/src/hash.rs rename to crates/vendor/brush-builtins/src/hash.rs diff --git a/crates/brush-builtins-vendored/src/help.rs b/crates/vendor/brush-builtins/src/help.rs similarity index 100% rename from crates/brush-builtins-vendored/src/help.rs rename to crates/vendor/brush-builtins/src/help.rs diff --git a/crates/brush-builtins-vendored/src/history.rs b/crates/vendor/brush-builtins/src/history.rs similarity index 100% rename from crates/brush-builtins-vendored/src/history.rs rename to crates/vendor/brush-builtins/src/history.rs diff --git a/crates/brush-builtins-vendored/src/jobs.rs b/crates/vendor/brush-builtins/src/jobs.rs similarity index 100% rename from crates/brush-builtins-vendored/src/jobs.rs rename to crates/vendor/brush-builtins/src/jobs.rs diff --git a/crates/brush-builtins-vendored/src/kill.rs b/crates/vendor/brush-builtins/src/kill.rs similarity index 100% rename from crates/brush-builtins-vendored/src/kill.rs rename to crates/vendor/brush-builtins/src/kill.rs diff --git a/crates/brush-builtins-vendored/src/let_.rs b/crates/vendor/brush-builtins/src/let_.rs similarity index 100% rename from crates/brush-builtins-vendored/src/let_.rs rename to crates/vendor/brush-builtins/src/let_.rs diff --git a/crates/brush-builtins-vendored/src/lib.rs b/crates/vendor/brush-builtins/src/lib.rs similarity index 100% rename from crates/brush-builtins-vendored/src/lib.rs rename to crates/vendor/brush-builtins/src/lib.rs diff --git a/crates/brush-builtins-vendored/src/mapfile.rs b/crates/vendor/brush-builtins/src/mapfile.rs similarity index 100% rename from crates/brush-builtins-vendored/src/mapfile.rs rename to crates/vendor/brush-builtins/src/mapfile.rs diff --git a/crates/brush-builtins-vendored/src/popd.rs b/crates/vendor/brush-builtins/src/popd.rs similarity index 100% rename from crates/brush-builtins-vendored/src/popd.rs rename to crates/vendor/brush-builtins/src/popd.rs diff --git a/crates/brush-builtins-vendored/src/printf.rs b/crates/vendor/brush-builtins/src/printf.rs similarity index 100% rename from crates/brush-builtins-vendored/src/printf.rs rename to crates/vendor/brush-builtins/src/printf.rs diff --git a/crates/brush-builtins-vendored/src/pushd.rs b/crates/vendor/brush-builtins/src/pushd.rs similarity index 100% rename from crates/brush-builtins-vendored/src/pushd.rs rename to crates/vendor/brush-builtins/src/pushd.rs diff --git a/crates/brush-builtins-vendored/src/pwd.rs b/crates/vendor/brush-builtins/src/pwd.rs similarity index 100% rename from crates/brush-builtins-vendored/src/pwd.rs rename to crates/vendor/brush-builtins/src/pwd.rs diff --git a/crates/brush-builtins-vendored/src/read.rs b/crates/vendor/brush-builtins/src/read.rs similarity index 100% rename from crates/brush-builtins-vendored/src/read.rs rename to crates/vendor/brush-builtins/src/read.rs diff --git a/crates/brush-builtins-vendored/src/return_.rs b/crates/vendor/brush-builtins/src/return_.rs similarity index 100% rename from crates/brush-builtins-vendored/src/return_.rs rename to crates/vendor/brush-builtins/src/return_.rs diff --git a/crates/brush-builtins-vendored/src/set.rs b/crates/vendor/brush-builtins/src/set.rs similarity index 100% rename from crates/brush-builtins-vendored/src/set.rs rename to crates/vendor/brush-builtins/src/set.rs diff --git a/crates/brush-builtins-vendored/src/shift.rs b/crates/vendor/brush-builtins/src/shift.rs similarity index 100% rename from crates/brush-builtins-vendored/src/shift.rs rename to crates/vendor/brush-builtins/src/shift.rs diff --git a/crates/brush-builtins-vendored/src/shopt.rs b/crates/vendor/brush-builtins/src/shopt.rs similarity index 100% rename from crates/brush-builtins-vendored/src/shopt.rs rename to crates/vendor/brush-builtins/src/shopt.rs diff --git a/crates/brush-builtins-vendored/src/suspend.rs b/crates/vendor/brush-builtins/src/suspend.rs similarity index 100% rename from crates/brush-builtins-vendored/src/suspend.rs rename to crates/vendor/brush-builtins/src/suspend.rs diff --git a/crates/brush-builtins-vendored/src/test.rs b/crates/vendor/brush-builtins/src/test.rs similarity index 100% rename from crates/brush-builtins-vendored/src/test.rs rename to crates/vendor/brush-builtins/src/test.rs diff --git a/crates/brush-builtins-vendored/src/times.rs b/crates/vendor/brush-builtins/src/times.rs similarity index 100% rename from crates/brush-builtins-vendored/src/times.rs rename to crates/vendor/brush-builtins/src/times.rs diff --git a/crates/brush-builtins-vendored/src/trap.rs b/crates/vendor/brush-builtins/src/trap.rs similarity index 100% rename from crates/brush-builtins-vendored/src/trap.rs rename to crates/vendor/brush-builtins/src/trap.rs diff --git a/crates/brush-builtins-vendored/src/true_.rs b/crates/vendor/brush-builtins/src/true_.rs similarity index 100% rename from crates/brush-builtins-vendored/src/true_.rs rename to crates/vendor/brush-builtins/src/true_.rs diff --git a/crates/brush-builtins-vendored/src/type_.rs b/crates/vendor/brush-builtins/src/type_.rs similarity index 100% rename from crates/brush-builtins-vendored/src/type_.rs rename to crates/vendor/brush-builtins/src/type_.rs diff --git a/crates/brush-builtins-vendored/src/ulimit.rs b/crates/vendor/brush-builtins/src/ulimit.rs similarity index 100% rename from crates/brush-builtins-vendored/src/ulimit.rs rename to crates/vendor/brush-builtins/src/ulimit.rs diff --git a/crates/brush-builtins-vendored/src/umask.rs b/crates/vendor/brush-builtins/src/umask.rs similarity index 100% rename from crates/brush-builtins-vendored/src/umask.rs rename to crates/vendor/brush-builtins/src/umask.rs diff --git a/crates/brush-builtins-vendored/src/unalias.rs b/crates/vendor/brush-builtins/src/unalias.rs similarity index 100% rename from crates/brush-builtins-vendored/src/unalias.rs rename to crates/vendor/brush-builtins/src/unalias.rs diff --git a/crates/brush-builtins-vendored/src/unimp.rs b/crates/vendor/brush-builtins/src/unimp.rs similarity index 100% rename from crates/brush-builtins-vendored/src/unimp.rs rename to crates/vendor/brush-builtins/src/unimp.rs diff --git a/crates/brush-builtins-vendored/src/unset.rs b/crates/vendor/brush-builtins/src/unset.rs similarity index 100% rename from crates/brush-builtins-vendored/src/unset.rs rename to crates/vendor/brush-builtins/src/unset.rs diff --git a/crates/brush-builtins-vendored/src/wait.rs b/crates/vendor/brush-builtins/src/wait.rs similarity index 100% rename from crates/brush-builtins-vendored/src/wait.rs rename to crates/vendor/brush-builtins/src/wait.rs diff --git a/crates/brush-core-vendored/Cargo.lock b/crates/vendor/brush-core/Cargo.lock similarity index 100% rename from crates/brush-core-vendored/Cargo.lock rename to crates/vendor/brush-core/Cargo.lock diff --git a/crates/brush-core-vendored/Cargo.toml b/crates/vendor/brush-core/Cargo.toml similarity index 100% rename from crates/brush-core-vendored/Cargo.toml rename to crates/vendor/brush-core/Cargo.toml diff --git a/crates/brush-core-vendored/LICENSE b/crates/vendor/brush-core/LICENSE similarity index 100% rename from crates/brush-core-vendored/LICENSE rename to crates/vendor/brush-core/LICENSE diff --git a/crates/brush-core-vendored/README.md b/crates/vendor/brush-core/README.md similarity index 100% rename from crates/brush-core-vendored/README.md rename to crates/vendor/brush-core/README.md diff --git a/crates/brush-core-vendored/examples/call-func.rs b/crates/vendor/brush-core/examples/call-func.rs similarity index 100% rename from crates/brush-core-vendored/examples/call-func.rs rename to crates/vendor/brush-core/examples/call-func.rs diff --git a/crates/brush-core-vendored/examples/custom-builtin.rs b/crates/vendor/brush-core/examples/custom-builtin.rs similarity index 100% rename from crates/brush-core-vendored/examples/custom-builtin.rs rename to crates/vendor/brush-core/examples/custom-builtin.rs diff --git a/crates/brush-core-vendored/src/arithmetic.rs b/crates/vendor/brush-core/src/arithmetic.rs similarity index 100% rename from crates/brush-core-vendored/src/arithmetic.rs rename to crates/vendor/brush-core/src/arithmetic.rs diff --git a/crates/brush-core-vendored/src/braceexpansion.rs b/crates/vendor/brush-core/src/braceexpansion.rs similarity index 100% rename from crates/brush-core-vendored/src/braceexpansion.rs rename to crates/vendor/brush-core/src/braceexpansion.rs diff --git a/crates/brush-core-vendored/src/builtins.rs b/crates/vendor/brush-core/src/builtins.rs similarity index 100% rename from crates/brush-core-vendored/src/builtins.rs rename to crates/vendor/brush-core/src/builtins.rs diff --git a/crates/brush-core-vendored/src/callstack.rs b/crates/vendor/brush-core/src/callstack.rs similarity index 100% rename from crates/brush-core-vendored/src/callstack.rs rename to crates/vendor/brush-core/src/callstack.rs diff --git a/crates/brush-core-vendored/src/commands.rs b/crates/vendor/brush-core/src/commands.rs similarity index 100% rename from crates/brush-core-vendored/src/commands.rs rename to crates/vendor/brush-core/src/commands.rs diff --git a/crates/brush-core-vendored/src/completion.rs b/crates/vendor/brush-core/src/completion.rs similarity index 100% rename from crates/brush-core-vendored/src/completion.rs rename to crates/vendor/brush-core/src/completion.rs diff --git a/crates/brush-core-vendored/src/env.rs b/crates/vendor/brush-core/src/env.rs similarity index 100% rename from crates/brush-core-vendored/src/env.rs rename to crates/vendor/brush-core/src/env.rs diff --git a/crates/brush-core-vendored/src/error.rs b/crates/vendor/brush-core/src/error.rs similarity index 100% rename from crates/brush-core-vendored/src/error.rs rename to crates/vendor/brush-core/src/error.rs diff --git a/crates/brush-core-vendored/src/escape.rs b/crates/vendor/brush-core/src/escape.rs similarity index 100% rename from crates/brush-core-vendored/src/escape.rs rename to crates/vendor/brush-core/src/escape.rs diff --git a/crates/brush-core-vendored/src/expansion.rs b/crates/vendor/brush-core/src/expansion.rs similarity index 100% rename from crates/brush-core-vendored/src/expansion.rs rename to crates/vendor/brush-core/src/expansion.rs diff --git a/crates/brush-core-vendored/src/extendedtests.rs b/crates/vendor/brush-core/src/extendedtests.rs similarity index 100% rename from crates/brush-core-vendored/src/extendedtests.rs rename to crates/vendor/brush-core/src/extendedtests.rs diff --git a/crates/brush-core-vendored/src/extensions.rs b/crates/vendor/brush-core/src/extensions.rs similarity index 100% rename from crates/brush-core-vendored/src/extensions.rs rename to crates/vendor/brush-core/src/extensions.rs diff --git a/crates/brush-core-vendored/src/functions.rs b/crates/vendor/brush-core/src/functions.rs similarity index 100% rename from crates/brush-core-vendored/src/functions.rs rename to crates/vendor/brush-core/src/functions.rs diff --git a/crates/brush-core-vendored/src/history.rs b/crates/vendor/brush-core/src/history.rs similarity index 100% rename from crates/brush-core-vendored/src/history.rs rename to crates/vendor/brush-core/src/history.rs diff --git a/crates/brush-core-vendored/src/int_utils.rs b/crates/vendor/brush-core/src/int_utils.rs similarity index 100% rename from crates/brush-core-vendored/src/int_utils.rs rename to crates/vendor/brush-core/src/int_utils.rs diff --git a/crates/brush-core-vendored/src/interfaces.rs b/crates/vendor/brush-core/src/interfaces.rs similarity index 100% rename from crates/brush-core-vendored/src/interfaces.rs rename to crates/vendor/brush-core/src/interfaces.rs diff --git a/crates/brush-core-vendored/src/interfaces/keybindings.rs b/crates/vendor/brush-core/src/interfaces/keybindings.rs similarity index 100% rename from crates/brush-core-vendored/src/interfaces/keybindings.rs rename to crates/vendor/brush-core/src/interfaces/keybindings.rs diff --git a/crates/brush-core-vendored/src/interp.rs b/crates/vendor/brush-core/src/interp.rs similarity index 100% rename from crates/brush-core-vendored/src/interp.rs rename to crates/vendor/brush-core/src/interp.rs diff --git a/crates/brush-core-vendored/src/ioutils.rs b/crates/vendor/brush-core/src/ioutils.rs similarity index 100% rename from crates/brush-core-vendored/src/ioutils.rs rename to crates/vendor/brush-core/src/ioutils.rs diff --git a/crates/brush-core-vendored/src/jobs.rs b/crates/vendor/brush-core/src/jobs.rs similarity index 100% rename from crates/brush-core-vendored/src/jobs.rs rename to crates/vendor/brush-core/src/jobs.rs diff --git a/crates/brush-core-vendored/src/keywords.rs b/crates/vendor/brush-core/src/keywords.rs similarity index 100% rename from crates/brush-core-vendored/src/keywords.rs rename to crates/vendor/brush-core/src/keywords.rs diff --git a/crates/brush-core-vendored/src/lib.rs b/crates/vendor/brush-core/src/lib.rs similarity index 100% rename from crates/brush-core-vendored/src/lib.rs rename to crates/vendor/brush-core/src/lib.rs diff --git a/crates/brush-core-vendored/src/namedoptions.rs b/crates/vendor/brush-core/src/namedoptions.rs similarity index 100% rename from crates/brush-core-vendored/src/namedoptions.rs rename to crates/vendor/brush-core/src/namedoptions.rs diff --git a/crates/brush-core-vendored/src/openfiles.rs b/crates/vendor/brush-core/src/openfiles.rs similarity index 100% rename from crates/brush-core-vendored/src/openfiles.rs rename to crates/vendor/brush-core/src/openfiles.rs diff --git a/crates/brush-core-vendored/src/options.rs b/crates/vendor/brush-core/src/options.rs similarity index 100% rename from crates/brush-core-vendored/src/options.rs rename to crates/vendor/brush-core/src/options.rs diff --git a/crates/brush-core-vendored/src/pathcache.rs b/crates/vendor/brush-core/src/pathcache.rs similarity index 100% rename from crates/brush-core-vendored/src/pathcache.rs rename to crates/vendor/brush-core/src/pathcache.rs diff --git a/crates/brush-core-vendored/src/pathsearch.rs b/crates/vendor/brush-core/src/pathsearch.rs similarity index 100% rename from crates/brush-core-vendored/src/pathsearch.rs rename to crates/vendor/brush-core/src/pathsearch.rs diff --git a/crates/brush-core-vendored/src/patterns.rs b/crates/vendor/brush-core/src/patterns.rs similarity index 100% rename from crates/brush-core-vendored/src/patterns.rs rename to crates/vendor/brush-core/src/patterns.rs diff --git a/crates/brush-core-vendored/src/processes.rs b/crates/vendor/brush-core/src/processes.rs similarity index 100% rename from crates/brush-core-vendored/src/processes.rs rename to crates/vendor/brush-core/src/processes.rs diff --git a/crates/brush-core-vendored/src/prompt.rs b/crates/vendor/brush-core/src/prompt.rs similarity index 100% rename from crates/brush-core-vendored/src/prompt.rs rename to crates/vendor/brush-core/src/prompt.rs diff --git a/crates/brush-core-vendored/src/regex.rs b/crates/vendor/brush-core/src/regex.rs similarity index 100% rename from crates/brush-core-vendored/src/regex.rs rename to crates/vendor/brush-core/src/regex.rs diff --git a/crates/brush-core-vendored/src/results.rs b/crates/vendor/brush-core/src/results.rs similarity index 100% rename from crates/brush-core-vendored/src/results.rs rename to crates/vendor/brush-core/src/results.rs diff --git a/crates/brush-core-vendored/src/shell.rs b/crates/vendor/brush-core/src/shell.rs similarity index 100% rename from crates/brush-core-vendored/src/shell.rs rename to crates/vendor/brush-core/src/shell.rs diff --git a/crates/brush-core-vendored/src/shell/builder.rs b/crates/vendor/brush-core/src/shell/builder.rs similarity index 100% rename from crates/brush-core-vendored/src/shell/builder.rs rename to crates/vendor/brush-core/src/shell/builder.rs diff --git a/crates/brush-core-vendored/src/shell/builtin_registry.rs b/crates/vendor/brush-core/src/shell/builtin_registry.rs similarity index 100% rename from crates/brush-core-vendored/src/shell/builtin_registry.rs rename to crates/vendor/brush-core/src/shell/builtin_registry.rs diff --git a/crates/brush-core-vendored/src/shell/callstack.rs b/crates/vendor/brush-core/src/shell/callstack.rs similarity index 100% rename from crates/brush-core-vendored/src/shell/callstack.rs rename to crates/vendor/brush-core/src/shell/callstack.rs diff --git a/crates/brush-core-vendored/src/shell/completion.rs b/crates/vendor/brush-core/src/shell/completion.rs similarity index 100% rename from crates/brush-core-vendored/src/shell/completion.rs rename to crates/vendor/brush-core/src/shell/completion.rs diff --git a/crates/brush-core-vendored/src/shell/env.rs b/crates/vendor/brush-core/src/shell/env.rs similarity index 100% rename from crates/brush-core-vendored/src/shell/env.rs rename to crates/vendor/brush-core/src/shell/env.rs diff --git a/crates/brush-core-vendored/src/shell/execution.rs b/crates/vendor/brush-core/src/shell/execution.rs similarity index 100% rename from crates/brush-core-vendored/src/shell/execution.rs rename to crates/vendor/brush-core/src/shell/execution.rs diff --git a/crates/brush-core-vendored/src/shell/expansion.rs b/crates/vendor/brush-core/src/shell/expansion.rs similarity index 100% rename from crates/brush-core-vendored/src/shell/expansion.rs rename to crates/vendor/brush-core/src/shell/expansion.rs diff --git a/crates/brush-core-vendored/src/shell/fs.rs b/crates/vendor/brush-core/src/shell/fs.rs similarity index 100% rename from crates/brush-core-vendored/src/shell/fs.rs rename to crates/vendor/brush-core/src/shell/fs.rs diff --git a/crates/brush-core-vendored/src/shell/funcs.rs b/crates/vendor/brush-core/src/shell/funcs.rs similarity index 100% rename from crates/brush-core-vendored/src/shell/funcs.rs rename to crates/vendor/brush-core/src/shell/funcs.rs diff --git a/crates/brush-core-vendored/src/shell/history.rs b/crates/vendor/brush-core/src/shell/history.rs similarity index 100% rename from crates/brush-core-vendored/src/shell/history.rs rename to crates/vendor/brush-core/src/shell/history.rs diff --git a/crates/brush-core-vendored/src/shell/initscripts.rs b/crates/vendor/brush-core/src/shell/initscripts.rs similarity index 100% rename from crates/brush-core-vendored/src/shell/initscripts.rs rename to crates/vendor/brush-core/src/shell/initscripts.rs diff --git a/crates/brush-core-vendored/src/shell/io.rs b/crates/vendor/brush-core/src/shell/io.rs similarity index 100% rename from crates/brush-core-vendored/src/shell/io.rs rename to crates/vendor/brush-core/src/shell/io.rs diff --git a/crates/brush-core-vendored/src/shell/job_control.rs b/crates/vendor/brush-core/src/shell/job_control.rs similarity index 100% rename from crates/brush-core-vendored/src/shell/job_control.rs rename to crates/vendor/brush-core/src/shell/job_control.rs diff --git a/crates/brush-core-vendored/src/shell/parsing.rs b/crates/vendor/brush-core/src/shell/parsing.rs similarity index 100% rename from crates/brush-core-vendored/src/shell/parsing.rs rename to crates/vendor/brush-core/src/shell/parsing.rs diff --git a/crates/brush-core-vendored/src/shell/prompts.rs b/crates/vendor/brush-core/src/shell/prompts.rs similarity index 100% rename from crates/brush-core-vendored/src/shell/prompts.rs rename to crates/vendor/brush-core/src/shell/prompts.rs diff --git a/crates/brush-core-vendored/src/shell/readline.rs b/crates/vendor/brush-core/src/shell/readline.rs similarity index 100% rename from crates/brush-core-vendored/src/shell/readline.rs rename to crates/vendor/brush-core/src/shell/readline.rs diff --git a/crates/brush-core-vendored/src/shell/state.rs b/crates/vendor/brush-core/src/shell/state.rs similarity index 100% rename from crates/brush-core-vendored/src/shell/state.rs rename to crates/vendor/brush-core/src/shell/state.rs diff --git a/crates/brush-core-vendored/src/shell/traps.rs b/crates/vendor/brush-core/src/shell/traps.rs similarity index 100% rename from crates/brush-core-vendored/src/shell/traps.rs rename to crates/vendor/brush-core/src/shell/traps.rs diff --git a/crates/brush-core-vendored/src/sourceinfo.rs b/crates/vendor/brush-core/src/sourceinfo.rs similarity index 100% rename from crates/brush-core-vendored/src/sourceinfo.rs rename to crates/vendor/brush-core/src/sourceinfo.rs diff --git a/crates/brush-core-vendored/src/sys.rs b/crates/vendor/brush-core/src/sys.rs similarity index 100% rename from crates/brush-core-vendored/src/sys.rs rename to crates/vendor/brush-core/src/sys.rs diff --git a/crates/brush-core-vendored/src/sys/fs.rs b/crates/vendor/brush-core/src/sys/fs.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/fs.rs rename to crates/vendor/brush-core/src/sys/fs.rs diff --git a/crates/brush-core-vendored/src/sys/hostname.rs b/crates/vendor/brush-core/src/sys/hostname.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/hostname.rs rename to crates/vendor/brush-core/src/sys/hostname.rs diff --git a/crates/brush-core-vendored/src/sys/stubs.rs b/crates/vendor/brush-core/src/sys/stubs.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/stubs.rs rename to crates/vendor/brush-core/src/sys/stubs.rs diff --git a/crates/brush-core-vendored/src/sys/stubs/async_pipe.rs b/crates/vendor/brush-core/src/sys/stubs/async_pipe.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/stubs/async_pipe.rs rename to crates/vendor/brush-core/src/sys/stubs/async_pipe.rs diff --git a/crates/brush-core-vendored/src/sys/stubs/commands.rs b/crates/vendor/brush-core/src/sys/stubs/commands.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/stubs/commands.rs rename to crates/vendor/brush-core/src/sys/stubs/commands.rs diff --git a/crates/brush-core-vendored/src/sys/stubs/env.rs b/crates/vendor/brush-core/src/sys/stubs/env.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/stubs/env.rs rename to crates/vendor/brush-core/src/sys/stubs/env.rs diff --git a/crates/brush-core-vendored/src/sys/stubs/fd.rs b/crates/vendor/brush-core/src/sys/stubs/fd.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/stubs/fd.rs rename to crates/vendor/brush-core/src/sys/stubs/fd.rs diff --git a/crates/brush-core-vendored/src/sys/stubs/fs.rs b/crates/vendor/brush-core/src/sys/stubs/fs.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/stubs/fs.rs rename to crates/vendor/brush-core/src/sys/stubs/fs.rs diff --git a/crates/brush-core-vendored/src/sys/stubs/input.rs b/crates/vendor/brush-core/src/sys/stubs/input.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/stubs/input.rs rename to crates/vendor/brush-core/src/sys/stubs/input.rs diff --git a/crates/brush-core-vendored/src/sys/stubs/network.rs b/crates/vendor/brush-core/src/sys/stubs/network.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/stubs/network.rs rename to crates/vendor/brush-core/src/sys/stubs/network.rs diff --git a/crates/brush-core-vendored/src/sys/stubs/pipes.rs b/crates/vendor/brush-core/src/sys/stubs/pipes.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/stubs/pipes.rs rename to crates/vendor/brush-core/src/sys/stubs/pipes.rs diff --git a/crates/brush-core-vendored/src/sys/stubs/poll.rs b/crates/vendor/brush-core/src/sys/stubs/poll.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/stubs/poll.rs rename to crates/vendor/brush-core/src/sys/stubs/poll.rs diff --git a/crates/brush-core-vendored/src/sys/stubs/process.rs b/crates/vendor/brush-core/src/sys/stubs/process.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/stubs/process.rs rename to crates/vendor/brush-core/src/sys/stubs/process.rs diff --git a/crates/brush-core-vendored/src/sys/stubs/resource.rs b/crates/vendor/brush-core/src/sys/stubs/resource.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/stubs/resource.rs rename to crates/vendor/brush-core/src/sys/stubs/resource.rs diff --git a/crates/brush-core-vendored/src/sys/stubs/signal.rs b/crates/vendor/brush-core/src/sys/stubs/signal.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/stubs/signal.rs rename to crates/vendor/brush-core/src/sys/stubs/signal.rs diff --git a/crates/brush-core-vendored/src/sys/stubs/terminal.rs b/crates/vendor/brush-core/src/sys/stubs/terminal.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/stubs/terminal.rs rename to crates/vendor/brush-core/src/sys/stubs/terminal.rs diff --git a/crates/brush-core-vendored/src/sys/stubs/users.rs b/crates/vendor/brush-core/src/sys/stubs/users.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/stubs/users.rs rename to crates/vendor/brush-core/src/sys/stubs/users.rs diff --git a/crates/brush-core-vendored/src/sys/tokio_process.rs b/crates/vendor/brush-core/src/sys/tokio_process.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/tokio_process.rs rename to crates/vendor/brush-core/src/sys/tokio_process.rs diff --git a/crates/brush-core-vendored/src/sys/unix.rs b/crates/vendor/brush-core/src/sys/unix.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/unix.rs rename to crates/vendor/brush-core/src/sys/unix.rs diff --git a/crates/brush-core-vendored/src/sys/unix/async_pipe.rs b/crates/vendor/brush-core/src/sys/unix/async_pipe.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/unix/async_pipe.rs rename to crates/vendor/brush-core/src/sys/unix/async_pipe.rs diff --git a/crates/brush-core-vendored/src/sys/unix/commands.rs b/crates/vendor/brush-core/src/sys/unix/commands.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/unix/commands.rs rename to crates/vendor/brush-core/src/sys/unix/commands.rs diff --git a/crates/brush-core-vendored/src/sys/unix/env.rs b/crates/vendor/brush-core/src/sys/unix/env.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/unix/env.rs rename to crates/vendor/brush-core/src/sys/unix/env.rs diff --git a/crates/brush-core-vendored/src/sys/unix/fd.rs b/crates/vendor/brush-core/src/sys/unix/fd.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/unix/fd.rs rename to crates/vendor/brush-core/src/sys/unix/fd.rs diff --git a/crates/brush-core-vendored/src/sys/unix/fs.rs b/crates/vendor/brush-core/src/sys/unix/fs.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/unix/fs.rs rename to crates/vendor/brush-core/src/sys/unix/fs.rs diff --git a/crates/brush-core-vendored/src/sys/unix/input.rs b/crates/vendor/brush-core/src/sys/unix/input.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/unix/input.rs rename to crates/vendor/brush-core/src/sys/unix/input.rs diff --git a/crates/brush-core-vendored/src/sys/unix/network.rs b/crates/vendor/brush-core/src/sys/unix/network.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/unix/network.rs rename to crates/vendor/brush-core/src/sys/unix/network.rs diff --git a/crates/brush-core-vendored/src/sys/unix/poll.rs b/crates/vendor/brush-core/src/sys/unix/poll.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/unix/poll.rs rename to crates/vendor/brush-core/src/sys/unix/poll.rs diff --git a/crates/brush-core-vendored/src/sys/unix/resource.rs b/crates/vendor/brush-core/src/sys/unix/resource.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/unix/resource.rs rename to crates/vendor/brush-core/src/sys/unix/resource.rs diff --git a/crates/brush-core-vendored/src/sys/unix/signal.rs b/crates/vendor/brush-core/src/sys/unix/signal.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/unix/signal.rs rename to crates/vendor/brush-core/src/sys/unix/signal.rs diff --git a/crates/brush-core-vendored/src/sys/unix/terminal.rs b/crates/vendor/brush-core/src/sys/unix/terminal.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/unix/terminal.rs rename to crates/vendor/brush-core/src/sys/unix/terminal.rs diff --git a/crates/brush-core-vendored/src/sys/unix/users.rs b/crates/vendor/brush-core/src/sys/unix/users.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/unix/users.rs rename to crates/vendor/brush-core/src/sys/unix/users.rs diff --git a/crates/brush-core-vendored/src/sys/wasm/fs.rs b/crates/vendor/brush-core/src/sys/wasm/fs.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/wasm/fs.rs rename to crates/vendor/brush-core/src/sys/wasm/fs.rs diff --git a/crates/brush-core-vendored/src/sys/wasm/mod.rs b/crates/vendor/brush-core/src/sys/wasm/mod.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/wasm/mod.rs rename to crates/vendor/brush-core/src/sys/wasm/mod.rs diff --git a/crates/brush-core-vendored/src/sys/windows.rs b/crates/vendor/brush-core/src/sys/windows.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/windows.rs rename to crates/vendor/brush-core/src/sys/windows.rs diff --git a/crates/brush-core-vendored/src/sys/windows/commands.rs b/crates/vendor/brush-core/src/sys/windows/commands.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/windows/commands.rs rename to crates/vendor/brush-core/src/sys/windows/commands.rs diff --git a/crates/brush-core-vendored/src/sys/windows/env.rs b/crates/vendor/brush-core/src/sys/windows/env.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/windows/env.rs rename to crates/vendor/brush-core/src/sys/windows/env.rs diff --git a/crates/brush-core-vendored/src/sys/windows/fd.rs b/crates/vendor/brush-core/src/sys/windows/fd.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/windows/fd.rs rename to crates/vendor/brush-core/src/sys/windows/fd.rs diff --git a/crates/brush-core-vendored/src/sys/windows/fs.rs b/crates/vendor/brush-core/src/sys/windows/fs.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/windows/fs.rs rename to crates/vendor/brush-core/src/sys/windows/fs.rs diff --git a/crates/brush-core-vendored/src/sys/windows/network.rs b/crates/vendor/brush-core/src/sys/windows/network.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/windows/network.rs rename to crates/vendor/brush-core/src/sys/windows/network.rs diff --git a/crates/brush-core-vendored/src/sys/windows/terminal.rs b/crates/vendor/brush-core/src/sys/windows/terminal.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/windows/terminal.rs rename to crates/vendor/brush-core/src/sys/windows/terminal.rs diff --git a/crates/brush-core-vendored/src/sys/windows/users.rs b/crates/vendor/brush-core/src/sys/windows/users.rs similarity index 100% rename from crates/brush-core-vendored/src/sys/windows/users.rs rename to crates/vendor/brush-core/src/sys/windows/users.rs diff --git a/crates/brush-core-vendored/src/terminal.rs b/crates/vendor/brush-core/src/terminal.rs similarity index 100% rename from crates/brush-core-vendored/src/terminal.rs rename to crates/vendor/brush-core/src/terminal.rs diff --git a/crates/brush-core-vendored/src/tests.rs b/crates/vendor/brush-core/src/tests.rs similarity index 100% rename from crates/brush-core-vendored/src/tests.rs rename to crates/vendor/brush-core/src/tests.rs diff --git a/crates/brush-core-vendored/src/timing.rs b/crates/vendor/brush-core/src/timing.rs similarity index 100% rename from crates/brush-core-vendored/src/timing.rs rename to crates/vendor/brush-core/src/timing.rs diff --git a/crates/brush-core-vendored/src/trace_categories.rs b/crates/vendor/brush-core/src/trace_categories.rs similarity index 100% rename from crates/brush-core-vendored/src/trace_categories.rs rename to crates/vendor/brush-core/src/trace_categories.rs diff --git a/crates/brush-core-vendored/src/traps.rs b/crates/vendor/brush-core/src/traps.rs similarity index 100% rename from crates/brush-core-vendored/src/traps.rs rename to crates/vendor/brush-core/src/traps.rs diff --git a/crates/brush-core-vendored/src/variables.rs b/crates/vendor/brush-core/src/variables.rs similarity index 100% rename from crates/brush-core-vendored/src/variables.rs rename to crates/vendor/brush-core/src/variables.rs diff --git a/crates/brush-core-vendored/src/wellknownvars.rs b/crates/vendor/brush-core/src/wellknownvars.rs similarity index 100% rename from crates/brush-core-vendored/src/wellknownvars.rs rename to crates/vendor/brush-core/src/wellknownvars.rs diff --git a/crates/uu-cat-vendored/Cargo.toml b/crates/vendor/uu-cat/Cargo.toml similarity index 92% rename from crates/uu-cat-vendored/Cargo.toml rename to crates/vendor/uu-cat/Cargo.toml index 939300ac3..7f56ff281 100644 --- a/crates/uu-cat-vendored/Cargo.toml +++ b/crates/vendor/uu-cat/Cargo.toml @@ -16,4 +16,4 @@ clap = { version = "4.5", features = ["wrap_help", "cargo", "color"] } memchr = "2.7.2" thiserror = "2.0.3" uucore = { version = "0.8.0", features = ["fast-inc", "fs", "pipes", "signals"] } -pi-uutils-ctx = { path = "../pi-uutils-ctx" } +pi-uutils-ctx = { path = "../../pi-uutils-ctx" } diff --git a/crates/uu-cat-vendored/LICENSE b/crates/vendor/uu-cat/LICENSE similarity index 100% rename from crates/uu-cat-vendored/LICENSE rename to crates/vendor/uu-cat/LICENSE diff --git a/crates/uu-cat-vendored/src/cat.rs b/crates/vendor/uu-cat/src/cat.rs similarity index 100% rename from crates/uu-cat-vendored/src/cat.rs rename to crates/vendor/uu-cat/src/cat.rs diff --git a/crates/uu-find-vendored/Cargo.toml b/crates/vendor/uu-find/Cargo.toml similarity index 90% rename from crates/uu-find-vendored/Cargo.toml rename to crates/vendor/uu-find/Cargo.toml index db48f9c31..a12d68ac5 100644 --- a/crates/uu-find-vendored/Cargo.toml +++ b/crates/vendor/uu-find/Cargo.toml @@ -17,7 +17,7 @@ onig = { version = "6.4", default-features = false } uucore = { version = "0.0.30", features = ["entries", "fs", "fsext", "mode"] } nix = { version = "0.29", features = ["fs", "user"] } argmax = "0.3.1" -pi-uutils-ctx = { path = "../pi-uutils-ctx" } +pi-uutils-ctx = { path = "../../pi-uutils-ctx" } [dev-dependencies] tempfile = "3" diff --git a/crates/uu-find-vendored/src/find/matchers/access.rs b/crates/vendor/uu-find/src/find/matchers/access.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/access.rs rename to crates/vendor/uu-find/src/find/matchers/access.rs diff --git a/crates/uu-find-vendored/src/find/matchers/delete.rs b/crates/vendor/uu-find/src/find/matchers/delete.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/delete.rs rename to crates/vendor/uu-find/src/find/matchers/delete.rs diff --git a/crates/uu-find-vendored/src/find/matchers/empty.rs b/crates/vendor/uu-find/src/find/matchers/empty.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/empty.rs rename to crates/vendor/uu-find/src/find/matchers/empty.rs diff --git a/crates/uu-find-vendored/src/find/matchers/entry.rs b/crates/vendor/uu-find/src/find/matchers/entry.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/entry.rs rename to crates/vendor/uu-find/src/find/matchers/entry.rs diff --git a/crates/uu-find-vendored/src/find/matchers/exec.rs b/crates/vendor/uu-find/src/find/matchers/exec.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/exec.rs rename to crates/vendor/uu-find/src/find/matchers/exec.rs diff --git a/crates/uu-find-vendored/src/find/matchers/fs.rs b/crates/vendor/uu-find/src/find/matchers/fs.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/fs.rs rename to crates/vendor/uu-find/src/find/matchers/fs.rs diff --git a/crates/uu-find-vendored/src/find/matchers/glob.rs b/crates/vendor/uu-find/src/find/matchers/glob.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/glob.rs rename to crates/vendor/uu-find/src/find/matchers/glob.rs diff --git a/crates/uu-find-vendored/src/find/matchers/group.rs b/crates/vendor/uu-find/src/find/matchers/group.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/group.rs rename to crates/vendor/uu-find/src/find/matchers/group.rs diff --git a/crates/uu-find-vendored/src/find/matchers/lname.rs b/crates/vendor/uu-find/src/find/matchers/lname.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/lname.rs rename to crates/vendor/uu-find/src/find/matchers/lname.rs diff --git a/crates/uu-find-vendored/src/find/matchers/logical_matchers.rs b/crates/vendor/uu-find/src/find/matchers/logical_matchers.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/logical_matchers.rs rename to crates/vendor/uu-find/src/find/matchers/logical_matchers.rs diff --git a/crates/uu-find-vendored/src/find/matchers/ls.rs b/crates/vendor/uu-find/src/find/matchers/ls.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/ls.rs rename to crates/vendor/uu-find/src/find/matchers/ls.rs diff --git a/crates/uu-find-vendored/src/find/matchers/mod.rs b/crates/vendor/uu-find/src/find/matchers/mod.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/mod.rs rename to crates/vendor/uu-find/src/find/matchers/mod.rs diff --git a/crates/uu-find-vendored/src/find/matchers/name.rs b/crates/vendor/uu-find/src/find/matchers/name.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/name.rs rename to crates/vendor/uu-find/src/find/matchers/name.rs diff --git a/crates/uu-find-vendored/src/find/matchers/path.rs b/crates/vendor/uu-find/src/find/matchers/path.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/path.rs rename to crates/vendor/uu-find/src/find/matchers/path.rs diff --git a/crates/uu-find-vendored/src/find/matchers/perm.rs b/crates/vendor/uu-find/src/find/matchers/perm.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/perm.rs rename to crates/vendor/uu-find/src/find/matchers/perm.rs diff --git a/crates/uu-find-vendored/src/find/matchers/printer.rs b/crates/vendor/uu-find/src/find/matchers/printer.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/printer.rs rename to crates/vendor/uu-find/src/find/matchers/printer.rs diff --git a/crates/uu-find-vendored/src/find/matchers/printf.rs b/crates/vendor/uu-find/src/find/matchers/printf.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/printf.rs rename to crates/vendor/uu-find/src/find/matchers/printf.rs diff --git a/crates/uu-find-vendored/src/find/matchers/prune.rs b/crates/vendor/uu-find/src/find/matchers/prune.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/prune.rs rename to crates/vendor/uu-find/src/find/matchers/prune.rs diff --git a/crates/uu-find-vendored/src/find/matchers/quit.rs b/crates/vendor/uu-find/src/find/matchers/quit.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/quit.rs rename to crates/vendor/uu-find/src/find/matchers/quit.rs diff --git a/crates/uu-find-vendored/src/find/matchers/regex.rs b/crates/vendor/uu-find/src/find/matchers/regex.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/regex.rs rename to crates/vendor/uu-find/src/find/matchers/regex.rs diff --git a/crates/uu-find-vendored/src/find/matchers/samefile.rs b/crates/vendor/uu-find/src/find/matchers/samefile.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/samefile.rs rename to crates/vendor/uu-find/src/find/matchers/samefile.rs diff --git a/crates/uu-find-vendored/src/find/matchers/size.rs b/crates/vendor/uu-find/src/find/matchers/size.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/size.rs rename to crates/vendor/uu-find/src/find/matchers/size.rs diff --git a/crates/uu-find-vendored/src/find/matchers/stat.rs b/crates/vendor/uu-find/src/find/matchers/stat.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/stat.rs rename to crates/vendor/uu-find/src/find/matchers/stat.rs diff --git a/crates/uu-find-vendored/src/find/matchers/time.rs b/crates/vendor/uu-find/src/find/matchers/time.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/time.rs rename to crates/vendor/uu-find/src/find/matchers/time.rs diff --git a/crates/uu-find-vendored/src/find/matchers/type_matcher.rs b/crates/vendor/uu-find/src/find/matchers/type_matcher.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/type_matcher.rs rename to crates/vendor/uu-find/src/find/matchers/type_matcher.rs diff --git a/crates/uu-find-vendored/src/find/matchers/user.rs b/crates/vendor/uu-find/src/find/matchers/user.rs similarity index 100% rename from crates/uu-find-vendored/src/find/matchers/user.rs rename to crates/vendor/uu-find/src/find/matchers/user.rs diff --git a/crates/uu-find-vendored/src/find/mod.rs b/crates/vendor/uu-find/src/find/mod.rs similarity index 100% rename from crates/uu-find-vendored/src/find/mod.rs rename to crates/vendor/uu-find/src/find/mod.rs diff --git a/crates/uu-find-vendored/src/lib.rs b/crates/vendor/uu-find/src/lib.rs similarity index 100% rename from crates/uu-find-vendored/src/lib.rs rename to crates/vendor/uu-find/src/lib.rs diff --git a/crates/uu-head-vendored/BENCHMARKING.md b/crates/vendor/uu-head/BENCHMARKING.md similarity index 100% rename from crates/uu-head-vendored/BENCHMARKING.md rename to crates/vendor/uu-head/BENCHMARKING.md diff --git a/crates/uu-head-vendored/Cargo.toml b/crates/vendor/uu-head/Cargo.toml similarity index 93% rename from crates/uu-head-vendored/Cargo.toml rename to crates/vendor/uu-head/Cargo.toml index 7a2265b03..da4d56e5f 100644 --- a/crates/uu-head-vendored/Cargo.toml +++ b/crates/vendor/uu-head/Cargo.toml @@ -16,4 +16,4 @@ clap = { version = "4.5", features = ["wrap_help", "cargo", "color"] } memchr = "2.7.2" thiserror = "2.0.3" uucore = { version = "0.8.0", features = ["parser-size", "ringbuffer", "lines", "fs"] } -pi-uutils-ctx = { path = "../pi-uutils-ctx" } +pi-uutils-ctx = { path = "../../pi-uutils-ctx" } diff --git a/crates/uu-head-vendored/LICENSE b/crates/vendor/uu-head/LICENSE similarity index 100% rename from crates/uu-head-vendored/LICENSE rename to crates/vendor/uu-head/LICENSE diff --git a/crates/uu-head-vendored/locales/en-US.ftl b/crates/vendor/uu-head/locales/en-US.ftl similarity index 100% rename from crates/uu-head-vendored/locales/en-US.ftl rename to crates/vendor/uu-head/locales/en-US.ftl diff --git a/crates/uu-head-vendored/src/cli.rs b/crates/vendor/uu-head/src/cli.rs similarity index 100% rename from crates/uu-head-vendored/src/cli.rs rename to crates/vendor/uu-head/src/cli.rs diff --git a/crates/uu-head-vendored/src/head.rs b/crates/vendor/uu-head/src/head.rs similarity index 100% rename from crates/uu-head-vendored/src/head.rs rename to crates/vendor/uu-head/src/head.rs diff --git a/crates/uu-head-vendored/src/parse.rs b/crates/vendor/uu-head/src/parse.rs similarity index 100% rename from crates/uu-head-vendored/src/parse.rs rename to crates/vendor/uu-head/src/parse.rs diff --git a/crates/uu-head-vendored/src/take.rs b/crates/vendor/uu-head/src/take.rs similarity index 100% rename from crates/uu-head-vendored/src/take.rs rename to crates/vendor/uu-head/src/take.rs diff --git a/crates/uu-ls-vendored/Cargo.toml b/crates/vendor/uu-ls/Cargo.toml similarity index 96% rename from crates/uu-ls-vendored/Cargo.toml rename to crates/vendor/uu-ls/Cargo.toml index 5eefa04ae..9104a416e 100644 --- a/crates/uu-ls-vendored/Cargo.toml +++ b/crates/vendor/uu-ls/Cargo.toml @@ -33,7 +33,7 @@ uucore = { version = "0.8.0", features = [ "version-cmp", ] } uutils_term_grid = "0.8" -pi-uutils-ctx = { path = "../pi-uutils-ctx" } +pi-uutils-ctx = { path = "../../pi-uutils-ctx" } # hostname crate does not support WASI (no OS-level hostname API) [target.'cfg(not(target_os = "wasi"))'.dependencies] diff --git a/crates/uu-ls-vendored/LICENSE b/crates/vendor/uu-ls/LICENSE similarity index 100% rename from crates/uu-ls-vendored/LICENSE rename to crates/vendor/uu-ls/LICENSE diff --git a/crates/uu-ls-vendored/locales/en-US.ftl b/crates/vendor/uu-ls/locales/en-US.ftl similarity index 100% rename from crates/uu-ls-vendored/locales/en-US.ftl rename to crates/vendor/uu-ls/locales/en-US.ftl diff --git a/crates/uu-ls-vendored/src/colors.rs b/crates/vendor/uu-ls/src/colors.rs similarity index 100% rename from crates/uu-ls-vendored/src/colors.rs rename to crates/vendor/uu-ls/src/colors.rs diff --git a/crates/uu-ls-vendored/src/config.rs b/crates/vendor/uu-ls/src/config.rs similarity index 100% rename from crates/uu-ls-vendored/src/config.rs rename to crates/vendor/uu-ls/src/config.rs diff --git a/crates/uu-ls-vendored/src/dired.rs b/crates/vendor/uu-ls/src/dired.rs similarity index 100% rename from crates/uu-ls-vendored/src/dired.rs rename to crates/vendor/uu-ls/src/dired.rs diff --git a/crates/uu-ls-vendored/src/display.rs b/crates/vendor/uu-ls/src/display.rs similarity index 100% rename from crates/uu-ls-vendored/src/display.rs rename to crates/vendor/uu-ls/src/display.rs diff --git a/crates/uu-ls-vendored/src/ls.rs b/crates/vendor/uu-ls/src/ls.rs similarity index 100% rename from crates/uu-ls-vendored/src/ls.rs rename to crates/vendor/uu-ls/src/ls.rs diff --git a/crates/uu-mkdir-vendored/Cargo.toml b/crates/vendor/uu-mkdir/Cargo.toml similarity index 94% rename from crates/uu-mkdir-vendored/Cargo.toml rename to crates/vendor/uu-mkdir/Cargo.toml index 9ce5ef467..b4e1af088 100644 --- a/crates/uu-mkdir-vendored/Cargo.toml +++ b/crates/vendor/uu-mkdir/Cargo.toml @@ -15,7 +15,7 @@ path = "src/mkdir.rs" [dependencies] clap = { version = "4.5", features = ["wrap_help", "cargo", "color"] } uucore = { version = "0.8.0", features = ["fs", "mode", "fsxattr"] } -pi-uutils-ctx = { path = "../pi-uutils-ctx" } +pi-uutils-ctx = { path = "../../pi-uutils-ctx" } [target.'cfg(unix)'.dependencies] rustix = { version = "1.1.4", features = ["process", "fs"] } diff --git a/crates/uu-mkdir-vendored/LICENSE b/crates/vendor/uu-mkdir/LICENSE similarity index 100% rename from crates/uu-mkdir-vendored/LICENSE rename to crates/vendor/uu-mkdir/LICENSE diff --git a/crates/uu-mkdir-vendored/locales/en-US.ftl b/crates/vendor/uu-mkdir/locales/en-US.ftl similarity index 100% rename from crates/uu-mkdir-vendored/locales/en-US.ftl rename to crates/vendor/uu-mkdir/locales/en-US.ftl diff --git a/crates/uu-mkdir-vendored/src/mkdir.rs b/crates/vendor/uu-mkdir/src/mkdir.rs similarity index 100% rename from crates/uu-mkdir-vendored/src/mkdir.rs rename to crates/vendor/uu-mkdir/src/mkdir.rs diff --git a/crates/uu-mv-vendored/Cargo.toml b/crates/vendor/uu-mv/Cargo.toml similarity index 96% rename from crates/uu-mv-vendored/Cargo.toml rename to crates/vendor/uu-mv/Cargo.toml index 93174f822..453145f46 100644 --- a/crates/uu-mv-vendored/Cargo.toml +++ b/crates/vendor/uu-mv/Cargo.toml @@ -25,7 +25,7 @@ uucore = { version = "0.8.0", features = [ "fsxattr", "update-control", ] } -pi-uutils-ctx = { path = "../pi-uutils-ctx" } +pi-uutils-ctx = { path = "../../pi-uutils-ctx" } [target.'cfg(windows)'.dependencies] windows-sys = { version = "0.61.0", default-features = false, features = [ diff --git a/crates/uu-mv-vendored/LICENSE b/crates/vendor/uu-mv/LICENSE similarity index 100% rename from crates/uu-mv-vendored/LICENSE rename to crates/vendor/uu-mv/LICENSE diff --git a/crates/uu-mv-vendored/src/error.rs b/crates/vendor/uu-mv/src/error.rs similarity index 100% rename from crates/uu-mv-vendored/src/error.rs rename to crates/vendor/uu-mv/src/error.rs diff --git a/crates/uu-mv-vendored/src/hardlink.rs b/crates/vendor/uu-mv/src/hardlink.rs similarity index 100% rename from crates/uu-mv-vendored/src/hardlink.rs rename to crates/vendor/uu-mv/src/hardlink.rs diff --git a/crates/uu-mv-vendored/src/mv.rs b/crates/vendor/uu-mv/src/mv.rs similarity index 100% rename from crates/uu-mv-vendored/src/mv.rs rename to crates/vendor/uu-mv/src/mv.rs diff --git a/crates/uu-rm-vendored/Cargo.toml b/crates/vendor/uu-rm/Cargo.toml similarity index 95% rename from crates/uu-rm-vendored/Cargo.toml rename to crates/vendor/uu-rm/Cargo.toml index 5290a0fd8..59612278a 100644 --- a/crates/uu-rm-vendored/Cargo.toml +++ b/crates/vendor/uu-rm/Cargo.toml @@ -17,7 +17,7 @@ thiserror = "2.0.3" clap = { version = "4.5", features = ["wrap_help", "cargo", "color"] } uucore = { version = "0.8.0", features = ["fs", "parser"] } indicatif = "0.18.0" -pi-uutils-ctx = { path = "../pi-uutils-ctx" } +pi-uutils-ctx = { path = "../../pi-uutils-ctx" } [target.'cfg(all(unix, not(target_os = "redox")))'.dependencies] uucore = { version = "0.8.0", features = ["safe-traversal"] } diff --git a/crates/uu-rm-vendored/LICENSE b/crates/vendor/uu-rm/LICENSE similarity index 100% rename from crates/uu-rm-vendored/LICENSE rename to crates/vendor/uu-rm/LICENSE diff --git a/crates/uu-rm-vendored/locales/en-US.ftl b/crates/vendor/uu-rm/locales/en-US.ftl similarity index 100% rename from crates/uu-rm-vendored/locales/en-US.ftl rename to crates/vendor/uu-rm/locales/en-US.ftl diff --git a/crates/uu-rm-vendored/src/platform/mod.rs b/crates/vendor/uu-rm/src/platform/mod.rs similarity index 100% rename from crates/uu-rm-vendored/src/platform/mod.rs rename to crates/vendor/uu-rm/src/platform/mod.rs diff --git a/crates/uu-rm-vendored/src/platform/unix.rs b/crates/vendor/uu-rm/src/platform/unix.rs similarity index 100% rename from crates/uu-rm-vendored/src/platform/unix.rs rename to crates/vendor/uu-rm/src/platform/unix.rs diff --git a/crates/uu-rm-vendored/src/rm.rs b/crates/vendor/uu-rm/src/rm.rs similarity index 100% rename from crates/uu-rm-vendored/src/rm.rs rename to crates/vendor/uu-rm/src/rm.rs diff --git a/crates/uu-sort-vendored/Cargo.toml b/crates/vendor/uu-sort/Cargo.toml similarity index 95% rename from crates/uu-sort-vendored/Cargo.toml rename to crates/vendor/uu-sort/Cargo.toml index 9509e6848..dce9d3891 100644 --- a/crates/uu-sort-vendored/Cargo.toml +++ b/crates/vendor/uu-sort/Cargo.toml @@ -36,7 +36,7 @@ uucore = { version = "0.8.0", features = [ "i18n-collator", "i18n-datetime", ] } -pi-uutils-ctx = { path = "../pi-uutils-ctx" } +pi-uutils-ctx = { path = "../../pi-uutils-ctx" } [target.'cfg(unix)'.dependencies] nix = { version = "0.31.2", default-features = false, features = ["resource"] } diff --git a/crates/uu-sort-vendored/LICENSE b/crates/vendor/uu-sort/LICENSE similarity index 100% rename from crates/uu-sort-vendored/LICENSE rename to crates/vendor/uu-sort/LICENSE diff --git a/crates/uu-sort-vendored/locales/en-US.ftl b/crates/vendor/uu-sort/locales/en-US.ftl similarity index 100% rename from crates/uu-sort-vendored/locales/en-US.ftl rename to crates/vendor/uu-sort/locales/en-US.ftl diff --git a/crates/uu-sort-vendored/src/buffer_hint.rs b/crates/vendor/uu-sort/src/buffer_hint.rs similarity index 100% rename from crates/uu-sort-vendored/src/buffer_hint.rs rename to crates/vendor/uu-sort/src/buffer_hint.rs diff --git a/crates/uu-sort-vendored/src/check.rs b/crates/vendor/uu-sort/src/check.rs similarity index 100% rename from crates/uu-sort-vendored/src/check.rs rename to crates/vendor/uu-sort/src/check.rs diff --git a/crates/uu-sort-vendored/src/chunks.rs b/crates/vendor/uu-sort/src/chunks.rs similarity index 100% rename from crates/uu-sort-vendored/src/chunks.rs rename to crates/vendor/uu-sort/src/chunks.rs diff --git a/crates/uu-sort-vendored/src/custom_str_cmp.rs b/crates/vendor/uu-sort/src/custom_str_cmp.rs similarity index 100% rename from crates/uu-sort-vendored/src/custom_str_cmp.rs rename to crates/vendor/uu-sort/src/custom_str_cmp.rs diff --git a/crates/uu-sort-vendored/src/ext_sort/mod.rs b/crates/vendor/uu-sort/src/ext_sort/mod.rs similarity index 100% rename from crates/uu-sort-vendored/src/ext_sort/mod.rs rename to crates/vendor/uu-sort/src/ext_sort/mod.rs diff --git a/crates/uu-sort-vendored/src/ext_sort/threaded.rs b/crates/vendor/uu-sort/src/ext_sort/threaded.rs similarity index 100% rename from crates/uu-sort-vendored/src/ext_sort/threaded.rs rename to crates/vendor/uu-sort/src/ext_sort/threaded.rs diff --git a/crates/uu-sort-vendored/src/ext_sort/wasi.rs b/crates/vendor/uu-sort/src/ext_sort/wasi.rs similarity index 100% rename from crates/uu-sort-vendored/src/ext_sort/wasi.rs rename to crates/vendor/uu-sort/src/ext_sort/wasi.rs diff --git a/crates/uu-sort-vendored/src/merge.rs b/crates/vendor/uu-sort/src/merge.rs similarity index 100% rename from crates/uu-sort-vendored/src/merge.rs rename to crates/vendor/uu-sort/src/merge.rs diff --git a/crates/uu-sort-vendored/src/numeric_str_cmp.rs b/crates/vendor/uu-sort/src/numeric_str_cmp.rs similarity index 100% rename from crates/uu-sort-vendored/src/numeric_str_cmp.rs rename to crates/vendor/uu-sort/src/numeric_str_cmp.rs diff --git a/crates/uu-sort-vendored/src/sort.rs b/crates/vendor/uu-sort/src/sort.rs similarity index 100% rename from crates/uu-sort-vendored/src/sort.rs rename to crates/vendor/uu-sort/src/sort.rs diff --git a/crates/uu-sort-vendored/src/tmp_dir.rs b/crates/vendor/uu-sort/src/tmp_dir.rs similarity index 100% rename from crates/uu-sort-vendored/src/tmp_dir.rs rename to crates/vendor/uu-sort/src/tmp_dir.rs diff --git a/crates/uu-tail-vendored/Cargo.toml b/crates/vendor/uu-tail/Cargo.toml similarity index 95% rename from crates/uu-tail-vendored/Cargo.toml rename to crates/vendor/uu-tail/Cargo.toml index be58a8775..62e6cdd0d 100644 --- a/crates/uu-tail-vendored/Cargo.toml +++ b/crates/vendor/uu-tail/Cargo.toml @@ -15,7 +15,7 @@ path = "src/tail.rs" clap = { version = "4.5", features = ["wrap_help", "cargo", "color"] } memchr = "2.7.2" uucore = { version = "0.8.0", features = ["fs", "parser-size", "signals"] } -pi-uutils-ctx = { path = "../pi-uutils-ctx" } +pi-uutils-ctx = { path = "../../pi-uutils-ctx" } [target.'cfg(not(target_os = "wasi"))'.dependencies] libc = "0.2.172" diff --git a/crates/uu-tail-vendored/src/args.rs b/crates/vendor/uu-tail/src/args.rs similarity index 100% rename from crates/uu-tail-vendored/src/args.rs rename to crates/vendor/uu-tail/src/args.rs diff --git a/crates/uu-tail-vendored/src/chunks.rs b/crates/vendor/uu-tail/src/chunks.rs similarity index 100% rename from crates/uu-tail-vendored/src/chunks.rs rename to crates/vendor/uu-tail/src/chunks.rs diff --git a/crates/uu-tail-vendored/src/follow/files.rs b/crates/vendor/uu-tail/src/follow/files.rs similarity index 100% rename from crates/uu-tail-vendored/src/follow/files.rs rename to crates/vendor/uu-tail/src/follow/files.rs diff --git a/crates/uu-tail-vendored/src/follow/mod.rs b/crates/vendor/uu-tail/src/follow/mod.rs similarity index 100% rename from crates/uu-tail-vendored/src/follow/mod.rs rename to crates/vendor/uu-tail/src/follow/mod.rs diff --git a/crates/uu-tail-vendored/src/follow/watch.rs b/crates/vendor/uu-tail/src/follow/watch.rs similarity index 100% rename from crates/uu-tail-vendored/src/follow/watch.rs rename to crates/vendor/uu-tail/src/follow/watch.rs diff --git a/crates/uu-tail-vendored/src/parse.rs b/crates/vendor/uu-tail/src/parse.rs similarity index 100% rename from crates/uu-tail-vendored/src/parse.rs rename to crates/vendor/uu-tail/src/parse.rs diff --git a/crates/uu-tail-vendored/src/paths.rs b/crates/vendor/uu-tail/src/paths.rs similarity index 100% rename from crates/uu-tail-vendored/src/paths.rs rename to crates/vendor/uu-tail/src/paths.rs diff --git a/crates/uu-tail-vendored/src/platform/mod.rs b/crates/vendor/uu-tail/src/platform/mod.rs similarity index 100% rename from crates/uu-tail-vendored/src/platform/mod.rs rename to crates/vendor/uu-tail/src/platform/mod.rs diff --git a/crates/uu-tail-vendored/src/platform/unix.rs b/crates/vendor/uu-tail/src/platform/unix.rs similarity index 100% rename from crates/uu-tail-vendored/src/platform/unix.rs rename to crates/vendor/uu-tail/src/platform/unix.rs diff --git a/crates/uu-tail-vendored/src/platform/windows.rs b/crates/vendor/uu-tail/src/platform/windows.rs similarity index 100% rename from crates/uu-tail-vendored/src/platform/windows.rs rename to crates/vendor/uu-tail/src/platform/windows.rs diff --git a/crates/uu-tail-vendored/src/tail.rs b/crates/vendor/uu-tail/src/tail.rs similarity index 100% rename from crates/uu-tail-vendored/src/tail.rs rename to crates/vendor/uu-tail/src/tail.rs diff --git a/crates/uu-tail-vendored/src/text.rs b/crates/vendor/uu-tail/src/text.rs similarity index 100% rename from crates/uu-tail-vendored/src/text.rs rename to crates/vendor/uu-tail/src/text.rs diff --git a/crates/uu-uniq-vendored/Cargo.toml b/crates/vendor/uu-uniq/Cargo.toml similarity index 92% rename from crates/uu-uniq-vendored/Cargo.toml rename to crates/vendor/uu-uniq/Cargo.toml index 2fadb21cd..2af6e9ef6 100644 --- a/crates/uu-uniq-vendored/Cargo.toml +++ b/crates/vendor/uu-uniq/Cargo.toml @@ -15,4 +15,4 @@ path = "src/uniq.rs" [dependencies] clap = { version = "4.5", features = ["wrap_help", "cargo", "color"] } uucore = { version = "0.8.0", features = ["parser"] } -pi-uutils-ctx = { path = "../pi-uutils-ctx" } +pi-uutils-ctx = { path = "../../pi-uutils-ctx" } diff --git a/crates/uu-uniq-vendored/LICENSE b/crates/vendor/uu-uniq/LICENSE similarity index 100% rename from crates/uu-uniq-vendored/LICENSE rename to crates/vendor/uu-uniq/LICENSE diff --git a/crates/uu-uniq-vendored/locales/en-US.ftl b/crates/vendor/uu-uniq/locales/en-US.ftl similarity index 100% rename from crates/uu-uniq-vendored/locales/en-US.ftl rename to crates/vendor/uu-uniq/locales/en-US.ftl diff --git a/crates/uu-uniq-vendored/src/uniq.rs b/crates/vendor/uu-uniq/src/uniq.rs similarity index 100% rename from crates/uu-uniq-vendored/src/uniq.rs rename to crates/vendor/uu-uniq/src/uniq.rs diff --git a/crates/uu-wc-vendored/Cargo.toml b/crates/vendor/uu-wc/Cargo.toml similarity index 94% rename from crates/uu-wc-vendored/Cargo.toml rename to crates/vendor/uu-wc/Cargo.toml index ba6cca9aa..4b764da55 100644 --- a/crates/uu-wc-vendored/Cargo.toml +++ b/crates/vendor/uu-wc/Cargo.toml @@ -23,7 +23,7 @@ uucore = { version = "0.8.0", features = [ "quoting-style", ] } unicode-width = "0.2.0" -pi-uutils-ctx = { path = "../pi-uutils-ctx" } +pi-uutils-ctx = { path = "../../pi-uutils-ctx" } [target.'cfg(unix)'.dependencies] libc = "0.2.172" diff --git a/crates/uu-wc-vendored/LICENSE b/crates/vendor/uu-wc/LICENSE similarity index 100% rename from crates/uu-wc-vendored/LICENSE rename to crates/vendor/uu-wc/LICENSE diff --git a/crates/uu-wc-vendored/src/count_fast.rs b/crates/vendor/uu-wc/src/count_fast.rs similarity index 100% rename from crates/uu-wc-vendored/src/count_fast.rs rename to crates/vendor/uu-wc/src/count_fast.rs diff --git a/crates/uu-wc-vendored/src/countable.rs b/crates/vendor/uu-wc/src/countable.rs similarity index 100% rename from crates/uu-wc-vendored/src/countable.rs rename to crates/vendor/uu-wc/src/countable.rs diff --git a/crates/uu-wc-vendored/src/utf8/LICENSE b/crates/vendor/uu-wc/src/utf8/LICENSE similarity index 100% rename from crates/uu-wc-vendored/src/utf8/LICENSE rename to crates/vendor/uu-wc/src/utf8/LICENSE diff --git a/crates/uu-wc-vendored/src/utf8/mod.rs b/crates/vendor/uu-wc/src/utf8/mod.rs similarity index 100% rename from crates/uu-wc-vendored/src/utf8/mod.rs rename to crates/vendor/uu-wc/src/utf8/mod.rs diff --git a/crates/uu-wc-vendored/src/utf8/read.rs b/crates/vendor/uu-wc/src/utf8/read.rs similarity index 100% rename from crates/uu-wc-vendored/src/utf8/read.rs rename to crates/vendor/uu-wc/src/utf8/read.rs diff --git a/crates/uu-wc-vendored/src/wc.rs b/crates/vendor/uu-wc/src/wc.rs similarity index 100% rename from crates/uu-wc-vendored/src/wc.rs rename to crates/vendor/uu-wc/src/wc.rs diff --git a/crates/uu-wc-vendored/src/word_count.rs b/crates/vendor/uu-wc/src/word_count.rs similarity index 100% rename from crates/uu-wc-vendored/src/word_count.rs rename to crates/vendor/uu-wc/src/word_count.rs diff --git a/packages/ai/CHANGELOG.md b/packages/ai/CHANGELOG.md index 78abe3a27..5ae02c9c2 100644 --- a/packages/ai/CHANGELOG.md +++ b/packages/ai/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog ## [Unreleased] + ### Added - Added branded wordmark and logo animation to authentication flow @@ -4148,4 +4149,4 @@ _Dedicated to Peter's shoulder ([@steipete](https://twitter.com/steipete))_ ## [0.9.4] - 2025-11-26 -Initial release with multi-provider LLM support. \ No newline at end of file +Initial release with multi-provider LLM support. diff --git a/packages/coding-agent/CHANGELOG.md b/packages/coding-agent/CHANGELOG.md index 6c896f22a..947d38e7c 100644 --- a/packages/coding-agent/CHANGELOG.md +++ b/packages/coding-agent/CHANGELOG.md @@ -5,18 +5,10 @@ ### Fixed - Fixed MCP OAuth discovery rejecting Atlassian-style cross-host issuer metadata during the resource-server fallback probe; issuer matching now remains enforced for advertised auth-server candidates but no longer blocks fallback metadata where the resource host and authorization-server issuer differ. ([#3551](https://github.com/can1357/oh-my-pi/issues/3551)) - - Fixed plan approval applying the wrong execution model when the model-tier slider sat on the model that exit would restore. The match check now compares the selected role's effective thinking level against the pre-plan thinking level, so picking the active planning tier is retained and picking a same-model tier with an explicit thinking suffix (e.g. `default = sonnet:off` while plan-mode raised thinking to `high`) goes through `applyRoleModel` instead of silently restoring the pre-plan level. ([#3554](https://github.com/can1357/oh-my-pi/issues/3554)) - Fixed plan approval applying the wrong execution model when the model-tier slider sat on the model that exit would restore. The match check now compares the selected role's effective thinking level against the pre-plan thinking level, and a singleton cycle (only `modelRoles.plan` configured, default unset, so `getRoleModelCycle` synthesizes a lone `default` entry from the active plan model and the slider stays hidden) is no longer pinned as the execution tier — approval falls through to the pre-plan restore instead of silently switching back to the plan model. ([#3554](https://github.com/can1357/oh-my-pi/issues/3554)) - - Fixed the `eval` Julia kernel showing only runner-internal backtrace frames (`at top-level scope (./none:N)`, `at main (…runner-…jl:635)`) with no exception type or message, making cell errors undebuggable. The host renderer (`packages/coding-agent/src/eval/kernel-base.ts`) displays a non-empty `traceback` verbatim and only falls back to `ename: evalue` when it is empty; the Python and Ruby runners embed the rendered error in `traceback`, but the Julia runner (`packages/coding-agent/src/eval/jl/runner.jl`) built `traceback` from stack frames only, so the message was dropped. `emit_error` now seeds `traceback` with the `showerror` output (matching the REPL's `ERROR:` text) ahead of the frames. - -### Fixed - - Fixed Windows stdio MCP servers timing out (and popping a visible terminal) when their direct child was a `cmd.exe` wrapper that itself launched a console grandchild — `node` wrappers, `npx.cmd -y mcp-remote`, similar nested shells. `StdioTransport.connect()` unconditionally passed `detached: true` to `Bun.spawn`, but Windows has no SIGTSTP/SIGTTIN to escape; `detached` only maps to `CreateProcess(DETACHED_PROCESS)`, which strips the parent's inherited console. The hidden direct `cmd.exe` lost its console, so the grandchild allocated a brand-new visible conhost whose stdout no longer routed through OMP's pipe — the proxy reported the bridge was up while OMP timed out waiting for the MCP `initialize` response. `resolveStdioSpawnCommand` now returns `detached: false` for every Windows return shape (direct `.exe`, cmd.exe-wrapped batch / unresolvable command, npm cmd-shim launched through node) and keeps `detached: true` on POSIX, where the original SIGTSTP/SIGTTIN reason still holds; `connect()` consumes the resolved flag. ([#3544](https://github.com/can1357/oh-my-pi/issues/3544)) - -### Fixed - - Fixed the LSP tool's per-cwd config cache (`getConfig` in `packages/coding-agent/src/lsp/index.ts`) never being invalidated, so `.omp/lsp.json`, root markers, and plugin LSP configs added after the first LSP call stayed invisible for the remainder of the process — even after `reload *`. The cached observation persists across chat sessions because OMP is a single-process binary, so users were stuck on `No language servers configured` until they killed the process. The `reload` handler now drops the cwd's cache entry and re-runs `loadConfig` before iterating servers, so the explicit refresh request behaves as the prompt documents. ([#3546](https://github.com/can1357/oh-my-pi/issues/3546)) ## [16.1.22] - 2026-06-26 @@ -40,7 +32,7 @@ ### Fixed -- Fixed Ctrl+Z hanging the terminal after any tool call had run: the TUI tore down (`ui.stop()`) but the process kept running in `Sl+` state, leaving the user with a dead terminal recoverable only via `kill -9`. The embedded `brush-core` shell behind every bash tool call installs a tokio SIGTSTP listener on `Process::wait` (`crates/brush-core-vendored/src/sys/unix/signal.rs::tstp_signal_listener` → `tokio::signal::unix::signal(SIGTSTP)`); per tokio's contract, the first call for a SignalKind permanently replaces the kernel-default handler for the lifetime of the process. So the first bash invocation — even `/usr/bin/true` — silently overrode SIGTSTP's "stop" default, and `InputController.handleCtrlZ`'s subsequent `process.kill(0, "SIGTSTP")` was swallowed by tokio. The handler now sends `SIGSTOP` (uncatchable, unblockable, unignorable) to the foreground process group, so the kernel parks omp regardless of installed handlers and the shell sees the whole job stop even when omp runs behind a wrapper (`npx`, `pnpm exec`, `bunx`, …) or as one stage of a pipeline. MCP stdio servers now spawn detached into their own session — they're insulated both from terminal job-control signals (which used to stop their process trees and leave the JSONL read loop blocked on silent pipes) and from the new pgid=0 suspend itself ([#3461](https://github.com/can1357/oh-my-pi/issues/3461)). +- Fixed Ctrl+Z hanging the terminal after any tool call had run: the TUI tore down (`ui.stop()`) but the process kept running in `Sl+` state, leaving the user with a dead terminal recoverable only via `kill -9`. The embedded `brush-core` shell behind every bash tool call installs a tokio SIGTSTP listener on `Process::wait` (`crates/vendor/brush-core/src/sys/unix/signal.rs::tstp_signal_listener` → `tokio::signal::unix::signal(SIGTSTP)`); per tokio's contract, the first call for a SignalKind permanently replaces the kernel-default handler for the lifetime of the process. So the first bash invocation — even `/usr/bin/true` — silently overrode SIGTSTP's "stop" default, and `InputController.handleCtrlZ`'s subsequent `process.kill(0, "SIGTSTP")` was swallowed by tokio. The handler now sends `SIGSTOP` (uncatchable, unblockable, unignorable) to the foreground process group, so the kernel parks omp regardless of installed handlers and the shell sees the whole job stop even when omp runs behind a wrapper (`npx`, `pnpm exec`, `bunx`, …) or as one stage of a pipeline. MCP stdio servers now spawn detached into their own session — they're insulated both from terminal job-control signals (which used to stop their process trees and leave the JSONL read loop blocked on silent pipes) and from the new pgid=0 suspend itself ([#3461](https://github.com/can1357/oh-my-pi/issues/3461)). - Fixed image-only composer submissions while the agent is streaming being treated as empty input, which dropped the image or aborted the active turn when another message was queued. Pending pasted images now count as submit content for Enter and Ctrl+Enter follow-ups. ([#3467](https://github.com/can1357/oh-my-pi/issues/3467)) - Fixed `omp gallery --state` accepting lifecycle tokens that did not match displayed state labels and rendering unknown state values as `· undefined`; displayed labels now work as aliases, invalid values fail with a valid-token list, and failed gallery fixtures visibly render failures. ([#3473](https://github.com/can1357/oh-my-pi/issues/3473)) - Fixed the bash tool's snapshotted `mise()` shell function dying with `command: command not found:` because `$__MISE_EXE` was empty in the replay shell. `generateSnapshotScript` captured the function via `declare -f`/`typeset -f` but only ever re-exported `PATH`, so every other env var the rc file set (notably the `*_EXE` sidecar `mise activate` exports) was lost; the function body then expanded `command "$__MISE_EXE" "$@"` to `command "" …` and died with exit 127. The snapshot script now scans captured function bodies for `$VAR` / `${VAR…}` references and re-emits `export NAME='value'` for each referenced var that is currently set (with a denylist for shell-internal names like `PATH`/`HOME`/`BASH_*`/`LC_*` plus a likely-secret denylist for `*TOKEN*`/`*SECRET*`/`*API_KEY*`/`*PASSWORD*`/`*PRIVATE_KEY*`/`*ACCESS_KEY*`/`*CREDENTIAL*`/`*SESSION_KEY*`), the snapshot script `umask 077`s itself and the JS caller chmods the snapshot file/dir to `0600`/`0700` so the new export pass can't leak secrets into a shared tmp dir. Fixes mise, asdf shims, direnv-style helpers, and other activation idioms that pair a function with a helper env var. `getShellConfigFile` now also honours `env.HOME` (falling back to `os.homedir()`) so sandboxed callers can target a non-default rc. ([#3470](https://github.com/can1357/oh-my-pi/issues/3470)) diff --git a/packages/coding-agent/src/modes/controllers/input-controller.ts b/packages/coding-agent/src/modes/controllers/input-controller.ts index fdd636117..2cf24fd34 100644 --- a/packages/coding-agent/src/modes/controllers/input-controller.ts +++ b/packages/coding-agent/src/modes/controllers/input-controller.ts @@ -969,7 +969,7 @@ export class InputController { // // SIGTSTP: brush-core (the embedded shell behind every bash tool call) // installs a tokio SIGTSTP listener on `Process::wait` to detect when - // its children have been stopped (`crates/brush-core-vendored/src/sys/ + // its children have been stopped (`crates/vendor/brush-core/src/sys/ // unix/signal.rs::tstp_signal_listener` → `tokio::signal::unix:: // signal(SIGTSTP)`). Per tokio's documented contract, the first call // for a given SignalKind permanently replaces the kernel-default @@ -993,7 +993,7 @@ export class InputController { // children that must survive the suspend (MCP stdio servers via // the `detached: true` spawn in `mcp/transports/stdio.ts`, every // brush external command via brush's per-child `setsid` in - // `crates/brush-core-vendored/src/commands.rs`) are already in + // `crates/vendor/brush-core/src/commands.rs`) are already in // their own sessions, so pgid=0 does not reach them. process.kill(0, "SIGSTOP"); } catch (err) { diff --git a/packages/coding-agent/src/utils/shell-snapshot.ts b/packages/coding-agent/src/utils/shell-snapshot.ts index 9e5fb15f8..191694663 100644 --- a/packages/coding-agent/src/utils/shell-snapshot.ts +++ b/packages/coding-agent/src/utils/shell-snapshot.ts @@ -17,7 +17,7 @@ const SNAPSHOT_TIMEOUT_MS = 2_000; /** * Characters that force brush's primitive alias expander down a path it does * not implement. brush-core resolves aliases via `value.split_ascii_whitespace()` - * (`crates/brush-core-vendored/src/interp.rs:1500`, tracking + * (`crates/vendor/brush-core/src/interp.rs:1500`, tracking * https://github.com/reubeno/brush/issues/57): the resulting pieces are dropped * into argv verbatim instead of going through the shell parser. Any alias body * containing subshells `(...)`, pipes `|`, redirections `<` `>`, separators diff --git a/packages/coding-agent/test/agent-session-bash-detach.test.ts b/packages/coding-agent/test/agent-session-bash-detach.test.ts index b8d4fe509..9ab432cc5 100644 --- a/packages/coding-agent/test/agent-session-bash-detach.test.ts +++ b/packages/coding-agent/test/agent-session-bash-detach.test.ts @@ -4,7 +4,7 @@ * Branch: `fix/brush-detach-when-embedded` * Target commit: b0950f7ed * - * The fix lives in `crates/brush-core-vendored/src/commands.rs` and is + * The fix lives in `crates/vendor/brush-core/src/commands.rs` and is * verified at the unit level by `pi-natives::shell::tests::child_session_action` * (truth-table) and `embedded_external_command_runs_in_its_own_session` (real * brush spawn). This test pulls the fix end-to-end through the OMP coding diff --git a/packages/coding-agent/test/issue-3461-repro.test.ts b/packages/coding-agent/test/issue-3461-repro.test.ts index 036e86c50..84379041d 100644 --- a/packages/coding-agent/test/issue-3461-repro.test.ts +++ b/packages/coding-agent/test/issue-3461-repro.test.ts @@ -29,8 +29,8 @@ import * as path from "node:path"; */ describe("issue #3461 — Ctrl+Z hangs after a command has been run", () => { const packageDir = path.resolve(import.meta.dir, ".."); - const brushUnixSignal = path.resolve(packageDir, "../../crates/brush-core-vendored/src/sys/unix/signal.rs"); - const brushProcesses = path.resolve(packageDir, "../../crates/brush-core-vendored/src/processes.rs"); + const brushUnixSignal = path.resolve(packageDir, "../../crates/vendor/brush-core/src/sys/unix/signal.rs"); + const brushProcesses = path.resolve(packageDir, "../../crates/vendor/brush-core/src/processes.rs"); const inputController = path.resolve(packageDir, "src/modes/controllers/input-controller.ts"); const mcpStdioTransport = path.resolve(packageDir, "src/mcp/transports/stdio.ts"); diff --git a/packages/coding-agent/test/shell-snapshot.test.ts b/packages/coding-agent/test/shell-snapshot.test.ts index e5c6029a8..7585e64a9 100644 --- a/packages/coding-agent/test/shell-snapshot.test.ts +++ b/packages/coding-agent/test/shell-snapshot.test.ts @@ -17,7 +17,7 @@ const REAL_BASH = Bun.env.SHELL?.includes("bash") ? Bun.env.SHELL : "/bin/bash"; const REAL_ECHO = Bun.which("echo") ?? "/bin/echo"; // `sanitizeSnapshotForBrush` is the snapshot-side mitigation for brush's -// whitespace-only alias expander (`crates/brush-core-vendored/src/interp.rs:1500`, +// whitespace-only alias expander (`crates/vendor/brush-core/src/interp.rs:1500`, // brush issue reubeno/brush#57). Aliases whose body needs real shell parsing // must be dropped or brush turns the first whitespace piece into the command // name and the user sees `error: command not found: (alias;` (issue #3234). diff --git a/rustfmt.toml b/rustfmt.toml index 4135bab00..ca168781e 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -71,4 +71,4 @@ blank_lines_upper_bound = 1 force_explicit_abi = true hex_literal_case = "Lower" newline_style = "Unix" -ignore = ["crates/brush-core-vendored/**", "crates/brush-builtins-vendored/**"] +ignore = ["crates/vendor/brush-core/**", "crates/vendor/brush-builtins/**"]