Bump to version 0.99.0 (#14094)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the
tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -13,7 +13,7 @@ body:
     id: repro
     attributes:
       label: How to reproduce
-      description: Steps to reproduce the behavior
+      description: Steps to reproduce the behavior (including succinct code examples or screenshots of the observed behavior)
       placeholder: |
         1.
         2.
@@ -28,13 +28,6 @@ body:
       placeholder: I expected nu to...
     validations:
       required: true
-  - type: textarea
-    id: screenshots
-    attributes:
-      label: Screenshots
-      description: Please add any relevant screenshots here, if any
-    validations:
-      required: false
   - type: textarea
     id: config
     attributes:
@@ -55,10 +48,3 @@ body:
         | installed_plugins  | binaryview, chart bar, chart line, fetch, from bson, from sqlite, inc, match, post, ps, query json, s3, selector, start, sys, textview, to bson, to sqlite, tree, xpath |
     validations:
       required: true
-  - type: textarea
-    id: context
-    attributes:
-      label: Additional context
-      description: Add any other context about the problem here.
-    validations:
-      required: false

.github/workflows/audit.yml

@@ -20,6 +20,6 @@ jobs:
     continue-on-error: true
     steps:
       - uses: actions/checkout@v4.1.7
-      - uses: rustsec/audit-check@v1.4.1
+      - uses: rustsec/audit-check@v2.0.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yml

@@ -36,7 +36,7 @@ jobs:
       - uses: actions/checkout@v4.1.7
 
       - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
 
       - name: cargo fmt
         run: cargo fmt --all -- --check
@@ -57,11 +57,6 @@ jobs:
       fail-fast: true
       matrix:
         platform: [windows-latest, macos-latest, ubuntu-20.04]
-        include:
-          - default-flags: ""
-          # linux CI cannot handle clipboard feature
-          - platform: ubuntu-20.04
-            default-flags: "--no-default-features --features=default-no-clipboard"
 
     runs-on: ${{ matrix.platform }}
 
@@ -69,10 +64,10 @@ jobs:
       - uses: actions/checkout@v4.1.7
 
       - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
 
       - name: Tests
-        run: cargo test --workspace --profile ci --exclude nu_plugin_* ${{ matrix.default-flags }}
+        run: cargo test --workspace --profile ci --exclude nu_plugin_*
       - name: Check for clean repo
         shell: bash
         run: |
@@ -98,7 +93,7 @@ jobs:
       - uses: actions/checkout@v4.1.7
 
       - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
 
       - name: Install Nushell
         run: cargo install --path . --locked --no-default-features
@@ -149,7 +144,7 @@ jobs:
       - uses: actions/checkout@v4.1.7
 
       - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
 
       - name: Clippy
         run: cargo clippy --package nu_plugin_* -- $CLIPPY_OPTIONS

.github/workflows/nightly-build.yml

@@ -27,7 +27,7 @@ jobs:
     # if: github.repository == 'nushell/nightly'
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4
         if: github.repository == 'nushell/nightly'
         with:
           ref: main
@@ -36,10 +36,10 @@ jobs:
           token: ${{ secrets.WORKFLOW_TOKEN }}
 
       - name: Setup Nushell
-        uses: hustcer/setup-nu@v3.12
+        uses: hustcer/setup-nu@v3
         if: github.repository == 'nushell/nightly'
         with:
-          version: 0.95.0
+          version: 0.98.0
 
       # Synchronize the main branch of nightly repo with the main branch of Nushell official repo
       - name: Prepare for Nightly Release
@@ -65,7 +65,7 @@ jobs:
           }
 
   standard:
-    name: Std
+    name: Nu
     needs: prepare
     strategy:
       fail-fast: false
@@ -78,8 +78,11 @@ jobs:
         - x86_64-unknown-linux-gnu
         - x86_64-unknown-linux-musl
         - aarch64-unknown-linux-gnu
+        - aarch64-unknown-linux-musl
         - armv7-unknown-linux-gnueabihf
+        - armv7-unknown-linux-musleabihf
         - riscv64gc-unknown-linux-gnu
+        - loongarch64-unknown-linux-gnu
         extra: ['bin']
         include:
         - target: aarch64-apple-darwin
@@ -104,15 +107,21 @@ jobs:
           os: ubuntu-22.04
         - target: aarch64-unknown-linux-gnu
           os: ubuntu-22.04
+        - target: aarch64-unknown-linux-musl
+          os: ubuntu-22.04
         - target: armv7-unknown-linux-gnueabihf
           os: ubuntu-22.04
+        - target: armv7-unknown-linux-musleabihf
+          os: ubuntu-22.04
         - target: riscv64gc-unknown-linux-gnu
           os: ubuntu-latest
+        - target: loongarch64-unknown-linux-gnu
+          os: ubuntu-22.04
 
     runs-on: ${{matrix.os}}
 
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v4
       with:
         ref: main
         fetch-depth: 0
@@ -122,15 +131,15 @@ jobs:
         echo "targets = ['${{matrix.target}}']" >> rust-toolchain.toml
 
     - name: Setup Rust toolchain and cache
-      uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
+      uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
       # WARN: Keep the rustflags to prevent from the winget submission error: `CAQuietExec: Error 0xc0000135`
       with:
         rustflags: ''
 
     - name: Setup Nushell
-      uses: hustcer/setup-nu@v3.12
+      uses: hustcer/setup-nu@v3
       with:
-        version: 0.95.0
+        version: 0.98.0
 
     - name: Release Nu Binary
       id: nu
@@ -181,14 +190,14 @@ jobs:
       - name: Waiting for Release
         run: sleep 1800
 
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4
         with:
           ref: main
 
       - name: Setup Nushell
-        uses: hustcer/setup-nu@v3.12
+        uses: hustcer/setup-nu@v3
         with:
-          version: 0.95.0
+          version: 0.98.0
 
       # Keep the last a few releases
       - name: Delete Older Releases

.github/workflows/release-pkg.nu

@@ -84,6 +84,27 @@ if $os in ['macos-latest'] or $USE_UBUNTU {
             $env.CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER = 'arm-linux-gnueabihf-gcc'
             cargo-build-nu
         }
+        'aarch64-unknown-linux-musl' => {
+            aria2c https://musl.cc/aarch64-linux-musl-cross.tgz
+            tar -xf aarch64-linux-musl-cross.tgz -C $env.HOME
+            $env.PATH = ($env.PATH | split row (char esep) | prepend $'($env.HOME)/aarch64-linux-musl-cross/bin')
+            $env.CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER = 'aarch64-linux-musl-gcc'
+            cargo-build-nu
+        }
+        'armv7-unknown-linux-musleabihf' => {
+            aria2c https://musl.cc/armv7r-linux-musleabihf-cross.tgz
+            tar -xf armv7r-linux-musleabihf-cross.tgz -C $env.HOME
+            $env.PATH = ($env.PATH | split row (char esep) | prepend $'($env.HOME)/armv7r-linux-musleabihf-cross/bin')
+            $env.CARGO_TARGET_ARMV7_UNKNOWN_LINUX_MUSLEABIHF_LINKER = 'armv7r-linux-musleabihf-gcc'
+            cargo-build-nu
+        }
+        'loongarch64-unknown-linux-gnu' => {
+            aria2c https://github.com/loongson/build-tools/releases/download/2024.08.08/x86_64-cross-tools-loongarch64-binutils_2.43-gcc_14.2.0-glibc_2.40.tar.xz
+            tar xf x86_64-cross-tools-loongarch64-*.tar.xz
+            $env.PATH = ($env.PATH | split row (char esep) | prepend $'($env.PWD)/cross-tools/bin')
+            $env.CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_GNU_LINKER = 'loongarch64-unknown-linux-gnu-gcc'
+            cargo-build-nu
+        }
         _ => {
             # musl-tools to fix 'Failed to find tool. Is `musl-gcc` installed?'
             # Actually just for x86_64-unknown-linux-musl target

.github/workflows/release.yml

@@ -14,8 +14,8 @@ defaults:
     shell: bash
 
 jobs:
-  standard:
+  release:
-    name: Std
+    name: Nu
 
     strategy:
       fail-fast: false
@@ -28,8 +28,11 @@ jobs:
         - x86_64-unknown-linux-gnu
         - x86_64-unknown-linux-musl
         - aarch64-unknown-linux-gnu
+        - aarch64-unknown-linux-musl
         - armv7-unknown-linux-gnueabihf
+        - armv7-unknown-linux-musleabihf
         - riscv64gc-unknown-linux-gnu
+        - loongarch64-unknown-linux-gnu
         extra: ['bin']
         include:
         - target: aarch64-apple-darwin
@@ -54,31 +57,37 @@ jobs:
           os: ubuntu-22.04
         - target: aarch64-unknown-linux-gnu
           os: ubuntu-22.04
+        - target: aarch64-unknown-linux-musl
+          os: ubuntu-22.04
         - target: armv7-unknown-linux-gnueabihf
           os: ubuntu-22.04
+        - target: armv7-unknown-linux-musleabihf
+          os: ubuntu-22.04
         - target: riscv64gc-unknown-linux-gnu
           os: ubuntu-latest
+        - target: loongarch64-unknown-linux-gnu
+          os: ubuntu-22.04
 
     runs-on: ${{matrix.os}}
 
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v4
 
     - name: Update Rust Toolchain Target
       run: |
         echo "targets = ['${{matrix.target}}']" >> rust-toolchain.toml
 
     - name: Setup Rust toolchain
-      uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
+      uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
       # WARN: Keep the rustflags to prevent from the winget submission error: `CAQuietExec: Error 0xc0000135`
       with:
         cache: false
         rustflags: ''
 
     - name: Setup Nushell
-      uses: hustcer/setup-nu@v3.12
+      uses: hustcer/setup-nu@v3
       with:
-        version: 0.95.0
+        version: 0.98.0
 
     - name: Release Nu Binary
       id: nu
@@ -98,3 +107,26 @@ jobs:
         files: ${{ steps.nu.outputs.archive }}
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  sha256sum:
+    needs: release
+    name: Create Sha256sum
+    runs-on: ubuntu-latest
+    steps:
+    - name: Download Release Archives
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: >-
+        gh release download ${{ github.ref_name }}
+        --repo ${{ github.repository }}
+        --pattern '*'
+        --dir release
+    - name: Create Checksums
+      run: cd release && shasum -a 256 * > ../SHA256SUMS
+    - name: Publish Checksums
+      uses: softprops/action-gh-release@v2.0.8
+      with:
+        draft: true
+        files: SHA256SUMS
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/typos.yml

@@ -10,4 +10,4 @@ jobs:
         uses: actions/checkout@v4.1.7
 
       - name: Check spelling
-        uses: crate-ci/typos@v1.23.6
+        uses: crate-ci/typos@v1.26.0

Cargo.toml

@@ -10,8 +10,8 @@ homepage = "https://www.nushell.sh"
 license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
-rust-version = "1.78.0"
+rust-version = "1.79.0"
-version = "0.97.0"
+version = "0.99.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -69,18 +69,17 @@ base64 = "0.22.1"
 bracoxide = "0.1.2"
 brotli = "5.0"
 byteorder = "1.5"
+bytes = "1"
 bytesize = "1.3"
 calamine = "0.24.0"
 chardetng = "0.1.17"
 chrono = { default-features = false, version = "0.4.34" }
 chrono-humanize = "0.2.3"
 chrono-tz = "0.8"
-convert_case = "0.6"
 crossbeam-channel = "0.5.8"
-crossterm = "0.27"
+crossterm = "0.28.1"
 csv = "1.3"
 ctrlc = "3.4"
-deunicode = "1.6.0"
 dialoguer = { default-features = false, version = "0.11" }
 digest = { default-features = false, version = "0.10" }
 dirs = "5.0"
@@ -92,12 +91,12 @@ filesize = "0.2"
 filetime = "0.2"
 fuzzy-matcher = "0.3"
 heck = "0.5.0"
-human-date-parser = "0.1.1"
+human-date-parser = "0.2.0"
-indexmap = "2.4"
+indexmap = "2.6"
 indicatif = "0.17"
 interprocess = "2.2.0"
 is_executable = "1.0"
-itertools = "0.12"
+itertools = "0.13"
 libc = "0.2"
 libproc = "0.14"
 log = "0.4"
@@ -113,13 +112,13 @@ mime_guess = "2.0"
 mockito = { version = "1.5", default-features = false }
 multipart-rs = "0.1.11"
 native-tls = "0.2"
-nix = { version = "0.28", default-features = false }
+nix = { version = "0.29", default-features = false }
 notify-debouncer-full = { version = "0.3", default-features = false }
 nu-ansi-term = "0.50.1"
 num-format = "0.4"
 num-traits = "0.2"
 omnipath = "0.1"
-once_cell = "1.18"
+once_cell = "1.20"
 open = "5.3"
 os_pipe = { version = "1.2", features = ["io_safety"] }
 pathdiff = "0.2"
@@ -135,9 +134,10 @@ quickcheck = "1.0"
 quickcheck_macros = "1.0"
 quote = "1.0"
 rand = "0.8"
+rand_chacha = "0.3.1"
 ratatui = "0.26"
 rayon = "1.10"
-reedline = "0.34.0"
+reedline = "0.36.0"
 regex = "1.9.5"
 rmp = "0.8"
 rmp-serde = "1.3"
@@ -146,8 +146,7 @@ roxmltree = "0.19"
 rstest = { version = "0.18", default-features = false }
 rusqlite = "0.31"
 rust-embed = "8.5.0"
-same-file = "1.0"
+serde = { version = "1.0" }
-serde = { version = "1.0", default-features = false }
 serde_json = "1.0"
 serde_urlencoded = "0.7.1"
 serde_yaml = "0.9"
@@ -155,14 +154,14 @@ sha2 = "0.10"
 strip-ansi-escapes = "0.2.0"
 syn = "2.0"
 sysinfo = "0.30"
-tabled = { version = "0.14.0", default-features = false }
+tabled = { version = "0.16.0", default-features = false }
-tempfile = "3.10"
+tempfile = "3.13"
 terminal_size = "0.3"
 titlecase = "2.0"
 toml = "0.8"
 trash = "3.3"
 umask = "2.1"
-unicode-segmentation = "1.11"
+unicode-segmentation = "1.12"
 unicode-width = "0.1"
 ureq = { version = "2.10", default-features = false }
 url = "2.2"
@@ -181,23 +180,31 @@ windows = "0.54"
 windows-sys = "0.48"
 winreg = "0.52"
 
+[workspace.lints.clippy]
+# Warning: workspace lints affect library code as well as tests, so don't enable lints that would be too noisy in tests like that.
+# todo = "warn"
+unchecked_duration_subtraction = "warn"
+
+[lints]
+workspace = true
+
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.97.0" }
+nu-cli = { path = "./crates/nu-cli", version = "0.99.0" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.97.0" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.99.0" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.97.0" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.99.0" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.97.0", optional = true }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.99.0", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.97.0" }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.99.0" }
-nu-command = { path = "./crates/nu-command", version = "0.97.0" }
+nu-command = { path = "./crates/nu-command", version = "0.99.0" }
-nu-engine = { path = "./crates/nu-engine", version = "0.97.0" }
+nu-engine = { path = "./crates/nu-engine", version = "0.99.0" }
-nu-explore = { path = "./crates/nu-explore", version = "0.97.0" }
+nu-explore = { path = "./crates/nu-explore", version = "0.99.0" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.97.0" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.99.0" }
-nu-parser = { path = "./crates/nu-parser", version = "0.97.0" }
+nu-parser = { path = "./crates/nu-parser", version = "0.99.0" }
-nu-path = { path = "./crates/nu-path", version = "0.97.0" }
+nu-path = { path = "./crates/nu-path", version = "0.99.0" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.97.0" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.99.0" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.97.0" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.99.0" }
-nu-std = { path = "./crates/nu-std", version = "0.97.0" }
+nu-std = { path = "./crates/nu-std", version = "0.99.0" }
-nu-system = { path = "./crates/nu-system", version = "0.97.0" }
+nu-system = { path = "./crates/nu-system", version = "0.99.0" }
-nu-utils = { path = "./crates/nu-utils", version = "0.97.0" }
+nu-utils = { path = "./crates/nu-utils", version = "0.99.0" }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
 crossterm = { workspace = true }
@@ -227,12 +234,12 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.97.0" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.99.0" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.97.0" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.99.0" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.97.0" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.99.0" }
 assert_cmd = "2.0"
 dirs = { workspace = true }
-tango-bench = "0.5"
+tango-bench = "0.6"
 pretty_assertions = { workspace = true }
 regex = { workspace = true }
 rstest = { workspace = true, default-features = false }
@@ -249,10 +256,8 @@ plugin = [
   "nu-protocol/plugin",
   "nu-engine/plugin",
 ]
-default = ["default-no-clipboard", "system-clipboard"]
+
-# Enables convenient omitting of the system-clipboard feature, as it leads to problems in ci on linux
+default = [
-# See https://github.com/nushell/nushell/pull/11535
-default-no-clipboard = [
   "plugin",
   "trash-support",
   "sqlite",
@@ -266,6 +271,8 @@ stable = ["default"]
 static-link-openssl = ["dep:openssl", "nu-cmd-lang/static-link-openssl"]
 
 mimalloc = ["nu-cmd-lang/mimalloc", "dep:mimalloc"]
+# Optional system clipboard support in `reedline`, this behavior has problematic compatibility with some systems.
+# Missing X server/ Wayland can cause issues
 system-clipboard = [
   "reedline/system_clipboard",
   "nu-cli/system-clipboard",
@@ -306,11 +313,11 @@ bench = false
 # To use a development version of a dependency please use a global override here
 # changing versions in each sub-crate of the workspace is tedious
 [patch.crates-io]
-reedline = { git = "https://github.com/nushell/reedline", branch = "main" }
+# reedline = { git = "https://github.com/nushell/reedline", branch = "main" }
 # nu-ansi-term = {git = "https://github.com/nushell/nu-ansi-term.git", branch = "main"}
 
 # Run all benchmarks with `cargo bench`
 # Run individual benchmarks like `cargo bench -- <regex>` e.g. `cargo bench -- parse`
 [[bench]]
 name = "benchmarks"
-harness = false
+harness = false

benches/benchmarks.rs

@@ -46,8 +46,8 @@ fn setup_stack_and_engine_from_command(command: &str) -> (Stack, EngineState) {
 
     let mut stack = Stack::new();
 
-    // Support running benchmarks with IR mode
+    // Support running benchmarks without IR mode
-    stack.use_ir = std::env::var_os("NU_USE_IR").is_some();
+    stack.use_ir = std::env::var_os("NU_DISABLE_IR").is_none();
 
     evaluate_commands(
         &commands,

crates/nu-cli/Cargo.toml

@@ -5,27 +5,27 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cli"
 edition = "2021"
 license = "MIT"
 name = "nu-cli"
-version = "0.97.0"
+version = "0.99.0"
 
 [lib]
 bench = false
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.0" }
-nu-command = { path = "../nu-command", version = "0.97.0" }
+nu-command = { path = "../nu-command", version = "0.99.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.97.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.99.0" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.99.0" }
-nu-engine = { path = "../nu-engine", version = "0.97.0" }
+nu-engine = { path = "../nu-engine", version = "0.99.0" }
-nu-path = { path = "../nu-path", version = "0.97.0" }
+nu-path = { path = "../nu-path", version = "0.99.0" }
-nu-parser = { path = "../nu-parser", version = "0.97.0" }
+nu-parser = { path = "../nu-parser", version = "0.99.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.97.0", optional = true }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.99.0", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
-nu-utils = { path = "../nu-utils", version = "0.97.0" }
+nu-utils = { path = "../nu-utils", version = "0.99.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.97.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.99.0" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 
@@ -46,4 +46,7 @@ which = { workspace = true }
 
 [features]
 plugin = ["nu-plugin-engine"]
-system-clipboard = ["reedline/system_clipboard"]
+system-clipboard = ["reedline/system_clipboard"]
+
+[lints]
+workspace = true

crates/nu-cli/src/commands/commandline/commandline_.rs

@@ -14,7 +14,7 @@ impl Command for Commandline {
             .category(Category::Core)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "View the current command line input buffer."
     }
 

crates/nu-cli/src/commands/commandline/edit.rs

@@ -34,7 +34,7 @@ impl Command for SubCommand {
             .category(Category::Core)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Modify the current command line input buffer."
     }
 

crates/nu-cli/src/commands/commandline/get_cursor.rs

@@ -16,7 +16,7 @@ impl Command for SubCommand {
             .category(Category::Core)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Get the current cursor position."
     }
 

crates/nu-cli/src/commands/commandline/set_cursor.rs

@@ -22,7 +22,7 @@ impl Command for SubCommand {
             .category(Category::Core)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Set the current cursor position."
     }
 

crates/nu-cli/src/commands/history/history_.rs

@@ -13,7 +13,7 @@ impl Command for History {
         "history"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Get the command history."
     }
 
@@ -42,91 +42,75 @@ impl Command for History {
         let Some(history) = engine_state.history_config() else {
             return Ok(PipelineData::empty());
         };
-
         // todo for sqlite history this command should be an alias to `open ~/.config/nushell/history.sqlite3 | get history`
-        if let Some(config_path) = nu_path::config_dir() {
+        let Some(history_path) = history.file_path() else {
-            let clear = call.has_flag(engine_state, stack, "clear")?;
+            return Err(ShellError::ConfigDirNotFound { span: Some(head) });
-            let long = call.has_flag(engine_state, stack, "long")?;
+        };
-            let signals = engine_state.signals().clone();
 
-            let mut history_path = config_path;
+        if call.has_flag(engine_state, stack, "clear")? {
-            history_path.push("nushell");
+            let _ = std::fs::remove_file(history_path);
-            match history.file_format {
+            // TODO: FIXME also clear the auxiliary files when using sqlite
-                HistoryFileFormat::Sqlite => {
+            return Ok(PipelineData::empty());
-                    history_path.push("history.sqlite3");
+        }
-                }
-                HistoryFileFormat::PlainText => {
-                    history_path.push("history.txt");
-                }
-            }
 
-            if clear {
+        let long = call.has_flag(engine_state, stack, "long")?;
-                let _ = std::fs::remove_file(history_path);
+        let signals = engine_state.signals().clone();
-                // TODO: FIXME also clear the auxiliary files when using sqlite
+        let history_reader: Option<Box<dyn ReedlineHistory>> = match history.file_format {
-                Ok(PipelineData::empty())
+            HistoryFileFormat::Sqlite => {
-            } else {
+                SqliteBackedHistory::with_file(history_path.clone(), None, None)
-                let history_reader: Option<Box<dyn ReedlineHistory>> = match history.file_format {
-                    HistoryFileFormat::Sqlite => {
-                        SqliteBackedHistory::with_file(history_path.clone().into(), None, None)
-                            .map(|inner| {
-                                let boxed: Box<dyn ReedlineHistory> = Box::new(inner);
-                                boxed
-                            })
-                            .ok()
-                    }
-
-                    HistoryFileFormat::PlainText => FileBackedHistory::with_file(
-                        history.max_size as usize,
-                        history_path.clone().into(),
-                    )
                     .map(|inner| {
                         let boxed: Box<dyn ReedlineHistory> = Box::new(inner);
                         boxed
                     })
-                    .ok(),
+                    .ok()
-                };
-
-                match history.file_format {
-                    HistoryFileFormat::PlainText => Ok(history_reader
-                        .and_then(|h| {
-                            h.search(SearchQuery::everything(SearchDirection::Forward, None))
-                                .ok()
-                        })
-                        .map(move |entries| {
-                            entries.into_iter().enumerate().map(move |(idx, entry)| {
-                                Value::record(
-                                    record! {
-                                        "command" => Value::string(entry.command_line, head),
-                                        "index" => Value::int(idx as i64, head),
-                                    },
-                                    head,
-                                )
-                            })
-                        })
-                        .ok_or(ShellError::FileNotFound {
-                            file: history_path.display().to_string(),
-                            span: head,
-                        })?
-                        .into_pipeline_data(head, signals)),
-                    HistoryFileFormat::Sqlite => Ok(history_reader
-                        .and_then(|h| {
-                            h.search(SearchQuery::everything(SearchDirection::Forward, None))
-                                .ok()
-                        })
-                        .map(move |entries| {
-                            entries.into_iter().enumerate().map(move |(idx, entry)| {
-                                create_history_record(idx, entry, long, head)
-                            })
-                        })
-                        .ok_or(ShellError::FileNotFound {
-                            file: history_path.display().to_string(),
-                            span: head,
-                        })?
-                        .into_pipeline_data(head, signals)),
-                }
             }
-        } else {
+            HistoryFileFormat::Plaintext => {
-            Err(ShellError::ConfigDirNotFound { span: Some(head) })
+                FileBackedHistory::with_file(history.max_size as usize, history_path.clone())
+                    .map(|inner| {
+                        let boxed: Box<dyn ReedlineHistory> = Box::new(inner);
+                        boxed
+                    })
+                    .ok()
+            }
+        };
+        match history.file_format {
+            HistoryFileFormat::Plaintext => Ok(history_reader
+                .and_then(|h| {
+                    h.search(SearchQuery::everything(SearchDirection::Forward, None))
+                        .ok()
+                })
+                .map(move |entries| {
+                    entries.into_iter().enumerate().map(move |(idx, entry)| {
+                        Value::record(
+                            record! {
+                                "command" => Value::string(entry.command_line, head),
+                                "index" => Value::int(idx as i64, head),
+                            },
+                            head,
+                        )
+                    })
+                })
+                .ok_or(ShellError::FileNotFound {
+                    file: history_path.display().to_string(),
+                    span: head,
+                })?
+                .into_pipeline_data(head, signals)),
+            HistoryFileFormat::Sqlite => Ok(history_reader
+                .and_then(|h| {
+                    h.search(SearchQuery::everything(SearchDirection::Forward, None))
+                        .ok()
+                })
+                .map(move |entries| {
+                    entries
+                        .into_iter()
+                        .enumerate()
+                        .map(move |(idx, entry)| create_history_record(idx, entry, long, head))
+                })
+                .ok_or(ShellError::FileNotFound {
+                    file: history_path.display().to_string(),
+                    span: head,
+                })?
+                .into_pipeline_data(head, signals)),
         }
     }
 

crates/nu-cli/src/commands/history/history_session.rs

@@ -8,7 +8,7 @@ impl Command for HistorySession {
         "history session"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Get the command history session."
     }
 

crates/nu-cli/src/commands/keybindings.rs

@@ -14,11 +14,11 @@ impl Command for Keybindings {
             .input_output_types(vec![(Type::Nothing, Type::String)])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Keybindings related commands."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"You must use one of the following subcommands. Using this command as-is will only produce this help message.
 
 For more information on input and keybindings, check:

crates/nu-cli/src/commands/keybindings_default.rs

@@ -15,7 +15,7 @@ impl Command for KeybindingsDefault {
             .input_output_types(vec![(Type::Nothing, Type::table())])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "List default keybindings."
     }
 

crates/nu-cli/src/commands/keybindings_list.rs

@@ -23,7 +23,7 @@ impl Command for KeybindingsList {
             .category(Category::Platform)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "List available options that can be used to create keybindings."
     }
 

crates/nu-cli/src/commands/keybindings_listen.rs

@@ -12,11 +12,11 @@ impl Command for KeybindingsListen {
         "keybindings listen"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Get input from the user."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "This is an internal debugging tool. For better output, try `input listen --types [key]`"
     }
 

crates/nu-cli/src/completions/base.rs

@@ -12,7 +12,7 @@ pub trait Completer {
         &mut self,
         working_set: &StateWorkingSet,
         stack: &Stack,
-        prefix: Vec<u8>,
+        prefix: &[u8],
         span: Span,
         offset: usize,
         pos: usize,

crates/nu-cli/src/completions/command_completions.rs

@@ -51,7 +51,9 @@ impl CommandCompletion {
                             if working_set
                                 .permanent_state
                                 .config
-                                .max_external_completion_results
+                                .completions
+                                .external
+                                .max_results
                                 > executables.len() as i64
                                 && !executables.contains(
                                     &item
@@ -156,7 +158,7 @@ impl Completer for CommandCompletion {
         &mut self,
         working_set: &StateWorkingSet,
         _stack: &Stack,
-        prefix: Vec<u8>,
+        prefix: &[u8],
         span: Span,
         offset: usize,
         pos: usize,
@@ -193,7 +195,7 @@ impl Completer for CommandCompletion {
         };
 
         if !subcommands.is_empty() {
-            return sort_suggestions(&String::from_utf8_lossy(&prefix), subcommands, options);
+            return sort_suggestions(&String::from_utf8_lossy(prefix), subcommands, options);
         }
 
         let config = working_set.get_config();
@@ -211,14 +213,14 @@ impl Completer for CommandCompletion {
                 working_set,
                 span,
                 offset,
-                config.enable_external_completion,
+                config.completions.external.enable,
                 options.match_algorithm,
             )
         } else {
             vec![]
         };
 
-        sort_suggestions(&String::from_utf8_lossy(&prefix), commands, options)
+        sort_suggestions(&String::from_utf8_lossy(prefix), commands, options)
     }
 }
 

crates/nu-cli/src/completions/completer.rs

@@ -1,6 +1,6 @@
 use crate::completions::{
     CommandCompletion, Completer, CompletionOptions, CustomCompletion, DirectoryCompletion,
-    DotNuCompletion, FileCompletion, FlagCompletion, VariableCompletion,
+    DotNuCompletion, FileCompletion, FlagCompletion, OperatorCompletion, VariableCompletion,
 };
 use nu_color_config::{color_record_to_nustyle, lookup_ansi_color_style};
 use nu_engine::eval_block;
@@ -25,7 +25,7 @@ impl NuCompleter {
     pub fn new(engine_state: Arc<EngineState>, stack: Arc<Stack>) -> Self {
         Self {
             engine_state,
-            stack: Stack::with_parent(stack).reset_out_dest().capture(),
+            stack: Stack::with_parent(stack).reset_out_dest().collect_value(),
         }
     }
 
@@ -38,7 +38,7 @@ impl NuCompleter {
         &self,
         completer: &mut T,
         working_set: &StateWorkingSet,
-        prefix: Vec<u8>,
+        prefix: &[u8],
         new_span: Span,
         offset: usize,
         pos: usize,
@@ -46,16 +46,16 @@ impl NuCompleter {
         let config = self.engine_state.get_config();
 
         let options = CompletionOptions {
-            case_sensitive: config.case_sensitive_completions,
+            case_sensitive: config.completions.case_sensitive,
-            match_algorithm: config.completion_algorithm.into(),
+            match_algorithm: config.completions.algorithm.into(),
-            sort: config.completion_sort,
+            sort: config.completions.sort,
             ..Default::default()
         };
 
         completer.fetch(
             working_set,
             &self.stack,
-            prefix.clone(),
+            prefix,
             new_span,
             offset,
             pos,
@@ -170,23 +170,38 @@ impl NuCompleter {
                         let new_span = Span::new(flat.0.start, flat.0.end - 1);
 
                         // Parses the prefix. Completion should look up to the cursor position, not after.
-                        let mut prefix = working_set.get_span_contents(flat.0).to_vec();
+                        let mut prefix = working_set.get_span_contents(flat.0);
                         let index = pos - flat.0.start;
-                        prefix.drain(index..);
+                        prefix = &prefix[..index];
 
                         // Variables completion
                         if prefix.starts_with(b"$") || most_left_var.is_some() {
-                            let mut completer =
+                            let mut variable_names_completer =
                                 VariableCompletion::new(most_left_var.unwrap_or((vec![], vec![])));
 
-                            return self.process_completion(
+                            let mut variable_completions = self.process_completion(
-                                &mut completer,
+                                &mut variable_names_completer,
                                 &working_set,
                                 prefix,
                                 new_span,
                                 fake_offset,
                                 pos,
                             );
+
+                            let mut variable_operations_completer =
+                                OperatorCompletion::new(pipeline_element.expr.clone());
+
+                            let mut variable_operations_completions = self.process_completion(
+                                &mut variable_operations_completer,
+                                &working_set,
+                                prefix,
+                                new_span,
+                                fake_offset,
+                                pos,
+                            );
+
+                            variable_completions.append(&mut variable_operations_completions);
+                            return variable_completions;
                         }
 
                         // Flags completion
@@ -196,7 +211,7 @@ impl NuCompleter {
                             let result = self.process_completion(
                                 &mut completer,
                                 &working_set,
-                                prefix.clone(),
+                                prefix,
                                 new_span,
                                 fake_offset,
                                 pos,
@@ -208,7 +223,7 @@ impl NuCompleter {
 
                             // We got no results for internal completion
                             // now we can check if external completer is set and use it
-                            if let Some(closure) = config.external_completer.as_ref() {
+                            if let Some(closure) = config.completions.external.completer.as_ref() {
                                 if let Some(external_result) =
                                     self.external_completion(closure, &spans, fake_offset, new_span)
                                 {
@@ -262,6 +277,26 @@ impl NuCompleter {
                                 } else if prev_expr_str == b"ls" {
                                     let mut completer = FileCompletion::new();
 
+                                    return self.process_completion(
+                                        &mut completer,
+                                        &working_set,
+                                        prefix,
+                                        new_span,
+                                        fake_offset,
+                                        pos,
+                                    );
+                                } else if matches!(
+                                    previous_expr.1,
+                                    FlatShape::Float
+                                        | FlatShape::Int
+                                        | FlatShape::String
+                                        | FlatShape::List
+                                        | FlatShape::Bool
+                                        | FlatShape::Variable(_)
+                                ) {
+                                    let mut completer =
+                                        OperatorCompletion::new(pipeline_element.expr.clone());
+
                                     return self.process_completion(
                                         &mut completer,
                                         &working_set,
@@ -327,7 +362,7 @@ impl NuCompleter {
                                 let mut out: Vec<_> = self.process_completion(
                                     &mut completer,
                                     &working_set,
-                                    prefix.clone(),
+                                    prefix,
                                     new_span,
                                     fake_offset,
                                     pos,
@@ -338,7 +373,9 @@ impl NuCompleter {
                                 }
 
                                 // Try to complete using an external completer (if set)
-                                if let Some(closure) = config.external_completer.as_ref() {
+                                if let Some(closure) =
+                                    config.completions.external.completer.as_ref()
+                                {
                                     if let Some(external_result) = self.external_completion(
                                         closure,
                                         &spans,
@@ -531,6 +568,11 @@ mod completer_tests {
 
         let mut completer = NuCompleter::new(engine_state.into(), Arc::new(Stack::new()));
         let dataset = [
+            ("1 bit-sh", true, "b", vec!["bit-shl", "bit-shr"]),
+            ("1.0 bit-sh", false, "b", vec![]),
+            ("1 m", true, "m", vec!["mod"]),
+            ("1.0 m", true, "m", vec!["mod"]),
+            ("\"a\" s", true, "s", vec!["starts-with"]),
             ("sudo", false, "", Vec::new()),
             ("sudo l", true, "l", vec!["ls", "let", "lines", "loop"]),
             (" sudo", false, "", Vec::new()),

crates/nu-cli/src/completions/completion_common.rs

@@ -1,3 +1,4 @@
+use super::MatchAlgorithm;
 use crate::{
     completions::{matches, CompletionOptions},
     SemanticSuggestion,
@@ -5,6 +6,7 @@ use crate::{
 use fuzzy_matcher::{skim::SkimMatcherV2, FuzzyMatcher};
 use nu_ansi_term::Style;
 use nu_engine::env_to_string;
+use nu_path::dots::expand_ndots;
 use nu_path::{expand_to_real_path, home_dir};
 use nu_protocol::{
     engine::{EngineState, Stack, StateWorkingSet},
@@ -13,8 +15,6 @@ use nu_protocol::{
 use nu_utils::get_ls_colors;
 use std::path::{is_separator, Component, Path, PathBuf, MAIN_SEPARATOR as SEP};
 
-use super::MatchAlgorithm;
-
 #[derive(Clone, Default)]
 pub struct PathBuiltFromString {
     parts: Vec<String>,
@@ -41,7 +41,7 @@ pub fn complete_rec(
     let mut completions = vec![];
 
     if let Some((&base, rest)) = partial.split_first() {
-        if (base == "." || base == "..") && (isdir || !rest.is_empty()) {
+        if base.chars().all(|c| c == '.') && (isdir || !rest.is_empty()) {
             let mut built = built.clone();
             built.parts.push(base.to_string());
             built.isdir = true;
@@ -156,22 +156,31 @@ pub fn complete_item(
     engine_state: &EngineState,
     stack: &Stack,
 ) -> Vec<(nu_protocol::Span, String, Option<Style>)> {
-    let partial = surround_remove(partial);
+    let cleaned_partial = surround_remove(partial);
-    let isdir = partial.ends_with(is_separator);
+    let isdir = cleaned_partial.ends_with(is_separator);
+    let expanded_partial = expand_ndots(Path::new(&cleaned_partial));
+    let should_collapse_dots = expanded_partial != Path::new(&cleaned_partial);
+    let mut partial = expanded_partial.to_string_lossy().to_string();
 
     #[cfg(unix)]
     let path_separator = SEP;
     #[cfg(windows)]
-    let path_separator = partial
+    let path_separator = cleaned_partial
         .chars()
         .rfind(|c: &char| is_separator(*c))
         .unwrap_or(SEP);
+
+    // Handle the trailing dot case
+    if cleaned_partial.ends_with(&format!("{path_separator}.")) {
+        partial.push_str(&format!("{path_separator}."));
+    }
+
     let cwd_pathbuf = Path::new(cwd).to_path_buf();
-    let ls_colors = (engine_state.config.use_ls_colors_completions
+    let ls_colors = (engine_state.config.completions.use_ls_colors
         && engine_state.config.use_ansi_coloring)
         .then(|| {
             let ls_colors_env_str = match stack.get_env_var(engine_state, "LS_COLORS") {
-                Some(v) => env_to_string("LS_COLORS", &v, engine_state, stack).ok(),
+                Some(v) => env_to_string("LS_COLORS", v, engine_state, stack).ok(),
                 None => None,
             };
             get_ls_colors(ls_colors_env_str)
@@ -185,16 +194,11 @@ pub fn complete_item(
     match components.peek().cloned() {
         Some(c @ Component::Prefix(..)) => {
             // windows only by definition
-            components.next();
-            if let Some(Component::RootDir) = components.peek().cloned() {
-                components.next();
-            };
             cwd = [c, Component::RootDir].iter().collect();
             prefix_len = c.as_os_str().len();
             original_cwd = OriginalCwd::Prefix(c.as_os_str().to_string_lossy().into_owned());
         }
         Some(c @ Component::RootDir) => {
-            components.next();
             // This is kind of a hack. When joining an empty string with the rest,
             // we add the slash automagically
             cwd = PathBuf::from(c.as_os_str());
@@ -202,7 +206,6 @@ pub fn complete_item(
             original_cwd = OriginalCwd::Prefix(String::new());
         }
         Some(Component::Normal(home)) if home.to_string_lossy() == "~" => {
-            components.next();
             cwd = home_dir().map(Into::into).unwrap_or(cwd_pathbuf);
             prefix_len = 1;
             original_cwd = OriginalCwd::Home;
@@ -227,7 +230,10 @@ pub fn complete_item(
         isdir,
     )
     .into_iter()
-    .map(|p| {
+    .map(|mut p| {
+        if should_collapse_dots {
+            p = collapse_ndots(p);
+        }
         let path = original_cwd.apply(p, path_separator);
         let style = ls_colors.as_ref().map(|lsc| {
             lsc.style_for_path_with_metadata(
@@ -261,8 +267,10 @@ pub fn escape_path(path: String, dir: bool) -> String {
     let filename_contaminated = !dir && path.contains(['\'', '"', ' ', '#', '(', ')']);
     let dirname_contaminated = dir && path.contains(['\'', '"', ' ', '#']);
     let maybe_flag = path.starts_with('-');
+    let maybe_variable = path.starts_with('$');
     let maybe_number = path.parse::<f64>().is_ok();
-    if filename_contaminated || dirname_contaminated || maybe_flag || maybe_number {
+    if filename_contaminated || dirname_contaminated || maybe_flag || maybe_variable || maybe_number
+    {
         format!("`{path}`")
     } else {
         path
@@ -327,7 +335,7 @@ pub fn sort_completions<T>(
         } else {
             matcher = matcher.ignore_case();
         };
-        items.sort_by(|a, b| {
+        items.sort_unstable_by(|a, b| {
             let a_str = get_value(a);
             let b_str = get_value(b);
             let a_score = matcher.fuzzy_match(a_str, prefix).unwrap_or_default();
@@ -335,8 +343,42 @@ pub fn sort_completions<T>(
             b_score.cmp(&a_score).then(a_str.cmp(b_str))
         });
     } else {
-        items.sort_by(|a, b| get_value(a).cmp(get_value(b)));
+        items.sort_unstable_by(|a, b| get_value(a).cmp(get_value(b)));
     }
 
     items
 }
+
+/// Collapse multiple ".." components into n-dots.
+///
+/// It performs the reverse operation of `expand_ndots`, collapsing sequences of ".." into n-dots,
+/// such as "..." and "....".
+///
+/// The resulting path will use platform-specific path separators, regardless of what path separators were used in the input.
+fn collapse_ndots(path: PathBuiltFromString) -> PathBuiltFromString {
+    let mut result = PathBuiltFromString {
+        parts: Vec::with_capacity(path.parts.len()),
+        isdir: path.isdir,
+    };
+
+    let mut dot_count = 0;
+
+    for part in path.parts {
+        if part == ".." {
+            dot_count += 1;
+        } else {
+            if dot_count > 0 {
+                result.parts.push(".".repeat(dot_count + 1));
+                dot_count = 0;
+            }
+            result.parts.push(part);
+        }
+    }
+
+    // Add any remaining dots
+    if dot_count > 0 {
+        result.parts.push(".".repeat(dot_count + 1));
+    }
+
+    result
+}

crates/nu-cli/src/completions/custom_completions.rs

@@ -7,7 +7,7 @@ use nu_protocol::{
     ast::{Argument, Call, Expr, Expression},
     debugger::WithoutDebug,
     engine::{Stack, StateWorkingSet},
-    CompletionSort, PipelineData, Span, Type, Value,
+    CompletionSort, DeclId, PipelineData, Span, Type, Value,
 };
 use nu_utils::IgnoreCaseExt;
 use std::collections::HashMap;
@@ -16,12 +16,12 @@ use super::completion_common::sort_suggestions;
 
 pub struct CustomCompletion {
     stack: Stack,
-    decl_id: usize,
+    decl_id: DeclId,
     line: String,
 }
 
 impl CustomCompletion {
-    pub fn new(stack: Stack, decl_id: usize, line: String) -> Self {
+    pub fn new(stack: Stack, decl_id: DeclId, line: String) -> Self {
         Self {
             stack,
             decl_id,
@@ -35,7 +35,7 @@ impl Completer for CustomCompletion {
         &mut self,
         working_set: &StateWorkingSet,
         _stack: &Stack,
-        prefix: Vec<u8>,
+        prefix: &[u8],
         span: Span,
         offset: usize,
         pos: usize,
@@ -126,8 +126,8 @@ impl Completer for CustomCompletion {
         let options = custom_completion_options
             .as_ref()
             .unwrap_or(completion_options);
-        let suggestions = filter(&prefix, suggestions, completion_options);
+        let suggestions = filter(prefix, suggestions, options);
-        sort_suggestions(&String::from_utf8_lossy(&prefix), suggestions, options)
+        sort_suggestions(&String::from_utf8_lossy(prefix), suggestions, options)
     }
 }
 

crates/nu-cli/src/completions/directory_completions.rs

@@ -26,13 +26,13 @@ impl Completer for DirectoryCompletion {
         &mut self,
         working_set: &StateWorkingSet,
         stack: &Stack,
-        prefix: Vec<u8>,
+        prefix: &[u8],
         span: Span,
         offset: usize,
         _pos: usize,
         options: &CompletionOptions,
     ) -> Vec<SemanticSuggestion> {
-        let AdjustView { prefix, span, .. } = adjust_if_intermediate(&prefix, working_set, span);
+        let AdjustView { prefix, span, .. } = adjust_if_intermediate(prefix, working_set, span);
 
         // Filter only the folders
         #[allow(deprecated)]

crates/nu-cli/src/completions/dotnu_completions.rs

@@ -22,13 +22,13 @@ impl Completer for DotNuCompletion {
         &mut self,
         working_set: &StateWorkingSet,
         stack: &Stack,
-        prefix: Vec<u8>,
+        prefix: &[u8],
         span: Span,
         offset: usize,
         _pos: usize,
         options: &CompletionOptions,
     ) -> Vec<SemanticSuggestion> {
-        let prefix_str = String::from_utf8_lossy(&prefix).replace('`', "");
+        let prefix_str = String::from_utf8_lossy(prefix).replace('`', "");
         let mut search_dirs: Vec<String> = vec![];
 
         // If prefix_str is only a word we want to search in the current dir

crates/nu-cli/src/completions/file_completions.rs

@@ -27,7 +27,7 @@ impl Completer for FileCompletion {
         &mut self,
         working_set: &StateWorkingSet,
         stack: &Stack,
-        prefix: Vec<u8>,
+        prefix: &[u8],
         span: Span,
         offset: usize,
         _pos: usize,
@@ -37,7 +37,7 @@ impl Completer for FileCompletion {
             prefix,
             span,
             readjusted,
-        } = adjust_if_intermediate(&prefix, working_set, span);
+        } = adjust_if_intermediate(prefix, working_set, span);
 
         #[allow(deprecated)]
         let items: Vec<_> = complete_item(

crates/nu-cli/src/completions/flag_completions.rs

@@ -24,7 +24,7 @@ impl Completer for FlagCompletion {
         &mut self,
         working_set: &StateWorkingSet,
         _stack: &Stack,
-        prefix: Vec<u8>,
+        prefix: &[u8],
         span: Span,
         offset: usize,
         _pos: usize,
@@ -44,7 +44,7 @@ impl Completer for FlagCompletion {
                     short.encode_utf8(&mut named);
                     named.insert(0, b'-');
 
-                    if options.match_algorithm.matches_u8(&named, &prefix) {
+                    if options.match_algorithm.matches_u8(&named, prefix) {
                         output.push(SemanticSuggestion {
                             suggestion: Suggestion {
                                 value: String::from_utf8_lossy(&named).to_string(),
@@ -70,7 +70,7 @@ impl Completer for FlagCompletion {
                 named.insert(0, b'-');
                 named.insert(0, b'-');
 
-                if options.match_algorithm.matches_u8(&named, &prefix) {
+                if options.match_algorithm.matches_u8(&named, prefix) {
                     output.push(SemanticSuggestion {
                         suggestion: Suggestion {
                             value: String::from_utf8_lossy(&named).to_string(),
@@ -88,7 +88,7 @@ impl Completer for FlagCompletion {
                 }
             }
 
-            return sort_suggestions(&String::from_utf8_lossy(&prefix), output, options);
+            return sort_suggestions(&String::from_utf8_lossy(prefix), output, options);
         }
 
         vec![]

crates/nu-cli/src/completions/mod.rs

@@ -8,6 +8,7 @@ mod directory_completions;
 mod dotnu_completions;
 mod file_completions;
 mod flag_completions;
+mod operator_completions;
 mod variable_completions;
 
 pub use base::{Completer, SemanticSuggestion, SuggestionKind};
@@ -19,4 +20,5 @@ pub use directory_completions::DirectoryCompletion;
 pub use dotnu_completions::DotNuCompletion;
 pub use file_completions::{file_path_completion, matches, FileCompletion};
 pub use flag_completions::FlagCompletion;
+pub use operator_completions::OperatorCompletion;
 pub use variable_completions::VariableCompletion;

crates/nu-cli/src/completions/operator_completions.rs

@@ -0,0 +1,180 @@
+use crate::completions::{
+    Completer, CompletionOptions, MatchAlgorithm, SemanticSuggestion, SuggestionKind,
+};
+use nu_protocol::{
+    ast::{Expr, Expression},
+    engine::{Stack, StateWorkingSet},
+    Span, Type,
+};
+use reedline::Suggestion;
+
+#[derive(Clone)]
+pub struct OperatorCompletion {
+    previous_expr: Expression,
+}
+
+impl OperatorCompletion {
+    pub fn new(previous_expr: Expression) -> Self {
+        OperatorCompletion { previous_expr }
+    }
+}
+
+impl Completer for OperatorCompletion {
+    fn fetch(
+        &mut self,
+        working_set: &StateWorkingSet,
+        _stack: &Stack,
+        _prefix: &[u8],
+        span: Span,
+        offset: usize,
+        _pos: usize,
+        _options: &CompletionOptions,
+    ) -> Vec<SemanticSuggestion> {
+        //Check if int, float, or string
+        let partial = std::str::from_utf8(working_set.get_span_contents(span)).unwrap_or("");
+        let op = match &self.previous_expr.expr {
+            Expr::BinaryOp(x, _, _) => &x.expr,
+            _ => {
+                return vec![];
+            }
+        };
+        let possible_operations = match op {
+            Expr::Int(_) => vec![
+                ("+", "Add (Plus)"),
+                ("-", "Subtract (Minus)"),
+                ("*", "Multiply"),
+                ("/", "Divide"),
+                ("==", "Equal to"),
+                ("!=", "Not equal to"),
+                ("//", "Floor division"),
+                ("<", "Less than"),
+                (">", "Greater than"),
+                ("<=", "Less than or equal to"),
+                (">=", "Greater than or equal to"),
+                ("mod", "Floor division remainder (Modulo)"),
+                ("**", "Power of"),
+                ("bit-or", "Bitwise OR"),
+                ("bit-xor", "Bitwise exclusive OR"),
+                ("bit-and", "Bitwise AND"),
+                ("bit-shl", "Bitwise shift left"),
+                ("bit-shr", "Bitwise shift right"),
+                ("in", "Is a member of (doesn't use regex)"),
+                ("not-in", "Is not a member of (doesn't use regex)"),
+                (
+                    "++",
+                    "Appends two lists, a list and a value, two strings, or two binary values",
+                ),
+            ],
+            Expr::String(_) => vec![
+                ("=~", "Contains regex match"),
+                ("!~", "Does not contain regex match"),
+                (
+                    "++",
+                    "Appends two lists, a list and a value, two strings, or two binary values",
+                ),
+                ("in", "Is a member of (doesn't use regex)"),
+                ("not-in", "Is not a member of (doesn't use regex)"),
+                ("starts-with", "Starts with"),
+                ("ends-with", "Ends with"),
+            ],
+            Expr::Float(_) => vec![
+                ("+", "Add (Plus)"),
+                ("-", "Subtract (Minus)"),
+                ("*", "Multiply"),
+                ("/", "Divide"),
+                ("==", "Equal to"),
+                ("!=", "Not equal to"),
+                ("//", "Floor division"),
+                ("<", "Less than"),
+                (">", "Greater than"),
+                ("<=", "Less than or equal to"),
+                (">=", "Greater than or equal to"),
+                ("mod", "Floor division remainder (Modulo)"),
+                ("**", "Power of"),
+                ("in", "Is a member of (doesn't use regex)"),
+                ("not-in", "Is not a member of (doesn't use regex)"),
+                (
+                    "++",
+                    "Appends two lists, a list and a value, two strings, or two binary values",
+                ),
+            ],
+            Expr::Bool(_) => vec![
+                (
+                    "and",
+                    "Both values are true (short-circuits when first value is false)",
+                ),
+                (
+                    "or",
+                    "Either value is true (short-circuits when first value is true)",
+                ),
+                ("xor", "One value is true and the other is false"),
+                ("not", "Negates a value or expression"),
+                ("in", "Is a member of (doesn't use regex)"),
+                ("not-in", "Is not a member of (doesn't use regex)"),
+                (
+                    "++",
+                    "Appends two lists, a list and a value, two strings, or two binary values",
+                ),
+            ],
+            Expr::FullCellPath(path) => match path.head.expr {
+                Expr::List(_) => vec![(
+                    "++",
+                    "Appends two lists, a list and a value, two strings, or two binary values",
+                )],
+                Expr::Var(id) => get_variable_completions(id, working_set),
+                _ => vec![],
+            },
+            _ => vec![],
+        };
+
+        let match_algorithm = MatchAlgorithm::Prefix;
+        let input_fuzzy_search =
+            |(operator, _): &(&str, &str)| match_algorithm.matches_str(operator, partial);
+
+        possible_operations
+            .into_iter()
+            .filter(input_fuzzy_search)
+            .map(move |x| SemanticSuggestion {
+                suggestion: Suggestion {
+                    value: x.0.to_string(),
+                    description: Some(x.1.to_string()),
+                    span: reedline::Span::new(span.start - offset, span.end - offset),
+                    append_whitespace: true,
+                    ..Suggestion::default()
+                },
+                kind: Some(SuggestionKind::Command(
+                    nu_protocol::engine::CommandType::Builtin,
+                )),
+            })
+            .collect()
+    }
+}
+
+pub fn get_variable_completions<'a>(
+    id: nu_protocol::Id<nu_protocol::marker::Var>,
+    working_set: &StateWorkingSet,
+) -> Vec<(&'a str, &'a str)> {
+    let var = working_set.get_variable(id);
+    if !var.mutable {
+        return vec![];
+    }
+
+    match var.ty {
+        Type::List(_) | Type::String | Type::Binary => vec![
+            (
+                "++=",
+                "Appends a list, a value, a string, or a binary value to a variable.",
+            ),
+            ("=", "Assigns a value to a variable."),
+        ],
+
+        Type::Int | Type::Float => vec![
+            ("=", "Assigns a value to a variable."),
+            ("+=", "Adds a value to a variable."),
+            ("-=", "Subtracts a value from a variable."),
+            ("*=", "Multiplies a variable by a value"),
+            ("/=", "Divides a variable by a value."),
+        ],
+        _ => vec![],
+    }
+}

crates/nu-cli/src/completions/variable_completions.rs

@@ -27,7 +27,7 @@ impl Completer for VariableCompletion {
         &mut self,
         working_set: &StateWorkingSet,
         stack: &Stack,
-        prefix: Vec<u8>,
+        prefix: &[u8],
         span: Span,
         offset: usize,
         _pos: usize,
@@ -42,7 +42,7 @@ impl Completer for VariableCompletion {
             end: span.end - offset,
         };
         let sublevels_count = self.var_context.1.len();
-        let prefix_str = String::from_utf8_lossy(&prefix);
+        let prefix_str = String::from_utf8_lossy(prefix);
 
         // Completions for the given variable
         if !var_str.is_empty() {
@@ -66,7 +66,7 @@ impl Completer for VariableCompletion {
                             if options.match_algorithm.matches_u8_insensitive(
                                 options.case_sensitive,
                                 suggestion.suggestion.value.as_bytes(),
-                                &prefix,
+                                prefix,
                             ) {
                                 output.push(suggestion);
                             }
@@ -80,7 +80,7 @@ impl Completer for VariableCompletion {
                         if options.match_algorithm.matches_u8_insensitive(
                             options.case_sensitive,
                             env_var.0.as_bytes(),
-                            &prefix,
+                            prefix,
                         ) {
                             output.push(SemanticSuggestion {
                                 suggestion: Suggestion {
@@ -111,7 +111,7 @@ impl Completer for VariableCompletion {
                         if options.match_algorithm.matches_u8_insensitive(
                             options.case_sensitive,
                             suggestion.suggestion.value.as_bytes(),
-                            &prefix,
+                            prefix,
                         ) {
                             output.push(suggestion);
                         }
@@ -133,7 +133,7 @@ impl Completer for VariableCompletion {
                         if options.match_algorithm.matches_u8_insensitive(
                             options.case_sensitive,
                             suggestion.suggestion.value.as_bytes(),
-                            &prefix,
+                            prefix,
                         ) {
                             output.push(suggestion);
                         }
@@ -149,7 +149,7 @@ impl Completer for VariableCompletion {
             if options.match_algorithm.matches_u8_insensitive(
                 options.case_sensitive,
                 builtin.as_bytes(),
-                &prefix,
+                prefix,
             ) {
                 output.push(SemanticSuggestion {
                     suggestion: Suggestion {
@@ -173,7 +173,7 @@ impl Completer for VariableCompletion {
                     if options.match_algorithm.matches_u8_insensitive(
                         options.case_sensitive,
                         v.0,
-                        &prefix,
+                        prefix,
                     ) {
                         output.push(SemanticSuggestion {
                             suggestion: Suggestion {
@@ -201,7 +201,7 @@ impl Completer for VariableCompletion {
                 if options.match_algorithm.matches_u8_insensitive(
                     options.case_sensitive,
                     v.0,
-                    &prefix,
+                    prefix,
                 ) {
                     output.push(SemanticSuggestion {
                         suggestion: Suggestion {

crates/nu-cli/src/config_files.rs

@@ -2,10 +2,10 @@ use crate::util::eval_source;
 #[cfg(feature = "plugin")]
 use nu_path::canonicalize_with;
 #[cfg(feature = "plugin")]
-use nu_protocol::{engine::StateWorkingSet, report_error, ParseError, PluginRegistryFile, Spanned};
+use nu_protocol::{engine::StateWorkingSet, ParseError, PluginRegistryFile, Spanned};
 use nu_protocol::{
     engine::{EngineState, Stack},
-    report_error_new, HistoryFileFormat, PipelineData,
+    report_shell_error, PipelineData,
 };
 #[cfg(feature = "plugin")]
 use nu_utils::perf;
@@ -16,15 +16,8 @@ const PLUGIN_FILE: &str = "plugin.msgpackz";
 #[cfg(feature = "plugin")]
 const OLD_PLUGIN_FILE: &str = "plugin.nu";
 
-const HISTORY_FILE_TXT: &str = "history.txt";
-const HISTORY_FILE_SQLITE: &str = "history.sqlite3";
-
 #[cfg(feature = "plugin")]
-pub fn read_plugin_file(
+pub fn read_plugin_file(engine_state: &mut EngineState, plugin_file: Option<Spanned<String>>) {
-    engine_state: &mut EngineState,
-    plugin_file: Option<Spanned<String>>,
-    storage_path: &str,
-) {
     use nu_protocol::ShellError;
     use std::path::Path;
 
@@ -36,7 +29,7 @@ pub fn read_plugin_file(
         .and_then(|p| Path::new(&p.item).extension())
         .is_some_and(|ext| ext == "nu")
     {
-        report_error_new(
+        report_shell_error(
             engine_state,
             &ShellError::GenericError {
                 error: "Wrong plugin file format".into(),
@@ -52,7 +45,7 @@ pub fn read_plugin_file(
     let mut start_time = std::time::Instant::now();
     // Reading signatures from plugin registry file
     // The plugin.msgpackz file stores the parsed signature collected from each registered plugin
-    add_plugin_file(engine_state, plugin_file.clone(), storage_path);
+    add_plugin_file(engine_state, plugin_file.clone());
     perf!(
         "add plugin file to engine_state",
         start_time,
@@ -70,8 +63,7 @@ pub fn read_plugin_file(
                     log::warn!("Plugin file not found: {}", plugin_path.display());
 
                     // Try migration of an old plugin file if this wasn't a custom plugin file
-                    if plugin_file.is_none() && migrate_old_plugin_file(engine_state, storage_path)
+                    if plugin_file.is_none() && migrate_old_plugin_file(engine_state) {
-                    {
                         let Ok(file) = std::fs::File::open(&plugin_path) else {
                             log::warn!("Failed to load newly migrated plugin file");
                             return;
@@ -81,7 +73,7 @@ pub fn read_plugin_file(
                         return;
                     }
                 } else {
-                    report_error_new(
+                    report_shell_error(
                         engine_state,
                         &ShellError::GenericError {
                             error: format!(
@@ -113,7 +105,7 @@ pub fn read_plugin_file(
             Ok(contents) => contents,
             Err(err) => {
                 log::warn!("Failed to read plugin registry file: {err:?}");
-                report_error_new(
+                report_shell_error(
                     engine_state,
                     &ShellError::GenericError {
                         error: format!(
@@ -146,7 +138,7 @@ pub fn read_plugin_file(
         nu_plugin_engine::load_plugin_file(&mut working_set, &contents, span);
 
         if let Err(err) = engine_state.merge_delta(working_set.render()) {
-            report_error_new(engine_state, &err);
+            report_shell_error(engine_state, &err);
             return;
         }
 
@@ -159,14 +151,10 @@ pub fn read_plugin_file(
 }
 
 #[cfg(feature = "plugin")]
-pub fn add_plugin_file(
+pub fn add_plugin_file(engine_state: &mut EngineState, plugin_file: Option<Spanned<String>>) {
-    engine_state: &mut EngineState,
-    plugin_file: Option<Spanned<String>>,
-    storage_path: &str,
-) {
     use std::path::Path;
 
-    let working_set = StateWorkingSet::new(engine_state);
+    use nu_protocol::report_parse_error;
 
     if let Ok(cwd) = engine_state.cwd_as_string(None) {
         if let Some(plugin_file) = plugin_file {
@@ -181,17 +169,16 @@ pub fn add_plugin_file(
                 engine_state.plugin_path = Some(path)
             } else {
                 // It's an error if the directory for the plugin file doesn't exist.
-                report_error(
+                report_parse_error(
-                    &working_set,
+                    &StateWorkingSet::new(engine_state),
                     &ParseError::FileNotFound(
                         path_dir.to_string_lossy().into_owned(),
                         plugin_file.span,
                     ),
                 );
             }
-        } else if let Some(mut plugin_path) = nu_path::config_dir() {
+        } else if let Some(plugin_path) = nu_path::nu_config_dir() {
             // Path to store plugins signatures
-            plugin_path.push(storage_path);
             let mut plugin_path =
                 canonicalize_with(&plugin_path, &cwd).unwrap_or(plugin_path.into());
             plugin_path.push(PLUGIN_FILE);
@@ -214,7 +201,8 @@ pub fn eval_config_contents(
             let prev_file = engine_state.file.take();
             engine_state.file = Some(config_path.clone());
 
-            eval_source(
+            // TODO: ignore this error?
+            let _ = eval_source(
                 engine_state,
                 stack,
                 &contents,
@@ -227,33 +215,15 @@ pub fn eval_config_contents(
             engine_state.file = prev_file;
 
             // Merge the environment in case env vars changed in the config
-            match engine_state.cwd(Some(stack)) {
+            if let Err(e) = engine_state.merge_env(stack) {
-                Ok(cwd) => {
+                report_shell_error(engine_state, &e);
-                    if let Err(e) = engine_state.merge_env(stack, cwd) {
-                        report_error_new(engine_state, &e);
-                    }
-                }
-                Err(e) => {
-                    report_error_new(engine_state, &e);
-                }
             }
         }
     }
 }
 
-pub(crate) fn get_history_path(storage_path: &str, mode: HistoryFileFormat) -> Option<PathBuf> {
-    nu_path::config_dir().map(|mut history_path| {
-        history_path.push(storage_path);
-        history_path.push(match mode {
-            HistoryFileFormat::PlainText => HISTORY_FILE_TXT,
-            HistoryFileFormat::Sqlite => HISTORY_FILE_SQLITE,
-        });
-        history_path.into()
-    })
-}
-
 #[cfg(feature = "plugin")]
-pub fn migrate_old_plugin_file(engine_state: &EngineState, storage_path: &str) -> bool {
+pub fn migrate_old_plugin_file(engine_state: &EngineState) -> bool {
     use nu_protocol::{
         PluginExample, PluginIdentity, PluginRegistryItem, PluginRegistryItemData, PluginSignature,
         ShellError,
@@ -266,10 +236,9 @@ pub fn migrate_old_plugin_file(engine_state: &EngineState, storage_path: &str) -
         return false;
     };
 
-    let Some(config_dir) = nu_path::config_dir().and_then(|mut dir| {
+    let Some(config_dir) =
-        dir.push(storage_path);
+        nu_path::nu_config_dir().and_then(|dir| nu_path::canonicalize_with(dir, &cwd).ok())
-        nu_path::canonicalize_with(dir, &cwd).ok()
+    else {
-    }) else {
         return false;
     };
 
@@ -280,7 +249,7 @@ pub fn migrate_old_plugin_file(engine_state: &EngineState, storage_path: &str) -
     let old_contents = match std::fs::read(&old_plugin_file_path) {
         Ok(old_contents) => old_contents,
         Err(err) => {
-            report_error_new(
+            report_shell_error(
                 engine_state,
                 &ShellError::GenericError {
                     error: "Can't read old plugin file to migrate".into(),
@@ -349,7 +318,7 @@ pub fn migrate_old_plugin_file(engine_state: &EngineState, storage_path: &str) -
         .map_err(|e| e.into())
         .and_then(|file| contents.write_to(file, None))
     {
-        report_error_new(
+        report_shell_error(
             &engine_state,
             &ShellError::GenericError {
                 error: "Failed to save migrated plugin file".into(),

crates/nu-cli/src/eval_cmds.rs

@@ -2,9 +2,10 @@ use log::info;
 use nu_engine::{convert_env_values, eval_block};
 use nu_parser::parse;
 use nu_protocol::{
+    cli_error::report_compile_error,
     debugger::WithoutDebug,
     engine::{EngineState, Stack, StateWorkingSet},
-    report_error, PipelineData, ShellError, Spanned, Value,
+    report_parse_error, report_parse_warning, PipelineData, ShellError, Spanned, Value,
 };
 use std::sync::Arc;
 
@@ -53,7 +54,7 @@ pub fn evaluate_commands(
     // Parse the source code
     let (block, delta) = {
         if let Some(ref t_mode) = table_mode {
-            Arc::make_mut(&mut engine_state.config).table_mode =
+            Arc::make_mut(&mut engine_state.config).table.mode =
                 t_mode.coerce_str()?.parse().unwrap_or_default();
         }
 
@@ -61,16 +62,16 @@ pub fn evaluate_commands(
 
         let output = parse(&mut working_set, None, commands.item.as_bytes(), false);
         if let Some(warning) = working_set.parse_warnings.first() {
-            report_error(&working_set, warning);
+            report_parse_warning(&working_set, warning);
         }
 
         if let Some(err) = working_set.parse_errors.first() {
-            report_error(&working_set, err);
+            report_parse_error(&working_set, err);
             std::process::exit(1);
         }
 
         if let Some(err) = working_set.compile_errors.first() {
-            report_error(&working_set, err);
+            report_compile_error(&working_set, err);
             // Not a fatal error, for now
         }
 
@@ -88,15 +89,11 @@ pub fn evaluate_commands(
     }
 
     if let Some(t_mode) = table_mode {
-        Arc::make_mut(&mut engine_state.config).table_mode =
+        Arc::make_mut(&mut engine_state.config).table.mode =
             t_mode.coerce_str()?.parse().unwrap_or_default();
     }
 
-    if let Some(status) = pipeline.print(engine_state, stack, no_newline, false)? {
+    pipeline.print(engine_state, stack, no_newline, false)?;
-        if status.code() != 0 {
-            std::process::exit(status.code())
-        }
-    }
 
     info!("evaluate {}:{}:{}", file!(), line!(), column!());
 

crates/nu-cli/src/eval_file.rs

@@ -4,9 +4,10 @@ use nu_engine::{convert_env_values, eval_block};
 use nu_parser::parse;
 use nu_path::canonicalize_with;
 use nu_protocol::{
+    cli_error::report_compile_error,
     debugger::WithoutDebug,
     engine::{EngineState, Stack, StateWorkingSet},
-    report_error, PipelineData, ShellError, Span, Value,
+    report_parse_error, report_parse_warning, PipelineData, ShellError, Span, Value,
 };
 use std::sync::Arc;
 
@@ -77,17 +78,17 @@ pub fn evaluate_file(
     let block = parse(&mut working_set, Some(file_path_str), &file, false);
 
     if let Some(warning) = working_set.parse_warnings.first() {
-        report_error(&working_set, warning);
+        report_parse_warning(&working_set, warning);
     }
 
     // If any parse errors were found, report the first error and exit.
     if let Some(err) = working_set.parse_errors.first() {
-        report_error(&working_set, err);
+        report_parse_error(&working_set, err);
         std::process::exit(1);
     }
 
     if let Some(err) = working_set.compile_errors.first() {
-        report_error(&working_set, err);
+        report_compile_error(&working_set, err);
         // Not a fatal error, for now
     }
 
@@ -118,11 +119,7 @@ pub fn evaluate_file(
             };
 
         // Print the pipeline output of the last command of the file.
-        if let Some(status) = pipeline.print(engine_state, stack, true, false)? {
+        pipeline.print(engine_state, stack, true, false)?;
-            if status.code() != 0 {
-                std::process::exit(status.code())
-            }
-        }
 
         // Invoke the main command with arguments.
         // Arguments with whitespaces are quoted, thus can be safely concatenated by whitespace.
@@ -140,7 +137,7 @@ pub fn evaluate_file(
     };
 
     if exit_code != 0 {
-        std::process::exit(exit_code)
+        std::process::exit(exit_code);
     }
 
     info!("evaluate {}:{}:{}", file!(), line!(), column!());

crates/nu-cli/src/lib.rs

@@ -21,7 +21,6 @@ pub use config_files::eval_config_contents;
 pub use eval_cmds::{evaluate_commands, EvaluateCommandsOpts};
 pub use eval_file::evaluate_file;
 pub use menus::NuHelpCompleter;
-pub use nu_cmd_base::util::get_init_cwd;
 pub use nu_highlight::NuHighlight;
 pub use print::Print;
 pub use prompt::NushellPrompt;

crates/nu-cli/src/menus/help_completions.rs

@@ -30,12 +30,15 @@ impl NuHelpCompleter {
             .filter_map(|(_, decl_id)| {
                 let decl = self.engine_state.get_decl(decl_id);
                 (decl.name().to_folded_case().contains(&folded_line)
-                    || decl.usage().to_folded_case().contains(&folded_line)
+                    || decl.description().to_folded_case().contains(&folded_line)
                     || decl
                         .search_terms()
                         .into_iter()
                         .any(|term| term.to_folded_case().contains(&folded_line))
-                    || decl.extra_usage().to_folded_case().contains(&folded_line))
+                    || decl
+                        .extra_description()
+                        .to_folded_case()
+                        .contains(&folded_line))
                 .then_some(decl)
             })
             .collect::<Vec<_>>();
@@ -47,15 +50,15 @@ impl NuHelpCompleter {
             .map(|decl| {
                 let mut long_desc = String::new();
 
-                let usage = decl.usage();
+                let description = decl.description();
-                if !usage.is_empty() {
+                if !description.is_empty() {
-                    long_desc.push_str(usage);
+                    long_desc.push_str(description);
                     long_desc.push_str("\r\n\r\n");
                 }
 
-                let extra_usage = decl.extra_usage();
+                let extra_desc = decl.extra_description();
-                if !extra_usage.is_empty() {
+                if !extra_desc.is_empty() {
-                    long_desc.push_str(extra_usage);
+                    long_desc.push_str(extra_desc);
                     long_desc.push_str("\r\n\r\n");
                 }
 

crates/nu-cli/src/menus/menu_completions.rs

@@ -2,7 +2,7 @@ use nu_engine::eval_block;
 use nu_protocol::{
     debugger::WithoutDebug,
     engine::{EngineState, Stack},
-    IntoPipelineData, Span, Value,
+    BlockId, IntoPipelineData, Span, Value,
 };
 use reedline::{menu_functions::parse_selection_char, Completer, Suggestion};
 use std::sync::Arc;
@@ -10,7 +10,7 @@ use std::sync::Arc;
 const SELECTION_CHAR: char = '!';
 
 pub struct NuMenuCompleter {
-    block_id: usize,
+    block_id: BlockId,
     span: Span,
     stack: Stack,
     engine_state: Arc<EngineState>,
@@ -19,7 +19,7 @@ pub struct NuMenuCompleter {
 
 impl NuMenuCompleter {
     pub fn new(
-        block_id: usize,
+        block_id: BlockId,
         span: Span,
         stack: Stack,
         engine_state: Arc<EngineState>,
@@ -28,7 +28,7 @@ impl NuMenuCompleter {
         Self {
             block_id,
             span,
-            stack: stack.reset_out_dest().capture(),
+            stack: stack.reset_out_dest().collect_value(),
             engine_state,
             only_buffer_difference,
         }

crates/nu-cli/src/nu_highlight.rs

@@ -17,7 +17,7 @@ impl Command for NuHighlight {
             .input_output_types(vec![(Type::String, Type::String)])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Syntax highlight the input string."
     }
 

crates/nu-cli/src/print.rs

@@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
+use nu_protocol::ByteStreamSource;
 
 #[derive(Clone)]
 pub struct Print;
@@ -30,11 +31,11 @@ impl Command for Print {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Print the given values to stdout."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         r#"Unlike `echo`, this command does not return any value (`print | describe` will return "nothing").
 Since this command has no output, there is no point in piping it with other commands.
 
@@ -50,7 +51,7 @@ Since this command has no output, there is no point in piping it with other comm
         engine_state: &EngineState,
         stack: &mut Stack,
         call: &Call,
-        input: PipelineData,
+        mut input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let args: Vec<Value> = call.rest(engine_state, stack, 0)?;
         let no_newline = call.has_flag(engine_state, stack, "no-newline")?;
@@ -69,6 +70,11 @@ Since this command has no output, there is no point in piping it with other comm
                 }
             }
         } else if !input.is_nothing() {
+            if let PipelineData::ByteStream(stream, _) = &mut input {
+                if let ByteStreamSource::Child(child) = stream.source_mut() {
+                    child.ignore_error(true);
+                }
+            }
             if raw {
                 input.print_raw(engine_state, no_newline, to_stderr)?;
             } else {

crates/nu-cli/src/prompt.rs

@@ -1,10 +1,7 @@
 use crate::prompt_update::{
     POST_PROMPT_MARKER, PRE_PROMPT_MARKER, VSCODE_POST_PROMPT_MARKER, VSCODE_PRE_PROMPT_MARKER,
 };
-use nu_protocol::{
+use nu_protocol::engine::{EngineState, Stack};
-    engine::{EngineState, Stack},
-    Value,
-};
 #[cfg(windows)]
 use nu_utils::enable_vt_processing;
 use reedline::{
@@ -124,8 +121,11 @@ impl Prompt for NushellPrompt {
                 .replace('\n', "\r\n");
 
             if self.shell_integration_osc633 {
-                if self.stack.get_env_var(&self.engine_state, "TERM_PROGRAM")
+                if self
-                    == Some(Value::test_string("vscode"))
+                    .stack
+                    .get_env_var(&self.engine_state, "TERM_PROGRAM")
+                    .and_then(|v| v.as_str().ok())
+                    == Some("vscode")
                 {
                     // We're in vscode and we have osc633 enabled
                     format!("{VSCODE_PRE_PROMPT_MARKER}{prompt}{VSCODE_POST_PROMPT_MARKER}").into()

crates/nu-cli/src/prompt_update.rs

@@ -3,7 +3,7 @@ use log::trace;
 use nu_engine::ClosureEvalOnce;
 use nu_protocol::{
     engine::{EngineState, Stack},
-    report_error_new, Config, PipelineData, Value,
+    report_shell_error, Config, PipelineData, Value,
 };
 use reedline::Prompt;
 
@@ -68,7 +68,7 @@ fn get_prompt_string(
         .get_env_var(engine_state, prompt)
         .and_then(|v| match v {
             Value::Closure { val, .. } => {
-                let result = ClosureEvalOnce::new(engine_state, stack, *val)
+                let result = ClosureEvalOnce::new(engine_state, stack, val.as_ref().clone())
                     .run_with_input(PipelineData::Empty);
 
                 trace!(
@@ -80,7 +80,7 @@ fn get_prompt_string(
 
                 result
                     .map_err(|err| {
-                        report_error_new(engine_state, &err);
+                        report_shell_error(engine_state, &err);
                     })
                     .ok()
             }
@@ -118,13 +118,17 @@ pub(crate) fn update_prompt(
 
     // Now that we have the prompt string lets ansify it.
     // <133 A><prompt><133 B><command><133 C><command output>
-    let left_prompt_string = if config.shell_integration_osc633 {
+    let left_prompt_string = if config.shell_integration.osc633 {
-        if stack.get_env_var(engine_state, "TERM_PROGRAM") == Some(Value::test_string("vscode")) {
+        if stack
+            .get_env_var(engine_state, "TERM_PROGRAM")
+            .and_then(|v| v.as_str().ok())
+            == Some("vscode")
+        {
             // We're in vscode and we have osc633 enabled
             Some(format!(
                 "{VSCODE_PRE_PROMPT_MARKER}{configured_left_prompt_string}{VSCODE_POST_PROMPT_MARKER}"
             ))
-        } else if config.shell_integration_osc133 {
+        } else if config.shell_integration.osc133 {
             // If we're in VSCode but we don't find the env var, but we have osc133 set, then use it
             Some(format!(
                 "{PRE_PROMPT_MARKER}{configured_left_prompt_string}{POST_PROMPT_MARKER}"
@@ -132,7 +136,7 @@ pub(crate) fn update_prompt(
         } else {
             configured_left_prompt_string.into()
         }
-    } else if config.shell_integration_osc133 {
+    } else if config.shell_integration.osc133 {
         Some(format!(
             "{PRE_PROMPT_MARKER}{configured_left_prompt_string}{POST_PROMPT_MARKER}"
         ))

crates/nu-cli/src/reedline_config.rs

@@ -5,11 +5,10 @@ use nu_color_config::{color_record_to_nustyle, lookup_ansi_color_style};
 use nu_engine::eval_block;
 use nu_parser::parse;
 use nu_protocol::{
-    create_menus,
     debugger::WithoutDebug,
     engine::{EngineState, Stack, StateWorkingSet},
-    extract_value, Config, EditBindings, ParsedKeybinding, ParsedMenu, PipelineData, Record,
+    extract_value, Config, EditBindings, FromValue, ParsedKeybinding, ParsedMenu, PipelineData,
-    ShellError, Span, Value,
+    Record, ShellError, Span, Type, Value,
 };
 use reedline::{
     default_emacs_keybindings, default_vi_insert_keybindings, default_vi_normal_keybindings,
@@ -36,6 +35,41 @@ const DEFAULT_COMPLETION_MENU: &str = r#"
   }
 }"#;
 
+const DEFAULT_IDE_COMPLETION_MENU: &str = r#"
+{
+  name: ide_completion_menu
+  only_buffer_difference: false
+  marker: "| "
+  type: {
+    layout: ide
+    min_completion_width: 0,
+    max_completion_width: 50,
+    max_completion_height: 10, # will be limited by the available lines in the terminal
+    padding: 0,
+    border: true,
+    cursor_offset: 0,
+    description_mode: "prefer_right"
+    min_description_width: 0
+    max_description_width: 50
+    max_description_height: 10
+    description_offset: 1
+    # If true, the cursor pos will be corrected, so the suggestions match up with the typed text
+    #
+    # C:\> str
+    #      str join
+    #      str trim
+    #      str split
+    correct_cursor_pos: false
+  }
+  style: {
+    text: green
+    selected_text: { attr: r }
+    description_text: yellow
+    match_text: { attr: u }
+    selected_match_text: { attr: ur }
+  }
+}"#;
+
 const DEFAULT_HISTORY_MENU: &str = r#"
 {
   name: history_menu
@@ -95,6 +129,7 @@ pub(crate) fn add_menus(
     // Checking if the default menus have been added from the config file
     let default_menus = [
         ("completion_menu", DEFAULT_COMPLETION_MENU),
+        ("ide_completion_menu", DEFAULT_IDE_COMPLETION_MENU),
         ("history_menu", DEFAULT_HISTORY_MENU),
         ("help_menu", DEFAULT_HELP_MENU),
     ];
@@ -122,7 +157,7 @@ pub(crate) fn add_menus(
 
             engine_state.merge_delta(delta)?;
 
-            let mut temp_stack = Stack::new().capture();
+            let mut temp_stack = Stack::new().collect_value();
             let input = PipelineData::Empty;
             menu_eval_results.push(eval_block::<WithoutDebug>(
                 &engine_state,
@@ -137,15 +172,13 @@ pub(crate) fn add_menus(
 
     for res in menu_eval_results.into_iter() {
         if let PipelineData::Value(value, None) = res {
-            for menu in create_menus(&value)? {
+            line_editor = add_menu(
-                line_editor = add_menu(
+                line_editor,
-                    line_editor,
+                &ParsedMenu::from_value(value)?,
-                    &menu,
+                new_engine_state_ref.clone(),
-                    new_engine_state_ref.clone(),
+                stack,
-                    stack,
+                config.clone(),
-                    config.clone(),
+            )?;
-                )?;
-            }
         }
     }
 
@@ -159,8 +192,8 @@ fn add_menu(
     stack: &Stack,
     config: Arc<Config>,
 ) -> Result<Reedline, ShellError> {
-    let span = menu.menu_type.span();
+    let span = menu.r#type.span();
-    if let Value::Record { val, .. } = &menu.menu_type {
+    if let Value::Record { val, .. } = &menu.r#type {
         let layout = extract_value("layout", val, span)?.to_expanded_string("", &config);
 
         match layout.as_str() {
@@ -168,22 +201,22 @@ fn add_menu(
             "list" => add_list_menu(line_editor, menu, engine_state, stack, config),
             "ide" => add_ide_menu(line_editor, menu, engine_state, stack, config),
             "description" => add_description_menu(line_editor, menu, engine_state, stack, config),
-            _ => Err(ShellError::UnsupportedConfigValue {
+            str => Err(ShellError::InvalidValue {
-                expected: "columnar, list, ide or description".to_string(),
+                valid: "'columnar', 'list', 'ide', or 'description'".into(),
-                value: menu.menu_type.to_abbreviated_string(&config),
+                actual: format!("'{str}'"),
-                span: menu.menu_type.span(),
+                span,
             }),
         }
     } else {
-        Err(ShellError::UnsupportedConfigValue {
+        Err(ShellError::RuntimeTypeMismatch {
-            expected: "only record type".to_string(),
+            expected: Type::record(),
-            value: menu.menu_type.to_abbreviated_string(&config),
+            actual: menu.r#type.get_type(),
-            span: menu.menu_type.span(),
+            span,
         })
     }
 }
 
-fn get_style(record: &Record, name: &str, span: Span) -> Option<Style> {
+fn get_style(record: &Record, name: &'static str, span: Span) -> Option<Style> {
     extract_value(name, record, span)
         .ok()
         .map(|text| match text {
@@ -224,11 +257,11 @@ pub(crate) fn add_columnar_menu(
     stack: &Stack,
     config: &Config,
 ) -> Result<Reedline, ShellError> {
-    let span = menu.menu_type.span();
+    let span = menu.r#type.span();
     let name = menu.name.to_expanded_string("", config);
     let mut columnar_menu = ColumnarMenu::default().with_name(&name);
 
-    if let Value::Record { val, .. } = &menu.menu_type {
+    if let Value::Record { val, .. } = &menu.r#type {
         columnar_menu = match extract_value("columns", val, span) {
             Ok(columns) => {
                 let columns = columns.as_int()?;
@@ -262,30 +295,23 @@ pub(crate) fn add_columnar_menu(
     let only_buffer_difference = menu.only_buffer_difference.as_bool()?;
     columnar_menu = columnar_menu.with_only_buffer_difference(only_buffer_difference);
 
-    let span = menu.source.span();
+    let completer = if let Some(closure) = &menu.source {
-    match &menu.source {
+        let menu_completer = NuMenuCompleter::new(
-        Value::Nothing { .. } => {
+            closure.block_id,
-            Ok(line_editor.with_menu(ReedlineMenu::EngineCompleter(Box::new(columnar_menu))))
-        }
-        Value::Closure { val, .. } => {
-            let menu_completer = NuMenuCompleter::new(
-                val.block_id,
-                span,
-                stack.captures_to_stack(val.captures.clone()),
-                engine_state,
-                only_buffer_difference,
-            );
-            Ok(line_editor.with_menu(ReedlineMenu::WithCompleter {
-                menu: Box::new(columnar_menu),
-                completer: Box::new(menu_completer),
-            }))
-        }
-        _ => Err(ShellError::UnsupportedConfigValue {
-            expected: "block or omitted value".to_string(),
-            value: menu.source.to_abbreviated_string(config),
             span,
-        }),
+            stack.captures_to_stack(closure.captures.clone()),
-    }
+            engine_state,
+            only_buffer_difference,
+        );
+        ReedlineMenu::WithCompleter {
+            menu: Box::new(columnar_menu),
+            completer: Box::new(menu_completer),
+        }
+    } else {
+        ReedlineMenu::EngineCompleter(Box::new(columnar_menu))
+    };
+
+    Ok(line_editor.with_menu(completer))
 }
 
 // Adds a search menu to the line editor
@@ -299,8 +325,8 @@ pub(crate) fn add_list_menu(
     let name = menu.name.to_expanded_string("", &config);
     let mut list_menu = ListMenu::default().with_name(&name);
 
-    let span = menu.menu_type.span();
+    let span = menu.r#type.span();
-    if let Value::Record { val, .. } = &menu.menu_type {
+    if let Value::Record { val, .. } = &menu.r#type {
         list_menu = match extract_value("page_size", val, span) {
             Ok(page_size) => {
                 let page_size = page_size.as_int()?;
@@ -318,30 +344,23 @@ pub(crate) fn add_list_menu(
     let only_buffer_difference = menu.only_buffer_difference.as_bool()?;
     list_menu = list_menu.with_only_buffer_difference(only_buffer_difference);
 
-    let span = menu.source.span();
+    let completer = if let Some(closure) = &menu.source {
-    match &menu.source {
+        let menu_completer = NuMenuCompleter::new(
-        Value::Nothing { .. } => {
+            closure.block_id,
-            Ok(line_editor.with_menu(ReedlineMenu::HistoryMenu(Box::new(list_menu))))
+            span,
+            stack.captures_to_stack(closure.captures.clone()),
+            engine_state,
+            only_buffer_difference,
+        );
+        ReedlineMenu::WithCompleter {
+            menu: Box::new(list_menu),
+            completer: Box::new(menu_completer),
         }
-        Value::Closure { val, .. } => {
+    } else {
-            let menu_completer = NuMenuCompleter::new(
+        ReedlineMenu::HistoryMenu(Box::new(list_menu))
-                val.block_id,
+    };
-                span,
+
-                stack.captures_to_stack(val.captures.clone()),
+    Ok(line_editor.with_menu(completer))
-                engine_state,
-                only_buffer_difference,
-            );
-            Ok(line_editor.with_menu(ReedlineMenu::WithCompleter {
-                menu: Box::new(list_menu),
-                completer: Box::new(menu_completer),
-            }))
-        }
-        _ => Err(ShellError::UnsupportedConfigValue {
-            expected: "block or omitted value".to_string(),
-            value: menu.source.to_abbreviated_string(&config),
-            span: menu.source.span(),
-        }),
-    }
 }
 
 // Adds an IDE menu to the line editor
@@ -352,11 +371,11 @@ pub(crate) fn add_ide_menu(
     stack: &Stack,
     config: Arc<Config>,
 ) -> Result<Reedline, ShellError> {
-    let span = menu.menu_type.span();
+    let span = menu.r#type.span();
     let name = menu.name.to_expanded_string("", &config);
     let mut ide_menu = IdeMenu::default().with_name(&name);
 
-    if let Value::Record { val, .. } = &menu.menu_type {
+    if let Value::Record { val, .. } = &menu.r#type {
         ide_menu = match extract_value("min_completion_width", val, span) {
             Ok(min_completion_width) => {
                 let min_completion_width = min_completion_width.as_int()?;
@@ -416,9 +435,9 @@ pub(crate) fn add_ide_menu(
                         vertical,
                     )
                 } else {
-                    return Err(ShellError::UnsupportedConfigValue {
+                    return Err(ShellError::RuntimeTypeMismatch {
-                        expected: "bool or record".to_string(),
+                        expected: Type::custom("bool or record"),
-                        value: border.to_abbreviated_string(&config),
+                        actual: border.get_type(),
                         span: border.span(),
                     });
                 }
@@ -439,10 +458,10 @@ pub(crate) fn add_ide_menu(
                 "left" => ide_menu.with_description_mode(DescriptionMode::Left),
                 "right" => ide_menu.with_description_mode(DescriptionMode::Right),
                 "prefer_right" => ide_menu.with_description_mode(DescriptionMode::PreferRight),
-                _ => {
+                str => {
-                    return Err(ShellError::UnsupportedConfigValue {
+                    return Err(ShellError::InvalidValue {
-                        expected: "\"left\", \"right\" or \"prefer_right\"".to_string(),
+                        valid: "'left', 'right', or 'prefer_right'".into(),
-                        value: description_mode.to_abbreviated_string(&config),
+                        actual: format!("'{str}'"),
                         span: description_mode.span(),
                     });
                 }
@@ -499,30 +518,23 @@ pub(crate) fn add_ide_menu(
     let only_buffer_difference = menu.only_buffer_difference.as_bool()?;
     ide_menu = ide_menu.with_only_buffer_difference(only_buffer_difference);
 
-    let span = menu.source.span();
+    let completer = if let Some(closure) = &menu.source {
-    match &menu.source {
+        let menu_completer = NuMenuCompleter::new(
-        Value::Nothing { .. } => {
+            closure.block_id,
-            Ok(line_editor.with_menu(ReedlineMenu::EngineCompleter(Box::new(ide_menu))))
-        }
-        Value::Closure { val, .. } => {
-            let menu_completer = NuMenuCompleter::new(
-                val.block_id,
-                span,
-                stack.captures_to_stack(val.captures.clone()),
-                engine_state,
-                only_buffer_difference,
-            );
-            Ok(line_editor.with_menu(ReedlineMenu::WithCompleter {
-                menu: Box::new(ide_menu),
-                completer: Box::new(menu_completer),
-            }))
-        }
-        _ => Err(ShellError::UnsupportedConfigValue {
-            expected: "block or omitted value".to_string(),
-            value: menu.source.to_abbreviated_string(&config),
             span,
-        }),
+            stack.captures_to_stack(closure.captures.clone()),
-    }
+            engine_state,
+            only_buffer_difference,
+        );
+        ReedlineMenu::WithCompleter {
+            menu: Box::new(ide_menu),
+            completer: Box::new(menu_completer),
+        }
+    } else {
+        ReedlineMenu::EngineCompleter(Box::new(ide_menu))
+    };
+
+    Ok(line_editor.with_menu(completer))
 }
 
 // Adds a description menu to the line editor
@@ -536,8 +548,8 @@ pub(crate) fn add_description_menu(
     let name = menu.name.to_expanded_string("", &config);
     let mut description_menu = DescriptionMenu::default().with_name(&name);
 
-    let span = menu.menu_type.span();
+    let span = menu.r#type.span();
-    if let Value::Record { val, .. } = &menu.menu_type {
+    if let Value::Record { val, .. } = &menu.r#type {
         description_menu = match extract_value("columns", val, span) {
             Ok(columns) => {
                 let columns = columns.as_int()?;
@@ -587,34 +599,27 @@ pub(crate) fn add_description_menu(
     let only_buffer_difference = menu.only_buffer_difference.as_bool()?;
     description_menu = description_menu.with_only_buffer_difference(only_buffer_difference);
 
-    let span = menu.source.span();
+    let completer = if let Some(closure) = &menu.source {
-    match &menu.source {
+        let menu_completer = NuMenuCompleter::new(
-        Value::Nothing { .. } => {
+            closure.block_id,
-            let completer = Box::new(NuHelpCompleter::new(engine_state, config));
+            span,
-            Ok(line_editor.with_menu(ReedlineMenu::WithCompleter {
+            stack.captures_to_stack(closure.captures.clone()),
-                menu: Box::new(description_menu),
+            engine_state,
-                completer,
+            only_buffer_difference,
-            }))
+        );
+        ReedlineMenu::WithCompleter {
+            menu: Box::new(description_menu),
+            completer: Box::new(menu_completer),
         }
-        Value::Closure { val, .. } => {
+    } else {
-            let menu_completer = NuMenuCompleter::new(
+        let menu_completer = NuHelpCompleter::new(engine_state, config);
-                val.block_id,
+        ReedlineMenu::WithCompleter {
-                span,
+            menu: Box::new(description_menu),
-                stack.captures_to_stack(val.captures.clone()),
+            completer: Box::new(menu_completer),
-                engine_state,
-                only_buffer_difference,
-            );
-            Ok(line_editor.with_menu(ReedlineMenu::WithCompleter {
-                menu: Box::new(description_menu),
-                completer: Box::new(menu_completer),
-            }))
         }
-        _ => Err(ShellError::UnsupportedConfigValue {
+    };
-            expected: "closure or omitted value".to_string(),
+
-            value: menu.source.to_abbreviated_string(&config),
+    Ok(line_editor.with_menu(completer))
-            span: menu.source.span(),
-        }),
-    }
 }
 
 fn add_menu_keybindings(keybindings: &mut Keybindings) {
@@ -629,6 +634,16 @@ fn add_menu_keybindings(keybindings: &mut Keybindings) {
         ]),
     );
 
+    keybindings.add_binding(
+        KeyModifiers::CONTROL,
+        KeyCode::Char(' '),
+        ReedlineEvent::UntilFound(vec![
+            ReedlineEvent::Menu("ide_completion_menu".to_string()),
+            ReedlineEvent::MenuNext,
+            ReedlineEvent::Edit(vec![EditCommand::Complete]),
+        ]),
+    );
+
     keybindings.add_binding(
         KeyModifiers::SHIFT,
         KeyCode::BackTab,
@@ -728,9 +743,9 @@ fn add_keybinding(
             "emacs" => add_parsed_keybinding(emacs_keybindings, keybinding, config),
             "vi_insert" => add_parsed_keybinding(insert_keybindings, keybinding, config),
             "vi_normal" => add_parsed_keybinding(normal_keybindings, keybinding, config),
-            m => Err(ShellError::UnsupportedConfigValue {
+            str => Err(ShellError::InvalidValue {
-                expected: "emacs, vi_insert or vi_normal".to_string(),
+                valid: "'emacs', 'vi_insert', or 'vi_normal'".into(),
-                value: m.to_string(),
+                actual: format!("'{str}'"),
                 span,
             }),
         },
@@ -748,9 +763,9 @@ fn add_keybinding(
 
             Ok(())
         }
-        v => Err(ShellError::UnsupportedConfigValue {
+        v => Err(ShellError::RuntimeTypeMismatch {
-            expected: "string or list of strings".to_string(),
+            expected: Type::custom("string or list<string>"),
-            value: v.to_abbreviated_string(config),
+            actual: v.get_type(),
             span: v.span(),
         }),
     }
@@ -761,91 +776,107 @@ fn add_parsed_keybinding(
     keybinding: &ParsedKeybinding,
     config: &Config,
 ) -> Result<(), ShellError> {
-    let modifier = match keybinding
+    let Ok(modifier_str) = keybinding.modifier.as_str() else {
-        .modifier
+        return Err(ShellError::RuntimeTypeMismatch {
-        .to_expanded_string("", config)
+            expected: Type::String,
-        .to_ascii_lowercase()
+            actual: keybinding.modifier.get_type(),
-        .as_str()
+            span: keybinding.modifier.span(),
-    {
+        });
-        "control" => KeyModifiers::CONTROL,
-        "shift" => KeyModifiers::SHIFT,
-        "alt" => KeyModifiers::ALT,
-        "none" => KeyModifiers::NONE,
-        "shift_alt" | "alt_shift" => KeyModifiers::SHIFT | KeyModifiers::ALT,
-        "control_shift" | "shift_control" => KeyModifiers::CONTROL | KeyModifiers::SHIFT,
-        "control_alt" | "alt_control" => KeyModifiers::CONTROL | KeyModifiers::ALT,
-        "control_alt_shift" | "control_shift_alt" => {
-            KeyModifiers::CONTROL | KeyModifiers::ALT | KeyModifiers::SHIFT
-        }
-        _ => {
-            return Err(ShellError::UnsupportedConfigValue {
-                expected: "CONTROL, SHIFT, ALT or NONE".to_string(),
-                value: keybinding.modifier.to_abbreviated_string(config),
-                span: keybinding.modifier.span(),
-            })
-        }
     };
 
-    let keycode = match keybinding
+    let mut modifier = KeyModifiers::NONE;
-        .keycode
+    if !str::eq_ignore_ascii_case(modifier_str, "none") {
-        .to_expanded_string("", config)
+        for part in modifier_str.split('_') {
-        .to_ascii_lowercase()
+            match part.to_ascii_lowercase().as_str() {
-        .as_str()
+                "control" => modifier |= KeyModifiers::CONTROL,
-    {
+                "shift" => modifier |= KeyModifiers::SHIFT,
-        "backspace" => KeyCode::Backspace,
+                "alt" => modifier |= KeyModifiers::ALT,
-        "enter" => KeyCode::Enter,
+                "super" => modifier |= KeyModifiers::SUPER,
-        c if c.starts_with("char_") => {
+                "hyper" => modifier |= KeyModifiers::HYPER,
-            let mut char_iter = c.chars().skip(5);
+                "meta" => modifier |= KeyModifiers::META,
-            let pos1 = char_iter.next();
+                _ => {
-            let pos2 = char_iter.next();
+                    return Err(ShellError::InvalidValue {
-
+                        valid: "'control', 'shift', 'alt', 'super', 'hyper', 'meta', or 'none'"
-            let char = if let (Some(char), None) = (pos1, pos2) {
+                            .into(),
-                char
+                        actual: format!("'{part}'"),
-            } else {
+                        span: keybinding.modifier.span(),
-                return Err(ShellError::UnsupportedConfigValue {
+                    });
-                    expected: "char_<CHAR: unicode codepoint>".to_string(),
+                }
-                    value: c.to_string(),
+            }
-                    span: keybinding.keycode.span(),
-                });
-            };
-
-            KeyCode::Char(char)
         }
-        "space" => KeyCode::Char(' '),
+    }
-        "down" => KeyCode::Down,
+
-        "up" => KeyCode::Up,
+    let Ok(keycode) = keybinding.keycode.as_str() else {
-        "left" => KeyCode::Left,
+        return Err(ShellError::RuntimeTypeMismatch {
-        "right" => KeyCode::Right,
+            expected: Type::String,
-        "home" => KeyCode::Home,
+            actual: keybinding.keycode.get_type(),
-        "end" => KeyCode::End,
+            span: keybinding.keycode.span(),
-        "pageup" => KeyCode::PageUp,
+        });
-        "pagedown" => KeyCode::PageDown,
+    };
-        "tab" => KeyCode::Tab,
+
-        "backtab" => KeyCode::BackTab,
+    let keycode_lower = keycode.to_ascii_lowercase();
-        "delete" => KeyCode::Delete,
+
-        "insert" => KeyCode::Insert,
+    let keycode = if let Some(rest) = keycode_lower.strip_prefix("char_") {
-        c if c.starts_with('f') => {
+        let error = |valid: &str, actual: &str| ShellError::InvalidValue {
-            let fn_num: u8 = c[1..]
+            valid: valid.into(),
+            actual: actual.into(),
+            span: keybinding.keycode.span(),
+        };
+
+        let mut char_iter = rest.chars();
+        let char = match (char_iter.next(), char_iter.next()) {
+            (Some(char), None) => char,
+            (Some('u'), Some(_)) => {
+                // This will never panic as we know there are at least two symbols
+                let Ok(code_point) = u32::from_str_radix(&rest[1..], 16) else {
+                    return Err(error("a valid hex code", keycode));
+                };
+
+                char::from_u32(code_point).ok_or(error("a valid Unicode code point", keycode))?
+            }
+            _ => return Err(error("'char_<char>' or 'char_u<hex code>'", keycode)),
+        };
+
+        KeyCode::Char(char)
+    } else {
+        match keycode_lower.as_str() {
+            "backspace" => KeyCode::Backspace,
+            "enter" => KeyCode::Enter,
+            "space" => KeyCode::Char(' '),
+            "down" => KeyCode::Down,
+            "up" => KeyCode::Up,
+            "left" => KeyCode::Left,
+            "right" => KeyCode::Right,
+            "home" => KeyCode::Home,
+            "end" => KeyCode::End,
+            "pageup" => KeyCode::PageUp,
+            "pagedown" => KeyCode::PageDown,
+            "tab" => KeyCode::Tab,
+            "backtab" => KeyCode::BackTab,
+            "delete" => KeyCode::Delete,
+            "insert" => KeyCode::Insert,
+            c if c.starts_with('f') => c[1..]
                 .parse()
                 .ok()
-                .filter(|num| matches!(num, 1..=20))
+                .filter(|num| (1..=20).contains(num))
-                .ok_or(ShellError::UnsupportedConfigValue {
+                .map(KeyCode::F)
-                    expected: "(f1|f2|...|f20)".to_string(),
+                .ok_or(ShellError::InvalidValue {
-                    value: format!("unknown function key: {c}"),
+                    valid: "'f1', 'f2', ..., or 'f20'".into(),
+                    actual: format!("'{keycode}'"),
                     span: keybinding.keycode.span(),
-                })?;
+                })?,
-            KeyCode::F(fn_num)
+            "null" => KeyCode::Null,
-        }
+            "esc" | "escape" => KeyCode::Esc,
-        "null" => KeyCode::Null,
+            _ => {
-        "esc" | "escape" => KeyCode::Esc,
+                return Err(ShellError::InvalidValue {
-        _ => {
+                    valid: "a crossterm KeyCode".into(),
-            return Err(ShellError::UnsupportedConfigValue {
+                    actual: format!("'{keycode}'"),
-                expected: "crossterm KeyCode".to_string(),
+                    span: keybinding.keycode.span(),
-                value: keybinding.keycode.to_abbreviated_string(config),
+                });
-                span: keybinding.keycode.span(),
+            }
-            })
         }
     };
+
     if let Some(event) = parse_event(&keybinding.event, config)? {
         keybindings.add_binding(modifier, keycode, event);
     } else {
@@ -867,8 +898,8 @@ impl<'config> EventType<'config> {
             .map(Self::Send)
             .or_else(|_| extract_value("edit", record, span).map(Self::Edit))
             .or_else(|_| extract_value("until", record, span).map(Self::Until))
-            .map_err(|_| ShellError::MissingConfigValue {
+            .map_err(|_| ShellError::MissingRequiredColumn {
-                missing_value: "send, edit or until".to_string(),
+                column: "'send', 'edit', or 'until'",
                 span,
             })
     }
@@ -906,9 +937,9 @@ fn parse_event(value: &Value, config: &Config) -> Result<Option<ReedlineEvent>,
                         .iter()
                         .map(|value| match parse_event(value, config) {
                             Ok(inner) => match inner {
-                                None => Err(ShellError::UnsupportedConfigValue {
+                                None => Err(ShellError::RuntimeTypeMismatch {
-                                    expected: "List containing valid events".to_string(),
+                                    expected: Type::custom("record or table"),
-                                    value: "Nothing value (null)".to_string(),
+                                    actual: value.get_type(),
                                     span: value.span(),
                                 }),
                                 Some(event) => Ok(event),
@@ -919,9 +950,9 @@ fn parse_event(value: &Value, config: &Config) -> Result<Option<ReedlineEvent>,
 
                     Ok(Some(ReedlineEvent::UntilFound(events)))
                 }
-                v => Err(ShellError::UnsupportedConfigValue {
+                v => Err(ShellError::RuntimeTypeMismatch {
-                    expected: "list of events".to_string(),
+                    expected: Type::list(Type::Any),
-                    value: v.to_abbreviated_string(config),
+                    actual: v.get_type(),
                     span: v.span(),
                 }),
             },
@@ -931,9 +962,9 @@ fn parse_event(value: &Value, config: &Config) -> Result<Option<ReedlineEvent>,
                 .iter()
                 .map(|value| match parse_event(value, config) {
                     Ok(inner) => match inner {
-                        None => Err(ShellError::UnsupportedConfigValue {
+                        None => Err(ShellError::RuntimeTypeMismatch {
-                            expected: "List containing valid events".to_string(),
+                            expected: Type::custom("record or table"),
-                            value: "Nothing value (null)".to_string(),
+                            actual: value.get_type(),
                             span: value.span(),
                         }),
                         Some(event) => Ok(event),
@@ -945,9 +976,9 @@ fn parse_event(value: &Value, config: &Config) -> Result<Option<ReedlineEvent>,
             Ok(Some(ReedlineEvent::Multiple(events)))
         }
         Value::Nothing { .. } => Ok(None),
-        v => Err(ShellError::UnsupportedConfigValue {
+        v => Err(ShellError::RuntimeTypeMismatch {
-            expected: "record or list of records, null to unbind key".to_string(),
+            expected: Type::custom("record, table, or nothing"),
-            value: v.to_abbreviated_string(config),
+            actual: v.get_type(),
             span: v.span(),
         }),
     }
@@ -996,12 +1027,12 @@ fn event_from_record(
             let cmd = extract_value("cmd", record, span)?;
             ReedlineEvent::ExecuteHostCommand(cmd.to_expanded_string("", config))
         }
-        v => {
+        str => {
-            return Err(ShellError::UnsupportedConfigValue {
+            return Err(ShellError::InvalidValue {
-                expected: "Reedline event".to_string(),
+                valid: "a reedline event".into(),
-                value: v.to_string(),
+                actual: format!("'{str}'"),
                 span,
-            })
+            });
         }
     };
 
@@ -1094,7 +1125,7 @@ fn edit_from_record(
         }
         "insertchar" => {
             let value = extract_value("value", record, span)?;
-            let char = extract_char(value, config)?;
+            let char = extract_char(value)?;
             EditCommand::InsertChar(char)
         }
         "insertstring" => {
@@ -1131,17 +1162,17 @@ fn edit_from_record(
         "redo" => EditCommand::Redo,
         "cutrightuntil" => {
             let value = extract_value("value", record, span)?;
-            let char = extract_char(value, config)?;
+            let char = extract_char(value)?;
             EditCommand::CutRightUntil(char)
         }
         "cutrightbefore" => {
             let value = extract_value("value", record, span)?;
-            let char = extract_char(value, config)?;
+            let char = extract_char(value)?;
             EditCommand::CutRightBefore(char)
         }
         "moverightuntil" => {
             let value = extract_value("value", record, span)?;
-            let char = extract_char(value, config)?;
+            let char = extract_char(value)?;
             let select = extract_value("select", record, span)
                 .and_then(|value| value.as_bool())
                 .unwrap_or(false);
@@ -1149,7 +1180,7 @@ fn edit_from_record(
         }
         "moverightbefore" => {
             let value = extract_value("value", record, span)?;
-            let char = extract_char(value, config)?;
+            let char = extract_char(value)?;
             let select = extract_value("select", record, span)
                 .and_then(|value| value.as_bool())
                 .unwrap_or(false);
@@ -1157,17 +1188,17 @@ fn edit_from_record(
         }
         "cutleftuntil" => {
             let value = extract_value("value", record, span)?;
-            let char = extract_char(value, config)?;
+            let char = extract_char(value)?;
             EditCommand::CutLeftUntil(char)
         }
         "cutleftbefore" => {
             let value = extract_value("value", record, span)?;
-            let char = extract_char(value, config)?;
+            let char = extract_char(value)?;
             EditCommand::CutLeftBefore(char)
         }
         "moveleftuntil" => {
             let value = extract_value("value", record, span)?;
-            let char = extract_char(value, config)?;
+            let char = extract_char(value)?;
             let select = extract_value("select", record, span)
                 .and_then(|value| value.as_bool())
                 .unwrap_or(false);
@@ -1175,7 +1206,7 @@ fn edit_from_record(
         }
         "moveleftbefore" => {
             let value = extract_value("value", record, span)?;
-            let char = extract_char(value, config)?;
+            let char = extract_char(value)?;
             let select = extract_value("select", record, span)
                 .and_then(|value| value.as_bool())
                 .unwrap_or(false);
@@ -1192,28 +1223,36 @@ fn edit_from_record(
         #[cfg(feature = "system-clipboard")]
         "pastesystem" => EditCommand::PasteSystem,
         "selectall" => EditCommand::SelectAll,
-        e => {
+        str => {
-            return Err(ShellError::UnsupportedConfigValue {
+            return Err(ShellError::InvalidValue {
-                expected: "reedline EditCommand".to_string(),
+                valid: "a reedline EditCommand".into(),
-                value: e.to_string(),
+                actual: format!("'{str}'"),
                 span,
-            })
+            });
         }
     };
 
     Ok(edit)
 }
 
-fn extract_char(value: &Value, config: &Config) -> Result<char, ShellError> {
+fn extract_char(value: &Value) -> Result<char, ShellError> {
-    let span = value.span();
+    if let Ok(str) = value.as_str() {
-    value
+        let mut chars = str.chars();
-        .to_expanded_string("", config)
+        match (chars.next(), chars.next()) {
-        .chars()
+            (Some(c), None) => Ok(c),
-        .next()
+            _ => Err(ShellError::InvalidValue {
-        .ok_or_else(|| ShellError::MissingConfigValue {
+                valid: "a single character".into(),
-            missing_value: "char to insert".to_string(),
+                actual: format!("'{str}'"),
-            span,
+                span: value.span(),
+            }),
+        }
+    } else {
+        Err(ShellError::RuntimeTypeMismatch {
+            expected: Type::String,
+            actual: value.get_type(),
+            span: value.span(),
         })
+    }
 }
 
 #[cfg(test)]
@@ -1342,7 +1381,7 @@ mod test {
 
         let span = Span::test_data();
         let b = EventType::try_from_record(&event, span);
-        assert!(matches!(b, Err(ShellError::MissingConfigValue { .. })));
+        assert!(matches!(b, Err(ShellError::MissingRequiredColumn { .. })));
     }
 
     #[test]

crates/nu-cli/src/repl.rs

@@ -16,10 +16,7 @@ use crate::{
 use crossterm::cursor::SetCursorStyle;
 use log::{error, trace, warn};
 use miette::{ErrReport, IntoDiagnostic, Result};
-use nu_cmd_base::{
+use nu_cmd_base::{hook::eval_hook, util::get_editor};
-    hook::eval_hook,
-    util::{get_editor, get_guaranteed_cwd},
-};
 use nu_color_config::StyleComputer;
 #[allow(deprecated)]
 use nu_engine::{convert_env_values, current_dir_str, env_to_strings};
@@ -27,7 +24,7 @@ use nu_parser::{lex, parse, trim_quotes_str};
 use nu_protocol::{
     config::NuCursorShape,
     engine::{EngineState, Stack, StateWorkingSet},
-    report_error_new, HistoryConfig, HistoryFileFormat, PipelineData, ShellError, Span, Spanned,
+    report_shell_error, HistoryConfig, HistoryFileFormat, PipelineData, ShellError, Span, Spanned,
     Value,
 };
 use nu_utils::{
@@ -53,7 +50,6 @@ use sysinfo::System;
 pub fn evaluate_repl(
     engine_state: &mut EngineState,
     stack: Stack,
-    nushell_path: &str,
     prerun_command: Option<Spanned<String>>,
     load_std_lib: Option<Spanned<String>>,
     entire_start_time: Instant,
@@ -72,11 +68,11 @@ pub fn evaluate_repl(
     let mut entry_num = 0;
 
     // Let's grab the shell_integration configs
-    let shell_integration_osc2 = config.shell_integration_osc2;
+    let shell_integration_osc2 = config.shell_integration.osc2;
-    let shell_integration_osc7 = config.shell_integration_osc7;
+    let shell_integration_osc7 = config.shell_integration.osc7;
-    let shell_integration_osc9_9 = config.shell_integration_osc9_9;
+    let shell_integration_osc9_9 = config.shell_integration.osc9_9;
-    let shell_integration_osc133 = config.shell_integration_osc133;
+    let shell_integration_osc133 = config.shell_integration.osc133;
-    let shell_integration_osc633 = config.shell_integration_osc633;
+    let shell_integration_osc633 = config.shell_integration.osc633;
 
     let nu_prompt = NushellPrompt::new(
         shell_integration_osc133,
@@ -88,7 +84,7 @@ pub fn evaluate_repl(
     let start_time = std::time::Instant::now();
     // Translate environment variables from Strings to Values
     if let Err(e) = convert_env_values(engine_state, &unique_stack) {
-        report_error_new(engine_state, &e);
+        report_shell_error(engine_state, &e);
     }
     perf!("translate env vars", start_time, use_color);
 
@@ -98,9 +94,9 @@ pub fn evaluate_repl(
         Value::string("0823", Span::unknown()),
     );
 
-    unique_stack.add_env_var("LAST_EXIT_CODE".into(), Value::int(0, Span::unknown()));
+    unique_stack.set_last_exit_code(0, Span::unknown());
 
-    let mut line_editor = get_line_editor(engine_state, nushell_path, use_color)?;
+    let mut line_editor = get_line_editor(engine_state, use_color)?;
     let temp_file = temp_dir().join(format!("{}.nu", uuid::Uuid::new_v4()));
 
     if let Some(s) = prerun_command {
@@ -112,8 +108,7 @@ pub fn evaluate_repl(
             PipelineData::empty(),
             false,
         );
-        let cwd = get_guaranteed_cwd(engine_state, &unique_stack);
+        engine_state.merge_env(&mut unique_stack)?;
-        engine_state.merge_env(&mut unique_stack, cwd)?;
     }
 
     let hostname = System::host_name();
@@ -135,16 +130,13 @@ pub fn evaluate_repl(
         // escape a few things because this says so
         // https://code.visualstudio.com/docs/terminal/shell-integration#_vs-code-custom-sequences-osc-633-st
         let cmd_text = line_editor.current_buffer_contents().to_string();
+        let len = cmd_text.len();
+        let mut cmd_text_chars = cmd_text[0..len].chars();
+        let mut replaced_cmd_text = String::with_capacity(len);
 
-        let replaced_cmd_text = cmd_text
+        while let Some(c) = unescape_for_vscode(&mut cmd_text_chars) {
-            .chars()
+            replaced_cmd_text.push(c);
-            .map(|c| match c {
+        }
-                '\n' => '\x0a',
-                '\r' => '\x0d',
-                '\x1b' => '\x1b',
-                _ => c,
-            })
-            .collect();
 
         run_shell_integration_osc633(
             engine_state,
@@ -163,7 +155,7 @@ pub fn evaluate_repl(
         eval_source(
             engine_state,
             &mut unique_stack,
-            r#"use std banner; banner"#.as_bytes(),
+            r#"banner"#.as_bytes(),
             "show_banner",
             PipelineData::empty(),
             false,
@@ -220,7 +212,7 @@ pub fn evaluate_repl(
             }
             Err(_) => {
                 // line_editor is lost in the error case so reconstruct a new one
-                line_editor = get_line_editor(engine_state, nushell_path, use_color)?;
+                line_editor = get_line_editor(engine_state, use_color)?;
             }
         }
     }
@@ -228,11 +220,29 @@ pub fn evaluate_repl(
     Ok(())
 }
 
-fn get_line_editor(
+fn unescape_for_vscode(text: &mut std::str::Chars) -> Option<char> {
-    engine_state: &mut EngineState,
+    match text.next() {
-    nushell_path: &str,
+        Some('\\') => match text.next() {
-    use_color: bool,
+            Some('0') => Some('\x00'),  // NUL '\0' (null character)
-) -> Result<Reedline> {
+            Some('a') => Some('\x07'),  // BEL '\a' (bell)
+            Some('b') => Some('\x08'),  // BS  '\b' (backspace)
+            Some('t') => Some('\x09'),  // HT  '\t' (horizontal tab)
+            Some('n') => Some('\x0a'),  // LF  '\n' (new line)
+            Some('v') => Some('\x0b'),  // VT  '\v' (vertical tab)
+            Some('f') => Some('\x0c'),  // FF  '\f' (form feed)
+            Some('r') => Some('\x0d'),  // CR  '\r' (carriage ret)
+            Some(';') => Some('\x3b'),  // semi-colon
+            Some('\\') => Some('\x5c'), // backslash
+            Some('e') => Some('\x1b'),  // escape
+            Some(c) => Some(c),
+            None => None,
+        },
+        Some(c) => Some(c),
+        None => None,
+    }
+}
+
+fn get_line_editor(engine_state: &mut EngineState, use_color: bool) -> Result<Reedline> {
     let mut start_time = std::time::Instant::now();
     let mut line_editor = Reedline::create();
 
@@ -243,7 +253,7 @@ fn get_line_editor(
     if let Some(history) = engine_state.history_config() {
         start_time = std::time::Instant::now();
 
-        line_editor = setup_history(nushell_path, engine_state, line_editor, history)?;
+        line_editor = setup_history(engine_state, line_editor, history)?;
 
         perf!("setup history", start_time, use_color);
     }
@@ -280,17 +290,15 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
         hostname,
     } = ctx;
 
-    let cwd = get_guaranteed_cwd(engine_state, &stack);
-
     let mut start_time = std::time::Instant::now();
     // Before doing anything, merge the environment from the previous REPL iteration into the
     // permanent state.
-    if let Err(err) = engine_state.merge_env(&mut stack, cwd) {
+    if let Err(err) = engine_state.merge_env(&mut stack) {
-        report_error_new(engine_state, &err);
+        report_shell_error(engine_state, &err);
     }
-    // Check whether $env.NU_USE_IR is set, so that the user can change it in the REPL
+    // Check whether $env.NU_DISABLE_IR is set, so that the user can change it in the REPL
     // Temporary while IR eval is optional
-    stack.use_ir = stack.has_env_var(engine_state, "NU_USE_IR");
+    stack.use_ir = !stack.has_env_var(engine_state, "NU_DISABLE_IR");
     perf!("merge env", start_time, use_color);
 
     start_time = std::time::Instant::now();
@@ -302,7 +310,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
     // fire the "pre_prompt" hook
     if let Some(hook) = engine_state.get_config().hooks.pre_prompt.clone() {
         if let Err(err) = eval_hook(engine_state, &mut stack, None, vec![], &hook, "pre_prompt") {
-            report_error_new(engine_state, &err);
+            report_shell_error(engine_state, &err);
         }
     }
     perf!("pre-prompt hook", start_time, use_color);
@@ -312,7 +320,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
     // fire the "env_change" hook
     let env_change = engine_state.get_config().hooks.env_change.clone();
     if let Err(error) = hook::eval_env_change_hook(env_change, engine_state, &mut stack) {
-        report_error_new(engine_state, &error)
+        report_shell_error(engine_state, &error)
     }
     perf!("env-change hook", start_time, use_color);
 
@@ -322,9 +330,9 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
     start_time = std::time::Instant::now();
     // Find the configured cursor shapes for each mode
     let cursor_config = CursorConfig {
-        vi_insert: map_nucursorshape_to_cursorshape(config.cursor_shape_vi_insert),
+        vi_insert: map_nucursorshape_to_cursorshape(config.cursor_shape.vi_insert),
-        vi_normal: map_nucursorshape_to_cursorshape(config.cursor_shape_vi_normal),
+        vi_normal: map_nucursorshape_to_cursorshape(config.cursor_shape.vi_normal),
-        emacs: map_nucursorshape_to_cursorshape(config.cursor_shape_emacs),
+        emacs: map_nucursorshape_to_cursorshape(config.cursor_shape.emacs),
     };
     perf!("get config/cursor config", start_time, use_color);
 
@@ -352,8 +360,8 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
             // STACK-REFERENCE 2
             stack_arc.clone(),
         )))
-        .with_quick_completions(config.quick_completions)
+        .with_quick_completions(config.completions.quick)
-        .with_partial_completions(config.partial_completions)
+        .with_partial_completions(config.completions.partial)
         .with_ansi_colors(config.use_ansi_coloring)
         .with_cwd(Some(
             engine_state
@@ -363,7 +371,11 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
                 .to_string_lossy()
                 .to_string(),
         ))
-        .with_cursor_config(cursor_config);
+        .with_cursor_config(cursor_config)
+        .with_visual_selection_style(nu_ansi_term::Style {
+            is_reverse: true,
+            ..Default::default()
+        });
 
     perf!("reedline builder", start_time, use_color);
 
@@ -386,7 +398,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
     trace!("adding menus");
     line_editor =
         add_menus(line_editor, engine_reference, &stack_arc, config).unwrap_or_else(|e| {
-            report_error_new(engine_state, &e);
+            report_shell_error(engine_state, &e);
             Reedline::create()
         });
 
@@ -457,12 +469,12 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
         .with_completer(Box::<DefaultCompleter>::default());
 
     // Let's grab the shell_integration configs
-    let shell_integration_osc2 = config.shell_integration_osc2;
+    let shell_integration_osc2 = config.shell_integration.osc2;
-    let shell_integration_osc7 = config.shell_integration_osc7;
+    let shell_integration_osc7 = config.shell_integration.osc7;
-    let shell_integration_osc9_9 = config.shell_integration_osc9_9;
+    let shell_integration_osc9_9 = config.shell_integration.osc9_9;
-    let shell_integration_osc133 = config.shell_integration_osc133;
+    let shell_integration_osc133 = config.shell_integration.osc133;
-    let shell_integration_osc633 = config.shell_integration_osc633;
+    let shell_integration_osc633 = config.shell_integration.osc633;
-    let shell_integration_reset_application_mode = config.shell_integration_reset_application_mode;
+    let shell_integration_reset_application_mode = config.shell_integration.reset_application_mode;
 
     // TODO: we may clone the stack, this can lead to major performance issues
     // so we should avoid it or making stack cheaper to clone.
@@ -506,7 +518,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
                     &hook,
                     "pre_execution",
                 ) {
-                    report_error_new(engine_state, &err);
+                    report_shell_error(engine_state, &err);
                 }
             }
 
@@ -518,8 +530,10 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
             drop(repl);
 
             if shell_integration_osc633 {
-                if stack.get_env_var(engine_state, "TERM_PROGRAM")
+                if stack
-                    == Some(Value::test_string("vscode"))
+                    .get_env_var(engine_state, "TERM_PROGRAM")
+                    .and_then(|v| v.as_str().ok())
+                    == Some("vscode")
                 {
                     start_time = Instant::now();
 
@@ -808,7 +822,7 @@ fn do_auto_cd(
 ) {
     let path = {
         if !path.exists() {
-            report_error_new(
+            report_shell_error(
                 engine_state,
                 &ShellError::DirectoryNotFound {
                     dir: path.to_string_lossy().to_string(),
@@ -820,7 +834,7 @@ fn do_auto_cd(
     };
 
     if let PermissionResult::PermissionDenied(reason) = have_permission(path.clone()) {
-        report_error_new(
+        report_shell_error(
             engine_state,
             &ShellError::IOError {
                 msg: format!("Cannot change directory to {path}: {reason}"),
@@ -834,14 +848,14 @@ fn do_auto_cd(
     //FIXME: this only changes the current scope, but instead this environment variable
     //should probably be a block that loads the information from the state in the overlay
     if let Err(err) = stack.set_cwd(&path) {
-        report_error_new(engine_state, &err);
+        report_shell_error(engine_state, &err);
         return;
     };
     let cwd = Value::string(cwd, span);
 
     let shells = stack.get_env_var(engine_state, "NUSHELL_SHELLS");
     let mut shells = if let Some(v) = shells {
-        v.into_list().unwrap_or_else(|_| vec![cwd])
+        v.clone().into_list().unwrap_or_else(|_| vec![cwd])
     } else {
         vec![cwd]
     };
@@ -867,7 +881,7 @@ fn do_auto_cd(
         "NUSHELL_LAST_SHELL".into(),
         Value::int(last_shell as i64, span),
     );
-    stack.add_env_var("LAST_EXIT_CODE".into(), Value::int(0, Span::unknown()));
+    stack.set_last_exit_code(0, Span::unknown());
 }
 
 ///
@@ -1033,7 +1047,11 @@ fn run_shell_integration_osc633(
     if let Ok(path) = current_dir_str(engine_state, stack) {
         // Supported escape sequences of Microsoft's Visual Studio Code (vscode)
         // https://code.visualstudio.com/docs/terminal/shell-integration#_supported-escape-sequences
-        if stack.get_env_var(engine_state, "TERM_PROGRAM") == Some(Value::test_string("vscode")) {
+        if stack
+            .get_env_var(engine_state, "TERM_PROGRAM")
+            .and_then(|v| v.as_str().ok())
+            == Some("vscode")
+        {
             let start_time = Instant::now();
 
             // If we're in vscode, run their specific ansi escape sequence.
@@ -1098,7 +1116,6 @@ fn flush_engine_state_repl_buffer(engine_state: &mut EngineState, line_editor: &
 /// Setup history management for Reedline
 ///
 fn setup_history(
-    nushell_path: &str,
     engine_state: &mut EngineState,
     line_editor: Reedline,
     history: HistoryConfig,
@@ -1110,7 +1127,7 @@ fn setup_history(
         None
     };
 
-    if let Some(path) = crate::config_files::get_history_path(nushell_path, history.file_format) {
+    if let Some(path) = history.file_path() {
         return update_line_editor_history(
             engine_state,
             path,
@@ -1141,7 +1158,7 @@ fn setup_keybindings(engine_state: &EngineState, line_editor: Reedline) -> Reedl
             }
         },
         Err(e) => {
-            report_error_new(engine_state, &e);
+            report_shell_error(engine_state, &e);
             line_editor
         }
     };
@@ -1173,7 +1190,7 @@ fn update_line_editor_history(
     history_session_id: Option<HistorySessionId>,
 ) -> Result<Reedline, ErrReport> {
     let history: Box<dyn reedline::History> = match history.file_format {
-        HistoryFileFormat::PlainText => Box::new(
+        HistoryFileFormat::Plaintext => Box::new(
             FileBackedHistory::with_file(history.max_size as usize, history_path)
                 .into_diagnostic()?,
         ),
@@ -1211,10 +1228,10 @@ fn confirm_stdin_is_terminal() -> Result<()> {
 fn map_nucursorshape_to_cursorshape(shape: NuCursorShape) -> Option<SetCursorStyle> {
     match shape {
         NuCursorShape::Block => Some(SetCursorStyle::SteadyBlock),
-        NuCursorShape::UnderScore => Some(SetCursorStyle::SteadyUnderScore),
+        NuCursorShape::Underscore => Some(SetCursorStyle::SteadyUnderScore),
         NuCursorShape::Line => Some(SetCursorStyle::SteadyBar),
         NuCursorShape::BlinkBlock => Some(SetCursorStyle::BlinkingBlock),
-        NuCursorShape::BlinkUnderScore => Some(SetCursorStyle::BlinkingUnderScore),
+        NuCursorShape::BlinkUnderscore => Some(SetCursorStyle::BlinkingUnderScore),
         NuCursorShape::BlinkLine => Some(SetCursorStyle::BlinkingBar),
         NuCursorShape::Inherit => None,
     }
@@ -1231,7 +1248,11 @@ fn get_command_finished_marker(
         .and_then(|e| e.as_i64().ok());
 
     if shell_integration_osc633 {
-        if stack.get_env_var(engine_state, "TERM_PROGRAM") == Some(Value::test_string("vscode")) {
+        if stack
+            .get_env_var(engine_state, "TERM_PROGRAM")
+            .and_then(|v| v.as_str().ok())
+            == Some("vscode")
+        {
             // We're in vscode and we have osc633 enabled
             format!(
                 "{}{}{}",
@@ -1280,7 +1301,11 @@ fn run_finaliziation_ansi_sequence(
 ) {
     if shell_integration_osc633 {
         // Only run osc633 if we are in vscode
-        if stack.get_env_var(engine_state, "TERM_PROGRAM") == Some(Value::test_string("vscode")) {
+        if stack
+            .get_env_var(engine_state, "TERM_PROGRAM")
+            .and_then(|v| v.as_str().ok())
+            == Some("vscode")
+        {
             let start_time = Instant::now();
 
             run_ansi_sequence(&get_command_finished_marker(
@@ -1378,8 +1403,7 @@ fn trailing_slash_looks_like_path() {
 fn are_session_ids_in_sync() {
     let engine_state = &mut EngineState::new();
     let history = engine_state.history_config().unwrap();
-    let history_path =
+    let history_path = history.file_path().unwrap();
-        crate::config_files::get_history_path("nushell", history.file_format).unwrap();
     let line_editor = reedline::Reedline::create();
     let history_session_id = reedline::Reedline::create_history_session_id();
     let line_editor = update_line_editor_history(

crates/nu-cli/src/util.rs

@@ -2,9 +2,11 @@ use nu_cmd_base::hook::eval_hook;
 use nu_engine::{eval_block, eval_block_with_early_return};
 use nu_parser::{escape_quote_string, lex, parse, unescape_unquote_string, Token, TokenContents};
 use nu_protocol::{
+    cli_error::report_compile_error,
     debugger::WithoutDebug,
     engine::{EngineState, Stack, StateWorkingSet},
-    report_error, report_error_new, PipelineData, ShellError, Span, Value,
+    report_parse_error, report_parse_warning, report_shell_error, PipelineData, ShellError, Span,
+    Value,
 };
 #[cfg(windows)]
 use nu_utils::enable_vt_processing;
@@ -39,7 +41,7 @@ fn gather_env_vars(
     init_cwd: &Path,
 ) {
     fn report_capture_error(engine_state: &EngineState, env_str: &str, msg: &str) {
-        report_error_new(
+        report_shell_error(
             engine_state,
             &ShellError::GenericError {
                 error: format!("Environment variable was not captured: {env_str}"),
@@ -70,7 +72,7 @@ fn gather_env_vars(
         }
         None => {
             // Could not capture current working directory
-            report_error_new(
+            report_shell_error(
                 engine_state,
                 &ShellError::GenericError {
                     error: "Current directory is not a valid utf-8 path".into(),
@@ -210,18 +212,19 @@ pub fn eval_source(
     let start_time = std::time::Instant::now();
 
     let exit_code = match evaluate_source(engine_state, stack, source, fname, input, allow_return) {
-        Ok(code) => code.unwrap_or(0),
+        Ok(failed) => {
+            let code = failed.into();
+            stack.set_last_exit_code(code, Span::unknown());
+            code
+        }
         Err(err) => {
-            report_error_new(engine_state, &err);
+            report_shell_error(engine_state, &err);
-            1
+            let code = err.exit_code();
+            stack.set_last_error(&err);
+            code
         }
     };
 
-    stack.add_env_var(
-        "LAST_EXIT_CODE".to_string(),
-        Value::int(exit_code.into(), Span::unknown()),
-    );
-
     // reset vt processing, aka ansi because illbehaved externals can break it
     #[cfg(windows)]
     {
@@ -244,7 +247,7 @@ fn evaluate_source(
     fname: &str,
     input: PipelineData,
     allow_return: bool,
-) -> Result<Option<i32>, ShellError> {
+) -> Result<bool, ShellError> {
     let (block, delta) = {
         let mut working_set = StateWorkingSet::new(engine_state);
         let output = parse(
@@ -254,16 +257,16 @@ fn evaluate_source(
             false,
         );
         if let Some(warning) = working_set.parse_warnings.first() {
-            report_error(&working_set, warning);
+            report_parse_warning(&working_set, warning);
         }
 
         if let Some(err) = working_set.parse_errors.first() {
-            report_error(&working_set, err);
+            report_parse_error(&working_set, err);
-            return Ok(Some(1));
+            return Ok(true);
         }
 
         if let Some(err) = working_set.compile_errors.first() {
-            report_error(&working_set, err);
+            report_compile_error(&working_set, err);
             // Not a fatal error, for now
         }
 
@@ -278,25 +281,23 @@ fn evaluate_source(
         eval_block::<WithoutDebug>(engine_state, stack, &block, input)
     }?;
 
-    let status = if let PipelineData::ByteStream(..) = pipeline {
+    if let PipelineData::ByteStream(..) = pipeline {
-        pipeline.print(engine_state, stack, false, false)?
+        pipeline.print(engine_state, stack, false, false)
+    } else if let Some(hook) = engine_state.get_config().hooks.display_output.clone() {
+        let pipeline = eval_hook(
+            engine_state,
+            stack,
+            Some(pipeline),
+            vec![],
+            &hook,
+            "display_output",
+        )?;
+        pipeline.print(engine_state, stack, false, false)
     } else {
-        if let Some(hook) = engine_state.get_config().hooks.display_output.clone() {
+        pipeline.print(engine_state, stack, true, false)
-            let pipeline = eval_hook(
+    }?;
-                engine_state,
-                stack,
-                Some(pipeline),
-                vec![],
-                &hook,
-                "display_output",
-            )?;
-            pipeline.print(engine_state, stack, false, false)
-        } else {
-            pipeline.print(engine_state, stack, true, false)
-        }?
-    };
 
-    Ok(status.map(|status| status.code()))
+    Ok(false)
 }
 
 #[cfg(test)]

crates/nu-cli/tests/completions/mod.rs

@@ -18,11 +18,11 @@ use support::{
 #[fixture]
 fn completer() -> NuCompleter {
     // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Add record value as example
     let record = "def tst [--mod -s] {}";
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack).is_ok());
 
     // Instantiate a new completer
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
@@ -31,11 +31,12 @@ fn completer() -> NuCompleter {
 #[fixture]
 fn completer_strings() -> NuCompleter {
     // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
+
     // Add record value as example
     let record = r#"def animals [] { ["cat", "dog", "eel" ] }
     def my-command [animal: string@animals] { print $animal }"#;
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack).is_ok());
 
     // Instantiate a new completer
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
@@ -44,7 +45,7 @@ fn completer_strings() -> NuCompleter {
 #[fixture]
 fn extern_completer() -> NuCompleter {
     // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Add record value as example
     let record = r#"
@@ -55,7 +56,33 @@ fn extern_completer() -> NuCompleter {
             -b: string@animals
         ]
     "#;
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack).is_ok());
+
+    // Instantiate a new completer
+    NuCompleter::new(Arc::new(engine), Arc::new(stack))
+}
+
+#[fixture]
+fn completer_strings_with_options() -> NuCompleter {
+    // Create a new engine
+    let (_, _, mut engine, mut stack) = new_engine();
+    // Add record value as example
+    let record = r#"
+        # To test that the config setting has no effect on the custom completions
+        $env.config.completions.algorithm = "fuzzy"
+        def animals [] {
+            {
+                # Very rare and totally real animals
+                completions: ["Abcdef", "Foo Abcdef", "Acd Bar" ],
+                options: {
+                    completion_algorithm: "prefix",
+                    positional: false,
+                    case_sensitive: false,
+                }
+            }
+        }
+        def my-command [animal: string@animals] { print $animal }"#;
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack).is_ok());
 
     // Instantiate a new completer
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
@@ -64,7 +91,7 @@ fn extern_completer() -> NuCompleter {
 #[fixture]
 fn custom_completer() -> NuCompleter {
     // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Add record value as example
     let record = r#"
@@ -78,7 +105,7 @@ fn custom_completer() -> NuCompleter {
             completer: $external_completer
         }
     "#;
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack).is_ok());
 
     // Instantiate a new completer
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
@@ -87,7 +114,7 @@ fn custom_completer() -> NuCompleter {
 #[fixture]
 fn subcommand_completer() -> NuCompleter {
     // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     let commands = r#"
             $env.config.completions.algorithm = "fuzzy"
@@ -97,7 +124,7 @@ fn subcommand_completer() -> NuCompleter {
             def "foo aabcrr" [] {}
             def food [] {}
         "#;
-    assert!(support::merge_input(commands.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(commands.as_bytes(), &mut engine, &mut stack).is_ok());
 
     // Instantiate a new completer
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
@@ -107,13 +134,13 @@ fn subcommand_completer() -> NuCompleter {
 #[fixture]
 fn fuzzy_alpha_sort_completer() -> NuCompleter {
     // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     let config = r#"
         $env.config.completions.algorithm = "fuzzy"
         $env.config.completions.sort = "alphabetical"
     "#;
-    assert!(support::merge_input(config.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(config.as_bytes(), &mut engine, &mut stack).is_ok());
 
     // Instantiate a new completer
     NuCompleter::new(Arc::new(engine), Arc::new(stack))
@@ -169,6 +196,20 @@ fn variables_customcompletion_subcommands_with_customcompletion_2(
     match_suggestions(&expected, &suggestions);
 }
 
+#[rstest]
+fn customcompletions_substring_matching(mut completer_strings_with_options: NuCompleter) {
+    let suggestions = completer_strings_with_options.complete("my-command Abcd", 15);
+    let expected: Vec<String> = vec!["Abcdef".into(), "Foo Abcdef".into()];
+    match_suggestions(&expected, &suggestions);
+}
+
+#[rstest]
+fn customcompletions_case_insensitive(mut completer_strings_with_options: NuCompleter) {
+    let suggestions = completer_strings_with_options.complete("my-command foo", 14);
+    let expected: Vec<String> = vec!["Foo Abcdef".into()];
+    match_suggestions(&expected, &suggestions);
+}
+
 #[test]
 fn dotnu_completions() {
     // Create a new engine
@@ -299,7 +340,7 @@ fn file_completions() {
     match_suggestions(&expected_paths, &suggestions);
 
     // Test completions for hidden files
-    let target_dir = format!("ls {}{MAIN_SEPARATOR}.", folder(dir.join(".hidden_folder")));
+    let target_dir = format!("ls {}", file(dir.join(".hidden_folder").join(".")));
     let suggestions = completer.complete(&target_dir, target_dir.len());
 
     let expected_paths: Vec<String> =
@@ -337,7 +378,7 @@ fn file_completions_with_mixed_separators() {
         file(dir.join("lib-dir1").join("baz.nu")),
         file(dir.join("lib-dir1").join("xyzzy.nu")),
     ];
-    let expecetd_slash_paths: Vec<String> = expected_paths
+    let expected_slash_paths: Vec<String> = expected_paths
         .iter()
         .map(|s| s.replace(MAIN_SEPARATOR, "/"))
         .collect();
@@ -345,22 +386,22 @@ fn file_completions_with_mixed_separators() {
     let target_dir = format!("ls {dir_str}/lib-dir1/");
     let suggestions = completer.complete(&target_dir, target_dir.len());
 
-    match_suggestions(&expecetd_slash_paths, &suggestions);
+    match_suggestions(&expected_slash_paths, &suggestions);
 
     let target_dir = format!("cp {dir_str}\\lib-dir1/");
     let suggestions = completer.complete(&target_dir, target_dir.len());
 
-    match_suggestions(&expecetd_slash_paths, &suggestions);
+    match_suggestions(&expected_slash_paths, &suggestions);
 
     let target_dir = format!("ls {dir_str}/lib-dir1\\/");
     let suggestions = completer.complete(&target_dir, target_dir.len());
 
-    match_suggestions(&expecetd_slash_paths, &suggestions);
+    match_suggestions(&expected_slash_paths, &suggestions);
 
     let target_dir = format!("ls {dir_str}\\lib-dir1\\/");
     let suggestions = completer.complete(&target_dir, target_dir.len());
 
-    match_suggestions(&expecetd_slash_paths, &suggestions);
+    match_suggestions(&expected_slash_paths, &suggestions);
 
     let target_dir = format!("ls {dir_str}\\lib-dir1\\");
     let suggestions = completer.complete(&target_dir, target_dir.len());
@@ -524,6 +565,58 @@ fn partial_completions() {
     match_suggestions(&expected_paths, &suggestions);
 }
 
+#[test]
+fn partial_completion_with_dot_expansions() {
+    let (dir, _, engine, stack) = new_partial_engine();
+
+    let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
+
+    let dir_str = file(
+        dir.join("par")
+            .join("...")
+            .join("par")
+            .join("fi")
+            .join("so"),
+    );
+    let target_dir = format!("rm {dir_str}");
+    let suggestions = completer.complete(&target_dir, target_dir.len());
+
+    // Create the expected values
+    let expected_paths: Vec<String> = vec![
+        file(
+            dir.join("partial")
+                .join("...")
+                .join("partial_completions")
+                .join("final_partial")
+                .join("somefile"),
+        ),
+        file(
+            dir.join("partial-a")
+                .join("...")
+                .join("partial_completions")
+                .join("final_partial")
+                .join("somefile"),
+        ),
+        file(
+            dir.join("partial-b")
+                .join("...")
+                .join("partial_completions")
+                .join("final_partial")
+                .join("somefile"),
+        ),
+        file(
+            dir.join("partial-c")
+                .join("...")
+                .join("partial_completions")
+                .join("final_partial")
+                .join("somefile"),
+        ),
+    ];
+
+    // Match the results
+    match_suggestions(&expected_paths, &suggestions);
+}
+
 #[test]
 fn command_ls_with_filecompletion() {
     let (_, _, engine, stack) = new_engine();
@@ -850,7 +943,7 @@ fn flag_completions() {
     // Test completions for the 'ls' flags
     let suggestions = completer.complete("ls -", 4);
 
-    assert_eq!(16, suggestions.len());
+    assert_eq!(18, suggestions.len());
 
     let expected: Vec<String> = vec![
         "--all".into(),
@@ -861,6 +954,7 @@ fn flag_completions() {
         "--long".into(),
         "--mime-type".into(),
         "--short-names".into(),
+        "--threads".into(),
         "-D".into(),
         "-a".into(),
         "-d".into(),
@@ -869,6 +963,7 @@ fn flag_completions() {
         "-l".into(),
         "-m".into(),
         "-s".into(),
+        "-t".into(),
     ];
 
     // Match results
@@ -913,14 +1008,200 @@ fn folder_with_directorycompletions() {
     match_suggestions(&expected_paths, &suggestions);
 }
 
+#[test]
+fn folder_with_directorycompletions_with_dots() {
+    // Create a new engine
+    let (dir, _, engine, stack) = new_engine();
+    let dir_str = dir
+        .join("directory_completion")
+        .join("folder_inside_folder")
+        .into_os_string()
+        .into_string()
+        .unwrap();
+
+    // Instantiate a new completer
+    let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
+
+    // Test completions for the current folder
+    let target_dir = format!("cd {dir_str}{MAIN_SEPARATOR}..{MAIN_SEPARATOR}");
+    let suggestions = completer.complete(&target_dir, target_dir.len());
+
+    // Create the expected values
+    let expected_paths: Vec<String> = vec![folder(
+        dir.join("directory_completion")
+            .join("folder_inside_folder")
+            .join("..")
+            .join("folder_inside_folder"),
+    )];
+
+    #[cfg(windows)]
+    {
+        let target_dir = format!("cd {dir_str}/../");
+        let slash_suggestions = completer.complete(&target_dir, target_dir.len());
+
+        let expected_slash_paths: Vec<String> = expected_paths
+            .iter()
+            .map(|s| s.replace('\\', "/"))
+            .collect();
+
+        match_suggestions(&expected_slash_paths, &slash_suggestions);
+    }
+
+    // Match the results
+    match_suggestions(&expected_paths, &suggestions);
+}
+
+#[test]
+fn folder_with_directorycompletions_with_three_trailing_dots() {
+    // Create a new engine
+    let (dir, _, engine, stack) = new_engine();
+    let dir_str = dir
+        .join("directory_completion")
+        .join("folder_inside_folder")
+        .into_os_string()
+        .into_string()
+        .unwrap();
+
+    // Instantiate a new completer
+    let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
+
+    // Test completions for the current folder
+    let target_dir = format!("cd {dir_str}{MAIN_SEPARATOR}...{MAIN_SEPARATOR}");
+    let suggestions = completer.complete(&target_dir, target_dir.len());
+
+    // Create the expected values
+    let expected_paths: Vec<String> = vec![
+        folder(
+            dir.join("directory_completion")
+                .join("folder_inside_folder")
+                .join("...")
+                .join("another"),
+        ),
+        folder(
+            dir.join("directory_completion")
+                .join("folder_inside_folder")
+                .join("...")
+                .join("directory_completion"),
+        ),
+        folder(
+            dir.join("directory_completion")
+                .join("folder_inside_folder")
+                .join("...")
+                .join("test_a"),
+        ),
+        folder(
+            dir.join("directory_completion")
+                .join("folder_inside_folder")
+                .join("...")
+                .join("test_b"),
+        ),
+        folder(
+            dir.join("directory_completion")
+                .join("folder_inside_folder")
+                .join("...")
+                .join(".hidden_folder"),
+        ),
+    ];
+
+    #[cfg(windows)]
+    {
+        let target_dir = format!("cd {dir_str}/.../");
+        let slash_suggestions = completer.complete(&target_dir, target_dir.len());
+
+        let expected_slash_paths: Vec<String> = expected_paths
+            .iter()
+            .map(|s| s.replace('\\', "/"))
+            .collect();
+
+        match_suggestions(&expected_slash_paths, &slash_suggestions);
+    }
+
+    // Match the results
+    match_suggestions(&expected_paths, &suggestions);
+}
+
+#[test]
+fn folder_with_directorycompletions_do_not_collapse_dots() {
+    // Create a new engine
+    let (dir, _, engine, stack) = new_engine();
+    let dir_str = dir
+        .join("directory_completion")
+        .join("folder_inside_folder")
+        .into_os_string()
+        .into_string()
+        .unwrap();
+
+    // Instantiate a new completer
+    let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
+
+    // Test completions for the current folder
+    let target_dir = format!("cd {dir_str}{MAIN_SEPARATOR}..{MAIN_SEPARATOR}..{MAIN_SEPARATOR}");
+    let suggestions = completer.complete(&target_dir, target_dir.len());
+
+    // Create the expected values
+    let expected_paths: Vec<String> = vec![
+        folder(
+            dir.join("directory_completion")
+                .join("folder_inside_folder")
+                .join("..")
+                .join("..")
+                .join("another"),
+        ),
+        folder(
+            dir.join("directory_completion")
+                .join("folder_inside_folder")
+                .join("..")
+                .join("..")
+                .join("directory_completion"),
+        ),
+        folder(
+            dir.join("directory_completion")
+                .join("folder_inside_folder")
+                .join("..")
+                .join("..")
+                .join("test_a"),
+        ),
+        folder(
+            dir.join("directory_completion")
+                .join("folder_inside_folder")
+                .join("..")
+                .join("..")
+                .join("test_b"),
+        ),
+        folder(
+            dir.join("directory_completion")
+                .join("folder_inside_folder")
+                .join("..")
+                .join("..")
+                .join(".hidden_folder"),
+        ),
+    ];
+
+    #[cfg(windows)]
+    {
+        let target_dir = format!("cd {dir_str}/../../");
+        let slash_suggestions = completer.complete(&target_dir, target_dir.len());
+
+        let expected_slash_paths: Vec<String> = expected_paths
+            .iter()
+            .map(|s| s.replace('\\', "/"))
+            .collect();
+
+        match_suggestions(&expected_slash_paths, &slash_suggestions);
+    }
+
+    // Match the results
+    match_suggestions(&expected_paths, &suggestions);
+}
+
 #[test]
 fn variables_completions() {
     // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Add record value as example
     let record = "let actor = { name: 'Tom Hardy', age: 44 }";
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack).is_ok());
 
     // Instantiate a new completer
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
@@ -1031,11 +1312,11 @@ fn variables_completions() {
 
 #[test]
 fn alias_of_command_and_flags() {
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Create an alias
     let alias = r#"alias ll = ls -l"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
 
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
 
@@ -1050,11 +1331,11 @@ fn alias_of_command_and_flags() {
 
 #[test]
 fn alias_of_basic_command() {
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Create an alias
     let alias = r#"alias ll = ls "#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
 
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
 
@@ -1069,14 +1350,14 @@ fn alias_of_basic_command() {
 
 #[test]
 fn alias_of_another_alias() {
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Create an alias
     let alias = r#"alias ll = ls -la"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir.clone()).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
     // Create the second alias
     let alias = r#"alias lf = ll -f"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
 
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
 
@@ -1093,7 +1374,7 @@ fn run_external_completion(completer: &str, input: &str) -> Vec<Suggestion> {
     let completer = format!("$env.config.completions.external.completer = {completer}");
 
     // Create a new engine
-    let (dir, _, mut engine_state, mut stack) = new_engine();
+    let (_, _, mut engine_state, mut stack) = new_engine();
     let (block, delta) = {
         let mut working_set = StateWorkingSet::new(&engine_state);
         let block = parse(&mut working_set, None, completer.as_bytes(), false);
@@ -1109,7 +1390,7 @@ fn run_external_completion(completer: &str, input: &str) -> Vec<Suggestion> {
     );
 
     // Merge environment into the permanent state
-    assert!(engine_state.merge_env(&mut stack, &dir).is_ok());
+    assert!(engine_state.merge_env(&mut stack).is_ok());
 
     // Instantiate a new completer
     let mut completer = NuCompleter::new(Arc::new(engine_state), Arc::new(stack));
@@ -1298,11 +1579,11 @@ fn sort_fuzzy_completions_in_alphabetical_order(mut fuzzy_alpha_sort_completer:
 #[ignore = "was reverted, still needs fixing"]
 #[rstest]
 fn alias_offset_bug_7648() {
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Create an alias
     let alias = r#"alias ea = ^$env.EDITOR /tmp/test.s"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
 
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
 
@@ -1317,11 +1598,11 @@ fn alias_offset_bug_7648() {
 #[ignore = "was reverted, still needs fixing"]
 #[rstest]
 fn alias_offset_bug_7754() {
-    let (dir, _, mut engine, mut stack) = new_engine();
+    let (_, _, mut engine, mut stack) = new_engine();
 
     // Create an alias
     let alias = r#"alias ll = ls -l"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack).is_ok());
 
     let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
 

crates/nu-cli/tests/completions/support/completions_helpers.rs

@@ -63,7 +63,7 @@ pub fn new_engine() -> (AbsolutePathBuf, String, EngineState, Stack) {
     );
 
     // Merge environment into the permanent state
-    let merge_result = engine_state.merge_env(&mut stack, &dir);
+    let merge_result = engine_state.merge_env(&mut stack);
     assert!(merge_result.is_ok());
 
     (dir, dir_str, engine_state, stack)
@@ -109,7 +109,7 @@ pub fn new_dotnu_engine() -> (AbsolutePathBuf, String, EngineState, Stack) {
     );
 
     // Merge environment into the permanent state
-    let merge_result = engine_state.merge_env(&mut stack, &dir);
+    let merge_result = engine_state.merge_env(&mut stack);
     assert!(merge_result.is_ok());
 
     (dir, dir_str, engine_state, stack)
@@ -144,7 +144,7 @@ pub fn new_quote_engine() -> (AbsolutePathBuf, String, EngineState, Stack) {
     );
 
     // Merge environment into the permanent state
-    let merge_result = engine_state.merge_env(&mut stack, &dir);
+    let merge_result = engine_state.merge_env(&mut stack);
     assert!(merge_result.is_ok());
 
     (dir, dir_str, engine_state, stack)
@@ -179,7 +179,7 @@ pub fn new_partial_engine() -> (AbsolutePathBuf, String, EngineState, Stack) {
     );
 
     // Merge environment into the permanent state
-    let merge_result = engine_state.merge_env(&mut stack, &dir);
+    let merge_result = engine_state.merge_env(&mut stack);
     assert!(merge_result.is_ok());
 
     (dir, dir_str, engine_state, stack)
@@ -223,7 +223,6 @@ pub fn merge_input(
     input: &[u8],
     engine_state: &mut EngineState,
     stack: &mut Stack,
-    dir: AbsolutePathBuf,
 ) -> Result<(), ShellError> {
     let (block, delta) = {
         let mut working_set = StateWorkingSet::new(engine_state);
@@ -246,5 +245,5 @@ pub fn merge_input(
     .is_ok());
 
     // Merge environment into the permanent state
-    engine_state.merge_env(stack, &dir)
+    engine_state.merge_env(stack)
 }

crates/nu-cmd-base/Cargo.toml

@@ -5,15 +5,18 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-base"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-base"
-version = "0.97.0"
+version = "0.99.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[lints]
+workspace = true
+
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.97.0" }
+nu-engine = { path = "../nu-engine", version = "0.99.0" }
-nu-parser = { path = "../nu-parser", version = "0.97.0" }
+nu-parser = { path = "../nu-parser", version = "0.99.0" }
-nu-path = { path = "../nu-path", version = "0.97.0" }
+nu-path = { path = "../nu-path", version = "0.99.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
 
 indexmap = { workspace = true }
 miette = { workspace = true }

crates/nu-cmd-base/src/hook.rs

@@ -1,9 +1,8 @@
-use crate::util::get_guaranteed_cwd;
 use miette::Result;
 use nu_engine::{eval_block, eval_block_with_early_return};
 use nu_parser::parse;
 use nu_protocol::{
-    cli_error::{report_error, report_error_new},
+    cli_error::{report_parse_error, report_shell_error},
     debugger::WithoutDebug,
     engine::{Closure, EngineState, Stack, StateWorkingSet},
     PipelineData, PositionalArg, ShellError, Span, Type, Value, VarId,
@@ -19,17 +18,12 @@ pub fn eval_env_change_hook(
         match hook {
             Value::Record { val, .. } => {
                 for (env_name, hook_value) in &*val {
-                    let before = engine_state
+                    let before = engine_state.previous_env_vars.get(env_name);
-                        .previous_env_vars
+                    let after = stack.get_env_var(engine_state, env_name);
-                        .get(env_name)
-                        .cloned()
-                        .unwrap_or_default();
-
-                    let after = stack
-                        .get_env_var(engine_state, env_name)
-                        .unwrap_or_default();
-
                     if before != after {
+                        let before = before.cloned().unwrap_or_default();
+                        let after = after.cloned().unwrap_or_default();
+
                         eval_hook(
                             engine_state,
                             stack,
@@ -40,7 +34,7 @@ pub fn eval_env_change_hook(
                         )?;
 
                         Arc::make_mut(&mut engine_state.previous_env_vars)
-                            .insert(env_name.to_string(), after);
+                            .insert(env_name.clone(), after);
                     }
                 }
             }
@@ -91,12 +85,13 @@ pub fn eval_hook(
                     false,
                 );
                 if let Some(err) = working_set.parse_errors.first() {
-                    report_error(&working_set, err);
+                    report_parse_error(&working_set, err);
-
+                    return Err(ShellError::GenericError {
-                    return Err(ShellError::UnsupportedConfigValue {
+                        error: format!("Failed to run {hook_name} hook"),
-                        expected: "valid source code".into(),
+                        msg: "source code has errors".into(),
-                        value: "source code with syntax errors".into(),
+                        span: Some(span),
-                        span,
+                        help: None,
+                        inner: Vec::new(),
                     });
                 }
 
@@ -123,7 +118,7 @@ pub fn eval_hook(
                     output = pipeline_data;
                 }
                 Err(err) => {
-                    report_error_new(engine_state, &err);
+                    report_shell_error(engine_state, &err);
                 }
             }
 
@@ -167,10 +162,10 @@ pub fn eval_hook(
                             {
                                 val
                             } else {
-                                return Err(ShellError::UnsupportedConfigValue {
+                                return Err(ShellError::RuntimeTypeMismatch {
-                                    expected: "boolean output".to_string(),
+                                    expected: Type::Bool,
-                                    value: "other PipelineData variant".to_string(),
+                                    actual: pipeline_data.get_type(),
-                                    span: other_span,
+                                    span: pipeline_data.span().unwrap_or(other_span),
                                 });
                             }
                         }
@@ -179,9 +174,9 @@ pub fn eval_hook(
                         }
                     }
                 } else {
-                    return Err(ShellError::UnsupportedConfigValue {
+                    return Err(ShellError::RuntimeTypeMismatch {
-                        expected: "block".to_string(),
+                        expected: Type::Closure,
-                        value: format!("{}", condition.get_type()),
+                        actual: condition.get_type(),
                         span: other_span,
                     });
                 }
@@ -223,12 +218,13 @@ pub fn eval_hook(
                                 false,
                             );
                             if let Some(err) = working_set.parse_errors.first() {
-                                report_error(&working_set, err);
+                                report_parse_error(&working_set, err);
-
+                                return Err(ShellError::GenericError {
-                                return Err(ShellError::UnsupportedConfigValue {
+                                    error: format!("Failed to run {hook_name} hook"),
-                                    expected: "valid source code".into(),
+                                    msg: "source code has errors".into(),
-                                    value: "source code with syntax errors".into(),
+                                    span: Some(span),
-                                    span: source_span,
+                                    help: None,
+                                    inner: Vec::new(),
                                 });
                             }
 
@@ -251,7 +247,7 @@ pub fn eval_hook(
                                 output = pipeline_data;
                             }
                             Err(err) => {
-                                report_error_new(engine_state, &err);
+                                report_shell_error(engine_state, &err);
                             }
                         }
 
@@ -263,9 +259,9 @@ pub fn eval_hook(
                         run_hook(engine_state, stack, val, input, arguments, source_span)?;
                     }
                     other => {
-                        return Err(ShellError::UnsupportedConfigValue {
+                        return Err(ShellError::RuntimeTypeMismatch {
-                            expected: "block or string".to_string(),
+                            expected: Type::custom("string or closure"),
-                            value: format!("{}", other.get_type()),
+                            actual: other.get_type(),
                             span: source_span,
                         });
                     }
@@ -276,16 +272,15 @@ pub fn eval_hook(
             output = run_hook(engine_state, stack, val, input, arguments, span)?;
         }
         other => {
-            return Err(ShellError::UnsupportedConfigValue {
+            return Err(ShellError::RuntimeTypeMismatch {
-                expected: "string, block, record, or list of commands".into(),
+                expected: Type::custom("string, closure, record, or list"),
-                value: format!("{}", other.get_type()),
+                actual: other.get_type(),
                 span: other.span(),
             });
         }
     }
 
-    let cwd = get_guaranteed_cwd(engine_state, stack);
+    engine_state.merge_env(stack)?;
-    engine_state.merge_env(stack, cwd)?;
 
     Ok(output)
 }

crates/nu-cmd-base/src/util.rs

@@ -1,30 +1,9 @@
-use nu_path::AbsolutePathBuf;
 use nu_protocol::{
     engine::{EngineState, Stack},
     Range, ShellError, Span, Value,
 };
 use std::ops::Bound;
 
-pub fn get_init_cwd() -> AbsolutePathBuf {
-    std::env::current_dir()
-        .ok()
-        .and_then(|path| AbsolutePathBuf::try_from(path).ok())
-        .or_else(|| {
-            std::env::var("PWD")
-                .ok()
-                .and_then(|path| AbsolutePathBuf::try_from(path).ok())
-        })
-        .or_else(nu_path::home_dir)
-        .expect("Failed to get current working directory")
-}
-
-pub fn get_guaranteed_cwd(engine_state: &EngineState, stack: &Stack) -> AbsolutePathBuf {
-    engine_state
-        .cwd(Some(stack))
-        .ok()
-        .unwrap_or_else(get_init_cwd)
-}
-
 type MakeRangeError = fn(&str, Span) -> ShellError;
 
 /// Returns a inclusive pair of boundary in given `range`.

crates/nu-cmd-extra/Cargo.toml

@@ -5,21 +5,24 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-extra"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-extra"
-version = "0.97.0"
+version = "0.99.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [lib]
 bench = false
 
+[lints]
+workspace = true
+
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.99.0" }
-nu-engine = { path = "../nu-engine", version = "0.97.0" }
+nu-engine = { path = "../nu-engine", version = "0.99.0" }
-nu-json = { version = "0.97.0", path = "../nu-json" }
+nu-json = { version = "0.99.0", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.97.0" }
+nu-parser = { path = "../nu-parser", version = "0.99.0" }
-nu-pretty-hex = { version = "0.97.0", path = "../nu-pretty-hex" }
+nu-pretty-hex = { version = "0.99.0", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.99.0" }
-nu-utils = { path = "../nu-utils", version = "0.97.0" }
+nu-utils = { path = "../nu-utils", version = "0.99.0" }
 
 # Potential dependencies for extras
 heck = { workspace = true }
@@ -33,6 +36,6 @@ v_htmlescape = { workspace = true }
 itertools = { workspace = true }
 
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.99.0" }
-nu-command = { path = "../nu-command", version = "0.97.0" }
+nu-command = { path = "../nu-command", version = "0.99.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.97.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.99.0" }

crates/nu-cmd-extra/src/extra/bits/and.rs

@@ -37,7 +37,7 @@ impl Command for BitsAnd {
             .category(Category::Bits)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Performs bitwise and for ints or binary values."
     }
 

crates/nu-cmd-extra/src/extra/bits/bits_.rs

@@ -14,11 +14,11 @@ impl Command for Bits {
             .input_output_types(vec![(Type::Nothing, Type::String)])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Various commands for working with bits."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 

crates/nu-cmd-extra/src/extra/bits/into.rs

@@ -45,7 +45,7 @@ impl Command for BitsInto {
             .category(Category::Conversions)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert value to a binary primitive."
     }
 

crates/nu-cmd-extra/src/extra/bits/mod.rs

@@ -44,6 +44,25 @@ enum InputNumType {
     SignedEight,
 }
 
+impl InputNumType {
+    fn num_bits(self) -> u32 {
+        match self {
+            InputNumType::One => 8,
+            InputNumType::Two => 16,
+            InputNumType::Four => 32,
+            InputNumType::Eight => 64,
+            InputNumType::SignedOne => 8,
+            InputNumType::SignedTwo => 16,
+            InputNumType::SignedFour => 32,
+            InputNumType::SignedEight => 64,
+        }
+    }
+
+    fn is_permitted_bit_shift(self, bits: u32) -> bool {
+        bits < self.num_bits()
+    }
+}
+
 fn get_number_bytes(
     number_bytes: Option<Spanned<usize>>,
     head: Span,

crates/nu-cmd-extra/src/extra/bits/not.rs

@@ -51,7 +51,7 @@ impl Command for BitsNot {
             .category(Category::Bits)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Performs logical negation on each bit."
     }
 

crates/nu-cmd-extra/src/extra/bits/or.rs

@@ -38,7 +38,7 @@ impl Command for BitsOr {
             .category(Category::Bits)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Performs bitwise or for ints or binary values."
     }
 

crates/nu-cmd-extra/src/extra/bits/rotate_left.rs

@@ -1,11 +1,10 @@
 use super::{get_input_num_type, get_number_bytes, InputNumType, NumberBytes};
-use itertools::Itertools;
 use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
 
 struct Arguments {
     signed: bool,
-    bits: usize,
+    bits: Spanned<usize>,
     number_size: NumberBytes,
 }
 
@@ -53,7 +52,7 @@ impl Command for BitsRol {
             .category(Category::Bits)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Bitwise rotate left for ints or binary values."
     }
 
@@ -69,7 +68,7 @@ impl Command for BitsRol {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
-        let bits: usize = call.req(engine_state, stack, 0)?;
+        let bits = call.req(engine_state, stack, 0)?;
         let signed = call.has_flag(engine_state, stack, "signed")?;
         let number_bytes: Option<Spanned<usize>> =
             call.get_flag(engine_state, stack, "number-bytes")?;
@@ -119,6 +118,8 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
         number_size,
         bits,
     } = *args;
+    let bits_span = bits.span;
+    let bits = bits.item;
 
     match input {
         Value::Int { val, .. } => {
@@ -127,6 +128,19 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
             let bits = bits as u32;
             let input_num_type = get_input_num_type(val, signed, number_size);
 
+            if bits > input_num_type.num_bits() {
+                return Value::error(
+                    ShellError::IncorrectValue {
+                        msg: format!(
+                            "Trying to rotate by more than the available bits ({})",
+                            input_num_type.num_bits()
+                        ),
+                        val_span: bits_span,
+                        call_span: span,
+                    },
+                    span,
+                );
+            }
             let int = match input_num_type {
                 One => (val as u8).rotate_left(bits) as i64,
                 Two => (val as u16).rotate_left(bits) as i64,
@@ -157,16 +171,28 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
             Value::int(int, span)
         }
         Value::Binary { val, .. } => {
+            let len = val.len();
+            if bits > len * 8 {
+                return Value::error(
+                    ShellError::IncorrectValue {
+                        msg: format!(
+                            "Trying to rotate by more than the available bits ({})",
+                            len * 8
+                        ),
+                        val_span: bits_span,
+                        call_span: span,
+                    },
+                    span,
+                );
+            }
             let byte_shift = bits / 8;
             let bit_rotate = bits % 8;
 
-            let mut bytes = val
+            let bytes = if bit_rotate == 0 {
-                .iter()
+                rotate_bytes_left(val, byte_shift)
-                .copied()
+            } else {
-                .circular_tuple_windows::<(u8, u8)>()
+                rotate_bytes_and_bits_left(val, byte_shift, bit_rotate)
-                .map(|(lhs, rhs)| (lhs << bit_rotate) | (rhs >> (8 - bit_rotate)))
+            };
-                .collect::<Vec<u8>>();
-            bytes.rotate_left(byte_shift);
 
             Value::binary(bytes, span)
         }
@@ -184,6 +210,34 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
     }
 }
 
+fn rotate_bytes_left(data: &[u8], byte_shift: usize) -> Vec<u8> {
+    let len = data.len();
+    let mut output = vec![0; len];
+    output[..len - byte_shift].copy_from_slice(&data[byte_shift..]);
+    output[len - byte_shift..].copy_from_slice(&data[..byte_shift]);
+    output
+}
+
+fn rotate_bytes_and_bits_left(data: &[u8], byte_shift: usize, bit_shift: usize) -> Vec<u8> {
+    debug_assert!(byte_shift < data.len());
+    debug_assert!(
+        (1..8).contains(&bit_shift),
+        "Bit shifts of 0 can't be handled by this impl and everything else should be part of the byteshift");
+    let mut bytes = Vec::with_capacity(data.len());
+    let mut next_index = byte_shift;
+    for _ in 0..data.len() {
+        let curr_byte = data[next_index];
+        next_index += 1;
+        if next_index == data.len() {
+            next_index = 0;
+        }
+        let next_byte = data[next_index];
+        let new_byte = (curr_byte << bit_shift) | (next_byte >> (8 - bit_shift));
+        bytes.push(new_byte);
+    }
+    bytes
+}
+
 #[cfg(test)]
 mod test {
     use super::*;

crates/nu-cmd-extra/src/extra/bits/rotate_right.rs

@@ -1,11 +1,10 @@
 use super::{get_input_num_type, get_number_bytes, InputNumType, NumberBytes};
-use itertools::Itertools;
 use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
 
 struct Arguments {
     signed: bool,
-    bits: usize,
+    bits: Spanned<usize>,
     number_size: NumberBytes,
 }
 
@@ -53,7 +52,7 @@ impl Command for BitsRor {
             .category(Category::Bits)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Bitwise rotate right for ints or binary values."
     }
 
@@ -69,7 +68,7 @@ impl Command for BitsRor {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
-        let bits: usize = call.req(engine_state, stack, 0)?;
+        let bits = call.req(engine_state, stack, 0)?;
         let signed = call.has_flag(engine_state, stack, "signed")?;
         let number_bytes: Option<Spanned<usize>> =
             call.get_flag(engine_state, stack, "number-bytes")?;
@@ -123,6 +122,8 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
         number_size,
         bits,
     } = *args;
+    let bits_span = bits.span;
+    let bits = bits.item;
 
     match input {
         Value::Int { val, .. } => {
@@ -131,6 +132,19 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
             let bits = bits as u32;
             let input_num_type = get_input_num_type(val, signed, number_size);
 
+            if bits > input_num_type.num_bits() {
+                return Value::error(
+                    ShellError::IncorrectValue {
+                        msg: format!(
+                            "Trying to rotate by more than the available bits ({})",
+                            input_num_type.num_bits()
+                        ),
+                        val_span: bits_span,
+                        call_span: span,
+                    },
+                    span,
+                );
+            }
             let int = match input_num_type {
                 One => (val as u8).rotate_right(bits) as i64,
                 Two => (val as u16).rotate_right(bits) as i64,
@@ -161,16 +175,28 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
             Value::int(int, span)
         }
         Value::Binary { val, .. } => {
+            let len = val.len();
+            if bits > len * 8 {
+                return Value::error(
+                    ShellError::IncorrectValue {
+                        msg: format!(
+                            "Trying to rotate by more than the available bits ({})",
+                            len * 8
+                        ),
+                        val_span: bits_span,
+                        call_span: span,
+                    },
+                    span,
+                );
+            }
             let byte_shift = bits / 8;
             let bit_rotate = bits % 8;
 
-            let mut bytes = val
+            let bytes = if bit_rotate == 0 {
-                .iter()
+                rotate_bytes_right(val, byte_shift)
-                .copied()
+            } else {
-                .circular_tuple_windows::<(u8, u8)>()
+                rotate_bytes_and_bits_right(val, byte_shift, bit_rotate)
-                .map(|(lhs, rhs)| (lhs >> bit_rotate) | (rhs << (8 - bit_rotate)))
+            };
-                .collect::<Vec<u8>>();
-            bytes.rotate_right(byte_shift);
 
             Value::binary(bytes, span)
         }
@@ -188,6 +214,35 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
     }
 }
 
+fn rotate_bytes_right(data: &[u8], byte_shift: usize) -> Vec<u8> {
+    let len = data.len();
+    let mut output = vec![0; len];
+    output[byte_shift..].copy_from_slice(&data[..len - byte_shift]);
+    output[..byte_shift].copy_from_slice(&data[len - byte_shift..]);
+    output
+}
+
+fn rotate_bytes_and_bits_right(data: &[u8], byte_shift: usize, bit_shift: usize) -> Vec<u8> {
+    debug_assert!(byte_shift < data.len());
+    debug_assert!(
+        (1..8).contains(&bit_shift),
+        "Bit shifts of 0 can't be handled by this impl and everything else should be part of the byteshift"
+    );
+    let mut bytes = Vec::with_capacity(data.len());
+    let mut previous_index = data.len() - byte_shift - 1;
+    for _ in 0..data.len() {
+        let previous_byte = data[previous_index];
+        previous_index += 1;
+        if previous_index == data.len() {
+            previous_index = 0;
+        }
+        let curr_byte = data[previous_index];
+        let rotated_byte = (curr_byte >> bit_shift) | (previous_byte << (8 - bit_shift));
+        bytes.push(rotated_byte);
+    }
+
+    bytes
+}
 #[cfg(test)]
 mod test {
     use super::*;

crates/nu-cmd-extra/src/extra/bits/shift_left.rs

@@ -7,7 +7,7 @@ use std::iter;
 
 struct Arguments {
     signed: bool,
-    bits: usize,
+    bits: Spanned<usize>,
     number_size: NumberBytes,
 }
 
@@ -55,7 +55,7 @@ impl Command for BitsShl {
             .category(Category::Bits)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Bitwise shift left for ints or binary values."
     }
 
@@ -71,7 +71,9 @@ impl Command for BitsShl {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
-        let bits: usize = call.req(engine_state, stack, 0)?;
+        // This restricts to a positive shift value (our underlying operations do not
+        // permit them)
+        let bits: Spanned<usize> = call.req(engine_state, stack, 0)?;
         let signed = call.has_flag(engine_state, stack, "signed")?;
         let number_bytes: Option<Spanned<usize>> =
             call.get_flag(engine_state, stack, "number-bytes")?;
@@ -131,14 +133,29 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
         number_size,
         bits,
     } = *args;
+    let bits_span = bits.span;
+    let bits = bits.item;
 
     match input {
         Value::Int { val, .. } => {
             use InputNumType::*;
             let val = *val;
-            let bits = bits as u64;
+            let bits = bits as u32;
 
             let input_num_type = get_input_num_type(val, signed, number_size);
+            if !input_num_type.is_permitted_bit_shift(bits) {
+                return Value::error(
+                    ShellError::IncorrectValue {
+                        msg: format!(
+                            "Trying to shift by more than the available bits (permitted < {})",
+                            input_num_type.num_bits()
+                        ),
+                        val_span: bits_span,
+                        call_span: span,
+                    },
+                    span,
+                );
+            }
             let int = match input_num_type {
                 One => ((val as u8) << bits) as i64,
                 Two => ((val as u16) << bits) as i64,
@@ -147,12 +164,14 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
                     let Ok(i) = i64::try_from((val as u64) << bits) else {
                         return Value::error(
                             ShellError::GenericError {
-                                error: "result out of range for specified number".into(),
+                                error: "result out of range for int".into(),
                                 msg: format!(
                                     "shifting left by {bits} is out of range for the value {val}"
                                 ),
                                 span: Some(span),
-                                help: None,
+                                help: Some(
+                                    "Ensure the result fits in a 64-bit signed integer.".into(),
+                                ),
                                 inner: vec![],
                             },
                             span,
@@ -172,19 +191,26 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
             let byte_shift = bits / 8;
             let bit_shift = bits % 8;
 
-            use itertools::Position::*;
+            // This is purely for symmetry with the int case and the fact that the
-            let bytes = val
+            // shift right implementation in its current form panicked with an overflow
-                .iter()
+            if bits > val.len() * 8 {
-                .copied()
+                return Value::error(
-                .skip(byte_shift)
+                    ShellError::IncorrectValue {
-                .circular_tuple_windows::<(u8, u8)>()
+                        msg: format!(
-                .with_position()
+                            "Trying to shift by more than the available bits ({})",
-                .map(|(pos, (lhs, rhs))| match pos {
+                            val.len() * 8
-                    Last | Only => lhs << bit_shift,
+                        ),
-                    _ => (lhs << bit_shift) | (rhs >> bit_shift),
+                        val_span: bits_span,
-                })
+                        call_span: span,
-                .chain(iter::repeat(0).take(byte_shift))
+                    },
-                .collect::<Vec<u8>>();
+                    span,
+                );
+            }
+            let bytes = if bit_shift == 0 {
+                shift_bytes_left(val, byte_shift)
+            } else {
+                shift_bytes_and_bits_left(val, byte_shift, bit_shift)
+            };
 
             Value::binary(bytes, span)
         }
@@ -202,6 +228,31 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
     }
 }
 
+fn shift_bytes_left(data: &[u8], byte_shift: usize) -> Vec<u8> {
+    let len = data.len();
+    let mut output = vec![0; len];
+    output[..len - byte_shift].copy_from_slice(&data[byte_shift..]);
+    output
+}
+
+fn shift_bytes_and_bits_left(data: &[u8], byte_shift: usize, bit_shift: usize) -> Vec<u8> {
+    use itertools::Position::*;
+    debug_assert!((1..8).contains(&bit_shift),
+        "Bit shifts of 0 can't be handled by this impl and everything else should be part of the byteshift"
+    );
+    data.iter()
+        .copied()
+        .skip(byte_shift)
+        .circular_tuple_windows::<(u8, u8)>()
+        .with_position()
+        .map(|(pos, (lhs, rhs))| match pos {
+            Last | Only => lhs << bit_shift,
+            _ => (lhs << bit_shift) | (rhs >> (8 - bit_shift)),
+        })
+        .chain(iter::repeat(0).take(byte_shift))
+        .collect::<Vec<u8>>()
+}
+
 #[cfg(test)]
 mod test {
     use super::*;

crates/nu-cmd-extra/src/extra/bits/shift_right.rs

@@ -1,13 +1,10 @@
 use super::{get_input_num_type, get_number_bytes, InputNumType, NumberBytes};
-use itertools::Itertools;
 use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
 
-use std::iter;
-
 struct Arguments {
     signed: bool,
-    bits: usize,
+    bits: Spanned<usize>,
     number_size: NumberBytes,
 }
 
@@ -55,7 +52,7 @@ impl Command for BitsShr {
             .category(Category::Bits)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Bitwise shift right for ints or binary values."
     }
 
@@ -71,7 +68,9 @@ impl Command for BitsShr {
         input: PipelineData,
     ) -> Result<PipelineData, ShellError> {
         let head = call.head;
-        let bits: usize = call.req(engine_state, stack, 0)?;
+        // This restricts to a positive shift value (our underlying operations do not
+        // permit them)
+        let bits: Spanned<usize> = call.req(engine_state, stack, 0)?;
         let signed = call.has_flag(engine_state, stack, "signed")?;
         let number_bytes: Option<Spanned<usize>> =
             call.get_flag(engine_state, stack, "number-bytes")?;
@@ -121,6 +120,8 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
         number_size,
         bits,
     } = *args;
+    let bits_span = bits.span;
+    let bits = bits.item;
 
     match input {
         Value::Int { val, .. } => {
@@ -129,6 +130,19 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
             let bits = bits as u32;
             let input_num_type = get_input_num_type(val, signed, number_size);
 
+            if !input_num_type.is_permitted_bit_shift(bits) {
+                return Value::error(
+                    ShellError::IncorrectValue {
+                        msg: format!(
+                            "Trying to shift by more than the available bits (permitted < {})",
+                            input_num_type.num_bits()
+                        ),
+                        val_span: bits_span,
+                        call_span: span,
+                    },
+                    span,
+                );
+            }
             let int = match input_num_type {
                 One => ((val as u8) >> bits) as i64,
                 Two => ((val as u16) >> bits) as i64,
@@ -147,21 +161,27 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
             let bit_shift = bits % 8;
 
             let len = val.len();
-            use itertools::Position::*;
+            // This check is done for symmetry with the int case and the previous
-            let bytes = iter::repeat(0)
+            // implementation would overflow byte indices leading to unexpected output
-                .take(byte_shift)
+            // lengths
-                .chain(
+            if bits > len * 8 {
-                    val.iter()
+                return Value::error(
-                        .copied()
+                    ShellError::IncorrectValue {
-                        .circular_tuple_windows::<(u8, u8)>()
+                        msg: format!(
-                        .with_position()
+                            "Trying to shift by more than the available bits ({})",
-                        .map(|(pos, (lhs, rhs))| match pos {
+                            len * 8
-                            First | Only => lhs >> bit_shift,
+                        ),
-                            _ => (lhs >> bit_shift) | (rhs << bit_shift),
+                        val_span: bits_span,
-                        })
+                        call_span: span,
-                        .take(len - byte_shift),
+                    },
-                )
+                    span,
-                .collect::<Vec<u8>>();
+                );
+            }
+            let bytes = if bit_shift == 0 {
+                shift_bytes_right(val, byte_shift)
+            } else {
+                shift_bytes_and_bits_right(val, byte_shift, bit_shift)
+            };
 
             Value::binary(bytes, span)
         }
@@ -178,6 +198,35 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
         ),
     }
 }
+fn shift_bytes_right(data: &[u8], byte_shift: usize) -> Vec<u8> {
+    let len = data.len();
+    let mut output = vec![0; len];
+    output[byte_shift..].copy_from_slice(&data[..len - byte_shift]);
+    output
+}
+
+fn shift_bytes_and_bits_right(data: &[u8], byte_shift: usize, bit_shift: usize) -> Vec<u8> {
+    debug_assert!(
+        bit_shift > 0 && bit_shift < 8,
+        "bit_shift should be in the range (0, 8)"
+    );
+    let len = data.len();
+    let mut output = vec![0; len];
+
+    for i in byte_shift..len {
+        let shifted_bits = data[i - byte_shift] >> bit_shift;
+        let carried_bits = if i > byte_shift {
+            data[i - byte_shift - 1] << (8 - bit_shift)
+        } else {
+            0
+        };
+        let shifted_byte = shifted_bits | carried_bits;
+
+        output[i] = shifted_byte;
+    }
+
+    output
+}
 
 #[cfg(test)]
 mod test {

crates/nu-cmd-extra/src/extra/bits/xor.rs

@@ -38,7 +38,7 @@ impl Command for BitsXor {
             .category(Category::Bits)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Performs bitwise xor for ints or binary values."
     }
 

crates/nu-cmd-extra/src/extra/conversions/fmt.rs

@@ -9,7 +9,7 @@ impl Command for Fmt {
         "fmt"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Format a number."
     }
 

crates/nu-cmd-extra/src/extra/filters/each_while.rs

@@ -9,7 +9,7 @@ impl Command for EachWhile {
         "each while"
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Run a closure on each row of the input list until a null is found, then create a new list with the results."
     }
 

crates/nu-cmd-extra/src/extra/filters/roll/roll_.rs

@@ -18,11 +18,11 @@ impl Command for Roll {
             .input_output_types(vec![(Type::Nothing, Type::String)])
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Rolling commands for tables."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "You must use one of the following subcommands. Using this command as-is will only produce this help message."
     }
 

crates/nu-cmd-extra/src/extra/filters/roll/roll_down.rs

@@ -21,7 +21,7 @@ impl Command for RollDown {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Roll table rows down."
     }
 

crates/nu-cmd-extra/src/extra/filters/roll/roll_left.rs

@@ -33,7 +33,7 @@ impl Command for RollLeft {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Roll record or table columns left."
     }
 

crates/nu-cmd-extra/src/extra/filters/roll/roll_right.rs

@@ -33,7 +33,7 @@ impl Command for RollRight {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Roll table columns right."
     }
 

crates/nu-cmd-extra/src/extra/filters/roll/roll_up.rs

@@ -21,7 +21,7 @@ impl Command for RollUp {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Roll table rows up."
     }
 

crates/nu-cmd-extra/src/extra/filters/rotate.rs

@@ -23,7 +23,7 @@ impl Command for Rotate {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Rotates a table or record clockwise (default) or counter-clockwise (use --ccw flag)."
     }
 

crates/nu-cmd-extra/src/extra/filters/update_cells.rs

@@ -27,7 +27,7 @@ impl Command for UpdateCells {
             .category(Category::Filters)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Update the table cells."
     }
 

crates/nu-cmd-extra/src/extra/formats/from/url.rs

@@ -14,7 +14,7 @@ impl Command for FromUrl {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Parse url-encoded string as a record."
     }
 

crates/nu-cmd-extra/src/extra/formats/to/html.rs

@@ -138,11 +138,11 @@ impl Command for ToHtml {
         ]
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert table into simple HTML."
     }
 
-    fn extra_usage(&self) -> &str {
+    fn extra_description(&self) -> &str {
         "Screenshots of the themes can be browsed here: https://github.com/mbadolato/iTerm2-Color-Schemes."
     }
 

crates/nu-cmd-extra/src/extra/math/arccos.rs

@@ -22,7 +22,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the arccosine of the number."
     }
 

crates/nu-cmd-extra/src/extra/math/arccosh.rs

@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the inverse of the hyperbolic cosine function."
     }
 

crates/nu-cmd-extra/src/extra/math/arcsin.rs

@@ -22,7 +22,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the arcsine of the number."
     }
 

crates/nu-cmd-extra/src/extra/math/arcsinh.rs

@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the inverse of the hyperbolic sine function."
     }
 

crates/nu-cmd-extra/src/extra/math/arctan.rs

@@ -22,7 +22,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the arctangent of the number."
     }
 

crates/nu-cmd-extra/src/extra/math/arctanh.rs

@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the inverse of the hyperbolic tangent function."
     }
 

crates/nu-cmd-extra/src/extra/math/cos.rs

@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the cosine of the number."
     }
 

crates/nu-cmd-extra/src/extra/math/cosh.rs

@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the hyperbolic cosine of the number."
     }
 

crates/nu-cmd-extra/src/extra/math/exp.rs

@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns e raised to the power of x."
     }
 

crates/nu-cmd-extra/src/extra/math/ln.rs

@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the natural logarithm. Base: (math e)."
     }
 

crates/nu-cmd-extra/src/extra/math/sin.rs

@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the sine of the number."
     }
 

crates/nu-cmd-extra/src/extra/math/sinh.rs

@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the hyperbolic sine of the number."
     }
 

crates/nu-cmd-extra/src/extra/math/tan.rs

@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the tangent of the number."
     }
 

crates/nu-cmd-extra/src/extra/math/tanh.rs

@@ -21,7 +21,7 @@ impl Command for SubCommand {
             .category(Category::Math)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Returns the hyperbolic tangent of the number."
     }
 

crates/nu-cmd-extra/src/extra/mod.rs

@@ -45,8 +45,6 @@ pub fn add_extra_command_context(mut engine_state: EngineState) -> EngineState {
 
         bind_command!(
             strings::format::FormatPattern,
-            strings::encode_decode::EncodeHex,
-            strings::encode_decode::DecodeHex,
             strings::str_::case::Str,
             strings::str_::case::StrCamelCase,
             strings::str_::case::StrKebabCase,

crates/nu-cmd-extra/src/extra/platform/ansi/gradient.rs

@@ -53,7 +53,7 @@ impl Command for SubCommand {
             .category(Category::Platform)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Add a color gradient (using ANSI color codes) to the given string."
     }
 

crates/nu-cmd-extra/src/extra/strings/encode_decode/decode_hex.rs

@@ -29,7 +29,7 @@ impl Command for DecodeHex {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Hex decode a value."
     }
 

crates/nu-cmd-extra/src/extra/strings/encode_decode/encode_hex.rs

@@ -29,7 +29,7 @@ impl Command for EncodeHex {
             .category(Category::Formats)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Encode a binary value using hex."
     }
 

crates/nu-cmd-extra/src/extra/strings/encode_decode/hex.rs

@@ -1,192 +0,0 @@
-use nu_cmd_base::input_handler::{operate as general_operate, CmdArgument};
-use nu_engine::command_prelude::*;
-
-enum HexDecodingError {
-    InvalidLength(usize),
-    InvalidDigit(usize, char),
-}
-
-fn hex_decode(value: &str) -> Result<Vec<u8>, HexDecodingError> {
-    let mut digits = value
-        .chars()
-        .enumerate()
-        .filter(|(_, c)| !c.is_whitespace());
-
-    let mut res = Vec::with_capacity(value.len() / 2);
-    loop {
-        let c1 = match digits.next() {
-            Some((ind, c)) => match c.to_digit(16) {
-                Some(d) => d,
-                None => return Err(HexDecodingError::InvalidDigit(ind, c)),
-            },
-            None => return Ok(res),
-        };
-        let c2 = match digits.next() {
-            Some((ind, c)) => match c.to_digit(16) {
-                Some(d) => d,
-                None => return Err(HexDecodingError::InvalidDigit(ind, c)),
-            },
-            None => {
-                return Err(HexDecodingError::InvalidLength(value.len()));
-            }
-        };
-        res.push((c1 << 4 | c2) as u8);
-    }
-}
-
-fn hex_digit(num: u8) -> char {
-    match num {
-        0..=9 => (num + b'0') as char,
-        10..=15 => (num - 10 + b'A') as char,
-        _ => unreachable!(),
-    }
-}
-
-fn hex_encode(bytes: &[u8]) -> String {
-    let mut res = String::with_capacity(bytes.len() * 2);
-    for byte in bytes {
-        res.push(hex_digit(byte >> 4));
-        res.push(hex_digit(byte & 0b1111));
-    }
-    res
-}
-
-#[derive(Clone)]
-pub struct HexConfig {
-    pub action_type: ActionType,
-}
-
-#[derive(Clone, Copy, PartialEq, Eq)]
-pub enum ActionType {
-    Encode,
-    Decode,
-}
-
-struct Arguments {
-    cell_paths: Option<Vec<CellPath>>,
-    encoding_config: HexConfig,
-}
-
-impl CmdArgument for Arguments {
-    fn take_cell_paths(&mut self) -> Option<Vec<CellPath>> {
-        self.cell_paths.take()
-    }
-}
-
-pub fn operate(
-    action_type: ActionType,
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-    input: PipelineData,
-) -> Result<PipelineData, ShellError> {
-    let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
-    let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
-
-    let args = Arguments {
-        encoding_config: HexConfig { action_type },
-        cell_paths,
-    };
-
-    general_operate(action, args, input, call.head, engine_state.signals())
-}
-
-fn action(
-    input: &Value,
-    // only used for `decode` action
-    args: &Arguments,
-    command_span: Span,
-) -> Value {
-    let hex_config = &args.encoding_config;
-
-    match input {
-        // Propagate existing errors.
-        Value::Error { .. } => input.clone(),
-        Value::Binary { val, .. } => match hex_config.action_type {
-            ActionType::Encode => Value::string(hex_encode(val.as_ref()), command_span),
-            ActionType::Decode => Value::error(
-                ShellError::UnsupportedInput { msg: "Binary data can only be encoded".to_string(), input: "value originates from here".into(), msg_span: command_span, input_span: input.span() },
-                command_span,
-            ),
-        },
-        Value::String { val, .. } => {
-            match hex_config.action_type {
-                ActionType::Encode => Value::error(
-                    ShellError::UnsupportedInput { msg: "String value can only be decoded".to_string(), input: "value originates from here".into(), msg_span: command_span, input_span: input.span() },
-                    command_span,
-                ),
-
-                ActionType::Decode => match hex_decode(val.as_ref()) {
-                    Ok(decoded_value) => Value::binary(decoded_value, command_span),
-                    Err(HexDecodingError::InvalidLength(len)) => Value::error(ShellError::GenericError {
-                            error: "value could not be hex decoded".into(),
-                            msg: format!("invalid hex input length: {len}. The length should be even"),
-                            span: Some(command_span),
-                            help: None,
-                            inner: vec![],
-                        },
-                        command_span,
-                    ),
-                    Err(HexDecodingError::InvalidDigit(index, digit)) => Value::error(ShellError::GenericError {
-                            error: "value could not be hex decoded".into(),
-                            msg: format!("invalid hex digit: '{digit}' at index {index}. Only 0-9, A-F, a-f are allowed in hex encoding"),
-                            span: Some(command_span),
-                            help: None,
-                            inner: vec![],
-                        },
-                        command_span,
-                    ),
-                },
-            }
-        }
-        other => Value::error(
-            ShellError::TypeMismatch {
-                err_message: format!("string or binary, not {}", other.get_type()),
-                span: other.span(),
-            },
-            other.span(),
-        ),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::{action, ActionType, Arguments, HexConfig};
-    use nu_protocol::{Span, Value};
-
-    #[test]
-    fn hex_encode() {
-        let word = Value::binary([77, 97, 110], Span::test_data());
-        let expected = Value::test_string("4D616E");
-
-        let actual = action(
-            &word,
-            &Arguments {
-                encoding_config: HexConfig {
-                    action_type: ActionType::Encode,
-                },
-                cell_paths: None,
-            },
-            Span::test_data(),
-        );
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn hex_decode() {
-        let word = Value::test_string("4D 61\r\n\n6E");
-        let expected = Value::binary([77, 97, 110], Span::test_data());
-
-        let actual = action(
-            &word,
-            &Arguments {
-                encoding_config: HexConfig {
-                    action_type: ActionType::Decode,
-                },
-                cell_paths: None,
-            },
-            Span::test_data(),
-        );
-        assert_eq!(actual, expected);
-    }
-}

crates/nu-cmd-extra/src/extra/strings/encode_decode/mod.rs

@@ -1,6 +0,0 @@
-mod decode_hex;
-mod encode_hex;
-mod hex;
-
-pub(crate) use decode_hex::DecodeHex;
-pub(crate) use encode_hex::EncodeHex;

crates/nu-cmd-extra/src/extra/strings/format/command.rs

@@ -24,7 +24,7 @@ impl Command for FormatPattern {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Format columns into a string using a simple pattern."
     }
 

crates/nu-cmd-extra/src/extra/strings/mod.rs

@@ -1,3 +1,2 @@
-pub(crate) mod encode_decode;
 pub(crate) mod format;
 pub(crate) mod str_;

crates/nu-cmd-extra/src/extra/strings/str_/case/camel_case.rs

@@ -30,7 +30,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert a string to camelCase."
     }
 

crates/nu-cmd-extra/src/extra/strings/str_/case/kebab_case.rs

@@ -30,7 +30,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert a string to kebab-case."
     }
 

crates/nu-cmd-extra/src/extra/strings/str_/case/pascal_case.rs

@@ -30,7 +30,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert a string to PascalCase."
     }
 

crates/nu-cmd-extra/src/extra/strings/str_/case/screaming_snake_case.rs

@@ -30,7 +30,7 @@ impl Command for SubCommand {
             .category(Category::Strings)
     }
 
-    fn usage(&self) -> &str {
+    fn description(&self) -> &str {
         "Convert a string to SCREAMING_SNAKE_CASE."
     }