Bump version for 0.103.0 release (#15340 )

Feature-gate job unfreeze behind "os" (#15339 )
# Description The `job unfreeze` command relies on the `os` feature of the `nu-protocol` crate, which means that `nu-command` doesn't compile with `--no-default-features`. This PR gates `job unfreeze` behind `nu-command`'s `os` feature to avoid this. No user-facing changes, no tests needed.
2025-08-15 14:43:25 +02:00 · 2025-03-18 20:12:52 -04:00 · 2025-03-18 19:02:04 -04:00 · 2025-03-18 18:32:01 +01:00 · 2025-03-18 03:44:50 +00:00 · 2025-03-17 14:16:17 +01:00
547 changed files with 16986 additions and 8181 deletions
--- a/.github/workflows/beta-test.yml
+++ b/.github/workflows/beta-test.yml
@ -0,0 +1,52 @@
 name: Test on Beta Toolchain
 # This workflow is made to run our tests on the beta toolchain to validate that 
 # the beta toolchain works.
 # We do not intend to test here that we are working correctly but rather that 
 # the beta toolchain works correctly.
 # The ci.yml handles our actual testing with our guarantees.
 on:
  schedule:
    # If this workflow fails, GitHub notifications will go to the last person 
    # who edited this line.
    # See: https://docs.github.com/en/actions/monitoring-and-troubleshooting-workflows/monitoring-workflows/notifications-for-workflow-runs
    - cron: '0 0 * * *'  # Runs daily at midnight UTC
 env:
  NUSHELL_CARGO_PROFILE: ci
  NU_LOG_LEVEL: DEBUG
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
 jobs:
  build-and-test:
    # this job is more for testing the beta toolchain and not our tests, so if 
    # this fails but the tests of the regular ci pass, then this is fine
    continue-on-error: true
    strategy:
      fail-fast: true
      matrix:
        platform: [windows-latest, macos-latest, ubuntu-22.04]
    runs-on: ${{ matrix.platform }}
    steps:
      - uses: actions/checkout@v4
      - run: rustup update beta
      - name: Tests
        run: cargo +beta test --workspace --profile ci --exclude nu_plugin_*
      - name: Check for clean repo
        shell: bash
        run: |
          if [ -n "$(git status --porcelain)" ]; then
            echo "there are changes";
            git status --porcelain
            exit 1
          else
            echo "no changes in working directory";
          fi
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -3,6 +3,7 @@ on:
  push:
    branches:
      - main
      - 'patch-release-*'
 name: continuous-integration
@ -21,14 +22,14 @@ jobs:
    strategy:
      fail-fast: true
      matrix:
-        # Pinning to Ubuntu 20.04 because building on newer Ubuntu versions causes linux-gnu
+        # Pinning to Ubuntu 22.04 because building on newer Ubuntu versions causes linux-gnu
        # builds to link against a too-new-for-many-Linux-installs glibc version. Consider
-        # revisiting this when 20.04 is closer to EOL (April 2025)
+        # revisiting this when 22.04 is closer to EOL (June 2027)
        #
        # Using macOS 13 runner because 14 is based on the M1 and has half as much RAM (7 GB,
        # instead of 14 GB) which is too little for us right now. Revisit when `dfr` commands are
        # removed and we're only building the `polars` plugin instead
-        platform: [windows-latest, macos-13, ubuntu-20.04]
+        platform: [windows-latest, macos-13, ubuntu-22.04]
    runs-on: ${{ matrix.platform }}
@ -36,7 +37,7 @@ jobs:
      - uses: actions/checkout@v4.1.7
      - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
+        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
      - name: cargo fmt
        run: cargo fmt --all -- --check
@ -56,7 +57,7 @@ jobs:
    strategy:
      fail-fast: true
      matrix:
-        platform: [windows-latest, macos-latest, ubuntu-20.04]
+        platform: [windows-latest, macos-latest, ubuntu-22.04]
    runs-on: ${{ matrix.platform }}
@ -64,7 +65,7 @@ jobs:
      - uses: actions/checkout@v4.1.7
      - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
+        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
      - name: Tests
        run: cargo test --workspace --profile ci --exclude nu_plugin_*
@ -83,7 +84,7 @@ jobs:
    strategy:
      fail-fast: true
      matrix:
-        platform: [ubuntu-20.04, macos-latest, windows-latest]
+        platform: [ubuntu-22.04, macos-latest, windows-latest]
        py:
          - py
@ -93,10 +94,10 @@ jobs:
      - uses: actions/checkout@v4.1.7
      - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
+        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
      - name: Install Nushell
-        run: cargo install --path . --locked --no-default-features --force
+        run: cargo install --path . --locked --force
      - name: Standard library tests
        run: nu -c 'use crates/nu-std/testing.nu; testing run-tests --path crates/nu-std'
@ -136,7 +137,7 @@ jobs:
        # instead of 14 GB) which is too little for us right now.
        #
        # Failure occurring with clippy for rust 1.77.2
-        platform: [windows-latest, macos-13, ubuntu-20.04]
+        platform: [windows-latest, macos-13, ubuntu-22.04]
    runs-on: ${{ matrix.platform }}
@ -144,7 +145,7 @@ jobs:
      - uses: actions/checkout@v4.1.7
      - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
+        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
      - name: Clippy
        run: cargo clippy --package nu_plugin_* -- $CLIPPY_OPTIONS
@ -185,7 +186,7 @@ jobs:
      - uses: actions/checkout@v4.1.7
      - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
+        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
      - name: Add wasm32-unknown-unknown target
        run: rustup target add wasm32-unknown-unknown
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@ -131,7 +131,7 @@ jobs:
        echo "targets = ['${{matrix.target}}']" >> rust-toolchain.toml
    - name: Setup Rust toolchain and cache
-      uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
+      uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
      # WARN: Keep the rustflags to prevent from the winget submission error: `CAQuietExec: Error 0xc0000135`
      with:
        rustflags: ''
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -80,7 +80,7 @@ jobs:
        echo "targets = ['${{matrix.target}}']" >> rust-toolchain.toml
    - name: Setup Rust toolchain
-      uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
+      uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
      # WARN: Keep the rustflags to prevent from the winget submission error: `CAQuietExec: Error 0xc0000135`
      with:
        cache: false
--- a/.github/workflows/typos.yml
+++ b/.github/workflows/typos.yml
@ -10,4 +10,4 @@ jobs:
        uses: actions/checkout@v4.1.7
      - name: Check spelling
-        uses: crate-ci/typos@v1.29.4
+        uses: crate-ci/typos@v1.29.10
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 [[package]]
 name = "addr2line"
@ -293,6 +293,15 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4790f9e8961209112beb783d85449b508673cf4a6a419c8449b210743ac4dbe9"
 [[package]]
 name = "atomic"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994"
 dependencies = [
 "bytemuck",
 ]
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@ -752,9 +761,9 @@ dependencies = [
 [[package]]
 name = "bracoxide"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc0bcb5424e8e1f29c21a00f2d222df5e8e9779732ff03f840315d8fbac708e"
+checksum = "7f52991c481aa9d7518254cfb6ce5726d24ff8c5d383d6422cd3793729b0962a"
 [[package]]
 name = "brotli"
@ -828,9 +837,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 [[package]]
 name = "bytes"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
+checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
 dependencies = [
 "serde",
 ]
@ -847,9 +856,9 @@ dependencies = [
 [[package]]
 name = "bytesize"
-version = "1.3.0"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc"
+checksum = "2d2c12f985c78475a6b8d629afd0c360260ef34cfef52efccdcfd31972f81c2e"
 [[package]]
 name = "calamine"
@ -884,9 +893,9 @@ dependencies = [
 [[package]]
 name = "cc"
-version = "1.2.3"
+version = "1.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d"
+checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
 dependencies = [
 "jobserver",
 "libc",
@ -1088,25 +1097,12 @@ version = "7.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24f165e7b643266ea80cb858aed492ad9280e3e05ce24d4a99d7d7b889b6a4d9"
 dependencies = [
- "crossterm 0.28.1",
+ "crossterm",
 "strum",
 "strum_macros",
 "unicode-width 0.2.0",
 ]
 [[package]]
 name = "compact_str"
 version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f"
 dependencies = [
 "castaway",
 "cfg-if",
 "itoa",
 "ryu",
 "static_assertions",
 ]
 [[package]]
 name = "compact_str"
 version = "0.8.0"
@ -1279,25 +1275,9 @@ dependencies = [
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.20"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 [[package]]
 name = "crossterm"
 version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
 dependencies = [
 "bitflags 2.6.0",
 "crossterm_winapi",
 "libc",
 "mio 0.8.11",
 "parking_lot",
 "signal-hook",
 "signal-hook-mio",
 "winapi",
 ]
 [[package]]
 name = "crossterm"
@ -1426,10 +1406,45 @@ dependencies = [
 ]
 [[package]]
-name = "data-encoding"
+name = "darling"
-version = "2.7.0"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
 dependencies = [
 "darling_core",
 "darling_macro",
 ]
 [[package]]
 name = "darling_core"
 version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
 dependencies = [
 "fnv",
 "ident_case",
 "proc-macro2",
 "quote",
 "strsim",
 "syn 2.0.90",
 ]
 [[package]]
 name = "darling_macro"
 version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
 "darling_core",
 "quote",
 "syn 2.0.90",
 ]
 [[package]]
 name = "data-encoding"
 version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
 [[package]]
 name = "deranged"
@ -2639,6 +2654,12 @@ dependencies = [
 "syn 2.0.90",
 ]
 [[package]]
 name = "ident_case"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 [[package]]
 name = "idna"
 version = "1.0.3"
@ -2684,6 +2705,12 @@ dependencies = [
 "web-time",
 ]
 [[package]]
 name = "indoc"
 version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
 [[package]]
 name = "inotify"
 version = "0.9.6"
@ -2704,6 +2731,19 @@ dependencies = [
 "libc",
 ]
 [[package]]
 name = "instability"
 version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0bf9fed6d91cfb734e7476a06bde8300a1b94e217e1b523b6f0cd1a01998c71d"
 dependencies = [
 "darling",
 "indoc",
 "proc-macro2",
 "quote",
 "syn 2.0.90",
 ]
 [[package]]
 name = "interprocess"
 version = "2.2.2"
@ -2784,15 +2824,6 @@ dependencies = [
 "either",
 ]
 [[package]]
 name = "itertools"
 version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
 dependencies = [
 "either",
 ]
 [[package]]
 name = "itertools"
 version = "0.13.0"
@ -2920,16 +2951,6 @@ version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
 [[package]]
 name = "libmimalloc-sys"
 version = "0.1.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44"
 dependencies = [
 "cc",
 "libc",
 ]
 [[package]]
 name = "libproc"
 version = "0.14.10"
@ -3074,9 +3095,9 @@ dependencies = [
 [[package]]
 name = "lsp-textdocument"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a17dcde15cae78fb2e54166da22cd6c53f48033a0391cc392b22f2437805792"
+checksum = "2d564d595f4e3dcd3c071bf472dbd2cac53bc3665ae7222d2abfecd18feaed2c"
 dependencies = [
 "lsp-types",
 "serde_json",
@ -3196,9 +3217,9 @@ dependencies = [
 [[package]]
 name = "miette"
-version = "7.4.0"
+version = "7.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317f146e2eb7021892722af37cf1b971f0a70c8406f487e24952667616192c64"
+checksum = "1a955165f87b37fd1862df2a59547ac542c77ef6d17c666f619d1ad22dd89484"
 dependencies = [
 "backtrace",
 "backtrace-ext",
@ -3216,24 +3237,15 @@ dependencies = [
 [[package]]
 name = "miette-derive"
-version = "7.4.0"
+version = "7.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23c9b935fbe1d6cbd1dac857b54a688145e2d93f48db36010514d0f612d0ad67"
+checksum = "bf45bf44ab49be92fd1227a3be6fc6f617f1a337c06af54981048574d8783147"
 dependencies = [
 "proc-macro2",
 "quote",
 "syn 2.0.90",
 ]
 [[package]]
 name = "mimalloc"
 version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633"
 dependencies = [
 "libmimalloc-sys",
 ]
 [[package]]
 name = "mime"
 version = "0.3.17"
@ -3435,16 +3447,15 @@ dependencies = [
 [[package]]
 name = "nu"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "assert_cmd",
- "crossterm 0.28.1",
+ "crossterm",
 "ctrlc",
 "dirs",
 "fancy-regex",
 "log",
 "miette",
 "mimalloc",
 "multipart-rs",
 "nix 0.29.0",
 "nu-cli",
@ -3490,10 +3501,10 @@ dependencies = [
 [[package]]
 name = "nu-cli"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "chrono",
- "crossterm 0.28.1",
+ "crossterm",
 "fancy-regex",
 "is_executable",
 "log",
@ -3516,6 +3527,7 @@ dependencies = [
 "percent-encoding",
 "reedline",
 "rstest",
 "strum",
 "sysinfo",
 "tempfile",
 "unicode-segmentation",
@ -3525,7 +3537,7 @@ dependencies = [
 [[package]]
 name = "nu-cmd-base"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "indexmap",
 "miette",
@ -3537,7 +3549,7 @@ dependencies = [
 [[package]]
 name = "nu-cmd-extra"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "fancy-regex",
 "heck",
@ -3563,19 +3575,21 @@ dependencies = [
 [[package]]
 name = "nu-cmd-lang"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "itertools 0.13.0",
 "nu-engine",
 "nu-parser",
 "nu-protocol",
 "nu-utils",
 "quickcheck",
 "quickcheck_macros",
 "shadow-rs",
 ]
 [[package]]
 name = "nu-cmd-plugin"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "itertools 0.13.0",
 "nu-engine",
@ -3586,7 +3600,7 @@ dependencies = [
 [[package]]
 name = "nu-color-config"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "nu-ansi-term",
 "nu-engine",
@ -3598,7 +3612,7 @@ dependencies = [
 [[package]]
 name = "nu-command"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "alphanumeric-sort",
 "base64 0.22.1",
@ -3611,7 +3625,7 @@ dependencies = [
 "chrono",
 "chrono-humanize",
 "chrono-tz",
- "crossterm 0.28.1",
+ "crossterm",
 "csv",
 "data-encoding",
 "devicons",
@ -3666,8 +3680,6 @@ dependencies = [
 "print-positions",
 "procfs",
 "quick-xml 0.37.1",
 "quickcheck",
 "quickcheck_macros",
 "rand",
 "rand_chacha",
 "rayon",
@ -3713,10 +3725,10 @@ dependencies = [
 [[package]]
 name = "nu-derive-value"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "heck",
- "proc-macro-error",
+ "proc-macro-error2",
 "proc-macro2",
 "quote",
 "syn 2.0.90",
@ -3724,7 +3736,7 @@ dependencies = [
 [[package]]
 name = "nu-engine"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "log",
 "nu-glob",
@ -3735,11 +3747,11 @@ dependencies = [
 [[package]]
 name = "nu-explore"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "ansi-str",
 "anyhow",
- "crossterm 0.28.1",
+ "crossterm",
 "log",
 "lscolors",
 "nu-ansi-term",
@ -3759,14 +3771,15 @@ dependencies = [
 [[package]]
 name = "nu-glob"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "doc-comment",
 "nu-protocol",
 ]
 [[package]]
 name = "nu-json"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "fancy-regex",
 "linked-hash-map",
@ -3779,7 +3792,7 @@ dependencies = [
 [[package]]
 name = "nu-lsp"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "assert-json-diff",
 "crossbeam-channel",
@ -3790,10 +3803,12 @@ dependencies = [
 "nu-cli",
 "nu-cmd-lang",
 "nu-command",
 "nu-engine",
 "nu-glob",
 "nu-parser",
 "nu-protocol",
 "nu-test-support",
 "nu-utils",
 "nucleo-matcher",
 "serde",
 "serde_json",
@ -3802,7 +3817,7 @@ dependencies = [
 [[package]]
 name = "nu-parser"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "bytesize",
 "chrono",
@ -3819,7 +3834,7 @@ dependencies = [
 [[package]]
 name = "nu-path"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "dirs",
 "omnipath",
@ -3829,7 +3844,7 @@ dependencies = [
 [[package]]
 name = "nu-plugin"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "log",
 "nix 0.29.0",
@ -3845,7 +3860,7 @@ dependencies = [
 [[package]]
 name = "nu-plugin-core"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "interprocess",
 "log",
@ -3859,7 +3874,7 @@ dependencies = [
 [[package]]
 name = "nu-plugin-engine"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "log",
 "nu-engine",
@ -3875,7 +3890,7 @@ dependencies = [
 [[package]]
 name = "nu-plugin-protocol"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "nu-protocol",
 "nu-utils",
@ -3887,7 +3902,7 @@ dependencies = [
 [[package]]
 name = "nu-plugin-test-support"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "nu-ansi-term",
 "nu-cmd-lang",
@ -3905,7 +3920,7 @@ dependencies = [
 [[package]]
 name = "nu-pretty-hex"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "heapless",
 "nu-ansi-term",
@ -3914,7 +3929,7 @@ dependencies = [
 [[package]]
 name = "nu-protocol"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "brotli",
 "bytes",
@ -3953,7 +3968,7 @@ dependencies = [
 [[package]]
 name = "nu-std"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "log",
 "miette",
@ -3964,7 +3979,7 @@ dependencies = [
 [[package]]
 name = "nu-system"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "chrono",
 "itertools 0.13.0",
@ -3982,7 +3997,7 @@ dependencies = [
 [[package]]
 name = "nu-table"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "fancy-regex",
 "nu-ansi-term",
@ -3995,7 +4010,7 @@ dependencies = [
 [[package]]
 name = "nu-term-grid"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "nu-utils",
 "unicode-width 0.2.0",
@ -4003,7 +4018,7 @@ dependencies = [
 [[package]]
 name = "nu-test-support"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "nu-glob",
 "nu-path",
@ -4015,9 +4030,9 @@ dependencies = [
 [[package]]
 name = "nu-utils"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
- "crossterm 0.28.1",
+ "crossterm",
 "crossterm_winapi",
 "fancy-regex",
 "log",
@ -4044,7 +4059,7 @@ dependencies = [
 [[package]]
 name = "nu_plugin_example"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "nu-cmd-lang",
 "nu-plugin",
@ -4054,7 +4069,7 @@ dependencies = [
 [[package]]
 name = "nu_plugin_formats"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "chrono",
 "eml-parser",
@ -4069,7 +4084,7 @@ dependencies = [
 [[package]]
 name = "nu_plugin_gstat"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "git2",
 "nu-plugin",
@ -4078,7 +4093,7 @@ dependencies = [
 [[package]]
 name = "nu_plugin_inc"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "nu-plugin",
 "nu-protocol",
@ -4087,7 +4102,7 @@ dependencies = [
 [[package]]
 name = "nu_plugin_polars"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "aws-config",
 "aws-credential-types",
@ -4098,7 +4113,6 @@ dependencies = [
 "hashbrown 0.15.2",
 "indexmap",
 "log",
 "mimalloc",
 "nu-cmd-lang",
 "nu-command",
 "nu-engine",
@ -4127,7 +4141,7 @@ dependencies = [
 [[package]]
 name = "nu_plugin_query"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "gjson",
 "nu-plugin",
@ -4142,7 +4156,7 @@ dependencies = [
 [[package]]
 name = "nu_plugin_stress_internals"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "interprocess",
 "serde",
@ -4266,7 +4280,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 [[package]]
 name = "nuon"
-version = "0.102.0"
+version = "0.103.0"
 dependencies = [
 "chrono",
 "nu-engine",
@ -5350,7 +5364,7 @@ dependencies = [
 "bincode",
 "bytemuck",
 "bytes",
- "compact_str 0.8.0",
+ "compact_str",
 "flate2",
 "hashbrown 0.15.2",
 "indexmap",
@ -5452,26 +5466,25 @@ dependencies = [
 ]
 [[package]]
-name = "proc-macro-error"
+name = "proc-macro-error-attr2"
-version = "1.0.4"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
 dependencies = [
 "proc-macro-error-attr",
 "proc-macro2",
 "quote",
 "version_check",
 ]
 [[package]]
-name = "proc-macro-error-attr"
+name = "proc-macro-error2"
-version = "1.0.4"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
 dependencies = [
 "proc-macro-error-attr2",
 "proc-macro2",
 "quote",
- "version_check",
+ "syn 2.0.90",
 ]
 [[package]]
@ -5714,22 +5727,23 @@ dependencies = [
 [[package]]
 name = "ratatui"
-version = "0.26.3"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f44c9e68fd46eda15c646fbb85e1040b657a58cdc8c98db1d97a55930d991eef"
+checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b"
 dependencies = [
 "bitflags 2.6.0",
 "cassowary",
- "compact_str 0.7.1",
+ "compact_str",
- "crossterm 0.27.0",
+ "crossterm",
- "itertools 0.12.1",
+ "indoc",
 "instability",
 "itertools 0.13.0",
 "lru",
 "paste",
 "stability",
 "strum",
 "unicode-segmentation",
 "unicode-truncate",
- "unicode-width 0.1.11",
+ "unicode-width 0.2.0",
 ]
 [[package]]
@ -5809,15 +5823,15 @@ dependencies = [
 [[package]]
 name = "reedline"
-version = "0.38.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bfa8cb0ad84c396c936d8abb814703d7042a433d2da75a0c7060cbdc89109f3"
+checksum = "dd4728ee71d2aa3a364ee64470d1aa64b3f0467b2d28b73df15259d005dec64a"
 dependencies = [
 "arboard",
 "chrono",
- "crossterm 0.28.1",
+ "crossterm",
 "fd-lock",
- "itertools 0.12.1",
+ "itertools 0.13.0",
 "nu-ansi-term",
 "rusqlite",
 "serde",
@ -5956,15 +5970,14 @@ dependencies = [
 [[package]]
 name = "ring"
-version = "0.17.8"
+version = "0.17.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+checksum = "70ac5d832aa16abd7d1def883a8545280c20a60f523a370aa3a9617c2b8550ee"
 dependencies = [
 "cc",
 "cfg-if",
 "getrandom",
 "libc",
 "spin",
 "untrusted",
 "windows-sys 0.52.0",
 ]
@ -6058,9 +6071,9 @@ dependencies = [
 [[package]]
 name = "rust-embed"
-version = "8.5.0"
+version = "8.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa66af4a4fdd5e7ebc276f115e895611a34739a9c1c01028383d612d550953c0"
+checksum = "0b3aba5104622db5c9fc61098de54708feb732e7763d7faa2fa625899f00bf6f"
 dependencies = [
 "rust-embed-impl",
 "rust-embed-utils",
@ -6069,9 +6082,9 @@ dependencies = [
 [[package]]
 name = "rust-embed-impl"
-version = "8.5.0"
+version = "8.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6125dbc8867951125eec87294137f4e9c2c96566e61bf72c45095a7c77761478"
+checksum = "1f198c73be048d2c5aa8e12f7960ad08443e56fd39cc26336719fdb4ea0ebaae"
 dependencies = [
 "proc-macro2",
 "quote",
@ -6082,9 +6095,9 @@ dependencies = [
 [[package]]
 name = "rust-embed-utils"
-version = "8.5.0"
+version = "8.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e5347777e9aacb56039b0e1f28785929a8a3b709e87482e7442c72e7c12529d"
+checksum = "5a2fcdc9f40c8dc2922842ca9add611ad19f332227fc651d015881ad1552bd9a"
 dependencies = [
 "sha2",
 "walkdir",
@ -6272,9 +6285,9 @@ dependencies = [
 [[package]]
 name = "scc"
-version = "2.2.5"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66b202022bb57c049555430e11fc22fea12909276a80a4c3d368da36ac1d88ed"
+checksum = "ea091f6cac2595aa38993f04f4ee692ed43757035c36e67c180b6828356385b1"
 dependencies = [
 "sdd",
 ]
@ -6302,9 +6315,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 [[package]]
 name = "scraper"
-version = "0.22.0"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc3d051b884f40e309de6c149734eab57aa8cc1347992710dc80bcc1c2194c15"
+checksum = "527e65d9d888567588db4c12da1087598d0f6f8b346cc2c5abc91f05fc2dffe2"
 dependencies = [
 "cssparser",
 "ego-tree",
@ -6346,9 +6359,9 @@ dependencies = [
 [[package]]
 name = "sdd"
-version = "3.0.4"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49c1eeaf4b6a87c7479688c6d52b9f1153cedd3c489300564f932b065c6eab95"
+checksum = "b07779b9b918cc05650cb30f404d4d7835d26df37c235eded8a6832e2fb82cca"
 [[package]]
 name = "security-framework"
@ -6523,6 +6536,12 @@ dependencies = [
 "stable_deref_trait",
 ]
 [[package]]
 name = "sha1_smol"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d"
 [[package]]
 name = "sha2"
 version = "0.10.8"
@ -6574,7 +6593,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
 dependencies = [
 "libc",
 "mio 0.8.11",
 "mio 1.0.3",
 "signal-hook",
 ]
@ -6701,12 +6719,6 @@ dependencies = [
 "windows-sys 0.52.0",
 ]
 [[package]]
 name = "spin"
 version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 [[package]]
 name = "sqlparser"
 version = "0.53.0"
@ -6716,16 +6728,6 @@ dependencies = [
 "log",
 ]
 [[package]]
 name = "stability"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac"
 dependencies = [
 "quote",
 "syn 2.0.90",
 ]
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
@ -7159,9 +7161,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 [[package]]
 name = "titlecase"
-version = "3.3.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0e20e744fbec1913fa168f3ffbef64324bbcb152c6cda8394baa79fa5ec9142"
+checksum = "ef6b5cbe1316986025d8f662ff6945a0c85f2ca8ca13f04b5e0829ddb0d047f2"
 dependencies = [
 "regex",
 ]
@ -7698,8 +7700,11 @@ version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4"
 dependencies = [
 "atomic",
 "getrandom",
 "md-5",
 "serde",
 "sha1_smol",
 ]
 [[package]]
@ -8567,9 +8572,9 @@ dependencies = [
 [[package]]
 name = "zip"
-version = "2.2.1"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d52293fc86ea7cf13971b3bb81eb21683636e7ae24c729cdaf1b7c4157a352"
+checksum = "938cc23ac49778ac8340e366ddc422b2227ea176edb447e23fc0627608dddadd"
 dependencies = [
 "arbitrary",
 "crc32fast",
--- a/Cargo.toml
+++ b/Cargo.toml
@ -10,8 +10,8 @@ homepage = "https://www.nushell.sh"
 license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
-rust-version = "1.82.0"
+rust-version = "1.83.0"
-version = "0.102.0"
+version = "0.103.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@ -66,11 +66,11 @@ alphanumeric-sort = "1.5"
 ansi-str = "0.8"
 anyhow = "1.0.82"
 base64 = "0.22.1"
-bracoxide = "0.1.4"
+bracoxide = "0.1.5"
 brotli = "7.0"
 byteorder = "1.5"
 bytes = "1"
-bytesize = "1.3"
+bytesize = "1.3.1"
 calamine = "0.26.1"
 chardetng = "0.1.17"
 chrono = { default-features = false, version = "0.4.34" }
@ -104,10 +104,10 @@ lru = "0.12"
 lscolors = { version = "0.17", default-features = false }
 lsp-server = "0.7.8"
 lsp-types = { version = "0.97.0", features = ["proposed"] }
-lsp-textdocument = "0.4.1"
+lsp-textdocument = "0.4.2"
 mach2 = "0.4"
 md5 = { version = "0.10", package = "md-5" }
-miette = "7.3"
+miette = "7.5"
 mime = "0.3.17"
 mime_guess = "2.0"
 mockito = { version = "1.6", default-features = false }
@ -127,7 +127,7 @@ pathdiff = "0.2"
 percent-encoding = "2"
 pretty_assertions = "1.4"
 print-positions = "0.6"
-proc-macro-error = { version = "1.0", default-features = false }
+proc-macro-error2 = "2.0"
 proc-macro2 = "1.0"
 procfs = "0.17.0"
 pwd = "1.3"
@ -138,16 +138,16 @@ quote = "1.0"
 rand = "0.8"
 getrandom = "0.2" # pick same version that rand requires
 rand_chacha = "0.3.1"
-ratatui = "0.26"
+ratatui = "0.29"
 rayon = "1.10"
-reedline = "0.38.0"
+reedline = "0.39.0"
 rmp = "0.8"
 rmp-serde = "1.3"
 roxmltree = "0.20"
 rstest = { version = "0.23", default-features = false }
 rstest_reuse = "0.7"
 rusqlite = "0.31"
-rust-embed = "8.5.0"
+rust-embed = "8.6.0"
 scopeguard = { version = "1.2.0" }
 serde = { version = "1.0" }
 serde_json = "1.0"
@ -155,11 +155,13 @@ serde_urlencoded = "0.7.1"
 serde_yaml = "0.9.33"
 sha2 = "0.10"
 strip-ansi-escapes = "0.2.0"
 strum = "0.26"
 strum_macros = "0.26"
 syn = "2.0"
 sysinfo = "0.33"
 tabled = { version = "0.17.0", default-features = false }
 tempfile = "3.15"
-titlecase = "3.0"
+titlecase = "3.4"
 toml = "0.8"
 trash = "5.2"
 update-informer = { version = "1.2.0", default-features = false, features = ["github", "native-tls", "ureq"] }
@ -195,22 +197,22 @@ unchecked_duration_subtraction = "warn"
 workspace = true
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.102.0" }
+nu-cli = { path = "./crates/nu-cli", version = "0.103.0" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.102.0" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.103.0" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.102.0" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.103.0" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.102.0", optional = true }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.103.0", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.102.0" }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.103.0" }
-nu-command = { path = "./crates/nu-command", version = "0.102.0" }
+nu-command = { path = "./crates/nu-command", version = "0.103.0" }
-nu-engine = { path = "./crates/nu-engine", version = "0.102.0" }
+nu-engine = { path = "./crates/nu-engine", version = "0.103.0" }
-nu-explore = { path = "./crates/nu-explore", version = "0.102.0" }
+nu-explore = { path = "./crates/nu-explore", version = "0.103.0" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.102.0" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.103.0" }
-nu-parser = { path = "./crates/nu-parser", version = "0.102.0" }
+nu-parser = { path = "./crates/nu-parser", version = "0.103.0" }
-nu-path = { path = "./crates/nu-path", version = "0.102.0" }
+nu-path = { path = "./crates/nu-path", version = "0.103.0" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.102.0" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.103.0" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.102.0" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.103.0" }
-nu-std = { path = "./crates/nu-std", version = "0.102.0" }
+nu-std = { path = "./crates/nu-std", version = "0.103.0" }
-nu-system = { path = "./crates/nu-system", version = "0.102.0" }
+nu-system = { path = "./crates/nu-system", version = "0.103.0" }
-nu-utils = { path = "./crates/nu-utils", version = "0.102.0" }
+nu-utils = { path = "./crates/nu-utils", version = "0.103.0" }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 crossterm = { workspace = true }
@ -218,7 +220,6 @@ ctrlc = { workspace = true }
 dirs = { workspace = true }
 log = { workspace = true }
 miette = { workspace = true, features = ["fancy-no-backtrace", "fancy"] }
 mimalloc = { version = "0.1.42", default-features = false, optional = true }
 multipart-rs = { workspace = true }
 serde_json = { workspace = true }
 simplelog = "0.12"
@ -240,9 +241,9 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.102.0" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.103.0" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.102.0" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.103.0" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.102.0" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.103.0" }
 assert_cmd = "2.0"
 dirs = { workspace = true }
 tango-bench = "0.6"
@ -272,7 +273,6 @@ default = [
  "plugin",
  "trash-support",
  "sqlite",
  "mimalloc",
 ]
 stable = ["default"]
 # NOTE: individual features are also passed to `nu-cmd-lang` that uses them to generate the feature matrix in the `version` command
@ -281,7 +281,6 @@ stable = ["default"]
 # otherwise the system version will be used. Not enabled by default because it takes a while to build
 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 = [
@ -294,7 +293,7 @@ system-clipboard = [
 trash-support = ["nu-command/trash-support", "nu-cmd-lang/trash-support"]
 # SQLite commands for nushell
-sqlite = ["nu-command/sqlite", "nu-cmd-lang/sqlite"]
+sqlite = ["nu-command/sqlite", "nu-cmd-lang/sqlite", "nu-std/sqlite"]
 [profile.release]
 opt-level = "s"     # Optimize for size
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 MIT License
-Copyright (c) 2019 - 2023 The Nushell Project Developers
+Copyright (c) 2019 - 2025 The Nushell Project Developers
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@ -4,7 +4,6 @@
 [![Nightly Build](https://github.com/nushell/nushell/actions/workflows/nightly-build.yml/badge.svg)](https://github.com/nushell/nushell/actions/workflows/nightly-build.yml)
 [![Discord](https://img.shields.io/discord/601130461678272522.svg?logo=discord)](https://discord.gg/NtAbbGn)
 [![The Changelog #363](https://img.shields.io/badge/The%20Changelog-%23363-61c192.svg)](https://changelog.com/podcast/363)
 [![@nu_shell](https://img.shields.io/badge/twitter-@nu_shell-1DA1F3?style=flat-square)](https://twitter.com/nu_shell)
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/nushell/nushell)](https://github.com/nushell/nushell/graphs/commit-activity)
 [![GitHub contributors](https://img.shields.io/github/contributors/nushell/nushell)](https://github.com/nushell/nushell/graphs/contributors)
@ -35,7 +34,7 @@ This project has reached a minimum-viable-product level of quality. Many people
 The [Nushell book](https://www.nushell.sh/book/) is the primary source of Nushell documentation. You can find [a full list of Nu commands in the book](https://www.nushell.sh/commands/), and we have many examples of using Nu in our [cookbook](https://www.nushell.sh/cookbook/).
-We're also active on [Discord](https://discord.gg/NtAbbGn) and [Twitter](https://twitter.com/nu_shell); come and chat with us!
+We're also active on [Discord](https://discord.gg/NtAbbGn); come and chat with us!
 ## Installation
--- a/benches/benchmarks.rs
+++ b/benches/benchmarks.rs
@ -1,7 +1,6 @@
 use nu_cli::{eval_source, evaluate_commands};
 use nu_plugin_core::{Encoder, EncodingType};
 use nu_plugin_protocol::{PluginCallResponse, PluginOutput};
 use nu_protocol::{
    engine::{EngineState, Stack},
    PipelineData, Signals, Span, Spanned, Value,
@ -9,12 +8,11 @@ use nu_protocol::{
 use nu_std::load_standard_library;
 use nu_utils::{get_default_config, get_default_env};
 use std::{
    fmt::Write,
    hint::black_box,
    rc::Rc,
    sync::{atomic::AtomicBool, Arc},
 };
 use std::hint::black_box;
 use tango_bench::{benchmark_fn, tango_benchmarks, tango_main, IntoBenchmarks};
 fn load_bench_commands() -> EngineState {
@ -141,19 +139,16 @@ fn bench_load_standard_lib() -> impl IntoBenchmarks {
    })]
 }
-fn create_flat_record_string(n: i32) -> String {
+fn create_flat_record_string(n: usize) -> String {
-    let mut s = String::from("let record = {");
+    let mut s = String::from("let record = { ");
    for i in 0..n {
-        s.push_str(&format!("col_{}: {}", i, i));
+        write!(s, "col_{i}: {i}, ").unwrap();
        if i < n - 1 {
            s.push_str(", ");
        }
    }
    s.push('}');
    s
 }
-fn create_nested_record_string(depth: i32) -> String {
+fn create_nested_record_string(depth: usize) -> String {
    let mut s = String::from("let record = {");
    for _ in 0..depth {
        s.push_str("col: {");
@ -166,7 +161,7 @@ fn create_nested_record_string(depth: i32) -> String {
    s
 }
-fn create_example_table_nrows(n: i32) -> String {
+fn create_example_table_nrows(n: usize) -> String {
    let mut s = String::from("let table = [[foo bar baz]; ");
    for i in 0..n {
        s.push_str(&format!("[0, 1, {i}]"));
@ -178,7 +173,7 @@ fn create_example_table_nrows(n: i32) -> String {
    s
 }
-fn bench_record_create(n: i32) -> impl IntoBenchmarks {
+fn bench_record_create(n: usize) -> impl IntoBenchmarks {
    bench_command(
        &format!("record_create_{n}"),
        &create_flat_record_string(n),
@ -187,7 +182,7 @@ fn bench_record_create(n: i32) -> impl IntoBenchmarks {
    )
 }
-fn bench_record_flat_access(n: i32) -> impl IntoBenchmarks {
+fn bench_record_flat_access(n: usize) -> impl IntoBenchmarks {
    let setup_command = create_flat_record_string(n);
    let (stack, engine) = setup_stack_and_engine_from_command(&setup_command);
    bench_command(
@ -198,10 +193,10 @@ fn bench_record_flat_access(n: i32) -> impl IntoBenchmarks {
    )
 }
-fn bench_record_nested_access(n: i32) -> impl IntoBenchmarks {
+fn bench_record_nested_access(n: usize) -> impl IntoBenchmarks {
    let setup_command = create_nested_record_string(n);
    let (stack, engine) = setup_stack_and_engine_from_command(&setup_command);
-    let nested_access = ".col".repeat(n as usize);
+    let nested_access = ".col".repeat(n);
    bench_command(
        &format!("record_nested_access_{n}"),
        &format!("$record{} | ignore", nested_access),
@ -210,7 +205,18 @@ fn bench_record_nested_access(n: i32) -> impl IntoBenchmarks {
    )
 }
-fn bench_table_create(n: i32) -> impl IntoBenchmarks {
+fn bench_record_insert(n: usize, m: usize) -> impl IntoBenchmarks {
    let setup_command = create_flat_record_string(n);
    let (stack, engine) = setup_stack_and_engine_from_command(&setup_command);
    let mut insert = String::from("$record");
    for i in n..(n + m) {
        write!(insert, " | insert col_{i} {i}").unwrap();
    }
    insert.push_str(" | ignore");
    bench_command(&format!("record_insert_{n}_{m}"), &insert, stack, engine)
 }
 fn bench_table_create(n: usize) -> impl IntoBenchmarks {
    bench_command(
        &format!("table_create_{n}"),
        &create_example_table_nrows(n),
@ -219,7 +225,7 @@ fn bench_table_create(n: i32) -> impl IntoBenchmarks {
    )
 }
-fn bench_table_get(n: i32) -> impl IntoBenchmarks {
+fn bench_table_get(n: usize) -> impl IntoBenchmarks {
    let setup_command = create_example_table_nrows(n);
    let (stack, engine) = setup_stack_and_engine_from_command(&setup_command);
    bench_command(
@ -230,7 +236,7 @@ fn bench_table_get(n: i32) -> impl IntoBenchmarks {
    )
 }
-fn bench_table_select(n: i32) -> impl IntoBenchmarks {
+fn bench_table_select(n: usize) -> impl IntoBenchmarks {
    let setup_command = create_example_table_nrows(n);
    let (stack, engine) = setup_stack_and_engine_from_command(&setup_command);
    bench_command(
@ -241,7 +247,29 @@ fn bench_table_select(n: i32) -> impl IntoBenchmarks {
    )
 }
-fn bench_eval_interleave(n: i32) -> impl IntoBenchmarks {
+fn bench_table_insert_row(n: usize, m: usize) -> impl IntoBenchmarks {
    let setup_command = create_example_table_nrows(n);
    let (stack, engine) = setup_stack_and_engine_from_command(&setup_command);
    let mut insert = String::from("$table");
    for i in n..(n + m) {
        write!(insert, " | insert {i} {{ foo: 0, bar: 1, baz: {i} }}").unwrap();
    }
    insert.push_str(" | ignore");
    bench_command(&format!("table_insert_row_{n}_{m}"), &insert, stack, engine)
 }
 fn bench_table_insert_col(n: usize, m: usize) -> impl IntoBenchmarks {
    let setup_command = create_example_table_nrows(n);
    let (stack, engine) = setup_stack_and_engine_from_command(&setup_command);
    let mut insert = String::from("$table");
    for i in 0..m {
        write!(insert, " | insert col_{i} {i}").unwrap();
    }
    insert.push_str(" | ignore");
    bench_command(&format!("table_insert_col_{n}_{m}"), &insert, stack, engine)
 }
 fn bench_eval_interleave(n: usize) -> impl IntoBenchmarks {
    let engine = setup_engine();
    let stack = Stack::new();
    bench_command(
@ -252,7 +280,7 @@ fn bench_eval_interleave(n: i32) -> impl IntoBenchmarks {
    )
 }
-fn bench_eval_interleave_with_interrupt(n: i32) -> impl IntoBenchmarks {
+fn bench_eval_interleave_with_interrupt(n: usize) -> impl IntoBenchmarks {
    let mut engine = setup_engine();
    engine.set_signals(Signals::new(Arc::new(AtomicBool::new(false))));
    let stack = Stack::new();
@ -264,7 +292,7 @@ fn bench_eval_interleave_with_interrupt(n: i32) -> impl IntoBenchmarks {
    )
 }
-fn bench_eval_for(n: i32) -> impl IntoBenchmarks {
+fn bench_eval_for(n: usize) -> impl IntoBenchmarks {
    let engine = setup_engine();
    let stack = Stack::new();
    bench_command(
@ -275,7 +303,7 @@ fn bench_eval_for(n: i32) -> impl IntoBenchmarks {
    )
 }
-fn bench_eval_each(n: i32) -> impl IntoBenchmarks {
+fn bench_eval_each(n: usize) -> impl IntoBenchmarks {
    let engine = setup_engine();
    let stack = Stack::new();
    bench_command(
@ -286,7 +314,7 @@ fn bench_eval_each(n: i32) -> impl IntoBenchmarks {
    )
 }
-fn bench_eval_par_each(n: i32) -> impl IntoBenchmarks {
+fn bench_eval_par_each(n: usize) -> impl IntoBenchmarks {
    let engine = setup_engine();
    let stack = Stack::new();
    bench_command(
@ -427,6 +455,14 @@ tango_benchmarks!(
    bench_record_nested_access(32),
    bench_record_nested_access(64),
    bench_record_nested_access(128),
    bench_record_insert(1, 1),
    bench_record_insert(10, 1),
    bench_record_insert(100, 1),
    bench_record_insert(1000, 1),
    bench_record_insert(1, 10),
    bench_record_insert(10, 10),
    bench_record_insert(100, 10),
    bench_record_insert(1000, 10),
    // Table
    bench_table_create(1),
    bench_table_create(10),
@ -440,6 +476,22 @@ tango_benchmarks!(
    bench_table_select(10),
    bench_table_select(100),
    bench_table_select(1_000),
    bench_table_insert_row(1, 1),
    bench_table_insert_row(10, 1),
    bench_table_insert_row(100, 1),
    bench_table_insert_row(1000, 1),
    bench_table_insert_row(1, 10),
    bench_table_insert_row(10, 10),
    bench_table_insert_row(100, 10),
    bench_table_insert_row(1000, 10),
    bench_table_insert_col(1, 1),
    bench_table_insert_col(10, 1),
    bench_table_insert_col(100, 1),
    bench_table_insert_col(1000, 1),
    bench_table_insert_col(1, 10),
    bench_table_insert_col(10, 10),
    bench_table_insert_col(100, 10),
    bench_table_insert_col(1000, 10),
    // Eval
    // Interleave
    bench_eval_interleave(100),
--- a/crates/nu-cli/Cargo.toml
+++ b/crates/nu-cli/Cargo.toml
@ -5,28 +5,28 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cli"
 edition = "2021"
 license = "MIT"
 name = "nu-cli"
-version = "0.102.0"
+version = "0.103.0"
 [lib]
 bench = false
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.102.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.103.0" }
-nu-command = { path = "../nu-command", version = "0.102.0" }
+nu-command = { path = "../nu-command", version = "0.103.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.102.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.103.0" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.102.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.103.0" }
-nu-engine = { path = "../nu-engine", version = "0.102.0", features = ["os"] }
+nu-engine = { path = "../nu-engine", version = "0.103.0", features = ["os"] }
-nu-glob = { path = "../nu-glob", version = "0.102.0" }
+nu-glob = { path = "../nu-glob", version = "0.103.0" }
-nu-path = { path = "../nu-path", version = "0.102.0" }
+nu-path = { path = "../nu-path", version = "0.103.0" }
-nu-parser = { path = "../nu-parser", version = "0.102.0" }
+nu-parser = { path = "../nu-parser", version = "0.103.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.102.0", optional = true }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.103.0", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.102.0", features = ["os"] }
+nu-protocol = { path = "../nu-protocol", version = "0.103.0", features = ["os"] }
-nu-utils = { path = "../nu-utils", version = "0.102.0" }
+nu-utils = { path = "../nu-utils", version = "0.103.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.102.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.103.0" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
@ -40,6 +40,7 @@ miette = { workspace = true, features = ["fancy-no-backtrace"] }
 nucleo-matcher = { workspace = true }
 percent-encoding = { workspace = true }
 sysinfo = { workspace = true }
 strum = { workspace = true }
 unicode-segmentation = { workspace = true }
 uuid = { workspace = true, features = ["v4"] }
 which = { workspace = true }
@ -49,4 +50,4 @@ plugin = ["nu-plugin-engine"]
 system-clipboard = ["reedline/system_clipboard"]
 [lints]
-workspace = true
+workspace = true
--- a/crates/nu-cli/src/commands/commandline/edit.rs
+++ b/crates/nu-cli/src/commands/commandline/edit.rs
@ -1,9 +1,9 @@
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
-pub struct SubCommand;
+pub struct CommandlineEdit;
-impl Command for SubCommand {
+impl Command for CommandlineEdit {
    fn name(&self) -> &str {
        "commandline edit"
    }
@ -29,7 +29,7 @@ impl Command for SubCommand {
            .required(
                "str",
                SyntaxShape::String,
-                "the string to perform the operation with",
+                "The string to perform the operation with.",
            )
            .category(Category::Core)
    }
--- a/crates/nu-cli/src/commands/commandline/get_cursor.rs
+++ b/crates/nu-cli/src/commands/commandline/get_cursor.rs
@ -2,9 +2,9 @@ use nu_engine::command_prelude::*;
 use unicode_segmentation::UnicodeSegmentation;
 #[derive(Clone)]
-pub struct SubCommand;
+pub struct CommandlineGetCursor;
-impl Command for SubCommand {
+impl Command for CommandlineGetCursor {
    fn name(&self) -> &str {
        "commandline get-cursor"
    }
--- a/crates/nu-cli/src/commands/commandline/mod.rs
+++ b/crates/nu-cli/src/commands/commandline/mod.rs
@ -4,6 +4,6 @@ mod get_cursor;
 mod set_cursor;
 pub use commandline_::Commandline;
-pub use edit::SubCommand as CommandlineEdit;
+pub use edit::CommandlineEdit;
-pub use get_cursor::SubCommand as CommandlineGetCursor;
+pub use get_cursor::CommandlineGetCursor;
-pub use set_cursor::SubCommand as CommandlineSetCursor;
+pub use set_cursor::CommandlineSetCursor;
--- a/crates/nu-cli/src/commands/commandline/set_cursor.rs
+++ b/crates/nu-cli/src/commands/commandline/set_cursor.rs
@ -3,9 +3,9 @@ use nu_engine::command_prelude::*;
 use unicode_segmentation::UnicodeSegmentation;
 #[derive(Clone)]
-pub struct SubCommand;
+pub struct CommandlineSetCursor;
-impl Command for SubCommand {
+impl Command for CommandlineSetCursor {
    fn name(&self) -> &str {
        "commandline set-cursor"
    }
@ -18,7 +18,7 @@ impl Command for SubCommand {
                "set the current cursor position to the end of the buffer",
                Some('e'),
            )
-            .optional("pos", SyntaxShape::Int, "Cursor position to be set")
+            .optional("pos", SyntaxShape::Int, "Cursor position to be set.")
            .category(Category::Core)
    }
--- a/crates/nu-cli/src/commands/history/history_import.rs
+++ b/crates/nu-cli/src/commands/history/history_import.rs
@ -21,7 +21,7 @@ impl Command for HistoryImport {
    }
    fn description(&self) -> &str {
-        "Import command line history"
+        "Import command line history."
    }
    fn extra_description(&self) -> &str {
--- a/crates/nu-cli/src/completions/attribute_completions.rs
+++ b/crates/nu-cli/src/completions/attribute_completions.rs
@ -0,0 +1,87 @@
 use super::{completion_options::NuMatcher, SemanticSuggestion};
 use crate::{
    completions::{Completer, CompletionOptions},
    SuggestionKind,
 };
 use nu_protocol::{
    engine::{Stack, StateWorkingSet},
    Span,
 };
 use reedline::Suggestion;
 pub struct AttributeCompletion;
 pub struct AttributableCompletion;
 impl Completer for AttributeCompletion {
    fn fetch(
        &mut self,
        working_set: &StateWorkingSet,
        _stack: &Stack,
        prefix: impl AsRef<str>,
        span: Span,
        offset: usize,
        options: &CompletionOptions,
    ) -> Vec<SemanticSuggestion> {
        let mut matcher = NuMatcher::new(prefix, options);
        let attr_commands =
            working_set.find_commands_by_predicate(|s| s.starts_with(b"attr "), true);
        for (name, desc, ty) in attr_commands {
            let name = name.strip_prefix(b"attr ").unwrap_or(&name);
            matcher.add_semantic_suggestion(SemanticSuggestion {
                suggestion: Suggestion {
                    value: String::from_utf8_lossy(name).into_owned(),
                    description: desc,
                    style: None,
                    extra: None,
                    span: reedline::Span {
                        start: span.start - offset,
                        end: span.end - offset,
                    },
                    append_whitespace: false,
                },
                kind: Some(SuggestionKind::Command(ty)),
            });
        }
        matcher.results()
    }
 }
 impl Completer for AttributableCompletion {
    fn fetch(
        &mut self,
        working_set: &StateWorkingSet,
        _stack: &Stack,
        prefix: impl AsRef<str>,
        span: Span,
        offset: usize,
        options: &CompletionOptions,
    ) -> Vec<SemanticSuggestion> {
        let mut matcher = NuMatcher::new(prefix, options);
        for s in ["def", "extern", "export def", "export extern"] {
            let decl_id = working_set
                .find_decl(s.as_bytes())
                .expect("internal error, builtin declaration not found");
            let cmd = working_set.get_decl(decl_id);
            matcher.add_semantic_suggestion(SemanticSuggestion {
                suggestion: Suggestion {
                    value: cmd.name().into(),
                    description: Some(cmd.description().into()),
                    style: None,
                    extra: None,
                    span: reedline::Span {
                        start: span.start - offset,
                        end: span.end - offset,
                    },
                    append_whitespace: false,
                },
                kind: Some(SuggestionKind::Command(cmd.command_type())),
            });
        }
        matcher.results()
    }
 }
--- a/crates/nu-cli/src/completions/base.rs
+++ b/crates/nu-cli/src/completions/base.rs
@ -12,10 +12,9 @@ pub trait Completer {
        &mut self,
        working_set: &StateWorkingSet,
        stack: &Stack,
-        prefix: &[u8],
+        prefix: impl AsRef<str>,
        span: Span,
        offset: usize,
        pos: usize,
        options: &CompletionOptions,
    ) -> Vec<SemanticSuggestion>;
 }
@ -30,8 +29,14 @@ pub struct SemanticSuggestion {
 #[derive(Clone, Debug, PartialEq)]
 pub enum SuggestionKind {
    Command(nu_protocol::engine::CommandType),
-    Type(nu_protocol::Type),
+    Value(nu_protocol::Type),
    CellPath,
    Directory,
    File,
    Flag,
    Module,
    Operator,
    Variable,
 }
 impl From<Suggestion> for SemanticSuggestion {
--- a/crates/nu-cli/src/completions/cell_path_completions.rs
+++ b/crates/nu-cli/src/completions/cell_path_completions.rs
@ -0,0 +1,137 @@
 use crate::completions::{Completer, CompletionOptions, SemanticSuggestion, SuggestionKind};
 use nu_engine::{column::get_columns, eval_variable};
 use nu_protocol::{
    ast::{Expr, Expression, FullCellPath, PathMember},
    engine::{Stack, StateWorkingSet},
    eval_const::eval_constant,
    ShellError, Span, Value,
 };
 use reedline::Suggestion;
 use super::completion_options::NuMatcher;
 pub struct CellPathCompletion<'a> {
    pub full_cell_path: &'a FullCellPath,
    pub position: usize,
 }
 fn prefix_from_path_member(member: &PathMember, pos: usize) -> (String, Span) {
    let (prefix_str, start) = match member {
        PathMember::String { val, span, .. } => (val.clone(), span.start),
        PathMember::Int { val, span, .. } => (val.to_string(), span.start),
    };
    let prefix_str = prefix_str
        .get(..pos + 1 - start)
        .map(str::to_string)
        .unwrap_or(prefix_str);
    (prefix_str, Span::new(start, pos + 1))
 }
 impl Completer for CellPathCompletion<'_> {
    fn fetch(
        &mut self,
        working_set: &StateWorkingSet,
        stack: &Stack,
        _prefix: impl AsRef<str>,
        _span: Span,
        offset: usize,
        options: &CompletionOptions,
    ) -> Vec<SemanticSuggestion> {
        let mut prefix_str = String::new();
        // position at dots, e.g. `$env.config.<TAB>`
        let mut span = Span::new(self.position + 1, self.position + 1);
        let mut path_member_num_before_pos = 0;
        for member in self.full_cell_path.tail.iter() {
            if member.span().end <= self.position {
                path_member_num_before_pos += 1;
            } else if member.span().contains(self.position) {
                (prefix_str, span) = prefix_from_path_member(member, self.position);
                break;
            }
        }
        let current_span = reedline::Span {
            start: span.start - offset,
            end: span.end - offset,
        };
        let mut matcher = NuMatcher::new(prefix_str, options);
        let path_members = self
            .full_cell_path
            .tail
            .get(0..path_member_num_before_pos)
            .unwrap_or_default();
        let value = eval_cell_path(
            working_set,
            stack,
            &self.full_cell_path.head,
            path_members,
            span,
        )
        .unwrap_or_default();
        for suggestion in get_suggestions_by_value(&value, current_span) {
            matcher.add_semantic_suggestion(suggestion);
        }
        matcher.results()
    }
 }
 /// Follow cell path to get the value
 /// NOTE: This is a relatively lightweight implementation,
 /// so it may fail to get the exact value when the expression is complicated.
 /// One failing example would be `[$foo].0`
 pub(crate) fn eval_cell_path(
    working_set: &StateWorkingSet,
    stack: &Stack,
    head: &Expression,
    path_members: &[PathMember],
    span: Span,
 ) -> Result<Value, ShellError> {
    // evaluate the head expression to get its value
    let head_value = if let Expr::Var(var_id) = head.expr {
        working_set
            .get_variable(var_id)
            .const_val
            .to_owned()
            .map_or_else(
                || eval_variable(working_set.permanent_state, stack, var_id, span),
                Ok,
            )
    } else {
        eval_constant(working_set, head)
    }?;
    head_value.follow_cell_path(path_members, false)
 }
 fn get_suggestions_by_value(
    value: &Value,
    current_span: reedline::Span,
 ) -> Vec<SemanticSuggestion> {
    let to_suggestion = |s: String, v: Option<&Value>| SemanticSuggestion {
        suggestion: Suggestion {
            value: s,
            span: current_span,
            description: v.map(|v| v.get_type().to_string()),
            ..Suggestion::default()
        },
        kind: Some(SuggestionKind::CellPath),
    };
    match value {
        Value::Record { val, .. } => val
            .columns()
            .map(|s| to_suggestion(s.to_string(), val.get(s)))
            .collect(),
        Value::List { vals, .. } => get_columns(vals.as_slice())
            .into_iter()
            .map(|s| {
                let sub_val = vals
                    .first()
                    .and_then(|v| v.as_record().ok())
                    .and_then(|rv| rv.get(&s));
                to_suggestion(s, sub_val)
            })
            .collect(),
        _ => vec![],
    }
 }
--- a/crates/nu-cli/src/completions/command_completions.rs
+++ b/crates/nu-cli/src/completions/command_completions.rs
@ -4,9 +4,8 @@ use crate::{
    completions::{Completer, CompletionOptions},
    SuggestionKind,
 };
 use nu_parser::FlatShape;
 use nu_protocol::{
-    engine::{CachedFile, Stack, StateWorkingSet},
+    engine::{CommandType, Stack, StateWorkingSet},
    Span,
 };
 use reedline::Suggestion;
@ -14,24 +13,13 @@ use reedline::Suggestion;
 use super::{completion_options::NuMatcher, SemanticSuggestion};
 pub struct CommandCompletion {
-    flattened: Vec<(Span, FlatShape)>,
+    /// Whether to include internal commands
-    flat_shape: FlatShape,
+    pub internals: bool,
-    force_completion_after_space: bool,
+    /// Whether to include external commands
    pub externals: bool,
 }
 impl CommandCompletion {
    pub fn new(
        flattened: Vec<(Span, FlatShape)>,
        flat_shape: FlatShape,
        force_completion_after_space: bool,
    ) -> Self {
        Self {
            flattened,
            flat_shape,
            force_completion_after_space,
        }
    }
    fn external_command_completion(
        &self,
        working_set: &StateWorkingSet,
@ -71,6 +59,9 @@ impl CommandCompletion {
                            if suggs.contains_key(&value) {
                                continue;
                            }
                            // TODO: check name matching before a relative heavy IO involved
                            // `is_executable` for performance consideration, should avoid
                            // duplicated `match_aux` call for matched items in the future
                            if matcher.matches(&name) && is_executable::is_executable(item.path()) {
                                // If there's an internal command with the same name, adds ^cmd to the
                                // matcher so that both the internal and external command are included
@ -84,8 +75,7 @@ impl CommandCompletion {
                                            append_whitespace: true,
                                            ..Default::default()
                                        },
-                                        // TODO: is there a way to create a test?
+                                        kind: Some(SuggestionKind::Command(CommandType::External)),
                                        kind: None,
                                    },
                                );
                            }
@ -97,46 +87,50 @@ impl CommandCompletion {
        suggs
    }
 }
-    fn complete_commands(
+impl Completer for CommandCompletion {
-        &self,
+    fn fetch(
        &mut self,
        working_set: &StateWorkingSet,
        _stack: &Stack,
        prefix: impl AsRef<str>,
        span: Span,
        offset: usize,
        find_externals: bool,
        options: &CompletionOptions,
    ) -> Vec<SemanticSuggestion> {
-        let partial = working_set.get_span_contents(span);
+        let mut matcher = NuMatcher::new(prefix, options);
        let mut matcher = NuMatcher::new(String::from_utf8_lossy(partial), options.clone());
        let sugg_span = reedline::Span::new(span.start - offset, span.end - offset);
        let mut internal_suggs = HashMap::new();
-        let filtered_commands = working_set.find_commands_by_predicate(
+        if self.internals {
-            |name| {
+            let filtered_commands = working_set.find_commands_by_predicate(
-                let name = String::from_utf8_lossy(name);
+                |name| {
-                matcher.add(&name, name.to_string())
+                    let name = String::from_utf8_lossy(name);
-            },
+                    matcher.add(&name, name.to_string())
            true,
        );
        for (name, description, typ) in filtered_commands {
            let name = String::from_utf8_lossy(&name);
            internal_suggs.insert(
                name.to_string(),
                SemanticSuggestion {
                    suggestion: Suggestion {
                        value: name.to_string(),
                        description,
                        span: sugg_span,
                        append_whitespace: true,
                        ..Suggestion::default()
                    },
                    kind: Some(SuggestionKind::Command(typ)),
                },
                true,
            );
            for (name, description, typ) in filtered_commands {
                let name = String::from_utf8_lossy(&name);
                internal_suggs.insert(
                    name.to_string(),
                    SemanticSuggestion {
                        suggestion: Suggestion {
                            value: name.to_string(),
                            description,
                            span: sugg_span,
                            append_whitespace: true,
                            ..Suggestion::default()
                        },
                        kind: Some(SuggestionKind::Command(typ)),
                    },
                );
            }
        }
-        let mut external_suggs = if find_externals {
+        let mut external_suggs = if self.externals {
            self.external_command_completion(
                working_set,
                sugg_span,
@ -159,179 +153,3 @@ impl CommandCompletion {
        res
    }
 }
 impl Completer for CommandCompletion {
    fn fetch(
        &mut self,
        working_set: &StateWorkingSet,
        _stack: &Stack,
        _prefix: &[u8],
        span: Span,
        offset: usize,
        pos: usize,
        options: &CompletionOptions,
    ) -> Vec<SemanticSuggestion> {
        let last = self
            .flattened
            .iter()
            .rev()
            .skip_while(|x| x.0.end > pos)
            .take_while(|x| {
                matches!(
                    x.1,
                    FlatShape::InternalCall(_)
                        | FlatShape::External
                        | FlatShape::ExternalArg
                        | FlatShape::Literal
                        | FlatShape::String
                )
            })
            .last();
        // The last item here would be the earliest shape that could possible by part of this subcommand
        let subcommands = if let Some(last) = last {
            self.complete_commands(
                working_set,
                Span::new(last.0.start, pos),
                offset,
                false,
                options,
            )
        } else {
            vec![]
        };
        if !subcommands.is_empty() {
            return subcommands;
        }
        let config = working_set.get_config();
        if matches!(self.flat_shape, nu_parser::FlatShape::External)
            || matches!(self.flat_shape, nu_parser::FlatShape::InternalCall(_))
            || ((span.end - span.start) == 0)
            || is_passthrough_command(working_set.delta.get_file_contents())
        {
            // we're in a gap or at a command
            if working_set.get_span_contents(span).is_empty() && !self.force_completion_after_space
            {
                return vec![];
            }
            self.complete_commands(
                working_set,
                span,
                offset,
                config.completions.external.enable,
                options,
            )
        } else {
            vec![]
        }
    }
 }
 pub fn find_non_whitespace_index(contents: &[u8], start: usize) -> usize {
    match contents.get(start..) {
        Some(contents) => {
            contents
                .iter()
                .take_while(|x| x.is_ascii_whitespace())
                .count()
                + start
        }
        None => start,
    }
 }
 pub fn is_passthrough_command(working_set_file_contents: &[CachedFile]) -> bool {
    for cached_file in working_set_file_contents {
        let contents = &cached_file.content;
        let last_pipe_pos_rev = contents.iter().rev().position(|x| x == &b'|');
        let last_pipe_pos = last_pipe_pos_rev.map(|x| contents.len() - x).unwrap_or(0);
        let cur_pos = find_non_whitespace_index(contents, last_pipe_pos);
        let result = match contents.get(cur_pos..) {
            Some(contents) => contents.starts_with(b"sudo ") || contents.starts_with(b"doas "),
            None => false,
        };
        if result {
            return true;
        }
    }
    false
 }
 #[cfg(test)]
 mod command_completions_tests {
    use super::*;
    use nu_protocol::engine::EngineState;
    use std::sync::Arc;
    #[test]
    fn test_find_non_whitespace_index() {
        let commands = [
            ("    hello", 4),
            ("sudo ", 0),
            (" 	sudo ", 2),
            ("	 sudo ", 2),
            ("	hello ", 1),
            ("	  hello ", 3),
            ("    hello | sudo ", 4),
            ("     sudo|sudo", 5),
            ("sudo | sudo ", 0),
            ("	hello sud", 1),
        ];
        for (idx, ele) in commands.iter().enumerate() {
            let index = find_non_whitespace_index(ele.0.as_bytes(), 0);
            assert_eq!(index, ele.1, "Failed on index {}", idx);
        }
    }
    #[test]
    fn test_is_last_command_passthrough() {
        let commands = [
            ("    hello", false),
            ("    sudo ", true),
            ("sudo ", true),
            ("	hello", false),
            ("	sudo", false),
            ("	sudo ", true),
            (" 	sudo ", true),
            ("	 sudo ", true),
            ("	hello ", false),
            ("    hello | sudo ", true),
            ("    sudo|sudo", false),
            ("sudo | sudo ", true),
            ("	hello sud", false),
            ("	sudo | sud ", false),
            ("	sudo|sudo ", true),
            (" 	sudo | sudo ls | sudo ", true),
        ];
        for (idx, ele) in commands.iter().enumerate() {
            let input = ele.0.as_bytes();
            let mut engine_state = EngineState::new();
            engine_state.add_file("test.nu".into(), Arc::new([]));
            let delta = {
                let mut working_set = StateWorkingSet::new(&engine_state);
                let _ = working_set.add_file("child.nu".into(), input);
                working_set.render()
            };
            let result = engine_state.merge_delta(delta);
            assert!(
                result.is_ok(),
                "Merge delta has failed: {}",
                result.err().unwrap()
            );
            let is_passthrough_command = is_passthrough_command(engine_state.get_file_contents());
            assert_eq!(
                is_passthrough_command, ele.1,
                "index for '{}': {}",
                ele.0, idx
            );
        }
    }
 }
--- a/crates/nu-cli/src/completions/completer.rs
+++ b/crates/nu-cli/src/completions/completer.rs
--- a/crates/nu-cli/src/completions/completion_common.rs
+++ b/crates/nu-cli/src/completions/completion_common.rs
@ -51,7 +51,7 @@ fn complete_rec(
    }
    let prefix = partial.first().unwrap_or(&"");
-    let mut matcher = NuMatcher::new(prefix, options.clone());
+    let mut matcher = NuMatcher::new(prefix, options);
    for built in built_paths {
        let mut path = built.cwd.clone();
@ -65,10 +65,11 @@ fn complete_rec(
        for entry in result.filter_map(|e| e.ok()) {
            let entry_name = entry.file_name().to_string_lossy().into_owned();
-            let entry_isdir = entry.path().is_dir() && !entry.path().is_symlink();
+            let entry_isdir = entry.path().is_dir();
            let mut built = built.clone();
            built.parts.push(entry_name.clone());
-            built.isdir = entry_isdir;
+            // Symlinks to directories shouldn't have a trailing slash (#13275)
            built.isdir = entry_isdir && !entry.path().is_symlink();
            if !want_directory || entry_isdir {
                matcher.add(entry_name.clone(), (entry_name, built));
@ -157,6 +158,7 @@ pub struct FileSuggestion {
    pub span: nu_protocol::Span,
    pub path: String,
    pub style: Option<Style>,
    pub is_dir: bool,
 }
 /// # Parameters
@ -260,6 +262,7 @@ pub fn complete_item(
        if should_collapse_dots {
            p = collapse_ndots(p);
        }
        let is_dir = p.isdir;
        let path = original_cwd.apply(p, path_separator);
        let style = ls_colors.as_ref().map(|lsc| {
            lsc.style_for_path_with_metadata(
@ -273,38 +276,39 @@ pub fn complete_item(
        });
        FileSuggestion {
            span,
-            path: escape_path(path, want_directory),
+            path: escape_path(path),
            style,
            is_dir,
        }
    })
    .collect()
 }
 // Fix files or folders with quotes or hashes
-pub fn escape_path(path: String, dir: bool) -> String {
+pub fn escape_path(path: String) -> String {
    // make glob pattern have the highest priority.
-    if nu_glob::is_glob(path.as_str()) {
+    if nu_glob::is_glob(path.as_str()) || path.contains('`') {
        // expand home `~` for https://github.com/nushell/nushell/issues/13905
        let pathbuf = nu_path::expand_tilde(path);
        let path = pathbuf.to_string_lossy();
-        return if path.contains('\'') {
+        if path.contains('\'') {
-            // decide to use double quote, also need to escape `"` in path
+            // decide to use double quotes
-            // or else users can't do anything with completed path either.
+            // Path as Debug will do the escaping for `"`, `\`
-            format!("\"{}\"", path.replace('"', r#"\""#))
+            format!("{:?}", path)
        } else {
            format!("'{path}'")
-        };
+        }
    }
    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_variable || maybe_number
    {
        format!("`{path}`")
    } else {
-        path
+        let contaminated =
            path.contains(['\'', '"', ' ', '#', '(', ')', '{', '}', '[', ']', '|', ';']);
        let maybe_flag = path.starts_with('-');
        let maybe_variable = path.starts_with('$');
        let maybe_number = path.parse::<f64>().is_ok();
        if contaminated || maybe_flag || maybe_variable || maybe_number {
            format!("`{path}`")
        } else {
            path
        }
    }
 }
@ -315,12 +319,12 @@ pub struct AdjustView {
 }
 pub fn adjust_if_intermediate(
-    prefix: &[u8],
+    prefix: &str,
    working_set: &StateWorkingSet,
    mut span: nu_protocol::Span,
 ) -> AdjustView {
    let span_contents = String::from_utf8_lossy(working_set.get_span_contents(span)).to_string();
-    let mut prefix = String::from_utf8_lossy(prefix).to_string();
+    let mut prefix = prefix.to_string();
    // A difference of 1 because of the cursor's unicode code point in between.
    // Using .chars().count() because unicode and Windows.
--- a/crates/nu-cli/src/completions/completion_options.rs
+++ b/crates/nu-cli/src/completions/completion_options.rs
@ -25,8 +25,8 @@ pub enum MatchAlgorithm {
    Fuzzy,
 }
-pub struct NuMatcher<T> {
+pub struct NuMatcher<'a, T> {
-    options: CompletionOptions,
+    options: &'a CompletionOptions,
    needle: String,
    state: State<T>,
 }
@ -45,11 +45,11 @@ enum State<T> {
 }
 /// Filters and sorts suggestions
-impl<T> NuMatcher<T> {
+impl<T> NuMatcher<'_, T> {
    /// # Arguments
    ///
    /// * `needle` - The text to search for
-    pub fn new(needle: impl AsRef<str>, options: CompletionOptions) -> NuMatcher<T> {
+    pub fn new(needle: impl AsRef<str>, options: &CompletionOptions) -> NuMatcher<T> {
        let needle = trim_quotes_str(needle.as_ref());
        match options.match_algorithm {
            MatchAlgorithm::Prefix => {
@ -184,7 +184,7 @@ impl<T> NuMatcher<T> {
    }
 }
-impl NuMatcher<SemanticSuggestion> {
+impl NuMatcher<'_, SemanticSuggestion> {
    pub fn add_semantic_suggestion(&mut self, sugg: SemanticSuggestion) -> bool {
        let value = sugg.suggestion.value.to_string();
        self.add(value, sugg)
@ -271,7 +271,7 @@ mod test {
            match_algorithm,
            ..Default::default()
        };
-        let mut matcher = NuMatcher::new(needle, options);
+        let mut matcher = NuMatcher::new(needle, &options);
        matcher.add(haystack, haystack);
        if should_match {
            assert_eq!(vec![haystack], matcher.results());
@ -286,7 +286,7 @@ mod test {
            match_algorithm: MatchAlgorithm::Fuzzy,
            ..Default::default()
        };
-        let mut matcher = NuMatcher::new("fob", options);
+        let mut matcher = NuMatcher::new("fob", &options);
        for item in ["foo/bar", "fob", "foo bar"] {
            matcher.add(item, item);
        }
@ -300,7 +300,7 @@ mod test {
            match_algorithm: MatchAlgorithm::Fuzzy,
            ..Default::default()
        };
-        let mut matcher = NuMatcher::new("'love spaces' ", options);
+        let mut matcher = NuMatcher::new("'love spaces' ", &options);
        for item in [
            "'i love spaces'",
            "'i love spaces' so much",
--- a/crates/nu-cli/src/completions/custom_completions.rs
+++ b/crates/nu-cli/src/completions/custom_completions.rs
@ -13,18 +13,18 @@ use std::collections::HashMap;
 use super::completion_options::NuMatcher;
 pub struct CustomCompletion<T: Completer> {
    stack: Stack,
    decl_id: DeclId,
    line: String,
    line_pos: usize,
    fallback: T,
 }
 impl<T: Completer> CustomCompletion<T> {
-    pub fn new(stack: Stack, decl_id: DeclId, line: String, fallback: T) -> Self {
+    pub fn new(decl_id: DeclId, line: String, line_pos: usize, fallback: T) -> Self {
        Self {
            stack,
            decl_id,
            line,
            line_pos,
            fallback,
        }
    }
@ -35,19 +35,16 @@ impl<T: Completer> Completer for CustomCompletion<T> {
        &mut self,
        working_set: &StateWorkingSet,
        stack: &Stack,
-        prefix: &[u8],
+        prefix: impl AsRef<str>,
        span: Span,
        offset: usize,
        pos: usize,
        orig_options: &CompletionOptions,
    ) -> Vec<SemanticSuggestion> {
        // Line position
        let line_pos = pos - offset;
        // Call custom declaration
        let mut stack_mut = stack.clone();
        let result = eval_call::<WithoutDebug>(
            working_set.permanent_state,
-            &mut self.stack,
+            &mut stack_mut,
            &Call {
                decl_id: self.decl_id,
                head: span,
@ -58,7 +55,7 @@ impl<T: Completer> Completer for CustomCompletion<T> {
                        Type::String,
                    )),
                    Argument::Positional(Expression::new_unknown(
-                        Expr::Int(line_pos as i64),
+                        Expr::Int(self.line_pos as i64),
                        Span::unknown(),
                        Type::Int,
                    )),
@ -120,7 +117,6 @@ impl<T: Completer> Completer for CustomCompletion<T> {
                        prefix,
                        span,
                        offset,
                        pos,
                        orig_options,
                    );
                }
@ -138,7 +134,7 @@ impl<T: Completer> Completer for CustomCompletion<T> {
            }
        };
-        let mut matcher = NuMatcher::new(String::from_utf8_lossy(prefix), completion_options);
+        let mut matcher = NuMatcher::new(prefix, &completion_options);
        if should_sort {
            for sugg in suggestions {
--- a/crates/nu-cli/src/completions/directory_completions.rs
+++ b/crates/nu-cli/src/completions/directory_completions.rs
@ -9,29 +9,22 @@ use nu_protocol::{
 use reedline::Suggestion;
 use std::path::Path;
-use super::{completion_common::FileSuggestion, SemanticSuggestion};
+use super::{completion_common::FileSuggestion, SemanticSuggestion, SuggestionKind};
-#[derive(Clone, Default)]
+pub struct DirectoryCompletion;
 pub struct DirectoryCompletion {}
 impl DirectoryCompletion {
    pub fn new() -> Self {
        Self::default()
    }
 }
 impl Completer for DirectoryCompletion {
    fn fetch(
        &mut self,
        working_set: &StateWorkingSet,
        stack: &Stack,
-        prefix: &[u8],
+        prefix: impl AsRef<str>,
        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.as_ref(), working_set, span);
        // Filter only the folders
        #[allow(deprecated)]
@ -54,8 +47,7 @@ impl Completer for DirectoryCompletion {
                },
                ..Suggestion::default()
            },
-            // TODO????
+            kind: Some(SuggestionKind::Directory),
            kind: None,
        })
        .collect();
--- a/crates/nu-cli/src/completions/dotnu_completions.rs
+++ b/crates/nu-cli/src/completions/dotnu_completions.rs
@ -5,75 +5,99 @@ use nu_protocol::{
    Span,
 };
 use reedline::Suggestion;
-use std::path::{is_separator, PathBuf, MAIN_SEPARATOR as SEP, MAIN_SEPARATOR_STR};
+use std::{
    collections::HashSet,
    path::{is_separator, PathBuf, MAIN_SEPARATOR as SEP, MAIN_SEPARATOR_STR},
 };
 use super::{SemanticSuggestion, SuggestionKind};
-#[derive(Clone, Default)]
+pub struct DotNuCompletion;
 pub struct DotNuCompletion {}
 impl DotNuCompletion {
    pub fn new() -> Self {
        Self::default()
    }
 }
 impl Completer for DotNuCompletion {
    fn fetch(
        &mut self,
        working_set: &StateWorkingSet,
        stack: &Stack,
-        prefix: &[u8],
+        prefix: impl AsRef<str>,
        span: Span,
        offset: usize,
        _pos: usize,
        options: &CompletionOptions,
    ) -> Vec<SemanticSuggestion> {
-        let prefix_str = String::from_utf8_lossy(prefix);
+        let prefix_str = prefix.as_ref();
        let start_with_backquote = prefix_str.starts_with('`');
        let end_with_backquote = prefix_str.ends_with('`');
        let prefix_str = prefix_str.replace('`', "");
        // e.g. `./`, `..\`, `/`
        let not_lib_dirs = prefix_str
            .chars()
            .find(|c| *c != '.')
            .is_some_and(is_separator);
        let mut search_dirs: Vec<PathBuf> = vec![];
-        // If prefix_str is only a word we want to search in the current dir
+        let (base, partial) = if let Some((parent, remain)) = prefix_str.rsplit_once(is_separator) {
-        let (base, partial) = prefix_str
+            // If prefix_str is only a word we want to search in the current dir.
-            .rsplit_once(is_separator)
+            // "/xx" should be split to "/" and "xx".
-            .unwrap_or((".", &prefix_str));
+            if parent.is_empty() {
                (MAIN_SEPARATOR_STR, remain)
            } else {
                (parent, remain)
            }
        } else {
            (".", prefix_str.as_str())
        };
        let base_dir = base.replace(is_separator, MAIN_SEPARATOR_STR);
        // Fetch the lib dirs
-        let lib_dirs: Vec<PathBuf> = working_set
+        // NOTE: 2 ways to setup `NU_LIB_DIRS`
        // 1. `const NU_LIB_DIRS = [paths]`, equal to `nu -I paths`
        // 2. `$env.NU_LIB_DIRS = [paths]`
        let const_lib_dirs = working_set
            .find_variable(b"$NU_LIB_DIRS")
-            .and_then(|vid| working_set.get_variable(vid).const_val.as_ref())
+            .and_then(|vid| working_set.get_variable(vid).const_val.as_ref());
-            .or(working_set.get_env_var("NU_LIB_DIRS"))
+        let env_lib_dirs = working_set.get_env_var("NU_LIB_DIRS");
-            .map(|lib_dirs| {
+        let lib_dirs: HashSet<PathBuf> = [const_lib_dirs, env_lib_dirs]
            .into_iter()
            .flatten()
            .flat_map(|lib_dirs| {
                lib_dirs
                    .as_list()
                    .into_iter()
                    .flat_map(|it| it.iter().filter_map(|x| x.to_path().ok()))
                    .map(expand_tilde)
                    .collect()
            })
-            .unwrap_or_default();
+            .collect();
        // Check if the base_dir is a folder
        // rsplit_once removes the separator
        let cwd = working_set.permanent_state.cwd(None);
        if base_dir != "." {
-            // Search in base_dir as well as lib_dirs
+            let expanded_base_dir = expand_tilde(&base_dir);
            let is_base_dir_relative = expanded_base_dir.is_relative();
            // Search in base_dir as well as lib_dirs.
            // After expanded, base_dir can be a relative path or absolute path.
            // If relative, we join "current working dir" with it to get subdirectory and add to search_dirs.
            // If absolute, we add it to search_dirs.
            if let Ok(mut cwd) = cwd {
-                cwd.push(&base_dir);
+                if is_base_dir_relative {
-                search_dirs.push(cwd.into_std_path_buf());
+                    cwd.push(&base_dir);
                    search_dirs.push(cwd.into_std_path_buf());
                } else {
                    search_dirs.push(expanded_base_dir);
                }
            }
            if !not_lib_dirs {
                search_dirs.extend(lib_dirs.into_iter().map(|mut dir| {
                    dir.push(&base_dir);
                    dir
                }));
            }
            search_dirs.extend(lib_dirs.into_iter().map(|mut dir| {
                dir.push(&base_dir);
                dir
            }));
        } else {
            if let Ok(cwd) = cwd {
                search_dirs.push(cwd.into_std_path_buf());
            }
-            search_dirs.extend(lib_dirs);
+            if !not_lib_dirs {
                search_dirs.extend(lib_dirs);
            }
        }
        // Fetch the files filtering the ones that ends with .nu
@ -104,7 +128,9 @@ impl Completer for DotNuCompletion {
                let mut span_offset = 0;
                let mut value = x.path.to_string();
                // Complete only the last path component
-                if base_dir != "." {
+                if base_dir == MAIN_SEPARATOR_STR {
                    span_offset = base_dir.len()
                } else if base_dir != "." {
                    span_offset = base_dir.len() + 1
                }
                // Retain only one '`'
--- a/crates/nu-cli/src/completions/file_completions.rs
+++ b/crates/nu-cli/src/completions/file_completions.rs
@ -9,33 +9,25 @@ use nu_protocol::{
 use reedline::Suggestion;
 use std::path::Path;
-use super::{completion_common::FileSuggestion, SemanticSuggestion};
+use super::{completion_common::FileSuggestion, SemanticSuggestion, SuggestionKind};
-#[derive(Clone, Default)]
+pub struct FileCompletion;
 pub struct FileCompletion {}
 impl FileCompletion {
    pub fn new() -> Self {
        Self::default()
    }
 }
 impl Completer for FileCompletion {
    fn fetch(
        &mut self,
        working_set: &StateWorkingSet,
        stack: &Stack,
-        prefix: &[u8],
+        prefix: impl AsRef<str>,
        span: Span,
        offset: usize,
        _pos: usize,
        options: &CompletionOptions,
    ) -> Vec<SemanticSuggestion> {
        let AdjustView {
            prefix,
            span,
            readjusted,
-        } = adjust_if_intermediate(prefix, working_set, span);
+        } = adjust_if_intermediate(prefix.as_ref(), working_set, span);
        #[allow(deprecated)]
        let items: Vec<_> = complete_item(
@ -58,8 +50,11 @@ impl Completer for FileCompletion {
                },
                ..Suggestion::default()
            },
-            // TODO????
+            kind: Some(if x.is_dir {
-            kind: None,
+                SuggestionKind::Directory
            } else {
                SuggestionKind::File
            }),
        })
        .collect();
--- a/crates/nu-cli/src/completions/flag_completions.rs
+++ b/crates/nu-cli/src/completions/flag_completions.rs
@ -1,22 +1,15 @@
 use crate::completions::{completion_options::NuMatcher, Completer, CompletionOptions};
 use nu_protocol::{
    ast::{Expr, Expression},
    engine::{Stack, StateWorkingSet},
-    Span,
+    DeclId, Span,
 };
 use reedline::Suggestion;
-use super::SemanticSuggestion;
+use super::{SemanticSuggestion, SuggestionKind};
 #[derive(Clone)]
 pub struct FlagCompletion {
-    expression: Expression,
+    pub decl_id: DeclId,
 }
 impl FlagCompletion {
    pub fn new(expression: Expression) -> Self {
        Self { expression }
    }
 }
 impl Completer for FlagCompletion {
@ -24,69 +17,42 @@ impl Completer for FlagCompletion {
        &mut self,
        working_set: &StateWorkingSet,
        _stack: &Stack,
-        prefix: &[u8],
+        prefix: impl AsRef<str>,
        span: Span,
        offset: usize,
        _pos: usize,
        options: &CompletionOptions,
    ) -> Vec<SemanticSuggestion> {
-        // Check if it's a flag
+        let mut matcher = NuMatcher::new(prefix, options);
-        if let Expr::Call(call) = &self.expression.expr {
+        let mut add_suggestion = |value: String, description: String| {
-            let decl = working_set.get_decl(call.decl_id);
+            matcher.add_semantic_suggestion(SemanticSuggestion {
-            let sig = decl.signature();
+                suggestion: Suggestion {
-
+                    value,
-            let mut matcher = NuMatcher::new(String::from_utf8_lossy(prefix), options.clone());
+                    description: Some(description),
-
+                    span: reedline::Span {
-            for named in &sig.named {
+                        start: span.start - offset,
-                let flag_desc = &named.desc;
+                        end: span.end - offset,
                if let Some(short) = named.short {
                    let mut named = vec![0; short.len_utf8()];
                    short.encode_utf8(&mut named);
                    named.insert(0, b'-');
                    matcher.add_semantic_suggestion(SemanticSuggestion {
                        suggestion: Suggestion {
                            value: String::from_utf8_lossy(&named).to_string(),
                            description: Some(flag_desc.to_string()),
                            span: reedline::Span {
                                start: span.start - offset,
                                end: span.end - offset,
                            },
                            append_whitespace: true,
                            ..Suggestion::default()
                        },
                        // TODO????
                        kind: None,
                    });
                }
                if named.long.is_empty() {
                    continue;
                }
                let mut named = named.long.as_bytes().to_vec();
                named.insert(0, b'-');
                named.insert(0, b'-');
                matcher.add_semantic_suggestion(SemanticSuggestion {
                    suggestion: Suggestion {
                        value: String::from_utf8_lossy(&named).to_string(),
                        description: Some(flag_desc.to_string()),
                        span: reedline::Span {
                            start: span.start - offset,
                            end: span.end - offset,
                        },
                        append_whitespace: true,
                        ..Suggestion::default()
                    },
-                    // TODO????
+                    append_whitespace: true,
-                    kind: None,
+                    ..Suggestion::default()
-                });
+                },
                kind: Some(SuggestionKind::Flag),
            });
        };
        let decl = working_set.get_decl(self.decl_id);
        let sig = decl.signature();
        for named in &sig.named {
            if let Some(short) = named.short {
                let mut name = String::from("-");
                name.push(short);
                add_suggestion(name, named.desc.clone());
            }
-            return matcher.results();
+            if named.long.is_empty() {
                continue;
            }
            add_suggestion(format!("--{}", named.long), named.desc.clone());
        }
-
+        matcher.results()
        vec![]
    }
 }
--- a/crates/nu-cli/src/completions/mod.rs
+++ b/crates/nu-cli/src/completions/mod.rs
@ -1,4 +1,6 @@
 mod attribute_completions;
 mod base;
 mod cell_path_completions;
 mod command_completions;
 mod completer;
 mod completion_common;
@ -11,7 +13,9 @@ mod flag_completions;
 mod operator_completions;
 mod variable_completions;
 pub use attribute_completions::{AttributableCompletion, AttributeCompletion};
 pub use base::{Completer, SemanticSuggestion, SuggestionKind};
 pub use cell_path_completions::CellPathCompletion;
 pub use command_completions::CommandCompletion;
 pub use completer::NuCompleter;
 pub use completion_options::{CompletionOptions, MatchAlgorithm};
--- a/crates/nu-cli/src/completions/operator_completions.rs
+++ b/crates/nu-cli/src/completions/operator_completions.rs
@ -2,169 +2,276 @@ use crate::completions::{
    completion_options::NuMatcher, Completer, CompletionOptions, SemanticSuggestion, SuggestionKind,
 };
 use nu_protocol::{
-    ast::{Expr, Expression},
+    ast::{self, Comparison, Expr, Expression},
    engine::{Stack, StateWorkingSet},
-    Span, Type,
+    Span, Type, Value, ENV_VARIABLE_ID,
 };
 use reedline::Suggestion;
 use strum::{EnumMessage, IntoEnumIterator};
 use super::cell_path_completions::eval_cell_path;
 #[derive(Clone)]
-pub struct OperatorCompletion {
+pub struct OperatorCompletion<'a> {
-    previous_expr: Expression,
+    pub left_hand_side: &'a Expression,
 }
-impl OperatorCompletion {
+struct OperatorItem {
-    pub fn new(previous_expr: Expression) -> Self {
+    pub symbols: String,
-        OperatorCompletion { previous_expr }
+    pub description: String,
 }
 fn operator_to_item<T: EnumMessage + AsRef<str>>(op: T) -> OperatorItem {
    OperatorItem {
        symbols: op.as_ref().into(),
        description: op.get_message().unwrap_or_default().into(),
    }
 }
-impl Completer for OperatorCompletion {
+fn common_comparison_ops() -> Vec<OperatorItem> {
    vec![
        operator_to_item(Comparison::In),
        operator_to_item(Comparison::NotIn),
        operator_to_item(Comparison::Equal),
        operator_to_item(Comparison::NotEqual),
    ]
 }
 fn all_ops_for_immutable() -> Vec<OperatorItem> {
    ast::Comparison::iter()
        .map(operator_to_item)
        .chain(ast::Math::iter().map(operator_to_item))
        .chain(ast::Boolean::iter().map(operator_to_item))
        .chain(ast::Bits::iter().map(operator_to_item))
        .collect()
 }
 fn collection_comparison_ops() -> Vec<OperatorItem> {
    let mut ops = common_comparison_ops();
    ops.push(operator_to_item(Comparison::Has));
    ops.push(operator_to_item(Comparison::NotHas));
    ops
 }
 fn number_comparison_ops() -> Vec<OperatorItem> {
    Comparison::iter()
        .filter(|op| {
            !matches!(
                op,
                Comparison::RegexMatch
                    | Comparison::NotRegexMatch
                    | Comparison::StartsWith
                    | Comparison::EndsWith
                    | Comparison::Has
                    | Comparison::NotHas
            )
        })
        .map(operator_to_item)
        .collect()
 }
 fn math_ops() -> Vec<OperatorItem> {
    ast::Math::iter()
        .filter(|op| !matches!(op, ast::Math::Concatenate | ast::Math::Pow))
        .map(operator_to_item)
        .collect()
 }
 fn bit_ops() -> Vec<OperatorItem> {
    ast::Bits::iter().map(operator_to_item).collect()
 }
 fn all_assignment_ops() -> Vec<OperatorItem> {
    ast::Assignment::iter().map(operator_to_item).collect()
 }
 fn numeric_assignment_ops() -> Vec<OperatorItem> {
    ast::Assignment::iter()
        .filter(|op| !matches!(op, ast::Assignment::ConcatenateAssign))
        .map(operator_to_item)
        .collect()
 }
 fn concat_assignment_ops() -> Vec<OperatorItem> {
    vec![
        operator_to_item(ast::Assignment::Assign),
        operator_to_item(ast::Assignment::ConcatenateAssign),
    ]
 }
 fn valid_int_ops() -> Vec<OperatorItem> {
    let mut ops = valid_float_ops();
    ops.extend(bit_ops());
    ops
 }
 fn valid_float_ops() -> Vec<OperatorItem> {
    let mut ops = valid_value_with_unit_ops();
    ops.push(operator_to_item(ast::Math::Pow));
    ops
 }
 fn valid_string_ops() -> Vec<OperatorItem> {
    let mut ops: Vec<OperatorItem> = Comparison::iter().map(operator_to_item).collect();
    ops.push(operator_to_item(ast::Math::Concatenate));
    ops.push(OperatorItem {
        symbols: "like".into(),
        description: Comparison::RegexMatch
            .get_message()
            .unwrap_or_default()
            .into(),
    });
    ops.push(OperatorItem {
        symbols: "not-like".into(),
        description: Comparison::NotRegexMatch
            .get_message()
            .unwrap_or_default()
            .into(),
    });
    ops
 }
 fn valid_list_ops() -> Vec<OperatorItem> {
    let mut ops = collection_comparison_ops();
    ops.push(operator_to_item(ast::Math::Concatenate));
    ops
 }
 fn valid_binary_ops() -> Vec<OperatorItem> {
    let mut ops = number_comparison_ops();
    ops.extend(bit_ops());
    ops.push(operator_to_item(ast::Math::Concatenate));
    ops
 }
 fn valid_bool_ops() -> Vec<OperatorItem> {
    let mut ops: Vec<OperatorItem> = ast::Boolean::iter().map(operator_to_item).collect();
    ops.extend(common_comparison_ops());
    ops
 }
 fn valid_value_with_unit_ops() -> Vec<OperatorItem> {
    let mut ops = number_comparison_ops();
    ops.extend(math_ops());
    ops
 }
 fn ops_by_value(value: &Value, mutable: bool) -> Vec<OperatorItem> {
    let mut ops = match value {
        Value::Int { .. } => valid_int_ops(),
        Value::Float { .. } => valid_float_ops(),
        Value::String { .. } => valid_string_ops(),
        Value::Binary { .. } => valid_binary_ops(),
        Value::Bool { .. } => valid_bool_ops(),
        Value::Date { .. } => number_comparison_ops(),
        Value::Filesize { .. } | Value::Duration { .. } => valid_value_with_unit_ops(),
        Value::Range { .. } | Value::Record { .. } => collection_comparison_ops(),
        Value::List { .. } => valid_list_ops(),
        _ => all_ops_for_immutable(),
    };
    if mutable {
        ops.extend(match value {
            Value::Int { .. }
            | Value::Float { .. }
            | Value::Filesize { .. }
            | Value::Duration { .. } => numeric_assignment_ops(),
            Value::String { .. } | Value::Binary { .. } | Value::List { .. } => {
                concat_assignment_ops()
            }
            Value::Bool { .. }
            | Value::Date { .. }
            | Value::Range { .. }
            | Value::Record { .. } => vec![operator_to_item(ast::Assignment::Assign)],
            _ => all_assignment_ops(),
        })
    }
    ops
 }
 fn is_expression_mutable(expr: &Expr, working_set: &StateWorkingSet) -> bool {
    let Expr::FullCellPath(path) = expr else {
        return false;
    };
    let Expr::Var(id) = path.head.expr else {
        return false;
    };
    if id == ENV_VARIABLE_ID {
        return true;
    }
    let var = working_set.get_variable(id);
    var.mutable
 }
 impl Completer for OperatorCompletion<'_> {
    fn fetch(
        &mut self,
        working_set: &StateWorkingSet,
-        _stack: &Stack,
+        stack: &Stack,
-        _prefix: &[u8],
+        prefix: impl AsRef<str>,
        span: Span,
        offset: usize,
        _pos: usize,
        options: &CompletionOptions,
    ) -> Vec<SemanticSuggestion> {
-        //Check if int, float, or string
+        let mut needs_assignment_ops = true;
-        let partial = std::str::from_utf8(working_set.get_span_contents(span)).unwrap_or("");
+        // Complete according expression type
-        let op = match &self.previous_expr.expr {
+        // TODO: type inference on self.left_hand_side to get more accurate completions
-            Expr::BinaryOp(x, _, _) => &x.expr,
+        let mut possible_operations: Vec<OperatorItem> = match &self.left_hand_side.ty {
-            _ => {
+            Type::Int | Type::Number => valid_int_ops(),
-                return vec![];
+            Type::Float => valid_float_ops(),
-            }
+            Type::String => valid_string_ops(),
-        };
+            Type::Binary => valid_binary_ops(),
-        let possible_operations = match op {
+            Type::Bool => valid_bool_ops(),
-            Expr::Int(_) => vec![
+            Type::Date => number_comparison_ops(),
-                ("+", "Add (Plus)"),
+            Type::Filesize | Type::Duration => valid_value_with_unit_ops(),
-                ("-", "Subtract (Minus)"),
+            Type::Record(_) | Type::Range => collection_comparison_ops(),
-                ("*", "Multiply"),
+            Type::List(_) | Type::Table(_) => valid_list_ops(),
-                ("/", "Divide"),
+            // Unknown type, resort to evaluated values
-                ("==", "Equal to"),
+            Type::Any => match &self.left_hand_side.expr {
-                ("!=", "Not equal to"),
+                Expr::FullCellPath(path) => {
-                ("//", "Floor division"),
+                    // for `$ <tab>`
-                ("<", "Less than"),
+                    if matches!(path.head.expr, Expr::Garbage) {
-                (">", "Greater than"),
+                        return vec![];
-                ("<=", "Less than or equal to"),
+                    }
-                (">=", "Greater than or equal to"),
+                    let value =
-                ("mod", "Floor division remainder (Modulo)"),
+                        eval_cell_path(working_set, stack, &path.head, &path.tail, path.head.span)
-                ("**", "Power of"),
+                            .unwrap_or_default();
-                ("bit-or", "Bitwise OR"),
+                    let mutable = is_expression_mutable(&self.left_hand_side.expr, working_set);
-                ("bit-xor", "Bitwise exclusive OR"),
+                    // to avoid duplication
-                ("bit-and", "Bitwise AND"),
+                    needs_assignment_ops = false;
-                ("bit-shl", "Bitwise shift left"),
+                    ops_by_value(&value, mutable)
-                ("bit-shr", "Bitwise shift right"),
+                }
-                ("in", "Is a member of (doesn't use regex)"),
+                _ => all_ops_for_immutable(),
                ("not-in", "Is not a member of (doesn't use regex)"),
            ],
            Expr::String(_) => vec![
                ("=~", "Contains regex match"),
                ("like", "Contains regex match"),
                ("!~", "Does not contain regex match"),
                ("not-like", "Does not contain regex match"),
                (
                    "++",
                    "Concatenates two lists, 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)"),
            ],
            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)"),
            ],
            Expr::FullCellPath(path) => match path.head.expr {
                Expr::List(_) => vec![
                    (
                        "++",
                        "Concatenates two lists, two strings, or two binary values",
                    ),
                    ("has", "Contains a value of (doesn't use regex)"),
                    ("not-has", "Does not contain a value of (doesn't use regex)"),
                ],
                Expr::Var(id) => get_variable_completions(id, working_set),
                _ => vec![],
            },
-            _ => vec![],
+            _ => common_comparison_ops(),
        };
        // If the left hand side is a variable, add assignment operators if mutable
        if needs_assignment_ops && is_expression_mutable(&self.left_hand_side.expr, working_set) {
            possible_operations.extend(match &self.left_hand_side.ty {
                Type::Int | Type::Float | Type::Number => numeric_assignment_ops(),
                Type::Filesize | Type::Duration => numeric_assignment_ops(),
                Type::String | Type::Binary | Type::List(_) => concat_assignment_ops(),
                Type::Any => all_assignment_ops(),
                _ => vec![operator_to_item(ast::Assignment::Assign)],
            });
        }
-        let mut matcher = NuMatcher::new(partial, options.clone());
+        let mut matcher = NuMatcher::new(prefix, options);
-        for (symbol, desc) in possible_operations.into_iter() {
+        for OperatorItem {
            symbols,
            description,
        } in possible_operations
        {
            matcher.add_semantic_suggestion(SemanticSuggestion {
                suggestion: Suggestion {
-                    value: symbol.to_string(),
+                    value: symbols.to_owned(),
-                    description: Some(desc.to_string()),
+                    description: Some(description.to_owned()),
                    span: reedline::Span::new(span.start - offset, span.end - offset),
                    append_whitespace: true,
                    ..Suggestion::default()
                },
-                kind: Some(SuggestionKind::Command(
+                kind: Some(SuggestionKind::Operator),
                    nu_protocol::engine::CommandType::Builtin,
                )),
            });
        }
        matcher.results()
    }
 }
 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![
            (
                "++=",
                "Concatenates two lists, two strings, or two binary values",
            ),
            ("=", "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![],
    }
 }
--- a/crates/nu-cli/src/completions/variable_completions.rs
+++ b/crates/nu-cli/src/completions/variable_completions.rs
@ -1,157 +1,67 @@
 use crate::completions::{Completer, CompletionOptions, SemanticSuggestion, SuggestionKind};
 use nu_engine::{column::get_columns, eval_variable};
 use nu_protocol::{
    engine::{Stack, StateWorkingSet},
-    Span, Value,
+    Span, VarId,
 };
 use reedline::Suggestion;
 use std::str;
 use super::completion_options::NuMatcher;
-#[derive(Clone)]
+pub struct VariableCompletion;
 pub struct VariableCompletion {
    var_context: (Vec<u8>, Vec<Vec<u8>>), // tuple with $var and the sublevels (.b.c.d)
 }
 impl VariableCompletion {
    pub fn new(var_context: (Vec<u8>, Vec<Vec<u8>>)) -> Self {
        Self { var_context }
    }
 }
 impl Completer for VariableCompletion {
    fn fetch(
        &mut self,
        working_set: &StateWorkingSet,
-        stack: &Stack,
+        _stack: &Stack,
-        prefix: &[u8],
+        prefix: impl AsRef<str>,
        span: Span,
        offset: usize,
        _pos: usize,
        options: &CompletionOptions,
    ) -> Vec<SemanticSuggestion> {
-        let builtins = ["$nu", "$in", "$env"];
+        let mut matcher = NuMatcher::new(prefix, options);
        let var_str = std::str::from_utf8(&self.var_context.0).unwrap_or("");
        let var_id = working_set.find_variable(&self.var_context.0);
        let current_span = reedline::Span {
            start: span.start - offset,
            end: span.end - offset,
        };
        let sublevels_count = self.var_context.1.len();
        let prefix_str = String::from_utf8_lossy(prefix);
        let mut matcher = NuMatcher::new(prefix_str, options.clone());
        // Completions for the given variable
        if !var_str.is_empty() {
            // Completion for $env.<tab>
            if var_str == "$env" {
                let env_vars = stack.get_env_vars(working_set.permanent_state);
                // Return nested values
                if sublevels_count > 0 {
                    // Extract the target var ($env.<target-var>)
                    let target_var = self.var_context.1[0].clone();
                    let target_var_str =
                        str::from_utf8(&target_var).unwrap_or_default().to_string();
                    // Everything after the target var is the nested level ($env.<target-var>.<nested_levels>...)
                    let nested_levels: Vec<Vec<u8>> =
                        self.var_context.1.clone().into_iter().skip(1).collect();
                    if let Some(val) = env_vars.get(&target_var_str) {
                        for suggestion in nested_suggestions(val, &nested_levels, current_span) {
                            matcher.add_semantic_suggestion(suggestion);
                        }
                        return matcher.results();
                    }
                } else {
                    // No nesting provided, return all env vars
                    for env_var in env_vars {
                        matcher.add_semantic_suggestion(SemanticSuggestion {
                            suggestion: Suggestion {
                                value: env_var.0,
                                span: current_span,
                                ..Suggestion::default()
                            },
                            kind: Some(SuggestionKind::Type(env_var.1.get_type())),
                        });
                    }
                    return matcher.results();
                }
            }
            // Completions for $nu.<tab>
            if var_str == "$nu" {
                // Eval nu var
                if let Ok(nuval) = eval_variable(
                    working_set.permanent_state,
                    stack,
                    nu_protocol::NU_VARIABLE_ID,
                    nu_protocol::Span::new(current_span.start, current_span.end),
                ) {
                    for suggestion in nested_suggestions(&nuval, &self.var_context.1, current_span)
                    {
                        matcher.add_semantic_suggestion(suggestion);
                    }
                    return matcher.results();
                }
            }
            // Completion other variable types
            if let Some(var_id) = var_id {
                // Extract the variable value from the stack
                let var = stack.get_var(var_id, Span::new(span.start, span.end));
                // If the value exists and it's of type Record
                if let Ok(value) = var {
                    for suggestion in nested_suggestions(&value, &self.var_context.1, current_span)
                    {
                        matcher.add_semantic_suggestion(suggestion);
                    }
                    return matcher.results();
                }
            }
        }
        // Variable completion (e.g: $en<tab> to complete $env)
        let builtins = ["$nu", "$in", "$env"];
        for builtin in builtins {
            matcher.add_semantic_suggestion(SemanticSuggestion {
                suggestion: Suggestion {
                    value: builtin.to_string(),
                    span: current_span,
                    description: Some("reserved".into()),
                    ..Suggestion::default()
                },
-                // TODO is there a way to get the VarId to get the type???
+                kind: Some(SuggestionKind::Variable),
                kind: None,
            });
        }
        let mut add_candidate = |name, var_id: &VarId| {
            matcher.add_semantic_suggestion(SemanticSuggestion {
                suggestion: Suggestion {
                    value: String::from_utf8_lossy(name).to_string(),
                    span: current_span,
                    description: Some(working_set.get_variable(*var_id).ty.to_string()),
                    ..Suggestion::default()
                },
                kind: Some(SuggestionKind::Variable),
            })
        };
        // TODO: The following can be refactored (see find_commands_by_predicate() used in
        // command_completions).
        let mut removed_overlays = vec![];
        // Working set scope vars
        for scope_frame in working_set.delta.scope.iter().rev() {
            for overlay_frame in scope_frame.active_overlays(&mut removed_overlays).rev() {
-                for v in &overlay_frame.vars {
+                for (name, var_id) in &overlay_frame.vars {
-                    matcher.add_semantic_suggestion(SemanticSuggestion {
+                    add_candidate(name, var_id);
                        suggestion: Suggestion {
                            value: String::from_utf8_lossy(v.0).to_string(),
                            span: current_span,
                            ..Suggestion::default()
                        },
                        kind: Some(SuggestionKind::Type(
                            working_set.get_variable(*v.1).ty.clone(),
                        )),
                    });
                }
            }
        }
        // Permanent state vars
        // for scope in &self.engine_state.scope {
        for overlay_frame in working_set
@ -159,98 +69,11 @@ impl Completer for VariableCompletion {
            .active_overlays(&removed_overlays)
            .rev()
        {
-            for v in &overlay_frame.vars {
+            for (name, var_id) in &overlay_frame.vars {
-                matcher.add_semantic_suggestion(SemanticSuggestion {
+                add_candidate(name, var_id);
                    suggestion: Suggestion {
                        value: String::from_utf8_lossy(v.0).to_string(),
                        span: current_span,
                        ..Suggestion::default()
                    },
                    kind: Some(SuggestionKind::Type(
                        working_set.get_variable(*v.1).ty.clone(),
                    )),
                });
            }
        }
        matcher.results()
    }
 }
 // Find recursively the values for sublevels
 // if no sublevels are set it returns the current value
 fn nested_suggestions(
    val: &Value,
    sublevels: &[Vec<u8>],
    current_span: reedline::Span,
 ) -> Vec<SemanticSuggestion> {
    let mut output: Vec<SemanticSuggestion> = vec![];
    let value = recursive_value(val, sublevels).unwrap_or_else(Value::nothing);
    let kind = SuggestionKind::Type(value.get_type());
    match value {
        Value::Record { val, .. } => {
            // Add all the columns as completion
            for col in val.columns() {
                output.push(SemanticSuggestion {
                    suggestion: Suggestion {
                        value: col.clone(),
                        span: current_span,
                        ..Suggestion::default()
                    },
                    kind: Some(kind.clone()),
                });
            }
            output
        }
        Value::List { vals, .. } => {
            for column_name in get_columns(vals.as_slice()) {
                output.push(SemanticSuggestion {
                    suggestion: Suggestion {
                        value: column_name,
                        span: current_span,
                        ..Suggestion::default()
                    },
                    kind: Some(kind.clone()),
                });
            }
            output
        }
        _ => output,
    }
 }
 // Extracts the recursive value (e.g: $var.a.b.c)
 fn recursive_value(val: &Value, sublevels: &[Vec<u8>]) -> Result<Value, Span> {
    // Go to next sublevel
    if let Some((sublevel, next_sublevels)) = sublevels.split_first() {
        let span = val.span();
        match val {
            Value::Record { val, .. } => {
                if let Some((_, value)) = val.iter().find(|(key, _)| key.as_bytes() == sublevel) {
                    // If matches try to fetch recursively the next
                    recursive_value(value, next_sublevels)
                } else {
                    // Current sublevel value not found
                    Err(span)
                }
            }
            Value::List { vals, .. } => {
                for col in get_columns(vals.as_slice()) {
                    if col.as_bytes() == *sublevel {
                        let val = val.get_data_by_key(&col).ok_or(span)?;
                        return recursive_value(&val, next_sublevels);
                    }
                }
                // Current sublevel value not found
                Err(span)
            }
            _ => Ok(val.clone()),
        }
    } else {
        Ok(val.clone())
    }
 }
--- a/crates/nu-cli/src/eval_file.rs
+++ b/crates/nu-cli/src/eval_file.rs
@ -8,7 +8,7 @@ use nu_protocol::{
    debugger::WithoutDebug,
    engine::{EngineState, Stack, StateWorkingSet},
    report_parse_error, report_parse_warning,
-    shell_error::io::IoError,
+    shell_error::io::*,
    PipelineData, ShellError, Span, Value,
 };
 use std::{path::PathBuf, sync::Arc};
@ -27,11 +27,11 @@ pub fn evaluate_file(
    let cwd = engine_state.cwd_as_string(Some(stack))?;
    let file_path = canonicalize_with(&path, cwd).map_err(|err| {
-        IoError::new_with_additional_context(
+        IoError::new_internal_with_path(
-            err.kind(),
+            err.kind().not_found_as(NotFound::File),
            Span::unknown(),
            PathBuf::from(&path),
            "Could not access file",
            nu_protocol::location!(),
            PathBuf::from(&path),
        )
    })?;
@ -46,21 +46,21 @@ pub fn evaluate_file(
        })?;
    let file = std::fs::read(&file_path).map_err(|err| {
-        IoError::new_with_additional_context(
+        IoError::new_internal_with_path(
-            err.kind(),
+            err.kind().not_found_as(NotFound::File),
            Span::unknown(),
            file_path.clone(),
            "Could not read file",
            nu_protocol::location!(),
            file_path.clone(),
        )
    })?;
    engine_state.file = Some(file_path.clone());
    let parent = file_path.parent().ok_or_else(|| {
-        IoError::new_with_additional_context(
+        IoError::new_internal_with_path(
-            std::io::ErrorKind::NotFound,
+            ErrorKind::DirectoryNotFound,
            Span::unknown(),
            file_path.clone(),
            "The file path does not have a parent",
            nu_protocol::location!(),
            file_path.clone(),
        )
    })?;
--- a/crates/nu-cli/src/reedline_config.rs
+++ b/crates/nu-cli/src/reedline_config.rs
@ -740,9 +740,15 @@ fn add_keybinding(
    let span = mode.span();
    match &mode {
        Value::String { val, .. } => match val.as_str() {
-            "emacs" => add_parsed_keybinding(emacs_keybindings, keybinding, config),
+            str if str.eq_ignore_ascii_case("emacs") => {
-            "vi_insert" => add_parsed_keybinding(insert_keybindings, keybinding, config),
+                add_parsed_keybinding(emacs_keybindings, keybinding, config)
-            "vi_normal" => add_parsed_keybinding(normal_keybindings, keybinding, config),
+            }
            str if str.eq_ignore_ascii_case("vi_insert") => {
                add_parsed_keybinding(insert_keybindings, keybinding, config)
            }
            str if str.eq_ignore_ascii_case("vi_normal") => {
                add_parsed_keybinding(normal_keybindings, keybinding, config)
            }
            str => Err(ShellError::InvalidValue {
                valid: "'emacs', 'vi_insert', or 'vi_normal'".into(),
                actual: format!("'{str}'"),
@ -992,41 +998,54 @@ fn event_from_record(
 ) -> Result<ReedlineEvent, ShellError> {
    let event = match name {
        "none" => ReedlineEvent::None,
        "clearscreen" => ReedlineEvent::ClearScreen,
        "clearscrollback" => ReedlineEvent::ClearScrollback,
        "historyhintcomplete" => ReedlineEvent::HistoryHintComplete,
        "historyhintwordcomplete" => ReedlineEvent::HistoryHintWordComplete,
        "ctrld" => ReedlineEvent::CtrlD,
        "ctrlc" => ReedlineEvent::CtrlC,
        "clearscreen" => ReedlineEvent::ClearScreen,
        "clearscrollback" => ReedlineEvent::ClearScrollback,
        "enter" => ReedlineEvent::Enter,
        "submit" => ReedlineEvent::Submit,
        "submitornewline" => ReedlineEvent::SubmitOrNewline,
        "esc" | "escape" => ReedlineEvent::Esc,
        // Non-sensical for user configuration:
        //
        // `ReedlineEvent::Mouse` - itself a no-op
        // `ReedlineEvent::Resize` - requires size info specifically from the ANSI resize
        // event
        //
        // Handled above in `parse_event`:
        //
        // `ReedlineEvent::Edit`
        "repaint" => ReedlineEvent::Repaint,
        "previoushistory" => ReedlineEvent::PreviousHistory,
        "up" => ReedlineEvent::Up,
        "down" => ReedlineEvent::Down,
        "right" => ReedlineEvent::Right,
        "left" => ReedlineEvent::Left,
        "searchhistory" => ReedlineEvent::SearchHistory,
        "nexthistory" => ReedlineEvent::NextHistory,
-        "previoushistory" => ReedlineEvent::PreviousHistory,
+        "searchhistory" => ReedlineEvent::SearchHistory,
-        "repaint" => ReedlineEvent::Repaint,
+        // Handled above in `parse_event`:
-        "menudown" => ReedlineEvent::MenuDown,
+        //
-        "menuup" => ReedlineEvent::MenuUp,
+        // `ReedlineEvent::Multiple`
-        "menuleft" => ReedlineEvent::MenuLeft,
+        // `ReedlineEvent::UntilFound`
        "menuright" => ReedlineEvent::MenuRight,
        "menunext" => ReedlineEvent::MenuNext,
        "menuprevious" => ReedlineEvent::MenuPrevious,
        "menupagenext" => ReedlineEvent::MenuPageNext,
        "menupageprevious" => ReedlineEvent::MenuPagePrevious,
        "openeditor" => ReedlineEvent::OpenEditor,
        "menu" => {
            let menu = extract_value("name", record, span)?;
            ReedlineEvent::Menu(menu.to_expanded_string("", config))
        }
        "menunext" => ReedlineEvent::MenuNext,
        "menuprevious" => ReedlineEvent::MenuPrevious,
        "menuup" => ReedlineEvent::MenuUp,
        "menudown" => ReedlineEvent::MenuDown,
        "menuleft" => ReedlineEvent::MenuLeft,
        "menuright" => ReedlineEvent::MenuRight,
        "menupagenext" => ReedlineEvent::MenuPageNext,
        "menupageprevious" => ReedlineEvent::MenuPagePrevious,
        "executehostcommand" => {
            let cmd = extract_value("cmd", record, span)?;
            ReedlineEvent::ExecuteHostCommand(cmd.to_expanded_string("", config))
        }
        "openeditor" => ReedlineEvent::OpenEditor,
        str => {
            return Err(ShellError::InvalidValue {
                valid: "a reedline event".into(),
@ -1056,7 +1075,6 @@ fn edit_from_record(
                .and_then(|value| value.as_bool())
                .unwrap_or(false),
        },
        "movetoend" => EditCommand::MoveToEnd {
            select: extract_value("select", record, span)
                .and_then(|value| value.as_bool())
@ -1092,16 +1110,6 @@ fn edit_from_record(
                .and_then(|value| value.as_bool())
                .unwrap_or(false),
        },
        "movewordrightend" => EditCommand::MoveWordRightEnd {
            select: extract_value("select", record, span)
                .and_then(|value| value.as_bool())
                .unwrap_or(false),
        },
        "movebigwordrightend" => EditCommand::MoveBigWordRightEnd {
            select: extract_value("select", record, span)
                .and_then(|value| value.as_bool())
                .unwrap_or(false),
        },
        "movewordrightstart" => EditCommand::MoveWordRightStart {
            select: extract_value("select", record, span)
                .and_then(|value| value.as_bool())
@ -1112,6 +1120,16 @@ fn edit_from_record(
                .and_then(|value| value.as_bool())
                .unwrap_or(false),
        },
        "movewordrightend" => EditCommand::MoveWordRightEnd {
            select: extract_value("select", record, span)
                .and_then(|value| value.as_bool())
                .unwrap_or(false),
        },
        "movebigwordrightend" => EditCommand::MoveBigWordRightEnd {
            select: extract_value("select", record, span)
                .and_then(|value| value.as_bool())
                .unwrap_or(false),
        },
        "movetoposition" => {
            let value = extract_value("value", record, span)?;
            let select = extract_value("select", record, span)
@ -1133,6 +1151,13 @@ fn edit_from_record(
            EditCommand::InsertString(value.to_expanded_string("", config))
        }
        "insertnewline" => EditCommand::InsertNewline,
        "replacechar" => {
            let value = extract_value("value", record, span)?;
            let char = extract_char(value)?;
            EditCommand::ReplaceChar(char)
        }
        // `EditCommand::ReplaceChars` - Internal hack not sanely implementable as a
        // standalone binding
        "backspace" => EditCommand::Backspace,
        "delete" => EditCommand::Delete,
        "cutchar" => EditCommand::CutChar,
@ -1140,6 +1165,7 @@ fn edit_from_record(
        "deleteword" => EditCommand::DeleteWord,
        "clear" => EditCommand::Clear,
        "cleartolineend" => EditCommand::ClearToLineEnd,
        "complete" => EditCommand::Complete,
        "cutcurrentline" => EditCommand::CutCurrentLine,
        "cutfromstart" => EditCommand::CutFromStart,
        "cutfromlinestart" => EditCommand::CutFromLineStart,
@ -1156,6 +1182,7 @@ fn edit_from_record(
        "uppercaseword" => EditCommand::UppercaseWord,
        "lowercaseword" => EditCommand::LowercaseWord,
        "capitalizechar" => EditCommand::CapitalizeChar,
        "switchcasechar" => EditCommand::SwitchcaseChar,
        "swapwords" => EditCommand::SwapWords,
        "swapgraphemes" => EditCommand::SwapGraphemes,
        "undo" => EditCommand::Undo,
@ -1212,17 +1239,64 @@ fn edit_from_record(
                .unwrap_or(false);
            EditCommand::MoveLeftBefore { c: char, select }
        }
-        "complete" => EditCommand::Complete,
+        "selectall" => EditCommand::SelectAll,
        "cutselection" => EditCommand::CutSelection,
        "copyselection" => EditCommand::CopySelection,
        "paste" => EditCommand::Paste,
        "copyfromstart" => EditCommand::CopyFromStart,
        "copyfromlinestart" => EditCommand::CopyFromLineStart,
        "copytoend" => EditCommand::CopyToEnd,
        "copytolineend" => EditCommand::CopyToLineEnd,
        "copycurrentline" => EditCommand::CopyCurrentLine,
        "copywordleft" => EditCommand::CopyWordLeft,
        "copybigwordleft" => EditCommand::CopyBigWordLeft,
        "copywordright" => EditCommand::CopyWordRight,
        "copybigwordright" => EditCommand::CopyBigWordRight,
        "copywordrighttonext" => EditCommand::CopyWordRightToNext,
        "copybigwordrighttonext" => EditCommand::CopyBigWordRightToNext,
        "copyleft" => EditCommand::CopyLeft,
        "copyright" => EditCommand::CopyRight,
        "copyrightuntil" => {
            let value = extract_value("value", record, span)?;
            let char = extract_char(value)?;
            EditCommand::CopyRightUntil(char)
        }
        "copyrightbefore" => {
            let value = extract_value("value", record, span)?;
            let char = extract_char(value)?;
            EditCommand::CopyRightBefore(char)
        }
        "copyleftuntil" => {
            let value = extract_value("value", record, span)?;
            let char = extract_char(value)?;
            EditCommand::CopyLeftUntil(char)
        }
        "copyleftbefore" => {
            let value = extract_value("value", record, span)?;
            let char = extract_char(value)?;
            EditCommand::CopyLeftBefore(char)
        }
        "swapcursorandanchor" => EditCommand::SwapCursorAndAnchor,
        #[cfg(feature = "system-clipboard")]
        "cutselectionsystem" => EditCommand::CutSelectionSystem,
        "copyselection" => EditCommand::CopySelection,
        #[cfg(feature = "system-clipboard")]
        "copyselectionsystem" => EditCommand::CopySelectionSystem,
        "paste" => EditCommand::Paste,
        #[cfg(feature = "system-clipboard")]
        "pastesystem" => EditCommand::PasteSystem,
-        "selectall" => EditCommand::SelectAll,
+        "cutinside" => {
            let value = extract_value("left", record, span)?;
            let left = extract_char(value)?;
            let value = extract_value("right", record, span)?;
            let right = extract_char(value)?;
            EditCommand::CutInside { left, right }
        }
        "yankinside" => {
            let value = extract_value("left", record, span)?;
            let left = extract_char(value)?;
            let value = extract_value("right", record, span)?;
            let right = extract_char(value)?;
            EditCommand::YankInside { left, right }
        }
        str => {
            return Err(ShellError::InvalidValue {
                valid: "a reedline EditCommand".into(),
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@ -20,6 +20,7 @@ use nu_cmd_base::util::get_editor;
 use nu_color_config::StyleComputer;
 #[allow(deprecated)]
 use nu_engine::env_to_strings;
 use nu_engine::exit::cleanup_exit;
 use nu_parser::{lex, parse, trim_quotes_str};
 use nu_protocol::shell_error::io::IoError;
 use nu_protocol::{
@ -36,6 +37,7 @@ use reedline::{
    CursorConfig, CwdAwareHinter, DefaultCompleter, EditCommand, Emacs, FileBackedHistory,
    HistorySessionId, Reedline, SqliteBackedHistory, Vi,
 };
 use std::sync::atomic::Ordering;
 use std::{
    collections::HashMap,
    env::temp_dir,
@ -692,7 +694,11 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
            );
            println!();
-            return (false, stack, line_editor);
+
            cleanup_exit((), engine_state, 0);
            // if cleanup_exit didn't exit, we should keep running
            return (true, stack, line_editor);
        }
        Err(err) => {
            let message = err.to_string();
@ -930,6 +936,9 @@ fn do_run_cmd(
    trace!("eval source: {}", s);
    let mut cmds = s.split_whitespace();
    let had_warning_before = engine_state.exit_warning_given.load(Ordering::SeqCst);
    if let Some("exit") = cmds.next() {
        let mut working_set = StateWorkingSet::new(engine_state);
        let _ = parse(&mut working_set, None, s.as_bytes(), false);
@ -938,13 +947,11 @@ fn do_run_cmd(
            match cmds.next() {
                Some(s) => {
                    if let Ok(n) = s.parse::<i32>() {
-                        drop(line_editor);
+                        return cleanup_exit(line_editor, engine_state, n);
                        std::process::exit(n);
                    }
                }
                None => {
-                    drop(line_editor);
+                    return cleanup_exit(line_editor, engine_state, 0);
                    std::process::exit(0);
                }
            }
        }
@ -963,6 +970,14 @@ fn do_run_cmd(
        false,
    );
    // if there was a warning before, and we got to this point, it means
    // the possible call to cleanup_exit did not occur.
    if had_warning_before && engine_state.is_interactive {
        engine_state
            .exit_warning_given
            .store(false, Ordering::SeqCst);
    }
    line_editor
 }
--- a/crates/nu-cli/src/syntax_highlight.rs
+++ b/crates/nu-cli/src/syntax_highlight.rs
@ -309,6 +309,7 @@ fn find_matching_block_end_in_expr(
            .unwrap_or(expression.span.start);
        return match &expression.expr {
            // TODO: Can't these be handled with an `_ => None` branch? Refactor
            Expr::Bool(_) => None,
            Expr::Int(_) => None,
            Expr::Float(_) => None,
@ -335,6 +336,28 @@ fn find_matching_block_end_in_expr(
            Expr::Nothing => None,
            Expr::Garbage => None,
            Expr::AttributeBlock(ab) => ab
                .attributes
                .iter()
                .find_map(|attr| {
                    find_matching_block_end_in_expr(
                        line,
                        working_set,
                        &attr.expr,
                        global_span_offset,
                        global_cursor_offset,
                    )
                })
                .or_else(|| {
                    find_matching_block_end_in_expr(
                        line,
                        working_set,
                        &ab.item,
                        global_span_offset,
                        global_cursor_offset,
                    )
                }),
            Expr::Table(table) => {
                if expr_last == global_cursor_offset {
                    // cursor is at table end
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
--- a/crates/nu-cli/tests/completions/support/completions_helpers.rs
+++ b/crates/nu-cli/tests/completions/support/completions_helpers.rs
@ -14,7 +14,7 @@ fn create_default_context() -> EngineState {
    nu_command::add_shell_command_context(nu_cmd_lang::create_default_context())
 }
-// creates a new engine with the current path into the completions fixtures folder
+/// creates a new engine with the current path into the completions fixtures folder
 pub fn new_engine() -> (AbsolutePathBuf, String, EngineState, Stack) {
    // Target folder inside assets
    let dir = fs::fixtures().join("completions");
@ -69,7 +69,26 @@ pub fn new_engine() -> (AbsolutePathBuf, String, EngineState, Stack) {
    (dir, dir_str, engine_state, stack)
 }
-// creates a new engine with the current path into the completions fixtures folder
+/// Adds pseudo PATH env for external completion tests
 pub fn new_external_engine() -> EngineState {
    let mut engine = create_default_context();
    let dir = fs::fixtures().join("external_completions").join("path");
    let dir_str = dir.to_string_lossy().to_string();
    let internal_span = nu_protocol::Span::new(0, dir_str.len());
    engine.add_env_var(
        "PATH".to_string(),
        Value::List {
            vals: vec![Value::String {
                val: dir_str,
                internal_span,
            }],
            internal_span,
        },
    );
    engine
 }
 /// creates a new engine with the current path into the completions fixtures folder
 pub fn new_dotnu_engine() -> (AbsolutePathBuf, String, EngineState, Stack) {
    // Target folder inside assets
    let dir = fs::fixtures().join("dotnu_completions");
@ -86,6 +105,23 @@ pub fn new_dotnu_engine() -> (AbsolutePathBuf, String, EngineState, Stack) {
    // Add $nu
    engine_state.generate_nu_constant();
    // const $NU_LIB_DIRS
    let mut working_set = StateWorkingSet::new(&engine_state);
    let var_id = working_set.add_variable(
        b"$NU_LIB_DIRS".into(),
        Span::unknown(),
        nu_protocol::Type::List(Box::new(nu_protocol::Type::String)),
        false,
    );
    working_set.set_variable_const_val(
        var_id,
        Value::test_list(vec![
            Value::string(file(dir.join("lib-dir1")), dir_span),
            Value::string(file(dir.join("lib-dir3")), dir_span),
        ]),
    );
    let _ = engine_state.merge_delta(working_set.render());
    // New stack
    let mut stack = Stack::new();
@ -95,17 +131,12 @@ pub fn new_dotnu_engine() -> (AbsolutePathBuf, String, EngineState, Stack) {
        "TEST".to_string(),
        Value::string("NUSHELL".to_string(), dir_span),
    );
    stack.add_env_var(
-        "NU_LIB_DIRS".to_string(),
+        "NU_LIB_DIRS".into(),
-        Value::list(
+        Value::test_list(vec![
-            vec![
+            Value::string(file(dir.join("lib-dir2")), dir_span),
-                Value::string(file(dir.join("lib-dir1")), dir_span),
+            Value::string(file(dir.join("lib-dir3")), dir_span),
-                Value::string(file(dir.join("lib-dir2")), dir_span),
+        ]),
                Value::string(file(dir.join("lib-dir3")), dir_span),
            ],
            dir_span,
        ),
    );
    // Merge environment into the permanent state
@ -185,8 +216,8 @@ pub fn new_partial_engine() -> (AbsolutePathBuf, String, EngineState, Stack) {
    (dir, dir_str, engine_state, stack)
 }
-// match a list of suggestions with the expected values
+/// match a list of suggestions with the expected values
-pub fn match_suggestions(expected: &Vec<String>, suggestions: &Vec<Suggestion>) {
+pub fn match_suggestions(expected: &Vec<&str>, suggestions: &Vec<Suggestion>) {
    let expected_len = expected.len();
    let suggestions_len = suggestions.len();
    if expected_len != suggestions_len {
@ -197,28 +228,34 @@ pub fn match_suggestions(expected: &Vec<String>, suggestions: &Vec<Suggestion>)
        )
    }
-    let suggestoins_str = suggestions
+    let suggestions_str = suggestions
        .iter()
-        .map(|it| it.value.clone())
+        .map(|it| it.value.as_str())
        .collect::<Vec<_>>();
-    assert_eq!(expected, &suggestoins_str);
+    assert_eq!(expected, &suggestions_str);
 }
-// append the separator to the converted path
+/// match a list of suggestions with the expected values
 pub fn match_suggestions_by_string(expected: &[String], suggestions: &Vec<Suggestion>) {
    let expected = expected.iter().map(|it| it.as_str()).collect::<Vec<_>>();
    match_suggestions(&expected, suggestions);
 }
 /// append the separator to the converted path
 pub fn folder(path: impl Into<PathBuf>) -> String {
    let mut converted_path = file(path);
    converted_path.push(MAIN_SEPARATOR);
    converted_path
 }
-// convert a given path to string
+/// convert a given path to string
 pub fn file(path: impl Into<PathBuf>) -> String {
    path.into().into_os_string().into_string().unwrap()
 }
-// merge_input executes the given input into the engine
+/// merge_input executes the given input into the engine
-// and merges the state
+/// and merges the state
 pub fn merge_input(
    input: &[u8],
    engine_state: &mut EngineState,
--- a/crates/nu-cli/tests/completions/support/mod.rs
+++ b/crates/nu-cli/tests/completions/support/mod.rs
@ -1,3 +1,5 @@
 pub mod completions_helpers;
-pub use completions_helpers::{file, folder, match_suggestions, merge_input, new_engine};
+pub use completions_helpers::{
    file, folder, match_suggestions, match_suggestions_by_string, merge_input, new_engine,
 };
--- a/crates/nu-cmd-base/Cargo.toml
+++ b/crates/nu-cmd-base/Cargo.toml
@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-base"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-base"
-version = "0.102.0"
+version = "0.103.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@ -13,10 +13,10 @@ version = "0.102.0"
 workspace = true
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.102.0", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.103.0", default-features = false }
-nu-parser = { path = "../nu-parser", version = "0.102.0" }
+nu-parser = { path = "../nu-parser", version = "0.103.0" }
-nu-path = { path = "../nu-path", version = "0.102.0" }
+nu-path = { path = "../nu-path", version = "0.103.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.102.0", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.103.0", default-features = false }
 indexmap = { workspace = true }
 miette = { workspace = true }
--- a/crates/nu-cmd-extra/Cargo.toml
+++ b/crates/nu-cmd-extra/Cargo.toml
@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-extra"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-extra"
-version = "0.102.0"
+version = "0.103.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@ -16,13 +16,13 @@ bench = false
 workspace = true
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.102.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.103.0" }
-nu-engine = { path = "../nu-engine", version = "0.102.0", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.103.0", default-features = false }
-nu-json = { version = "0.102.0", path = "../nu-json" }
+nu-json = { version = "0.103.0", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.102.0" }
+nu-parser = { path = "../nu-parser", version = "0.103.0" }
-nu-pretty-hex = { version = "0.102.0", path = "../nu-pretty-hex" }
+nu-pretty-hex = { version = "0.103.0", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.102.0", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.103.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.102.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.103.0", default-features = false }
 # Potential dependencies for extras
 heck = { workspace = true }
@ -37,6 +37,6 @@ itertools = { workspace = true }
 mime = { workspace = true }
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.102.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.103.0" }
-nu-command = { path = "../nu-command", version = "0.102.0" }
+nu-command = { path = "../nu-command", version = "0.103.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.102.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.103.0" }
--- a/crates/nu-cmd-extra/src/extra/bits/and.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/and.rs
@ -26,7 +26,7 @@ impl Command for BitsAnd {
            .required(
                "target",
                SyntaxShape::OneOf(vec![SyntaxShape::Binary, SyntaxShape::Int]),
-                "right-hand side of the operation",
+                "Right-hand side of the operation.",
            )
            .named(
                "endian",
--- a/crates/nu-cmd-extra/src/extra/bits/into.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/into.rs
@ -1,120 +0,0 @@
 use nu_engine::command_prelude::*;
 use nu_protocol::{report_parse_warning, ParseWarning};
 #[derive(Clone)]
 pub struct BitsInto;
 impl Command for BitsInto {
    fn name(&self) -> &str {
        "into bits"
    }
    fn signature(&self) -> Signature {
        Signature::build("into bits")
            .input_output_types(vec![
                (Type::Binary, Type::String),
                (Type::Int, Type::String),
                (Type::Filesize, Type::String),
                (Type::Duration, Type::String),
                (Type::String, Type::String),
                (Type::Bool, Type::String),
                (Type::table(), Type::table()),
                (Type::record(), Type::record()),
            ])
            .allow_variants_without_examples(true) // TODO: supply exhaustive examples
            .rest(
                "rest",
                SyntaxShape::CellPath,
                "for a data structure input, convert data at the given cell paths",
            )
            .category(Category::Deprecated)
    }
    fn description(&self) -> &str {
        "Convert value to a binary string."
    }
    fn search_terms(&self) -> Vec<&str> {
        vec![]
    }
    fn run(
        &self,
        engine_state: &EngineState,
        stack: &mut Stack,
        call: &Call,
        input: PipelineData,
    ) -> Result<PipelineData, ShellError> {
        let head = call.head;
        report_parse_warning(
            &StateWorkingSet::new(engine_state),
            &ParseWarning::DeprecatedWarning {
                old_command: "into bits".into(),
                new_suggestion: "use `format bits`".into(),
                span: head,
                url: "`help format bits`".into(),
            },
        );
        crate::extra::strings::format::format_bits(engine_state, stack, call, input)
    }
    fn examples(&self) -> Vec<Example> {
        vec![
            Example {
                description: "convert a binary value into a string, padded to 8 places with 0s",
                example: "0x[1] | into bits",
                result: Some(Value::string("00000001",
                    Span::test_data(),
                )),
            },
            Example {
                description: "convert an int into a string, padded to 8 places with 0s",
                example: "1 | into bits",
                result: Some(Value::string("00000001",
                    Span::test_data(),
                )),
            },
            Example {
                description: "convert a filesize value into a string, padded to 8 places with 0s",
                example: "1b | into bits",
                result: Some(Value::string("00000001",
                    Span::test_data(),
                )),
            },
            Example {
                description: "convert a duration value into a string, padded to 8 places with 0s",
                example: "1ns | into bits",
                result: Some(Value::string("00000001",
                    Span::test_data(),
                )),
            },
            Example {
                description: "convert a boolean value into a string, padded to 8 places with 0s",
                example: "true | into bits",
                result: Some(Value::string("00000001",
                    Span::test_data(),
                )),
            },
            Example {
                description: "convert a string into a raw binary string, padded with 0s to 8 places",
                example: "'nushell.sh' | into bits",
                result: Some(Value::string("01101110 01110101 01110011 01101000 01100101 01101100 01101100 00101110 01110011 01101000",
                    Span::test_data(),
                )),
            },
        ]
    }
 }
 #[cfg(test)]
 mod test {
    use super::*;
    #[test]
    fn test_examples() {
        use crate::test_examples;
        test_examples(BitsInto {})
    }
 }
--- a/crates/nu-cmd-extra/src/extra/bits/mod.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/mod.rs
@ -1,6 +1,5 @@
 mod and;
 mod bits_;
 mod into;
 mod not;
 mod or;
 mod rotate_left;
@ -11,7 +10,6 @@ mod xor;
 pub use and::BitsAnd;
 pub use bits_::Bits;
 pub use into::BitsInto;
 pub use not::BitsNot;
 pub use or::BitsOr;
 pub use rotate_left::BitsRol;
--- a/crates/nu-cmd-extra/src/extra/bits/or.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/or.rs
@ -27,7 +27,7 @@ impl Command for BitsOr {
            .required(
                "target",
                SyntaxShape::OneOf(vec![SyntaxShape::Binary, SyntaxShape::Int]),
-                "right-hand side of the operation",
+                "Right-hand side of the operation.",
            )
            .named(
                "endian",
--- a/crates/nu-cmd-extra/src/extra/bits/rotate_left.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/rotate_left.rs
@ -37,7 +37,7 @@ impl Command for BitsRol {
                ),
            ])
            .allow_variants_without_examples(true)
-            .required("bits", SyntaxShape::Int, "number of bits to rotate left")
+            .required("bits", SyntaxShape::Int, "Number of bits to rotate left.")
            .switch(
                "signed",
                "always treat input number as a signed number",
--- a/crates/nu-cmd-extra/src/extra/bits/rotate_right.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/rotate_right.rs
@ -37,7 +37,7 @@ impl Command for BitsRor {
                ),
            ])
            .allow_variants_without_examples(true)
-            .required("bits", SyntaxShape::Int, "number of bits to rotate right")
+            .required("bits", SyntaxShape::Int, "Number of bits to rotate right.")
            .switch(
                "signed",
                "always treat input number as a signed number",
--- a/crates/nu-cmd-extra/src/extra/bits/shift_left.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/shift_left.rs
@ -40,7 +40,7 @@ impl Command for BitsShl {
                ),
            ])
            .allow_variants_without_examples(true)
-            .required("bits", SyntaxShape::Int, "number of bits to shift left")
+            .required("bits", SyntaxShape::Int, "Number of bits to shift left.")
            .switch(
                "signed",
                "always treat input number as a signed number",
--- a/crates/nu-cmd-extra/src/extra/bits/shift_right.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/shift_right.rs
@ -37,7 +37,7 @@ impl Command for BitsShr {
                ),
            ])
            .allow_variants_without_examples(true)
-            .required("bits", SyntaxShape::Int, "number of bits to shift right")
+            .required("bits", SyntaxShape::Int, "Number of bits to shift right.")
            .switch(
                "signed",
                "always treat input number as a signed number",
--- a/crates/nu-cmd-extra/src/extra/bits/xor.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/xor.rs
@ -27,7 +27,7 @@ impl Command for BitsXor {
            .required(
                "target",
                SyntaxShape::OneOf(vec![SyntaxShape::Binary, SyntaxShape::Int]),
-                "right-hand side of the operation",
+                "Right-hand side of the operation.",
            )
            .named(
                "endian",
--- a/crates/nu-cmd-extra/src/extra/conversions/fmt.rs
+++ b/crates/nu-cmd-extra/src/extra/conversions/fmt.rs
@ -1,74 +0,0 @@
 use nu_engine::command_prelude::*;
 use nu_protocol::{report_parse_warning, ParseWarning};
 #[derive(Clone)]
 pub struct Fmt;
 impl Command for Fmt {
    fn name(&self) -> &str {
        "fmt"
    }
    fn description(&self) -> &str {
        "Format a number."
    }
    fn signature(&self) -> nu_protocol::Signature {
        Signature::build("fmt")
            .input_output_types(vec![(Type::Number, Type::record())])
            .category(Category::Deprecated)
    }
    fn search_terms(&self) -> Vec<&str> {
        vec![]
    }
    fn examples(&self) -> Vec<Example> {
        vec![Example {
            description: "Get a record containing multiple formats for the number 42",
            example: "42 | fmt",
            result: Some(Value::test_record(record! {
                    "binary" =>   Value::test_string("0b101010"),
                    "debug" =>    Value::test_string("42"),
                    "display" =>  Value::test_string("42"),
                    "lowerexp" => Value::test_string("4.2e1"),
                    "lowerhex" => Value::test_string("0x2a"),
                    "octal" =>    Value::test_string("0o52"),
                    "upperexp" => Value::test_string("4.2E1"),
                    "upperhex" => Value::test_string("0x2A"),
            })),
        }]
    }
    fn run(
        &self,
        engine_state: &EngineState,
        stack: &mut Stack,
        call: &Call,
        input: PipelineData,
    ) -> Result<PipelineData, ShellError> {
        let head = call.head;
        report_parse_warning(
            &StateWorkingSet::new(engine_state),
            &ParseWarning::DeprecatedWarning {
                old_command: "fmt".into(),
                new_suggestion: "use `format number`".into(),
                span: head,
                url: "`help format number`".into(),
            },
        );
        crate::extra::strings::format::format_number(engine_state, stack, call, input)
    }
 }
 #[cfg(test)]
 mod test {
    use super::*;
    #[test]
    fn test_examples() {
        use crate::test_examples;
        test_examples(Fmt {})
    }
 }
--- a/crates/nu-cmd-extra/src/extra/conversions/mod.rs
+++ b/crates/nu-cmd-extra/src/extra/conversions/mod.rs
@ -1,3 +0,0 @@
 mod fmt;
 pub(crate) use fmt::Fmt;
--- a/crates/nu-cmd-extra/src/extra/filters/each_while.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/each_while.rs
@ -26,7 +26,7 @@ impl Command for EachWhile {
            .required(
                "closure",
                SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
-                "the closure to run",
+                "The closure to run.",
            )
            .category(Category::Filters)
    }
--- a/crates/nu-cmd-extra/src/extra/filters/rotate.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/rotate.rs
@ -20,7 +20,7 @@ impl Command for Rotate {
            .rest(
                "rest",
                SyntaxShape::String,
-                "the names to give columns once rotated",
+                "The names to give columns once rotated.",
            )
            .category(Category::Filters)
            .allow_variants_without_examples(true)
--- a/crates/nu-cmd-extra/src/extra/filters/update_cells.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/update_cells.rs
@ -16,7 +16,7 @@ impl Command for UpdateCells {
            .required(
                "closure",
                SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
-                "the closure to run an update for each cell",
+                "The closure to run an update for each cell.",
            )
            .named(
                "columns",
--- a/crates/nu-cmd-extra/src/extra/math/arccos.rs
+++ b/crates/nu-cmd-extra/src/extra/math/arccos.rs
@ -1,9 +1,9 @@
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
-pub struct SubCommand;
+pub struct MathArcCos;
-impl Command for SubCommand {
+impl Command for MathArcCos {
    fn name(&self) -> &str {
        "math arccos"
    }
@ -114,6 +114,6 @@ mod test {
    fn test_examples() {
        use crate::test_examples;
-        test_examples(SubCommand {})
+        test_examples(MathArcCos {})
    }
 }
--- a/crates/nu-cmd-extra/src/extra/math/arccosh.rs
+++ b/crates/nu-cmd-extra/src/extra/math/arccosh.rs
@ -1,9 +1,9 @@
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
-pub struct SubCommand;
+pub struct MathArcCosH;
-impl Command for SubCommand {
+impl Command for MathArcCosH {
    fn name(&self) -> &str {
        "math arccosh"
    }
@ -100,6 +100,6 @@ mod test {
    fn test_examples() {
        use crate::test_examples;
-        test_examples(SubCommand {})
+        test_examples(MathArcCosH {})
    }
 }
--- a/crates/nu-cmd-extra/src/extra/math/arcsin.rs
+++ b/crates/nu-cmd-extra/src/extra/math/arcsin.rs
@ -1,9 +1,9 @@
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
-pub struct SubCommand;
+pub struct MathArcSin;
-impl Command for SubCommand {
+impl Command for MathArcSin {
    fn name(&self) -> &str {
        "math arcsin"
    }
@ -115,6 +115,6 @@ mod test {
    fn test_examples() {
        use crate::test_examples;
-        test_examples(SubCommand {})
+        test_examples(MathArcSin {})
    }
 }
--- a/crates/nu-cmd-extra/src/extra/math/arcsinh.rs
+++ b/crates/nu-cmd-extra/src/extra/math/arcsinh.rs
@ -1,9 +1,9 @@
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
-pub struct SubCommand;
+pub struct MathArcSinH;
-impl Command for SubCommand {
+impl Command for MathArcSinH {
    fn name(&self) -> &str {
        "math arcsinh"
    }
@ -88,6 +88,6 @@ mod test {
    fn test_examples() {
        use crate::test_examples;
-        test_examples(SubCommand {})
+        test_examples(MathArcSinH {})
    }
 }
--- a/crates/nu-cmd-extra/src/extra/math/arctan.rs
+++ b/crates/nu-cmd-extra/src/extra/math/arctan.rs
@ -1,9 +1,9 @@
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
-pub struct SubCommand;
+pub struct MathArcTan;
-impl Command for SubCommand {
+impl Command for MathArcTan {
    fn name(&self) -> &str {
        "math arctan"
    }
@ -102,6 +102,6 @@ mod test {
    fn test_examples() {
        use crate::test_examples;
-        test_examples(SubCommand {})
+        test_examples(MathArcTan {})
    }
 }
--- a/crates/nu-cmd-extra/src/extra/math/arctanh.rs
+++ b/crates/nu-cmd-extra/src/extra/math/arctanh.rs
@ -1,9 +1,9 @@
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
-pub struct SubCommand;
+pub struct MathArcTanH;
-impl Command for SubCommand {
+impl Command for MathArcTanH {
    fn name(&self) -> &str {
        "math arctanh"
    }
@ -101,6 +101,6 @@ mod test {
    fn test_examples() {
        use crate::test_examples;
-        test_examples(SubCommand {})
+        test_examples(MathArcTanH {})
    }
 }
--- a/crates/nu-cmd-extra/src/extra/math/cos.rs
+++ b/crates/nu-cmd-extra/src/extra/math/cos.rs
@ -1,9 +1,9 @@
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
-pub struct SubCommand;
+pub struct MathCos;
-impl Command for SubCommand {
+impl Command for MathCos {
    fn name(&self) -> &str {
        "math cos"
    }
@ -108,6 +108,6 @@ mod test {
    fn test_examples() {
        use crate::test_examples;
-        test_examples(SubCommand {})
+        test_examples(MathCos {})
    }
 }
--- a/crates/nu-cmd-extra/src/extra/math/cosh.rs
+++ b/crates/nu-cmd-extra/src/extra/math/cosh.rs
@ -1,9 +1,9 @@
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
-pub struct SubCommand;
+pub struct MathCosH;
-impl Command for SubCommand {
+impl Command for MathCosH {
    fn name(&self) -> &str {
        "math cosh"
    }
@ -88,6 +88,6 @@ mod test {
    fn test_examples() {
        use crate::test_examples;
-        test_examples(SubCommand {})
+        test_examples(MathCosH {})
    }
 }
--- a/crates/nu-cmd-extra/src/extra/math/exp.rs
+++ b/crates/nu-cmd-extra/src/extra/math/exp.rs
@ -1,9 +1,9 @@
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
-pub struct SubCommand;
+pub struct MathExp;
-impl Command for SubCommand {
+impl Command for MathExp {
    fn name(&self) -> &str {
        "math exp"
    }
@ -93,6 +93,6 @@ mod test {
    fn test_examples() {
        use crate::test_examples;
-        test_examples(SubCommand {})
+        test_examples(MathExp {})
    }
 }
--- a/crates/nu-cmd-extra/src/extra/math/ln.rs
+++ b/crates/nu-cmd-extra/src/extra/math/ln.rs
@ -1,9 +1,9 @@
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
-pub struct SubCommand;
+pub struct MathLn;
-impl Command for SubCommand {
+impl Command for MathLn {
    fn name(&self) -> &str {
        "math ln"
    }
@ -100,6 +100,6 @@ mod test {
    fn test_examples() {
        use crate::test_examples;
-        test_examples(SubCommand {})
+        test_examples(MathLn {})
    }
 }
--- a/crates/nu-cmd-extra/src/extra/math/mod.rs
+++ b/crates/nu-cmd-extra/src/extra/math/mod.rs
@ -15,19 +15,19 @@ mod arcsinh;
 mod arctan;
 mod arctanh;
-pub use cos::SubCommand as MathCos;
+pub use cos::MathCos;
-pub use cosh::SubCommand as MathCosH;
+pub use cosh::MathCosH;
-pub use sin::SubCommand as MathSin;
+pub use sin::MathSin;
-pub use sinh::SubCommand as MathSinH;
+pub use sinh::MathSinH;
-pub use tan::SubCommand as MathTan;
+pub use tan::MathTan;
-pub use tanh::SubCommand as MathTanH;
+pub use tanh::MathTanH;
-pub use exp::SubCommand as MathExp;
+pub use exp::MathExp;
-pub use ln::SubCommand as MathLn;
+pub use ln::MathLn;
-pub use arccos::SubCommand as MathArcCos;
+pub use arccos::MathArcCos;
-pub use arccosh::SubCommand as MathArcCosH;
+pub use arccosh::MathArcCosH;
-pub use arcsin::SubCommand as MathArcSin;
+pub use arcsin::MathArcSin;
-pub use arcsinh::SubCommand as MathArcSinH;
+pub use arcsinh::MathArcSinH;
-pub use arctan::SubCommand as MathArcTan;
+pub use arctan::MathArcTan;
-pub use arctanh::SubCommand as MathArcTanH;
+pub use arctanh::MathArcTanH;
--- a/crates/nu-cmd-extra/src/extra/math/sin.rs
+++ b/crates/nu-cmd-extra/src/extra/math/sin.rs
@ -1,9 +1,9 @@
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
-pub struct SubCommand;
+pub struct MathSin;
-impl Command for SubCommand {
+impl Command for MathSin {
    fn name(&self) -> &str {
        "math sin"
    }
@ -108,6 +108,6 @@ mod test {
    fn test_examples() {
        use crate::test_examples;
-        test_examples(SubCommand {})
+        test_examples(MathSin {})
    }
 }
--- a/crates/nu-cmd-extra/src/extra/math/sinh.rs
+++ b/crates/nu-cmd-extra/src/extra/math/sinh.rs
@ -1,9 +1,9 @@
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
-pub struct SubCommand;
+pub struct MathSinH;
-impl Command for SubCommand {
+impl Command for MathSinH {
    fn name(&self) -> &str {
        "math sinh"
    }
@ -87,6 +87,6 @@ mod test {
    fn test_examples() {
        use crate::test_examples;
-        test_examples(SubCommand {})
+        test_examples(MathSinH {})
    }
 }
--- a/crates/nu-cmd-extra/src/extra/math/tan.rs
+++ b/crates/nu-cmd-extra/src/extra/math/tan.rs
@ -1,9 +1,9 @@
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
-pub struct SubCommand;
+pub struct MathTan;
-impl Command for SubCommand {
+impl Command for MathTan {
    fn name(&self) -> &str {
        "math tan"
    }
@ -106,6 +106,6 @@ mod test {
    fn test_examples() {
        use crate::test_examples;
-        test_examples(SubCommand {})
+        test_examples(MathTan {})
    }
 }
--- a/crates/nu-cmd-extra/src/extra/math/tanh.rs
+++ b/crates/nu-cmd-extra/src/extra/math/tanh.rs
@ -1,9 +1,9 @@
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
-pub struct SubCommand;
+pub struct MathTanH;
-impl Command for SubCommand {
+impl Command for MathTanH {
    fn name(&self) -> &str {
        "math tanh"
    }
@ -86,6 +86,6 @@ mod test {
    fn test_examples() {
        use crate::test_examples;
-        test_examples(SubCommand {})
+        test_examples(MathTanH {})
    }
 }
--- a/crates/nu-cmd-extra/src/extra/mod.rs
+++ b/crates/nu-cmd-extra/src/extra/mod.rs
@ -1,14 +1,11 @@
 mod bits;
 mod conversions;
 mod filters;
 mod formats;
 mod math;
 mod platform;
 mod strings;
-pub use bits::{
+pub use bits::{Bits, BitsAnd, BitsNot, BitsOr, BitsRol, BitsRor, BitsShl, BitsShr, BitsXor};
    Bits, BitsAnd, BitsInto, BitsNot, BitsOr, BitsRol, BitsRor, BitsShl, BitsShr, BitsXor,
 };
 pub use formats::ToHtml;
 pub use math::{MathArcCos, MathArcCosH, MathArcSin, MathArcSinH, MathArcTan, MathArcTanH};
 pub use math::{MathCos, MathCosH, MathSin, MathSinH, MathTan, MathTanH};
@ -29,8 +26,6 @@ pub fn add_extra_command_context(mut engine_state: EngineState) -> EngineState {
            };
        }
        bind_command!(conversions::Fmt);
        bind_command!(
            filters::UpdateCells,
            filters::EachWhile,
@ -63,7 +58,6 @@ pub fn add_extra_command_context(mut engine_state: EngineState) -> EngineState {
        bind_command! {
            Bits,
            BitsAnd,
            BitsInto,
            BitsNot,
            BitsOr,
            BitsRol,
--- a/crates/nu-cmd-extra/src/extra/platform/ansi/gradient.rs
+++ b/crates/nu-cmd-extra/src/extra/platform/ansi/gradient.rs
@ -38,7 +38,7 @@ impl Command for SubCommand {
            .rest(
                "cell path",
                SyntaxShape::CellPath,
-                "for a data structure input, add a gradient to strings at the given cell paths",
+                "For a data structure input, add a gradient to strings at the given cell paths.",
            )
            .input_output_types(vec![
                (Type::String, Type::String),
--- a/crates/nu-cmd-extra/src/extra/strings/format/bits.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/format/bits.rs
@ -40,7 +40,7 @@ impl Command for FormatBits {
            .rest(
                "rest",
                SyntaxShape::CellPath,
-                "for a data structure input, convert data at the given cell paths",
+                "For a data structure input, convert data at the given cell paths.",
            )
            .category(Category::Conversions)
    }
@ -111,8 +111,7 @@ impl Command for FormatBits {
    }
 }
-// TODO: crate public only during deprecation
+fn format_bits(
 pub(crate) fn format_bits(
    engine_state: &EngineState,
    stack: &mut Stack,
    call: &Call,
--- a/crates/nu-cmd-extra/src/extra/strings/format/command.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/format/command.rs
@ -18,7 +18,7 @@ impl Command for FormatPattern {
            .required(
                "pattern",
                SyntaxShape::String,
-                "the pattern to output. e.g.) \"{foo}: {bar}\"",
+                "The pattern to output. e.g.) \"{foo}: {bar}\".",
            )
            .allow_variants_without_examples(true)
            .category(Category::Strings)
--- a/crates/nu-cmd-extra/src/extra/strings/format/mod.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/format/mod.rs
@ -2,8 +2,6 @@ mod bits;
 mod command;
 mod number;
 pub(crate) use bits::FormatBits;
 pub(crate) use command::FormatPattern;
-// TODO remove `format_bits` visibility after removal of into bits
+pub(crate) use number::FormatNumber;
 pub(crate) use bits::{format_bits, FormatBits};
 // TODO remove `format_number` visibility after removal of into bits
 pub(crate) use number::{format_number, FormatNumber};
--- a/crates/nu-cmd-extra/src/extra/strings/format/number.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/format/number.rs
@ -20,7 +20,7 @@ impl Command for FormatNumber {
    }
    fn search_terms(&self) -> Vec<&str> {
-        vec!["display", "render", "format"]
+        vec!["display", "render", "fmt"]
    }
    fn examples(&self) -> Vec<Example> {
--- a/crates/nu-cmd-extra/src/extra/strings/str_/case/camel_case.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/str_/case/camel_case.rs
@ -3,9 +3,9 @@ use heck::ToLowerCamelCase;
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
-pub struct SubCommand;
+pub struct StrCamelCase;
-impl Command for SubCommand {
+impl Command for StrCamelCase {
    fn name(&self) -> &str {
        "str camel-case"
    }
@ -25,7 +25,7 @@ impl Command for SubCommand {
            .rest(
                "rest",
                SyntaxShape::CellPath,
-                "For a data structure input, convert strings at the given cell paths",
+                "For a data structure input, convert strings at the given cell paths.",
            )
            .category(Category::Strings)
    }
@ -91,6 +91,6 @@ mod test {
    fn test_examples() {
        use crate::test_examples;
-        test_examples(SubCommand {})
+        test_examples(StrCamelCase {})
    }
 }
--- a/crates/nu-cmd-extra/src/extra/strings/str_/case/kebab_case.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/str_/case/kebab_case.rs
@ -3,9 +3,9 @@ use heck::ToKebabCase;
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
-pub struct SubCommand;
+pub struct StrKebabCase;
-impl Command for SubCommand {
+impl Command for StrKebabCase {
    fn name(&self) -> &str {
        "str kebab-case"
    }
@ -25,7 +25,7 @@ impl Command for SubCommand {
            .rest(
                "rest",
                SyntaxShape::CellPath,
-                "For a data structure input, convert strings at the given cell paths",
+                "For a data structure input, convert strings at the given cell paths.",
            )
            .category(Category::Strings)
    }
@ -90,6 +90,6 @@ mod tests {
    fn test_examples() {
        use crate::test_examples;
-        test_examples(SubCommand {})
+        test_examples(StrKebabCase {})
    }
 }
--- a/crates/nu-cmd-extra/src/extra/strings/str_/case/mod.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/str_/case/mod.rs
@ -6,13 +6,13 @@ mod snake_case;
 mod str_;
 mod title_case;
-pub use camel_case::SubCommand as StrCamelCase;
+pub use camel_case::StrCamelCase;
-pub use kebab_case::SubCommand as StrKebabCase;
+pub use kebab_case::StrKebabCase;
-pub use pascal_case::SubCommand as StrPascalCase;
+pub use pascal_case::StrPascalCase;
-pub use screaming_snake_case::SubCommand as StrScreamingSnakeCase;
+pub use screaming_snake_case::StrScreamingSnakeCase;
-pub use snake_case::SubCommand as StrSnakeCase;
+pub use snake_case::StrSnakeCase;
 pub use str_::Str;
-pub use title_case::SubCommand as StrTitleCase;
+pub use title_case::StrTitleCase;
 use nu_cmd_base::input_handler::{operate as general_operate, CmdArgument};
 use nu_engine::command_prelude::*;
--- a/crates/nu-cmd-extra/src/extra/strings/str_/case/pascal_case.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/str_/case/pascal_case.rs
@ -3,9 +3,9 @@ use heck::ToUpperCamelCase;
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
-pub struct SubCommand;
+pub struct StrPascalCase;
-impl Command for SubCommand {
+impl Command for StrPascalCase {
    fn name(&self) -> &str {
        "str pascal-case"
    }
@ -25,7 +25,7 @@ impl Command for SubCommand {
            .rest(
                "rest",
                SyntaxShape::CellPath,
-                "For a data structure input, convert strings at the given cell paths",
+                "For a data structure input, convert strings at the given cell paths.",
            )
            .category(Category::Strings)
    }
@ -91,6 +91,6 @@ mod test {
    fn test_examples() {
        use crate::test_examples;
-        test_examples(SubCommand {})
+        test_examples(StrPascalCase {})
    }
 }
--- a/crates/nu-cmd-extra/src/extra/strings/str_/case/screaming_snake_case.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/str_/case/screaming_snake_case.rs
@ -3,9 +3,9 @@ use heck::ToShoutySnakeCase;
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
-pub struct SubCommand;
+pub struct StrScreamingSnakeCase;
-impl Command for SubCommand {
+impl Command for StrScreamingSnakeCase {
    fn name(&self) -> &str {
        "str screaming-snake-case"
    }
@ -25,7 +25,7 @@ impl Command for SubCommand {
            .rest(
                "rest",
                SyntaxShape::CellPath,
-                "For a data structure input, convert strings at the given cell paths",
+                "For a data structure input, convert strings at the given cell paths.",
            )
            .category(Category::Strings)
    }
@ -91,6 +91,6 @@ mod test {
    fn test_examples() {
        use crate::test_examples;
-        test_examples(SubCommand {})
+        test_examples(StrScreamingSnakeCase {})
    }
 }
--- a/crates/nu-cmd-extra/src/extra/strings/str_/case/snake_case.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/str_/case/snake_case.rs
@ -3,9 +3,9 @@ use heck::ToSnakeCase;
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
-pub struct SubCommand;
+pub struct StrSnakeCase;
-impl Command for SubCommand {
+impl Command for StrSnakeCase {
    fn name(&self) -> &str {
        "str snake-case"
    }
@ -25,7 +25,7 @@ impl Command for SubCommand {
            .rest(
                "rest",
                SyntaxShape::CellPath,
-                "For a data structure input, convert strings at the given cell paths",
+                "For a data structure input, convert strings at the given cell paths.",
            )
            .category(Category::Strings)
    }
@ -91,6 +91,6 @@ mod test {
    fn test_examples() {
        use crate::test_examples;
-        test_examples(SubCommand {})
+        test_examples(StrSnakeCase {})
    }
 }
--- a/crates/nu-cmd-extra/src/extra/strings/str_/case/title_case.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/str_/case/title_case.rs
@ -3,9 +3,9 @@ use heck::ToTitleCase;
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
-pub struct SubCommand;
+pub struct StrTitleCase;
-impl Command for SubCommand {
+impl Command for StrTitleCase {
    fn name(&self) -> &str {
        "str title-case"
    }
@ -25,7 +25,7 @@ impl Command for SubCommand {
            .rest(
                "rest",
                SyntaxShape::CellPath,
-                "For a data structure input, convert strings at the given cell paths",
+                "For a data structure input, convert strings at the given cell paths.",
            )
            .category(Category::Strings)
    }
@ -86,6 +86,6 @@ mod test {
    fn test_examples() {
        use crate::test_examples;
-        test_examples(SubCommand {})
+        test_examples(StrTitleCase {})
    }
 }
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@ -6,7 +6,7 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.102.0"
+version = "0.103.0"
 [lib]
 bench = false
@ -15,10 +15,10 @@ bench = false
 workspace = true
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.102.0", default-features = false }
+nu-engine = { path = "../nu-engine", version = "0.103.0", default-features = false }
-nu-parser = { path = "../nu-parser", version = "0.102.0" }
+nu-parser = { path = "../nu-parser", version = "0.103.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.102.0", default-features = false }
+nu-protocol = { path = "../nu-protocol", version = "0.103.0", default-features = false }
-nu-utils = { path = "../nu-utils", version = "0.102.0", default-features = false }
+nu-utils = { path = "../nu-utils", version = "0.103.0", default-features = false }
 itertools = { workspace = true }
 shadow-rs = { version = "0.38", default-features = false }
@ -26,6 +26,10 @@ shadow-rs = { version = "0.38", default-features = false }
 [build-dependencies]
 shadow-rs = { version = "0.38", default-features = false }
 [dev-dependencies]
 quickcheck = { workspace = true }
 quickcheck_macros = { workspace = true }
 [features]
 default = ["os"]
 os = [
@ -38,8 +42,7 @@ plugin = [
  "os",
 ]
 mimalloc = []
 trash-support = []
 sqlite = []
 static-link-openssl = []
-system-clipboard = []
+system-clipboard = []
--- a/crates/nu-cmd-lang/src/core_commands/attr/category.rs
+++ b/crates/nu-cmd-lang/src/core_commands/attr/category.rs
@ -0,0 +1,61 @@
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
 pub struct AttrCategory;
 impl Command for AttrCategory {
    fn name(&self) -> &str {
        "attr category"
    }
    fn signature(&self) -> Signature {
        Signature::build("attr category")
            .input_output_type(Type::Nothing, Type::list(Type::String))
            .allow_variants_without_examples(true)
            .required(
                "category",
                SyntaxShape::String,
                "Category of the custom command.",
            )
            .category(Category::Core)
    }
    fn description(&self) -> &str {
        "Attribute for adding a category to custom commands."
    }
    fn run(
        &self,
        engine_state: &EngineState,
        stack: &mut Stack,
        call: &Call,
        _input: PipelineData,
    ) -> Result<PipelineData, ShellError> {
        let arg: String = call.req(engine_state, stack, 0)?;
        Ok(Value::string(arg, call.head).into_pipeline_data())
    }
    fn run_const(
        &self,
        working_set: &StateWorkingSet,
        call: &Call,
        _input: PipelineData,
    ) -> Result<PipelineData, ShellError> {
        let arg: String = call.req_const(working_set, 0)?;
        Ok(Value::string(arg, call.head).into_pipeline_data())
    }
    fn is_const(&self) -> bool {
        true
    }
    fn examples(&self) -> Vec<Example> {
        vec![Example {
            description: "Add a category to a custom command",
            example: r###"# Double numbers
    @category math
    def double []: [number -> number] { $in * 2 }"###,
            result: None,
        }]
    }
 }
--- a/crates/nu-cmd-lang/src/core_commands/attr/example.rs
+++ b/crates/nu-cmd-lang/src/core_commands/attr/example.rs
@ -0,0 +1,159 @@
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
 pub struct AttrExample;
 impl Command for AttrExample {
    fn name(&self) -> &str {
        "attr example"
    }
    // TODO: When const closure are available, switch to using them for the `example` argument
    // rather than a block. That should remove the need for `requires_ast_for_arguments` to be true
    fn signature(&self) -> Signature {
        Signature::build("attr example")
            .input_output_types(vec![(
                Type::Nothing,
                Type::Record(
                    [
                        ("description".into(), Type::String),
                        ("example".into(), Type::String),
                    ]
                    .into(),
                ),
            )])
            .allow_variants_without_examples(true)
            .required(
                "description",
                SyntaxShape::String,
                "Description of the example.",
            )
            .required(
                "example",
                SyntaxShape::OneOf(vec![SyntaxShape::Block, SyntaxShape::String]),
                "Example code snippet.",
            )
            .named(
                "result",
                SyntaxShape::Any,
                "Expected output of example.",
                None,
            )
            .category(Category::Core)
    }
    fn description(&self) -> &str {
        "Attribute for adding examples to custom commands."
    }
    fn run(
        &self,
        engine_state: &EngineState,
        stack: &mut Stack,
        call: &Call,
        _input: PipelineData,
    ) -> Result<PipelineData, ShellError> {
        let description: Spanned<String> = call.req(engine_state, stack, 0)?;
        let result: Option<Value> = call.get_flag(engine_state, stack, "result")?;
        let example_string: Result<String, _> = call.req(engine_state, stack, 1);
        let example_expr = call
            .positional_nth(stack, 1)
            .ok_or(ShellError::MissingParameter {
                param_name: "example".into(),
                span: call.head,
            })?;
        let working_set = StateWorkingSet::new(engine_state);
        attr_example_impl(
            example_expr,
            example_string,
            &working_set,
            call,
            description,
            result,
        )
    }
    fn run_const(
        &self,
        working_set: &StateWorkingSet,
        call: &Call,
        _input: PipelineData,
    ) -> Result<PipelineData, ShellError> {
        let description: Spanned<String> = call.req_const(working_set, 0)?;
        let result: Option<Value> = call.get_flag_const(working_set, "result")?;
        let example_string: Result<String, _> = call.req_const(working_set, 1);
        let example_expr =
            call.assert_ast_call()?
                .positional_nth(1)
                .ok_or(ShellError::MissingParameter {
                    param_name: "example".into(),
                    span: call.head,
                })?;
        attr_example_impl(
            example_expr,
            example_string,
            working_set,
            call,
            description,
            result,
        )
    }
    fn is_const(&self) -> bool {
        true
    }
    fn requires_ast_for_arguments(&self) -> bool {
        true
    }
    fn examples(&self) -> Vec<Example> {
        vec![Example {
            description: "Add examples to custom command",
            example: r###"# Double numbers
    @example "double an int" { 2 | double } --result 4
    @example "double a float" { 0.25 | double } --result 0.5
    def double []: [number -> number] { $in * 2 }"###,
            result: None,
        }]
    }
 }
 fn attr_example_impl(
    example_expr: &nu_protocol::ast::Expression,
    example_string: Result<String, ShellError>,
    working_set: &StateWorkingSet<'_>,
    call: &Call<'_>,
    description: Spanned<String>,
    result: Option<Value>,
 ) -> Result<PipelineData, ShellError> {
    let example_content = match example_expr.as_block() {
        Some(block_id) => {
            let block = working_set.get_block(block_id);
            let contents =
                working_set.get_span_contents(block.span.expect("a block must have a span"));
            let contents = contents
                .strip_prefix(b"{")
                .and_then(|x| x.strip_suffix(b"}"))
                .unwrap_or(contents)
                .trim_ascii();
            String::from_utf8_lossy(contents).into_owned()
        }
        None => example_string?,
    };
    let mut rec = record! {
        "description" => Value::string(description.item, description.span),
        "example" => Value::string(example_content, example_expr.span),
    };
    if let Some(result) = result {
        rec.push("result", result);
    }
    Ok(Value::record(rec, call.head).into_pipeline_data())
 }
--- a/crates/nu-cmd-lang/src/core_commands/attr/mod.rs
+++ b/crates/nu-cmd-lang/src/core_commands/attr/mod.rs
@ -0,0 +1,7 @@
 mod category;
 mod example;
 mod search_terms;
 pub use category::AttrCategory;
 pub use example::AttrExample;
 pub use search_terms::AttrSearchTerms;
--- a/crates/nu-cmd-lang/src/core_commands/attr/search_terms.rs
+++ b/crates/nu-cmd-lang/src/core_commands/attr/search_terms.rs
@ -0,0 +1,57 @@
 use nu_engine::command_prelude::*;
 #[derive(Clone)]
 pub struct AttrSearchTerms;
 impl Command for AttrSearchTerms {
    fn name(&self) -> &str {
        "attr search-terms"
    }
    fn signature(&self) -> Signature {
        Signature::build("attr search-terms")
            .input_output_type(Type::Nothing, Type::list(Type::String))
            .allow_variants_without_examples(true)
            .rest("terms", SyntaxShape::String, "Search terms.")
            .category(Category::Core)
    }
    fn description(&self) -> &str {
        "Attribute for adding search terms to custom commands."
    }
    fn run(
        &self,
        engine_state: &EngineState,
        stack: &mut Stack,
        call: &Call,
        _input: PipelineData,
    ) -> Result<PipelineData, ShellError> {
        let args = call.rest(engine_state, stack, 0)?;
        Ok(Value::list(args, call.head).into_pipeline_data())
    }
    fn run_const(
        &self,
        working_set: &StateWorkingSet,
        call: &Call,
        _input: PipelineData,
    ) -> Result<PipelineData, ShellError> {
        let args = call.rest_const(working_set, 0)?;
        Ok(Value::list(args, call.head).into_pipeline_data())
    }
    fn is_const(&self) -> bool {
        true
    }
    fn examples(&self) -> Vec<Example> {
        vec![Example {
            description: "Add search terms to a custom command",
            example: r###"# Double numbers
    @search-terms multiply times
    def double []: [number -> number] { $in * 2 }"###,
            result: None,
        }]
    }
 }
--- a/crates/nu-cmd-lang/src/core_commands/const_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/const_.rs
@ -72,6 +72,19 @@ impl Command for Const {
        }
    }
    fn run_const(
        &self,
        _working_set: &StateWorkingSet,
        _call: &Call,
        _input: PipelineData,
    ) -> Result<PipelineData, ShellError> {
        Ok(PipelineData::empty())
    }
    fn is_const(&self) -> bool {
        true
    }
    fn examples(&self) -> Vec<Example> {
        vec![
            Example {
--- a/crates/nu-cmd-lang/src/core_commands/echo.rs
+++ b/crates/nu-cmd-lang/src/core_commands/echo.rs
@ -34,13 +34,22 @@ little reason to use this over just writing the values as-is."#
        call: &Call,
        _input: PipelineData,
    ) -> Result<PipelineData, ShellError> {
-        let mut args = call.rest(engine_state, stack, 0)?;
+        let args = call.rest(engine_state, stack, 0)?;
-        let value = match args.len() {
+        echo_impl(args, call.head)
-            0 => Value::string("", call.head),
+    }
-            1 => args.pop().expect("one element"),
+
-            _ => Value::list(args, call.head),
+    fn run_const(
-        };
+        &self,
-        Ok(value.into_pipeline_data())
+        working_set: &StateWorkingSet,
        call: &Call,
        _input: PipelineData,
    ) -> Result<PipelineData, ShellError> {
        let args = call.rest_const(working_set, 0)?;
        echo_impl(args, call.head)
    }
    fn is_const(&self) -> bool {
        true
    }
    fn examples(&self) -> Vec<Example> {
@ -63,6 +72,15 @@ little reason to use this over just writing the values as-is."#
    }
 }
 fn echo_impl(mut args: Vec<Value>, head: Span) -> Result<PipelineData, ShellError> {
    let value = match args.len() {
        0 => Value::string("", head),
        1 => args.pop().expect("one element"),
        _ => Value::list(args, head),
    };
    Ok(value.into_pipeline_data())
 }
 #[cfg(test)]
 mod test {
    #[test]
--- a/crates/nu-cmd-lang/src/core_commands/hide.rs
+++ b/crates/nu-cmd-lang/src/core_commands/hide.rs
@ -32,6 +32,10 @@ This command is a parser keyword. For details, check:
  https://www.nushell.sh/book/thinking_in_nu.html"#
    }
    fn search_terms(&self) -> Vec<&str> {
        vec!["unset"]
    }
    fn command_type(&self) -> CommandType {
        CommandType::Keyword
    }
--- a/crates/nu-cmd-lang/src/core_commands/hide_env.rs
+++ b/crates/nu-cmd-lang/src/core_commands/hide_env.rs
@ -29,6 +29,10 @@ impl Command for HideEnv {
        "Hide environment variables in the current scope."
    }
    fn search_terms(&self) -> Vec<&str> {
        vec!["unset", "drop"]
    }
    fn run(
        &self,
        engine_state: &EngineState,
--- a/crates/nu-cmd-lang/src/core_commands/mod.rs
+++ b/crates/nu-cmd-lang/src/core_commands/mod.rs
@ -1,4 +1,5 @@
 mod alias;
 mod attr;
 mod break_;
 mod collect;
 mod const_;
@ -35,6 +36,7 @@ mod version;
 mod while_;
 pub use alias::Alias;
 pub use attr::*;
 pub use break_::Break;
 pub use collect::Collect;
 pub use const_::Const;
--- a/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs
@ -119,31 +119,40 @@ impl Command for OverlayUse {
            // Evaluate the export-env block (if any) and keep its environment
            if let Some(block_id) = module.env_block {
-                let maybe_path = find_in_dirs_env(
+                let maybe_file_path_or_dir = find_in_dirs_env(
                    &name_arg.item,
                    engine_state,
                    caller_stack,
                    get_dirs_var_from_call(caller_stack, call),
                )?;
                let block = engine_state.get_block(block_id);
                let mut callee_stack = caller_stack
                    .gather_captures(engine_state, &block.captures)
                    .reset_pipes();
-                if let Some(path) = &maybe_path {
+                if let Some(path) = &maybe_file_path_or_dir {
                    // Set the currently evaluated directory, if the argument is a valid path
-                    let mut parent = path.clone();
+                    let parent = if path.is_dir() {
-                    parent.pop();
+                        path.clone()
-
+                    } else {
                        let mut parent = path.clone();
                        parent.pop();
                        parent
                    };
                    let file_pwd = Value::string(parent.to_string_lossy(), call.head);
                    callee_stack.add_env_var("FILE_PWD".to_string(), file_pwd);
                }
-                if let Some(file_path) = &maybe_path {
+                if let Some(path) = &maybe_file_path_or_dir {
-                    let file_path = Value::string(file_path.to_string_lossy(), call.head);
+                    let module_file_path = if path.is_dir() {
-                    callee_stack.add_env_var("CURRENT_FILE".to_string(), file_path);
+                        // the existence of `mod.nu` is verified in parsing time
                        // so it's safe to use it here.
                        Value::string(path.join("mod.nu").to_string_lossy(), call.head)
                    } else {
                        Value::string(path.to_string_lossy(), call.head)
                    };
                    callee_stack.add_env_var("CURRENT_FILE".to_string(), module_file_path);
                }
                let eval_block = get_eval_block(engine_state);
--- a/crates/nu-cmd-lang/src/core_commands/return_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/return_.rs
@ -10,7 +10,7 @@ impl Command for Return {
    }
    fn description(&self) -> &str {
-        "Return early from a function."
+        "Return early from a custom command."
    }
    fn signature(&self) -> nu_protocol::Signature {
--- a/crates/nu-cmd-lang/src/core_commands/version.rs
+++ b/crates/nu-cmd-lang/src/core_commands/version.rs
@ -161,11 +161,7 @@ fn push_version_numbers(record: &mut Record, head: Span) {
 }
 fn global_allocator() -> &'static str {
-    if cfg!(feature = "mimalloc") {
+    "standard"
        "mimalloc"
    } else {
        "standard"
    }
 }
 fn features_enabled() -> Vec<String> {
--- a/crates/nu-cmd-lang/src/default_context.rs
+++ b/crates/nu-cmd-lang/src/default_context.rs
@ -16,6 +16,9 @@ pub fn create_default_context() -> EngineState {
        // Core
        bind_command! {
            Alias,
            AttrCategory,
            AttrExample,
            AttrSearchTerms,
            Break,
            Collect,
            Const,
--- a/crates/nu-cmd-lang/src/example_support.rs
+++ b/crates/nu-cmd-lang/src/example_support.rs
@ -221,7 +221,7 @@ impl PartialEq for DebuggableValue<'_> {
    }
 }
-impl<'a> std::fmt::Debug for DebuggableValue<'a> {
+impl std::fmt::Debug for DebuggableValue<'_> {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        match self.0 {
            Value::Bool { val, .. } => {
--- a/crates/nu-cmd-lang/src/lib.rs
+++ b/crates/nu-cmd-lang/src/lib.rs
@ -4,6 +4,8 @@ mod core_commands;
 mod default_context;
 pub mod example_support;
 mod example_test;
 #[cfg(test)]
 mod parse_const_test;
 pub use core_commands::*;
 pub use default_context::*;
--- a/crates/nu-cmd-lang/src/parse_const_test.rs
+++ b/crates/nu-cmd-lang/src/parse_const_test.rs
@ -0,0 +1,19 @@
 use nu_protocol::{engine::StateWorkingSet, Span};
 use quickcheck_macros::quickcheck;
 #[quickcheck]
 fn quickcheck_parse(data: String) -> bool {
    let (tokens, err) = nu_parser::lex(data.as_bytes(), 0, b"", b"", true);
    if err.is_none() {
        let context = crate::create_default_context();
        {
            let mut working_set = StateWorkingSet::new(&context);
            let _ = working_set.add_file("quickcheck".into(), data.as_bytes());
            let _ =
                nu_parser::parse_block(&mut working_set, &tokens, Span::new(0, 0), false, false);
        }
    }
    true
 }
--- a/crates/nu-cmd-plugin/Cargo.toml
+++ b/crates/nu-cmd-plugin/Cargo.toml
@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-plugin"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-plugin"
-version = "0.102.0"
+version = "0.103.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@ -13,10 +13,10 @@ version = "0.102.0"
 workspace = true
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.102.0" }
+nu-engine = { path = "../nu-engine", version = "0.103.0" }
-nu-path = { path = "../nu-path", version = "0.102.0" }
+nu-path = { path = "../nu-path", version = "0.103.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.102.0", features = ["plugin"] }
+nu-protocol = { path = "../nu-protocol", version = "0.103.0", features = ["plugin"] }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.102.0" }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.103.0" }
 itertools = { workspace = true }
--- a/Show More
+++ b/Show More