Fix ls panics when a file or directory not exists (#6148 )

* Fix ls panics when a file or directory not exists Fixes #6146 Signed-off-by: nibon7 <nibon7@163.com> * add test Signed-off-by: nibon7 <nibon7@163.com>
winget wants this to match (#6152 )
2022-07-28 09:16:52 +12:00 · 2022-07-28 09:16:14 +12:00
1263 changed files with 53294 additions and 94840 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -12,17 +12,3 @@ rustflags = ["-C", "link-args=-stack:10000000", "-C", "target-feature=+crt-stati
 # set a 2 gb stack size (0x80000000 = 2147483648 bytes = 2 GB)
 # [target.x86_64-apple-darwin]
 # rustflags = ["-C", "link-args=-Wl,-stack_size,0x80000000"]
-
-# How to use mold in linux and mac
-
-# [target.x86_64-unknown-linux-gnu]
-# linker = "clang"
-# rustflags = ["-C", "link-arg=-fuse-ld=/usr/local/bin/mold"]
-
-# [target.x86_64-apple-darwin]
-# linker = "clang"
-# rustflags = ["-C", "link-arg=-fuse-ld=mold"]
-
-# [target.aarch64-apple-darwin]
-# linker = "clang"
-# rustflags = ["-C", "link-arg=-fuse-ld=mold"]
--- a/.githooks/pre-commit
+++ b/.githooks/pre-commit
@@ -1,5 +0,0 @@
-#!/usr/bin/env nu
-
-use ../toolkit.nu fmt
-
-fmt --check --verbose
--- a/.githooks/pre-push
+++ b/.githooks/pre-push
@@ -1,6 +0,0 @@
-#!/usr/bin/env nu
-
-use ../toolkit.nu [fmt, clippy]
-
-fmt --check --verbose
-clippy --verbose
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -53,7 +53,7 @@ body:
        | features           | clipboard-cli, ctrlc, dataframe, default, rustyline, term, trash, uuid, which, zip                                                                                      |
        | installed_plugins  | binaryview, chart bar, chart line, fetch, from bson, from sqlite, inc, match, post, ps, query json, s3, selector, start, sys, textview, to bson, to sqlite, tree, xpath |
    validations:
-      required: true
+      required: false
  - type: textarea
    id: context
    attributes:
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,6 +1,5 @@
 name: Feature Request
 description: "When you want a new feature for something that doesn't already exist"
-labels: "enhancement"
 body:
  - type: textarea
    id: problem
--- a/.github/ISSUE_TEMPLATE/question.yml
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -1,21 +0,0 @@
-name: Question
-description: "When you have a question to ask"
-labels: "question"
-body:
-  - type: textarea
-    id: problem
-    attributes:
-      label: Question
-      description: Leave your question here
-      placeholder: |
-        A clear and concise question
-        Example: Is there any equivalent of bash's $CDPATH in Nu?
-    validations:
-      required: true
-  - type: textarea
-    id: context
-    attributes:
-      label: Additional context and details
-      description: Add any other context, screenshots or other media that will help us understand your question here, if needed.
-    validations:
-      required: false
--- a/.github/ISSUE_TEMPLATE/standard-library-bug-or-feature-report.md
+++ b/.github/ISSUE_TEMPLATE/standard-library-bug-or-feature-report.md
@@ -1,11 +0,0 @@
---
-name: standard library bug or feature report
-about: Used to submit issues related to the nu standard library
-title: ''
-labels: std-library
-assignees: ''
-
---
-
-**Describe the bug or feature**
-A clear and concise description of what the bug is.
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,20 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-# docs
-# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
-version: 2
-updates:
-  - package-ecosystem: "cargo"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    ignore:
-      - dependency-name: "*"
-        update-types: ["version-update:semver-patch"]
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,32 +1,17 @@
-
 # Description
-<!--
-Thank you for improving Nushell. Please, check our [contributing guide](../CONTRIBUTING.md) and talk to the core team before making major changes.

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

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

-# Tests + Formatting
-<!--
-Don't forget to add tests that cover your changes.
+Make sure you've done the following:
+
+- [ ] Add tests that cover your changes, either in the command examples, the crate/tests folder, or in the /tests folder.
+- [ ] Try to think about corner cases and various ways how your changes could break. Cover them with tests.
+- [ ] If adding tests is not possible, please document in the PR body a minimal example with steps on how to reproduce so one can verify your change works.

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

- `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect` to check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` to run the tests for the standard library
-
-> **Note**
-> from `nushell` you can also use the `toolkit` as follows
-> ```bash
-> use toolkit.nu  # or use an `env_change` hook to activate it automatically
-> toolkit check pr
-> ```
-->
-
-# After Submitting
-<!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. -->
+- [ ] `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes)
+- [ ] `cargo clippy --workspace --features=extra -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect` to check that you're using the standard code style
+- [ ] `cargo test --workspace --features=extra` to check that all the tests pass
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,42 +11,40 @@ jobs:
    strategy:
      fail-fast: true
      matrix:
-        # Pinning to Ubuntu 20.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)
-        platform: [windows-latest, macos-latest, ubuntu-20.04]
-        style: [default, dataframe]
+        platform: [windows-latest, macos-latest, ubuntu-latest]
        rust:
          - stable
-        include:
-          - style: default
-            flags: ""
-          - style: dataframe
-            flags: "--features=dataframe "
-        exclude:
-          # only test dataframes on Ubuntu (the fastest platform)
-          - platform: windows-latest
-            style: dataframe
-          - platform: macos-latest
-            style: dataframe
-
-

    runs-on: ${{ matrix.platform }}
    env:
      NUSHELL_CARGO_TARGET: ci

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2

-      - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.4.4
+      - name: Setup Rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          override: true
+          components: rustfmt, clippy

-      - name: cargo fmt
-        run: cargo fmt --all -- --check
+      - uses: Swatinem/rust-cache@v1
+        with:
+          key: "v2" # increment this to bust the cache if needed
+
+      - name: Rustfmt
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check

      - name: Clippy
-        run: cargo clippy --workspace ${{ matrix.flags }}--exclude nu_plugin_* -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: --features=extra --workspace --exclude nu_plugin_* -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect

  nu-tests:
    env:
@@ -55,41 +53,53 @@ jobs:
    strategy:
      fail-fast: true
      matrix:
-        platform: [windows-latest, macos-latest, ubuntu-20.04]
-        style: [default, dataframe]
+        platform: [windows-latest, macos-latest, ubuntu-latest]
+        style: [extra, default]
        rust:
          - stable
        include:
+          - style: extra
+            flags: "--features=extra"
          - style: default
            flags: ""
-          - style: dataframe
-            flags: "--features=dataframe"
        exclude:
-          # only test dataframes on Ubuntu (the fastest platform)
          - platform: windows-latest
-            style: dataframe
+            style: default
          - platform: macos-latest
-            style: dataframe
+            style: default

    runs-on: ${{ matrix.platform }}

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2

-      - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.4.4
+      - name: Setup Rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          override: true
+
+      # Temporarily disabled; the cache was getting huge (2.6GB compressed) on Windows and causing issues.
+      # TODO: investigate why the cache was so big
+      # - uses: Swatinem/rust-cache@v1
+      #   with:
+      #     key: ${{ matrix.style }}v3 # increment this to bust the cache if needed

      - name: Tests
-        run: cargo test --workspace --profile ci --exclude nu_plugin_* ${{ matrix.flags }}
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --workspace --profile ci --exclude nu_plugin_* ${{ matrix.flags }}

-  std-lib-and-python-virtualenv:
+  python-virtualenv:
    env:
-      NU_LOG_LEVEL: DEBUG 
+      NUSHELL_CARGO_TARGET: ci

    strategy:
      fail-fast: true
      matrix:
-        platform: [ubuntu-20.04, macos-latest, windows-latest]
+        platform: [ubuntu-latest, macos-latest, windows-latest]
        rust:
          - stable
        py:
@@ -98,47 +108,38 @@ jobs:
    runs-on: ${{ matrix.platform }}

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2

-      - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.4.4
+      - name: Setup Rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          override: true
+
+      - uses: Swatinem/rust-cache@v1
+        with:
+          key: "2" # increment this to bust the cache if needed

      - name: Install Nushell
-        # prior to [*standard library: bring the tests into the main CI*](#8525)
-        # there was a `--profile ci` here in the `cargo install`, as well as
-        # `NUSHELL_CARGO_TARGET: ci` in the prelude above.
-        #
-        # this caused a "stackoverflow" error in the CI on windows,
-        # see [this failing job](https://github.com/nushell/nushell/actions/runs/4512034615/jobs/7944945590)
-        #
-        # the CI profile has been removed in 00b820de9021227d1910a9ea388297ee7aee308e
-        # as part of #8525.
-        run: cargo install --path . --locked --no-default-features
-
-      - name: Standard library tests
-        run: nu -c 'use std; std run-tests --path crates/nu-std'
+        uses: actions-rs/cargo@v1
+        with:
+          command: install
+          args: --path=. --profile ci --no-default-features

      - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v2
        with:
          python-version: "3.10"

      - run: python -m pip install tox

-        # Get only the latest tagged version for stability reasons
      - name: Install virtualenv
        run: git clone https://github.com/pypa/virtualenv.git          
        shell: bash

      - name: Test Nushell in virtualenv
-        run: |
-          cd virtualenv
-          # if we encounter problems with bleeding edge tests pin to the latest tag
-          # git checkout $(git describe --tags | cut -d - -f 1)
-          # We need to disable failing on coverage levels.
-          nu -c "open pyproject.toml | upsert tool.coverage.report.fail_under 1 | save patchproject.toml"
-          mv patchproject.toml pyproject.toml
-          tox -e ${{ matrix.py }} -- -k nushell
+        run: cd virtualenv && tox -e ${{ matrix.py }} -- -k nushell
        shell: bash

  # Build+test plugins on their own, without the rest of Nu. This helps with CI parallelization and
@@ -150,58 +151,30 @@ jobs:
    strategy:
      fail-fast: true
      matrix:
-        platform: [windows-latest, macos-latest, ubuntu-20.04]
+        platform: [windows-latest, macos-latest, ubuntu-latest]
        rust:
          - stable

    runs-on: ${{ matrix.platform }}

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2

-      - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.4.4
+      - name: Setup Rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          override: true

      - name: Clippy
-        run: cargo clippy --package nu_plugin_* ${{ matrix.flags }} -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect
-
-      - name: Tests
-        run: cargo test --profile ci --package nu_plugin_*
-
-
-  nu-coverage:
-    env:
-      NUSHELL_CARGO_TARGET: ci
-
-    strategy:
-      fail-fast: true
-      matrix:
-        # disabled mac due to problems with merging coverage and similarity to linux
-        # disabled windows due to running out of disk space when having too many crates or tests
-        platform: [ubuntu-20.04] # windows-latest
-        rust:
-          - stable
-
-    runs-on: ${{ matrix.platform }}
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup Rust toolchain and cache
-        uses: actions-rust-lang/setup-rust-toolchain@v1.4.4
-      - name: Install cargo-llvm-cov
-        uses: taiki-e/install-action@cargo-llvm-cov
-
-      - name: Tests
-        shell: bash
-        run: |
-          source <(cargo llvm-cov show-env --export-prefix) # Set the environment variables needed to get coverage.
-          cargo llvm-cov clean --workspace # Remove artifacts that may affect the coverage results.
-          cargo build --workspace --profile ci
-          cargo test --workspace --profile ci
-          cargo llvm-cov report --profile ci --lcov --output-path lcov.info
-
-      - name: Upload coverage reports to Codecov with GitHub Action
-        uses: codecov/codecov-action@v3
+        uses: actions-rs/cargo@v1
        with:
-          files: lcov.info
+          command: clippy
+          args: --package nu_plugin_* ${{ matrix.flags }} -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect
+
+      - name: Tests
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --profile ci --package nu_plugin_*
--- a/.github/workflows/release-pkg.nu
+++ b/.github/workflows/release-pkg.nu
@@ -6,40 +6,6 @@
 # REF:
 #   1. https://github.com/volks73/cargo-wix

-# Instructions for manually creating an MSI for Winget Releases when they fail
-# Added 2022-11-29 when Windows packaging wouldn't work
-# Updated again on 2023-02-23 because msis are still failing validation
-# To run this manual for windows here are the steps I take
-# checkout the release you want to publish
-# 1. git checkout 0.76.0
-# unset CARGO_TARGET_DIR if set (I have to do this in the parent shell to get it to work)
-# 2. $env:CARGO_TARGET_DIR = ""
-# 2. hide-env CARGO_TARGET_DIR
-# 3. let-env TARGET = 'x86_64-pc-windows-msvc'
-# 4. let-env TARGET_RUSTFLAGS = ''
-# 5. let-env GITHUB_WORKSPACE = 'C:\Users\dschroeder\source\repos\forks\nushell'
-# 6. let-env GITHUB_OUTPUT = 'C:\Users\dschroeder\source\repos\forks\nushell\output\out.txt'
-# 7. let-env OS = 'windows-latest'
-# make sure 7z.exe is in your path https://www.7-zip.org/download.html
-# 8. let-env Path = ($env.Path | append 'c:\apps\7-zip')
-# make sure aria2c.exe is in your path https://github.com/aria2/aria2
-# 9. let-env Path = ($env.Path | append 'c:\path\to\aria2c')
-# make sure you have the wixtools installed https://wixtoolset.org/
-# 10. let-env Path = ($env.Path | append 'C:\Users\dschroeder\AppData\Local\tauri\WixTools')
-# You need to run the release-pkg twice. The first pass, with _EXTRA_ as 'bin', makes the output
-# folder and builds everything. The second pass, that generates the msi file, with _EXTRA_ as 'msi'
-# 11. let-env _EXTRA_ = 'bin'
-# 12. source .github\workflows\release-pkg.nu
-# 13. cd ..
-# 14. let-env _EXTRA_ = 'msi'
-# 15. source .github\workflows\release-pkg.nu
-# After msi is generated, you have to update winget-pkgs repo, you'll need to patch the release
-# by deleting the existing msi and uploading this new msi. Then you'll need to update the hash
-# on the winget-pkgs PR. To generate the hash, run this command
-# 16. open target\wix\nu-0.74.0-x86_64-pc-windows-msvc.msi | hash sha256
-# Then, just take the output and put it in the winget-pkgs PR for the hash on the msi
-
-
 # The main binary file to be released
 let bin = 'nu'
 let os = $env.OS
@@ -50,59 +16,44 @@ let flags = $env.TARGET_RUSTFLAGS
 let dist = $'($env.GITHUB_WORKSPACE)/output'
 let version = (open Cargo.toml | get package.version)

-print $'Debugging info:'
-print { version: $version, bin: $bin, os: $os, target: $target, src: $src, flags: $flags, dist: $dist }; hr-line -b
-
 # $env

-let USE_UBUNTU = 'ubuntu-20.04'
-
-print $'(char nl)Packaging ($bin) v($version) for ($target) in ($src)...'; hr-line -b
+$'(char nl)Packaging ($bin) v($version) for ($target) in ($src)...'; hr-line -b
 if not ('Cargo.lock' | path exists) { cargo generate-lockfile }

-print $'Start building ($bin)...'; hr-line
+$'Start building ($bin)...'; hr-line

 # ----------------------------------------------------------------------------
 # Build for Ubuntu and macOS
 # ----------------------------------------------------------------------------
-if $os in [$USE_UBUNTU, 'macos-latest'] {
-    if $os == $USE_UBUNTU {
-        sudo apt update
+if $os in ['ubuntu-latest', 'macos-latest'] {
+    if $os == 'ubuntu-latest' {
        sudo apt-get install libxcb-composite0-dev -y
    }
-    match $target {
-        'aarch64-unknown-linux-gnu' => {
+    if $target == 'aarch64-unknown-linux-gnu' {
        sudo apt-get install gcc-aarch64-linux-gnu -y
        let-env CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER = 'aarch64-linux-gnu-gcc'
        cargo-build-nu $flags
-        }
-        'riscv64gc-unknown-linux-gnu' => {
-            sudo apt-get install gcc-riscv64-linux-gnu -y
-            let-env CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_LINKER = 'riscv64-linux-gnu-gcc'
-            cargo-build-nu $flags
-        }
-        'armv7-unknown-linux-gnueabihf' => {
+    } else if $target == 'armv7-unknown-linux-gnueabihf' {
        sudo apt-get install pkg-config gcc-arm-linux-gnueabihf -y
        let-env CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER = 'arm-linux-gnueabihf-gcc'
        cargo-build-nu $flags
-        }
-        _ => {
+    } else {
        # musl-tools to fix 'Failed to find tool. Is `musl-gcc` installed?'
        # Actually just for x86_64-unknown-linux-musl target
-            if $os == $USE_UBUNTU { sudo apt install musl-tools -y }
+        sudo apt install musl-tools -y
        cargo-build-nu $flags
    }
 }
-}

 # ----------------------------------------------------------------------------
 # Build for Windows without static-link-openssl feature
 # ----------------------------------------------------------------------------
 if $os in ['windows-latest'] {
-    if ($flags | str trim | is-empty) {
-        cargo build --release --all --target $target
+    if ($flags | str trim | empty?) {
+        cargo build --release --all --target $target --features=extra
    } else {
-        cargo build --release --all --target $target $flags
+        cargo build --release --all --target $target --features=extra $flags
    }
 }

@@ -112,89 +63,78 @@ if $os in ['windows-latest'] {
 let suffix = if $os == 'windows-latest' { '.exe' }
 # nu, nu_plugin_* were all included
 let executable = $'target/($target)/release/($bin)*($suffix)'
-print $'Current executable file: ($executable)'
+$'Current executable file: ($executable)'

 cd $src; mkdir $dist;
 rm -rf $'target/($target)/release/*.d' $'target/($target)/release/nu_pretty_hex*'
-print $'(char nl)All executable files:'; hr-line
-# We have to use `print` here to make sure the command output is displayed
-print (ls -f $executable); sleep 1sec
+$'(char nl)All executable files:'; hr-line
+ls -f $executable

-print $'(char nl)Copying release files...'; hr-line
+$'(char nl)Copying release files...'; hr-line
 cp -v README.release.txt $'($dist)/README.txt'
 [LICENSE $executable] | each {|it| cp -rv $it $dist } | flatten
-# Sleep a few seconds to make sure the cp process finished successfully
-sleep 3sec

-print $'(char nl)Check binary release version detail:'; hr-line
+$'(char nl)Check binary release version detail:'; hr-line
 let ver = if $os == 'windows-latest' {
-    (do -i { ./output/nu.exe -c 'version' }) | str join
+    (do -i { ./output/nu.exe -c 'version' }) | str collect
 } else {
-    (do -i { ./output/nu -c 'version' }) | str join
+    (do -i { ./output/nu -c 'version' }) | str collect
 }
-if ($ver | str trim | is-empty) {
-    print $'(ansi r)Incompatible nu binary...(ansi reset)'
-} else { print $ver }
+if ($ver | str trim | empty?) {
+    $'(ansi r)Incompatible nu binary...(ansi reset)'
+} else { $ver }

 # ----------------------------------------------------------------------------
 # Create a release archive and send it to output for the following steps
 # ----------------------------------------------------------------------------
-cd $dist; print $'(char nl)Creating release archive...'; hr-line
-if $os in [$USE_UBUNTU, 'macos-latest'] {
+cd $dist; $'(char nl)Creating release archive...'; hr-line
+if $os in ['ubuntu-latest', 'macos-latest'] {

-    let files = (ls | get name)
-    let dest = $'($bin)-($version)-($target)'
-    let archive = $'($dist)/($dest).tar.gz'
+    $'(char nl)(ansi g)Archive contents:(ansi reset)'; hr-line; ls

-    mkdir $dest
-    $files | each {|it| mv $it $dest } | ignore
-
-    print $'(char nl)(ansi g)Archive contents:(ansi reset)'; hr-line; ls $dest
-
-    tar -czf $archive $dest
+    let archive = $'($dist)/($bin)-($version)-($target).tar.gz'
+    tar czf $archive *
    print $'archive: ---> ($archive)'; ls $archive
-    # REF: https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/
-    echo $"archive=($archive)" | save --append $env.GITHUB_OUTPUT
+    echo $'::set-output name=archive::($archive)'

 } else if $os == 'windows-latest' {

    let releaseStem = $'($bin)-($version)-($target)'

-    print $'(char nl)Download less related stuffs...'; hr-line
-    aria2c https://github.com/jftuga/less-Windows/releases/download/less-v608/less.exe -o less.exe
+    $'(char nl)Download less related stuffs...'; hr-line
+    aria2c https://github.com/jftuga/less-Windows/releases/download/less-v590/less.exe -o less.exe
    aria2c https://raw.githubusercontent.com/jftuga/less-Windows/master/LICENSE -o LICENSE-for-less.txt

    # Create Windows msi release package
    if (get-env _EXTRA_) == 'msi' {

        let wixRelease = $'($src)/target/wix/($releaseStem).msi'
-        print $'(char nl)Start creating Windows msi package...'
+        $'(char nl)Start creating Windows msi package...'
        cd $src; hr-line
        # Wix need the binaries be stored in target/release/
        cp -r $'($dist)/*' target/release/
-        cargo install cargo-wix --version 0.3.4
+        cargo install cargo-wix --version 0.3.2
        cargo wix --no-build --nocapture --package nu --output $wixRelease
-        print $'archive: ---> ($wixRelease)';
-        echo $"archive=($wixRelease)" | save --append $env.GITHUB_OUTPUT
+        echo $'::set-output name=archive::($wixRelease)'

    } else {

-        print $'(char nl)(ansi g)Archive contents:(ansi reset)'; hr-line; ls
+        $'(char nl)(ansi g)Archive contents:(ansi reset)'; hr-line; ls
        let archive = $'($dist)/($releaseStem).zip'
        7z a $archive *
        print $'archive: ---> ($archive)';
        let pkg = (ls -f $archive | get name)
-        if not ($pkg | is-empty) {
-            echo $"archive=($pkg | get 0)" | save --append $env.GITHUB_OUTPUT
+        if not ($pkg | empty?) {
+            echo $'::set-output name=archive::($pkg | get 0)'
        }
    }
 }

 def 'cargo-build-nu' [ options: string ] {
-    if ($options | str trim | is-empty) {
-        cargo build --release --all --target $target --features=static-link-openssl
+    if ($options | str trim | empty?) {
+        cargo build --release --all --target $target --features=extra,static-link-openssl
    } else {
-        cargo build --release --all --target $target --features=static-link-openssl $options
+        cargo build --release --all --target $target --features=extra,static-link-openssl $options
    }
 }

@@ -203,7 +143,7 @@ def 'hr-line' [
    --blank-line(-b): bool
 ] {
    print $'(ansi g)---------------------------------------------------------------------------->(ansi reset)'
-    if $blank_line { char nl }
+    if $blank-line { char nl }
 }

 # Get the specified env key's value or ''
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,7 +27,6 @@ jobs:
        - x86_64-unknown-linux-musl
        - aarch64-unknown-linux-gnu
        - armv7-unknown-linux-gnueabihf
-        - riscv64gc-unknown-linux-gnu
        extra: ['bin']
        include:
        - target: aarch64-apple-darwin
@@ -45,37 +44,35 @@ jobs:
          os: windows-latest
          target_rustflags: ''
        - target: x86_64-unknown-linux-gnu
-          os: ubuntu-20.04
+          os: ubuntu-latest
          target_rustflags: ''
        - target: x86_64-unknown-linux-musl
-          os: ubuntu-20.04
+          os: ubuntu-latest
          target_rustflags: ''
        - target: aarch64-unknown-linux-gnu
-          os: ubuntu-20.04
+          os: ubuntu-latest
          target_rustflags: ''
        - target: armv7-unknown-linux-gnueabihf
-          os: ubuntu-20.04
-          target_rustflags: ''
-        - target: riscv64gc-unknown-linux-gnu
-          os: ubuntu-20.04
+          os: ubuntu-latest
          target_rustflags: ''

    runs-on: ${{matrix.os}}

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v3.0.2

-    - name: Update Rust Toolchain Target
-      run: |
-        echo "targets = ['${{matrix.target}}']" >> rust-toolchain.toml
-
-    - name: Setup Rust toolchain and cache
-      uses: actions-rust-lang/setup-rust-toolchain@v1.4.4
+    - name: Install Rust Toolchain Components
+      uses: actions-rs/toolchain@v1.0.6
+      with:
+        override: true
+        profile: minimal
+        toolchain: stable
+        target: ${{ matrix.target }}

    - name: Setup Nushell
-      uses: hustcer/setup-nu@v3
+      uses: hustcer/setup-nu@v1
      with:
-        version: 0.78.0
+        version: 0.63.0
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

@@ -91,7 +88,7 @@ jobs:

    # REF: https://github.com/marketplace/actions/gh-release
    - name: Publish Archive
-      uses: softprops/action-gh-release@v0.1.13
+      uses: softprops/action-gh-release@v1
      if: ${{ startsWith(github.ref, 'refs/tags/') }}
      with:
        draft: true
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -0,0 +1,28 @@
+name: 'Close stale issues and PRs'
+#on: [workflow_dispatch]
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v3
+        with:
+          #debug-only: true
+          ascending: true
+          operations-per-run: 520
+          enable-statistics: true
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          close-issue-message: 'This issue has been marked stale for more than 100000 days without activity. Closing this issue, but if you find that the issue is still valid, please reopen.'
+          close-pr-message: 'This PR has been marked stale for more than 100 days without activity. Closing this PR, but if you are still working on it, please reopen.'
+          days-before-issue-stale: 90
+          days-before-pr-stale: 45
+          days-before-issue-close: 100000
+          days-before-pr-close: 100
+          exempt-issue-labels: 'exempt,keep'
--- a/.github/workflows/typos.yml
+++ b/.github/workflows/typos.yml
@@ -1,13 +0,0 @@
-name: Typos
-on: [pull_request]
-
-jobs:
-  run:
-    name: Spell Check with Typos
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions Repository
-        uses: actions/checkout@v3
-
-      - name: Check spelling
-        uses: crate-ci/typos@master
--- a/.github/workflows/winget-submission.yml
+++ b/.github/workflows/winget-submission.yml
@@ -1,14 +1,9 @@
 name: Submit Nushell package to Windows Package Manager Community Repository

 on:
-  release:
-    types: [released]
  workflow_dispatch:
-    inputs:
-      tag_name:
-        description: 'Specific tag name'
-        required: true 
-        type: string
+  release:
+    types: [published]

 jobs:

@@ -17,10 +12,8 @@ jobs:
    runs-on: windows-latest
    steps:
      - name: Submit package to Windows Package Manager Community Repository
-        uses: vedantmgoyal2009/winget-releaser@v2
-        with:
-          identifier: Nushell.Nushell
-          version: ${{ inputs.tag_name || github.event.release.tag_name }}
-          release-tag: ${{ inputs.tag_name || github.event.release.tag_name }}
-          token: ${{ secrets.NUSHELL_PAT }}
-          fork-user: fdncred
+        run: |
+          iwr https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe
+          $github = Get-Content '${{ github.event_path }}' | ConvertFrom-Json
+          $installerUrl = $github.release.assets | Where-Object -Property name -match 'windows-msvc.msi' | Select -ExpandProperty browser_download_url -First 1
+          .\wingetcreate.exe update Nushell.Nushell -s -v $github.release.tag_name -u $installerUrl -t ${{ secrets.NUSHELL_PAT }}
--- a/.gitignore
+++ b/.gitignore
@@ -22,13 +22,6 @@ debian/nu/
 # VSCode's IDE items
 .vscode/*

-# JetBrains' Fleet IDE
-.fleet/*
-
-# Visual Studio Extension SourceGear Rust items
-VSWorkspaceSettings.json
-unstable_cargo_features.txt
-
 # Helix configuration folder
 .helix/*
 .helix
@@ -36,16 +29,3 @@ unstable_cargo_features.txt
 # Coverage tools
 lcov.info
 tarpaulin-report.html
-
-# Visual Studio
-.vs/*
-*.rsproj
-*.rsproj.user
-*.sln
-
-# direnv
-.direnv/
-.envrc
-
-# pre-commit-hooks
-.pre-commit-config.yaml
--- a/.typos.toml
+++ b/.typos.toml
@@ -1,12 +0,0 @@
-[files]
-extend-exclude = ["crates/nu-command/tests/commands/table.rs", "*.tsv", "*.json", "*.txt"]
-
-[default.extend-words]
-# Ignore false-positives
-nd = "nd"
-fo = "fo"
-ons = "ons"
-ba = "ba"
-Plasticos = "Plasticos"
-IIF = "IIF"
-numer = "numer"
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,23 +1,8 @@
 # Contributing

-Welcome to Nushell and thank you for considering contributing!
+Welcome to Nushell!

-## Review Process
-
-First of all, before diving into the code, if you want to create a new feature, change something significantly, and especially if the change is user-facing, it is a good practice to first get an approval from the core team before starting to work on it.
-This saves both your and our time if we realize the change needs to go another direction before spending time on it.
-So, please, reach out and tell us what you want to do.
-This will significantly increase the chance of your PR being accepted.
-
-The review process can be summarized as follows:
-1. You want to make some change to Nushell that is more involved than simple bug-fixing.
-2. Go to [Discord](https://discordapp.com/invite/NtAbbGn) or a [GitHub issue](https://github.com/nushell/nushell/issues/new/choose) and chat with some core team members and/or other contributors about it.
-3. After getting a green light from the core team, implement the feature, open a pull request (PR) and write a concise but comprehensive description of the change.
-4. If your PR includes any use-facing features (such as adding a flag to a command), clearly list them in the PR description.
-5. Then, core team members and other regular contributors will review the PR and suggest changes.
-6. When we all agree, the PR will be merged.
-7. If your PR includes any user-facing features, make sure the changes are also reflected in [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged.
-8. Congratulate yourself, you just improved Nushell! :-)
+To get live support from the community see our [Discord](https://discordapp.com/invite/NtAbbGn), [Twitter](https://twitter.com/nu_shell) or file an issue or feature request here on [GitHub](https://github.com/nushell/nushell/issues/new/choose)!

 ## Developing

@@ -31,18 +16,6 @@ cd nushell
 cargo build
 ```

-### Tests
-
-It is a good practice to cover your changes with a test. Also, try to think about corner cases and various ways how your changes could break. Cover those in the tests as well.
-
-Tests can be found in different places:
-* `/tests`
-* `src/tests`
-* command examples
-* crate-specific tests
-
-The most comprehensive test suite we have is the `nu-test-support` crate. For testing specific features, such as running Nushell in a REPL mode, we have so called "testbins". For simple tests, you can find `run_test()` and `fail_test()` functions.
-
 ### Useful Commands

 - Build and run Nushell:
@@ -51,31 +24,21 @@ The most comprehensive test suite we have is the `nu-test-support` crate. For te
  cargo run
  ```

- Build and run with dataframe support.
+- Build and run with extra features. Currently extra features include dataframes and sqlite database support.
  ```shell
-  cargo run --features=dataframe
+  cargo run --features=extra
  ```

 - Run Clippy on Nushell:

  ```shell
-  cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect
-  ```
-  or via the `toolkit.nu` command:
-  ```shell
-  use toolkit.nu clippy
-  clippy
+  cargo clippy --workspace --features=extra -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect
  ```

 - Run all tests:

  ```shell
-  cargo test --workspace
-  ```
-  or via the `toolkit.nu` command:
-  ```shell
-  use toolkit.nu test
-  test
+  cargo test --workspace --features=extra
  ```

 - Run all tests for a specific command
@@ -89,128 +52,17 @@ The most comprehensive test suite we have is the `nu-test-support` crate. For te
  ```shell
  cargo fmt --all -- --check
  ```
-  or via the `toolkit.nu` command:
-  ```shell
-  use toolkit.nu fmt
-  fmt --check
-  ```

 - Format the code in the project

  ```shell
  cargo fmt --all
  ```
-  or via the `toolkit.nu` command:
-  ```shell
-  use toolkit.nu fmt
-  fmt
-  ```
-
- Set up `git` hooks to check formatting and run `clippy` before committing and pushing:
-
-  ```shell
-  use toolkit.nu setup-git-hooks
-  setup-git-hooks
-  ```
-  _Unfortunately, this hook isn't available on Windows._

 ### Debugging Tips

 - To view verbose logs when developing, enable the `trace` log level.

  ```shell
-  cargo run --release -- --log-level trace
+  cargo run --release --features=extra -- --log-level trace
  ```
-
- To redirect trace logs to a file, enable the `--log-target file` switch.
-  ```shell
-  cargo run --release -- --log-level trace --log-target file
-  open $"($nu.temp-path)/nu-($nu.pid).log"
-  ```
-
-## Git etiquette
-
-As nushell thrives on its broad base of volunteer contributors and maintainers with different backgrounds we have a few guidelines for how we best utilize git and GitHub for our contributions. We strive to balance three goals with those recommendations:
-
-1. The **volunteer maintainers and contributors** can easily follow the changes you propose, gauge the impact, and come to help you or make a decision.
-2. **You as a contributor** can focus most of your time on improving the quality of the nushell project and contributing your expertise to the code or documentation.
-3. Making sure we can trace back *why* decisions were made in the past.
-This includes discarded approaches. Also we want to quickly identify regressions and fix when something broke.
-
-### How we merge PRs
-
-In general the maintainers **squash** all changes of your PR into a single commit when merging. 
-
-This keeps a clean enough linear history, while not forcing you to conform to a too strict style while iterating in your PR or fixing small problems. As an added benefit the commits on the `main` branch are tied to the discussion that happened in the PR through their `#1234` issue number.
-
-> **Note**
-> **Pro advice:** In some circumstances, we can agree on rebase-merging a particularly large but connected PR as a series of atomic commits onto the `main` branch to ensure we can more easily revert or bisect particular aspects.
-
-### A good PR makes a change!
-
-As a result of this PR-centric strategy and the general goal that the reviewers should easily understand your change, the **PR title and description matters** a great deal!
-
-Make sure your description is **concise** but contains all relevant information and context.
-This means demonstrating what changes, ideally through nushell code or output **examples**.
-Furthermore links to technical documentation or instructions for folks that want to play with your change make the review process much easier.
-
-> **Note**
-> Try to follow the suggestions in our PR message template to make sure we can quickly focus on the technical merits and impact on the users.
-
-#### A PR should limit itself to a single functional change or related set of same changes.
-
-Mixing different changes in the same PR will make the review process much harder. A PR might get stuck on one aspect while we would actually like to land another change. Furthermore, if we are forced to revert a change, mixing and matching different aspects makes fixing bugs or regressions much harder.
-
-Thus, please try to **separate out unrelated changes**!
-**Don't** mix unrelated refactors with a potentially contested change.
-Stylistic fixes and housekeeping can be bundled up into singular PRs.
-
-#### Guidelines for the PR title
-
-The PR title should be concise but contain everything for a contributor to know if they should help out in the review of this particular change.
-
-**DON'T**
- `Update file/in/some/deeply/nested/path.rs`
-  - Why are you making this change?
- `Fix 2134`
-  - What has to be fixed?
-  - Hard to follow when not online on GitHub.
- ``Ignore `~` expansion``
-  - In what context should this change take effect?
- `[feature] refactor the whole parser and also make nushell indentation-sensitive, upgrade to using Cpython. Let me know what you think!`
-  - Be concise
-  - Maybe break up into smaller commits or PRs if the title already appears too long?
-
-**DO**
- Mention the nushell feature or command that is affected.
-  - ``Fix URL parsing in `http get` (issue #1234)``
- You can mention the issue number if other context is there.
-  - In general, mention all related issues in the description to crosslink (e.g. `Fixes #1234`, `Closes #6789`)
- For internal changes mention the area or symbols affected if it helps to clarify
-  - ``Factor out `quote_string()` from parser to reuse in `explore` ``
-
-### Review process / Merge conflicts
-
-> **Note**
-> Keep in mind that the maintainers are volunteers that need to allocate their attention to several different areas and active PRs. We will try to get back to you as soon as possible.
-
-You can help us to make the review process a smooth experience:
- Testing:
-  - We generally review in detail after all the tests pass. Let us know if there is a problem you want to discuss to fix a test failure or forces us to accept a breaking change.
-  - If you fix a bug, it is highly recommended that you add a test that reproduces the original issue/panic in a minimal form.
-  - In general, added tests help us to understand which assumptions go into a particular addition/change.
-  - Try to also test corner cases where those assumptions might break. This can be more valuable than simply adding many similar tests.
- Commit history inside a PR during code review:
-  - Good **atomic commits** can help follow larger changes, but we are not pedantic. 
-  - We don't shame fixup commits while you try to figure out a problem. They can help others see what you tried and what didn't work. (see our [squash policy](#how-we-merge-prs))
-  - During active review constant **force pushing** just to amend changes can be confusing!
-    - GitHub's UI presents reviewers with less options to compare diffs
-    - fetched branches for experimentation become invalid!
-    - the notification a maintainer receives has a low signal-to-noise ratio
-  - Git pros *can* use their judgement to rebase/squash to clean up the history *if it aids the understanding* of a larger change during review 
- Merge conflicts:
-  - In general you should take care of resolving merge conflicts.
-    - Use your judgement whether to `git merge main` or to `git rebase main`
-    - Choose what simplifies having confidence in the conflict resolution and the review. **Merge commits in your branch are OK** in the squash model.
-  - Feel free to notify your reviewers or affected PR authors if your change might cause larger conflicts with another change.
-  - During the rollup of multiple PRs, we may choose to resolve merge conflicts and CI failures ourselves. (Allow maintainers to push to your branch to enable us to do this quickly.)
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,31 +3,24 @@ authors = ["The Nushell Project Developers"]
 default-run = "nu"
 description = "A new type of shell"
 documentation = "https://www.nushell.sh/book/"
-edition = "2021"
+edition = "2018"
 exclude = ["images"]
 homepage = "https://www.nushell.sh"
 license = "MIT"
 name = "nu"
+readme = "README.md"
 repository = "https://github.com/nushell/nushell"
 rust-version = "1.60"
-version = "0.79.0"
+version = "0.66.1"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

-[package.metadata.binstall]
-pkg-url = "{ repo }/releases/download/{ version }/{ name }-{ version }-{ target }.{ archive-format }"
-pkg-fmt = "tgz"
-
-[package.metadata.binstall.overrides.x86_64-pc-windows-msvc]
-pkg-fmt = "zip"
-
 [workspace]
 members = [
 	"crates/nu-cli",
 	"crates/nu-engine",
 	"crates/nu-parser",
 	"crates/nu-system",
-	"crates/nu-cmd-lang",
 	"crates/nu-command",
 	"crates/nu-protocol",
 	"crates/nu-plugin",
@@ -36,87 +29,59 @@ members = [
 	"crates/nu_plugin_example",
 	"crates/nu_plugin_query",
 	"crates/nu_plugin_custom_values",
-	"crates/nu_plugin_formats",
-	"crates/nu-std",
 	"crates/nu-utils",
 ]

 [dependencies]
-chrono = { version = "0.4.23", features = ["serde"] }
-crossterm = "0.26"
+chrono = { version = "0.4.19", features = ["serde"] }
+crossterm = "0.23.0"
 ctrlc = "3.2.1"
 log = "0.4"
-miette = { version = "5.7.0", features = ["fancy-no-backtrace"] }
-nu-cli = { path = "./crates/nu-cli", version = "0.79.0" }
-nu-color-config = { path = "./crates/nu-color-config", version = "0.79.0" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.79.0" }
-nu-command = { path = "./crates/nu-command", version = "0.79.0" }
-nu-engine = { path = "./crates/nu-engine", version = "0.79.0" }
-nu-json = { path = "./crates/nu-json", version = "0.79.0" }
-nu-parser = { path = "./crates/nu-parser", version = "0.79.0" }
-nu-path = { path = "./crates/nu-path", version = "0.79.0" }
-nu-plugin = { path = "./crates/nu-plugin", optional = true, version = "0.79.0" }
-nu-pretty-hex = { path = "./crates/nu-pretty-hex", version = "0.79.0" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.79.0" }
-nu-system = { path = "./crates/nu-system", version = "0.79.0" }
-nu-table = { path = "./crates/nu-table", version = "0.79.0" }
-nu-term-grid = { path = "./crates/nu-term-grid", version = "0.79.0" }
-nu-std = { path = "./crates/nu-std", version = "0.79.0" }
-nu-utils = { path = "./crates/nu-utils", version = "0.79.0" }
-
-nu-ansi-term = "0.47.0"
-reedline = { version = "0.19.0", features = ["bashisms", "sqlite"]}
-
-rayon = "1.7.0"
+miette = "5.1.0"
+nu-ansi-term = "0.46.0"
+nu-cli = { path="./crates/nu-cli", version = "0.66.1"  }
+nu-color-config = { path = "./crates/nu-color-config", version = "0.66.1"  }
+nu-command = { path="./crates/nu-command", version = "0.66.1"  }
+nu-engine = { path="./crates/nu-engine", version = "0.66.1"  }
+nu-json = { path="./crates/nu-json", version = "0.66.1"  }
+nu-parser = { path="./crates/nu-parser", version = "0.66.1"  }
+nu-path = { path="./crates/nu-path", version = "0.66.1"  }
+nu-plugin = { path = "./crates/nu-plugin", optional = true, version = "0.66.1"  }
+nu-pretty-hex = { path = "./crates/nu-pretty-hex", version = "0.66.1"  }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.66.1"  }
+nu-system = { path = "./crates/nu-system", version = "0.66.1" }
+nu-table = { path = "./crates/nu-table", version = "0.66.1"  }
+nu-term-grid = { path = "./crates/nu-term-grid", version = "0.66.1"  }
+nu-utils = { path = "./crates/nu-utils", version = "0.66.1"  }
+reedline = { version = "0.9.0", features = ["bashisms", "sqlite"]}
+pretty_env_logger = "0.4.0"
+rayon = "1.5.1"
 is_executable = "1.0.1"
-simplelog = "0.12.0"
-time = "0.3.12"
-serde_json = "1.0"

 [target.'cfg(not(target_os = "windows"))'.dependencies]
 # Our dependencies don't use OpenSSL on Windows
-openssl = { version = "0.10.48", features = ["vendored"], optional = true }
+openssl = { version = "0.10.38", features = ["vendored"], optional = true }
 signal-hook = { version = "0.3.14", default-features = false }

+[dev-dependencies]
+nu-test-support = { path="./crates/nu-test-support", version = "0.66.1"  }
+tempfile = "3.2.0"
+assert_cmd = "2.0.2"
+pretty_assertions = "1.0.0"
+serial_test = "0.8.0"
+hamcrest2 = "0.3.0"
+rstest = "0.15.0"
+itertools = "0.10.3"

 [target.'cfg(windows)'.build-dependencies]
 winres = "0.1"

-[target.'cfg(target_family = "unix")'.dependencies]
-nix = { version = "0.26", default-features = false, features = [
-	"signal",
-	"process",
-	"fs",
-	"term",
-] }
-atty = "0.2"
-
-[dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.79.0" }
-tempfile = "3.5.0"
-assert_cmd = "2.0.2"
-criterion = "0.4"
-pretty_assertions = "1.0.0"
-serial_test = "1.0.0"
-hamcrest2 = "0.3.0"
-rstest = { version = "0.17.0", default-features = false }
-itertools = "0.10.3"
-
 [features]
-plugin = [
-	"nu-plugin",
-	"nu-cli/plugin",
-	"nu-parser/plugin",
-	"nu-command/plugin",
-	"nu-protocol/plugin",
-	"nu-engine/plugin",
-]
-# extra used to be more useful but now it's the same as default. Leaving it in for backcompat with existing build scripts
-extra = ["default"]
-default = ["plugin", "which-support", "trash-support", "sqlite"]
+plugin = ["nu-plugin", "nu-cli/plugin", "nu-parser/plugin", "nu-command/plugin", "nu-protocol/plugin", "nu-engine/plugin"]
+default = ["plugin", "which-support", "trash-support"]
 stable = ["default"]
+extra = ["default", "dataframe", "database"]
 wasi = []
-
 # Enable to statically link OpenSSL; otherwise the system version will be used. Not enabled by default because it takes a while to build
 static-link-openssl = ["dep:openssl"]

@@ -129,8 +94,8 @@ trash-support = ["nu-command/trash-support"]
 # Dataframe feature for nushell
 dataframe = ["nu-command/dataframe"]

-# SQLite commands for nushell
-sqlite = ["nu-command/sqlite"]
+# Database commands for nushell
+database = ["nu-command/database"]

 [profile.release]
 opt-level = "s" # Optimize for size
@@ -155,17 +120,3 @@ debug = false
 [[bin]]
 name = "nu"
 path = "src/main.rs"
-bench = false
-
-# To use a development version of a dependency please use a global override here
-# changing versions in each sub-crate of the workspace is tedious
-[patch.crates-io]
-# reedline = { git = "https://github.com/nushell/reedline.git", branch = "main"}
-# nu-ansi-term = {git = "https://github.com/nushell/nu-ansi-term.git", branch = "main"}
-
-# Criterion benchmarking setup
-# Run all benchmarks with `cargo bench`
-# Run individual benchmarks like `cargo bench -- <regex>` e.g. `cargo bench -- parse`
-[[bench]]
-name = "benchmarks"
-harness = false
--- a/Cross.toml
+++ b/Cross.toml
@@ -1,9 +0,0 @@
-# Configuration for cross-rs: https://github.com/cross-rs/cross
-# Run cross-rs like this:
-# cross build --target aarch64-unknown-linux-musl --release
-
-[target.aarch64-unknown-linux-gnu]
-dockerfile = "./docker/cross-rs/aarch64-unknown-linux-gnu.dockerfile"
-
-[target.aarch64-unknown-linux-musl]
-dockerfile = "./docker/cross-rs/aarch64-unknown-linux-musl.dockerfile"
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2019 - 2023 The Nushell Project Developers
+Copyright (c) 2019 - 2022 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
@@ -1,12 +1,11 @@
 # Nushell <!-- omit in toc -->
 [![Crates.io](https://img.shields.io/crates/v/nu.svg)](https://crates.io/crates/nu)
-[![Build Status](https://img.shields.io/github/actions/workflow/status/nushell/nushell/ci.yml?branch=main)](https://github.com/nushell/nushell/actions)
+![Build Status](https://img.shields.io/github/workflow/status/nushell/nushell/continuous-integration)
 [![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)
-[![codecov](https://codecov.io/gh/nushell/nushell/branch/main/graph/badge.svg?token=JheS8qu2II)](https://codecov.io/gh/nushell/nushell)
+![GitHub commit activity](https://img.shields.io/github/commit-activity/m/nushell/nushell)
+![GitHub contributors](https://img.shields.io/github/contributors/nushell/nushell)

 A new type of shell.

@@ -33,7 +32,7 @@ This project has reached a minimum-viable-product level of quality. Many people

 ## Learning About Nu

-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/).
+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/book/command_reference.html), 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!

@@ -46,11 +45,9 @@ To quickly install Nu:
 brew install nushell
 # Windows
 winget install nushell
-# Cross Platform installation if you have node and npm installed, Note that nu plugins were not included
-npm install -g nushell
 ```

-To use `Nu` in GitHub Action, check [setup-nu](https://github.com/marketplace/actions/setup-nu) for more detail.
+To use `Nu` in Github Action, check [setup-nu](https://github.com/marketplace/actions/setup-nu) for more detail.

 Detailed installation instructions can be found in the [installation chapter of the book](https://www.nushell.sh/book/installation.html). Nu is available via many package managers:

@@ -74,7 +71,7 @@ Additionally, commands can output structured data (you can think of this as a th
 Commands that work in the pipeline fit into one of three categories:

 -   Commands that produce a stream (e.g., `ls`)
-   Commands that filter a stream (e.g., `where type == "dir"`)
+-   Commands that filter a stream (eg, `where type == "dir"`)
 -   Commands that consume the output of the pipeline (e.g., `table`)

 Commands are separated by the pipe symbol (`|`) to denote a pipeline flowing left to right.
@@ -129,13 +126,12 @@ For example, you can load a .toml file as structured data and explore it:
 > open Cargo.toml
 ╭──────────────────┬────────────────────╮
 │ bin              │ [table 1 row]      │
-│ dependencies     │ {record 25 fields} │
+│ dependencies     │ {record 24 fields} │
 │ dev-dependencies │ {record 8 fields}  │
 │ features         │ {record 10 fields} │
 │ package          │ {record 13 fields} │
-│ patch            │ {record 1 field}   │
 │ profile          │ {record 3 fields}  │
-│ target           │ {record 3 fields}  │
+│ target           │ {record 2 fields}  │
 │ workspace        │ {record 1 field}   │
 ╰──────────────────┴────────────────────╯
 ```
@@ -153,11 +149,11 @@ We can pipe this into a command that gets the contents of one of the columns:
 │ exclude       │ [list 1 item]                      │
 │ homepage      │ https://www.nushell.sh             │
 │ license       │ MIT                                │
-│ metadata      │ {record 1 field}                   │
 │ name          │ nu                                 │
+│ readme        │ README.md                          │
 │ repository    │ https://github.com/nushell/nushell │
 │ rust-version  │ 1.60                               │
-│ version       │ 0.72.0                             │
+│ version       │ 0.63.1                             │
 ╰───────────────┴────────────────────────────────────╯
 ```

@@ -165,7 +161,7 @@ And if needed we can drill down further:

 ```shell
 > open Cargo.toml | get package.version
-0.72.0
+0.63.1
 ```

 ### Plugins
@@ -177,9 +173,6 @@ These binaries interact with nu via a simple JSON-RPC protocol where the command
 If the plugin is a filter, data streams to it one element at a time, and it can stream data back in return via stdin/stdout.
 If the plugin is a sink, it is given the full vector of final data and is given free reign over stdin/stdout to use as it pleases.

-The [awesome-nu repo](https://github.com/nushell/awesome-nu#plugins) lists a variety of nu-plugins while the [showcase repo](https://github.com/nushell/showcase) *shows* off informative blog posts that have been written about Nushell along with videos that highlight technical
-topics that have been presented.
-
 ## Goals

 Nu adheres closely to a set of goals that make up its design philosophy. As features are added, they are checked against these goals.
@@ -213,7 +206,7 @@ Nu is under heavy development and will naturally change as it matures. The chart
 | Functions     |             |           |     |    X    |        | Functions and aliases are supported                                  |
 | Variables     |             |           |     |    X    |        | Nu supports variables and environment variables                      |
 | Completions   |             |           |     |    X    |        | Completions for filepaths                                            |
-| Type-checking |             |           |     |    x    |        | Commands check basic types, and input/output types                   |
+| Type-checking |             |           |  X  |         |        | Commands check basic types, but input/output isn't checked           |

 ## Officially Supported By

@@ -224,7 +217,6 @@ Please submit an issue or PR to be added to this list.
 -   [oh-my-posh](https://ohmyposh.dev)
 -   [Couchbase Shell](https://couchbase.sh)
 -   [virtualenv](https://github.com/pypa/virtualenv)
-   [atuin](https://github.com/ellie/atuin)

 ## Contributing

--- a/README.release.txt
+++ b/README.release.txt
@@ -1,3 +1,3 @@
 To use Nu plugins, use the register command to tell Nu where to find the plugin. For example:

-> register ./nu_plugin_query
+> register -e json ./nu_plugin_query
--- a/benches/README.md
+++ b/benches/README.md
@@ -1,7 +0,0 @@
-# Criterion benchmarks
-
-These are benchmarks using [Criterion](https://github.com/bheisler/criterion.rs), a microbenchmarking tool for Rust.
-
-Run all benchmarks with `cargo bench`
-
-Or run individual benchmarks like `cargo bench -- <regex>` e.g. `cargo bench -- parse`
--- a/benches/benchmarks.rs
+++ b/benches/benchmarks.rs
@@ -1,191 +0,0 @@
-use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
-use nu_cli::eval_source;
-use nu_parser::parse;
-use nu_plugin::{EncodingType, PluginResponse};
-use nu_protocol::{PipelineData, Span, Value};
-use nu_utils::{get_default_config, get_default_env};
-
-// FIXME: All benchmarks live in this 1 file to speed up build times when benchmarking.
-// When the *_benchmarks functions were in different files, `cargo bench` would build
-// an executable for every single one - incredibly slowly. Would be nice to figure out
-// a way to split things up again.
-
-fn parser_benchmarks(c: &mut Criterion) {
-    let mut engine_state = nu_command::create_default_context();
-    // parsing config.nu breaks without PWD set
-    engine_state.add_env_var(
-        "PWD".into(),
-        Value::string("/some/dir".to_string(), Span::test_data()),
-    );
-
-    let default_env = get_default_env().as_bytes();
-    c.bench_function("parse_default_env_file", |b| {
-        b.iter_batched(
-            || nu_protocol::engine::StateWorkingSet::new(&engine_state),
-            |mut working_set| parse(&mut working_set, None, default_env, false),
-            BatchSize::SmallInput,
-        )
-    });
-
-    let default_config = get_default_config().as_bytes();
-    c.bench_function("parse_default_config_file", |b| {
-        b.iter_batched(
-            || nu_protocol::engine::StateWorkingSet::new(&engine_state),
-            |mut working_set| parse(&mut working_set, None, default_config, false),
-            BatchSize::SmallInput,
-        )
-    });
-
-    c.bench_function("eval default_env.nu", |b| {
-        b.iter(|| {
-            let mut engine_state = nu_command::create_default_context();
-            let mut stack = nu_protocol::engine::Stack::new();
-            eval_source(
-                &mut engine_state,
-                &mut stack,
-                get_default_env().as_bytes(),
-                "default_env.nu",
-                PipelineData::empty(),
-                false,
-            )
-        })
-    });
-
-    c.bench_function("eval default_config.nu", |b| {
-        b.iter(|| {
-            let mut engine_state = nu_command::create_default_context();
-            // parsing config.nu breaks without PWD set
-            engine_state.add_env_var(
-                "PWD".into(),
-                Value::string("/some/dir".to_string(), Span::test_data()),
-            );
-            let mut stack = nu_protocol::engine::Stack::new();
-            eval_source(
-                &mut engine_state,
-                &mut stack,
-                get_default_config().as_bytes(),
-                "default_config.nu",
-                PipelineData::empty(),
-                false,
-            )
-        })
-    });
-}
-
-fn eval_benchmarks(c: &mut Criterion) {
-    c.bench_function("eval default_env.nu", |b| {
-        b.iter(|| {
-            let mut engine_state = nu_command::create_default_context();
-            let mut stack = nu_protocol::engine::Stack::new();
-            eval_source(
-                &mut engine_state,
-                &mut stack,
-                get_default_env().as_bytes(),
-                "default_env.nu",
-                PipelineData::empty(),
-                false,
-            )
-        })
-    });
-
-    c.bench_function("eval default_config.nu", |b| {
-        b.iter(|| {
-            let mut engine_state = nu_command::create_default_context();
-            // parsing config.nu breaks without PWD set
-            engine_state.add_env_var(
-                "PWD".into(),
-                Value::string("/some/dir".to_string(), Span::test_data()),
-            );
-            let mut stack = nu_protocol::engine::Stack::new();
-            eval_source(
-                &mut engine_state,
-                &mut stack,
-                get_default_config().as_bytes(),
-                "default_config.nu",
-                PipelineData::empty(),
-                false,
-            )
-        })
-    });
-}
-
-// generate a new table data with `row_cnt` rows, `col_cnt` columns.
-fn encoding_test_data(row_cnt: usize, col_cnt: usize) -> Value {
-    let columns: Vec<String> = (0..col_cnt).map(|x| format!("col_{x}")).collect();
-    let vals: Vec<Value> = (0..col_cnt as i64).map(Value::test_int).collect();
-
-    Value::List {
-        vals: (0..row_cnt)
-            .map(|_| Value::test_record(columns.clone(), vals.clone()))
-            .collect(),
-        span: Span::test_data(),
-    }
-}
-
-fn encoding_benchmarks(c: &mut Criterion) {
-    let mut group = c.benchmark_group("Encoding");
-    let test_cnt_pairs = [
-        (100, 5),
-        (100, 10),
-        (100, 15),
-        (1000, 5),
-        (1000, 10),
-        (1000, 15),
-        (10000, 5),
-        (10000, 10),
-        (10000, 15),
-    ];
-    for (row_cnt, col_cnt) in test_cnt_pairs.into_iter() {
-        for fmt in ["json", "msgpack"] {
-            group.bench_function(&format!("{fmt} encode {row_cnt} * {col_cnt}"), |b| {
-                let mut res = vec![];
-                let test_data =
-                    PluginResponse::Value(Box::new(encoding_test_data(row_cnt, col_cnt)));
-                let encoder = EncodingType::try_from_bytes(fmt.as_bytes()).unwrap();
-                b.iter(|| encoder.encode_response(&test_data, &mut res))
-            });
-        }
-    }
-    group.finish();
-}
-
-fn decoding_benchmarks(c: &mut Criterion) {
-    let mut group = c.benchmark_group("Decoding");
-    let test_cnt_pairs = [
-        (100, 5),
-        (100, 10),
-        (100, 15),
-        (1000, 5),
-        (1000, 10),
-        (1000, 15),
-        (10000, 5),
-        (10000, 10),
-        (10000, 15),
-    ];
-    for (row_cnt, col_cnt) in test_cnt_pairs.into_iter() {
-        for fmt in ["json", "msgpack"] {
-            group.bench_function(&format!("{fmt} decode for {row_cnt} * {col_cnt}"), |b| {
-                let mut res = vec![];
-                let test_data =
-                    PluginResponse::Value(Box::new(encoding_test_data(row_cnt, col_cnt)));
-                let encoder = EncodingType::try_from_bytes(fmt.as_bytes()).unwrap();
-                encoder.encode_response(&test_data, &mut res).unwrap();
-                let mut binary_data = std::io::Cursor::new(res);
-                b.iter(|| {
-                    binary_data.set_position(0);
-                    encoder.decode_response(&mut binary_data)
-                })
-            });
-        }
-    }
-    group.finish();
-}
-
-criterion_group!(
-    benches,
-    parser_benchmarks,
-    eval_benchmarks,
-    encoding_benchmarks,
-    decoding_benchmarks
-);
-criterion_main!(benches);
--- a/build-all-maclin.sh
+++ b/build-all-maclin.sh
@@ -1,8 +1,7 @@
-#!/usr/bin/env bash
-set -euo pipefail
+#!/bin/sh

 echo "---------------------------------------------------------------"
-echo "Building nushell (nu) with dataframes and all the plugins"
+echo "Building nushell (nu) with --features=extra and all the plugins"
 echo "---------------------------------------------------------------"
 echo ""

@@ -11,14 +10,13 @@ NU_PLUGINS=(
    'nu_plugin_gstat'
    'nu_plugin_inc'
    'nu_plugin_query'
-    'nu_plugin_custom_values'
 )

 echo "Building nushell"
-cargo build --features=dataframe
+cargo build --features=extra
 for plugin in "${NU_PLUGINS[@]}"
 do
-    echo '' && cd crates/"$plugin"
+    echo '' && cd crates/$plugin
    echo "Building $plugin..."
    echo "-----------------------------"
    cargo build && cd ../..
--- a/build-all-windows.cmd
+++ b/build-all-windows.cmd
@@ -1,11 +1,11 @@
@echo off
@echo -------------------------------------------------------------------
-@echo Building nushell (nu.exe) with dataframes and all the plugins
+@echo Building nushell (nu.exe) with --features=extra and all the plugins
@echo -------------------------------------------------------------------
@echo.

 echo Building nushell.exe
-cargo build --features=dataframe
+cargo build --features=extra
@echo.

@cd crates\nu_plugin_example
@@ -24,13 +24,9 @@ cargo build
@echo.

@cd ..\..\crates\nu_plugin_query
+
 echo Building nu_plugin_query.exe
 cargo build
@echo.

-@cd ..\..\crates\nu_plugin_custom_values
-echo Building nu_plugin_custom_values.exe
-cargo build
-@echo.
-
@cd ..\..
--- a/build-all.nu
+++ b/build-all.nu
@@ -1,18 +1,16 @@
 echo '-------------------------------------------------------------------'
-echo 'Building nushell (nu) with dataframes and all the plugins'
+echo 'Building nushell (nu) with --features=extra and all the plugins'
 echo '-------------------------------------------------------------------'

 echo $'(char nl)Building nushell'
 echo '----------------------------'
-cargo build --features=dataframe
+cargo build --features=extra

 let plugins = [
    nu_plugin_inc,
    nu_plugin_gstat,
    nu_plugin_query,
    nu_plugin_example,
-    nu_plugin_custom_values,
-    nu_plugin_formats,
 ]

 for plugin in $plugins {
@@ -20,6 +18,5 @@ for plugin in $plugins {
    '----------------------------'
    cd $'crates/($plugin)'
    cargo build
-    cd ../../
    ignore
 }
--- a/codecov.yml
+++ b/codecov.yml
@@ -1,17 +0,0 @@
-coverage:
-  status:
-    project:
-      default:
-        target: 55%
-        threshold: 2%
-    patch:
-      default:
-        informational: true
-
-comment:
-  layout: reach, diff, files
-  behavior: default
-  require_base: yes
-  require_head: yes
-  after_n_builds: 1 # Disabled windows else: 2
-  
--- a/coverage-local.nu
+++ b/coverage-local.nu
@@ -1,54 +0,0 @@
-#!/usr/bin/env nu
-
-let start = (date now)
-# Script to generate coverage locally
-#
-# Output: `lcov.info` file
-#
-# Relies on `cargo-llvm-cov`. Install via `cargo install cargo-llvm-cov`
-# https://github.com/taiki-e/cargo-llvm-cov
-
-# You probably have to run `cargo llvm-cov clean` once manually,
-# as you have to confirm to install additional tooling for your rustup toolchain.
-# Else the script might stall waiting for your `y<ENTER>`
-
-# Some of the internal tests rely on the exact cargo profile
-# (This is somewhat criminal itself)
-# but we have to signal to the tests that we use the `ci` `--profile`
-let-env NUSHELL_CARGO_TARGET = "ci"
-
-# Manual gathering of coverage to catch invocation of the `nu` binary.
-# This is relevant for tests using the `nu!` macro from `nu-test-support`
-# see: https://github.com/taiki-e/cargo-llvm-cov#get-coverage-of-external-tests
-
-print "Setting up environment variables for coverage"
-# Enable LLVM coverage tracking through environment variables
-# show env outputs .ini/.toml style description of the variables
-# In order to use from toml, we need to make sure our string literals are single quoted
-# This is especially important when running on Windows since "C:\blah" is treated as an escape
-cargo llvm-cov show-env | str replace (char dq) (char sq) -a | from toml | load-env
-
-print "Cleaning up coverage data"
-cargo llvm-cov clean --workspace
-
-print "Building with workspace and profile=ci"
-# Apparently we need to explicitly build the necessary parts
-# using the `--profile=ci` is basically `debug` build with unnecessary symbols stripped
-# leads to smaller binaries and potential savings when compiling and running
-cargo build --workspace --profile=ci
-
-print "Running tests with --workspace and profile=ci"
-cargo test --workspace --profile=ci
-
-# You need to provide the used profile to find the raw data
-print "Generating coverage report as lcov.info"
-cargo llvm-cov report --lcov --output-path lcov.info --profile=ci
-
-let end = (date now)
-$"Coverage generation took ($end - $start)."
-
-# To display the coverage in your editor see:
-#
-# - https://marketplace.visualstudio.com/items?itemName=ryanluker.vscode-coverage-gutters
-# - https://github.com/umaumax/vim-lcov
-# - https://github.com/andythigpen/nvim-coverage (probably needs some additional config)
--- a/coverage-local.sh
+++ b/coverage-local.sh
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-
-# Script to generate coverage locally
-#
-# Output: `lcov.info` file
-#
-# Relies on `cargo-llvm-cov`. Install via `cargo install cargo-llvm-cov`
-# https://github.com/taiki-e/cargo-llvm-cov
-
-# You probably have to run `cargo llvm-cov clean` once manually,
-# as you have to confirm to install additional tooling for your rustup toolchain.
-# Else the script might stall waiting for your `y<ENTER>`
-
-# Some of the internal tests rely on the exact cargo profile
-# (This is somewhat criminal itself)
-# but we have to signal to the tests that we use the `ci` `--profile`
-export NUSHELL_CARGO_TARGET=ci
-
-# Manual gathering of coverage to catch invocation of the `nu` binary.
-# This is relevant for tests using the `nu!` macro from `nu-test-support`
-# see: https://github.com/taiki-e/cargo-llvm-cov#get-coverage-of-external-tests
-
-# Enable LLVM coverage tracking through environment variables
-source <(cargo llvm-cov show-env --export-prefix)
-cargo llvm-cov clean --workspace
-# Apparently we need to explicitly build the necessary parts
-# using the `--profile=ci` is basically `debug` build with unnecessary symbols stripped
-# leads to smaller binaries and potential savings when compiling and running
-cargo build --workspace --profile=ci
-cargo test --workspace --profile=ci
-# You need to provide the used profile to find the raw data
-cargo llvm-cov report --lcov --output-path lcov.info --profile=ci
-
-# To display the coverage in your editor see:
-#
-# - https://marketplace.visualstudio.com/items?itemName=ryanluker.vscode-coverage-gutters
-# - https://github.com/umaumax/vim-lcov
-# - https://github.com/andythigpen/nvim-coverage (probably needs some additional config)
--- a/crates/nu-cli/Cargo.toml
+++ b/crates/nu-cli/Cargo.toml
@@ -1,44 +1,36 @@
 [package]
 authors = ["The Nushell Project Developers"]
 description = "CLI-related functionality for Nushell"
-repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cli"
 edition = "2021"
 license = "MIT"
 name = "nu-cli"
-version = "0.79.0"
-
-[lib]
-bench = false
+version = "0.66.1"

 [dev-dependencies]
-nu-test-support = { path = "../nu-test-support", version = "0.79.0" }
-rstest = { version = "0.17.0", default-features = false }
+nu-test-support = { path="../nu-test-support", version = "0.66.1"  }
+nu-command = { path = "../nu-command", version = "0.66.1" }
+rstest = "0.15.0"

 [dependencies]
-nu-command = { path = "../nu-command", version = "0.79.0" }
-nu-engine = { path = "../nu-engine", version = "0.79.0" }
-nu-path = { path = "../nu-path", version = "0.79.0" }
-nu-parser = { path = "../nu-parser", version = "0.79.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.79.0" }
-nu-utils = { path = "../nu-utils", version = "0.79.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.79.0" }
-
-nu-ansi-term = "0.47.0"
-reedline = { version = "0.19.0", features = ["bashisms", "sqlite"]}
-
-atty = "0.2.14"
-chrono = { default-features = false, features = ["std"], version = "0.4.23" }
-crossterm = "0.26"
-fancy-regex = "0.11.0"
-fuzzy-matcher = "0.3.7"
-is_executable = "1.0.1"
-once_cell = "1.17.0"
-log = "0.4"
-miette = { version = "5.7.0", features = ["fancy-no-backtrace"] }
-percent-encoding = "2"
-sysinfo = "0.28.2"
+nu-engine = { path = "../nu-engine", version = "0.66.1"  }
+nu-path = { path = "../nu-path", version = "0.66.1"  }
+nu-parser = { path = "../nu-parser", version = "0.66.1"  }
+nu-protocol = { path = "../nu-protocol", version = "0.66.1"  }
+nu-utils = { path = "../nu-utils", version = "0.66.1"  }
+nu-ansi-term = "0.46.0"
+nu-color-config = { path = "../nu-color-config", version = "0.66.1"  }
+reedline = { version = "0.9.0", features = ["bashisms", "sqlite"]}
+crossterm = "0.23.0"
+miette = { version = "5.1.0", features = ["fancy"] }
 thiserror = "1.0.31"
-unicode-segmentation = "1.10.0"
+fuzzy-matcher = "0.3.7"
+
+chrono = "0.4.19"
+is_executable = "1.0.1"
+lazy_static = "1.4.0"
+log = "0.4"
+regex = "1.5.4"
+sysinfo = "0.24.1"

 [features]
 plugin = []
--- a/crates/nu-cli/LICENSE
+++ b/crates/nu-cli/LICENSE
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2019 - 2023 The Nushell Project Developers
+Copyright (c) 2019 - 2022 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/crates/nu-cli/src/eval_cmds.rs
+++ b/crates/nu-cli/src/eval_cmds.rs
@@ -1,9 +1,9 @@
+use crate::util::report_error;
 use log::info;
 use miette::Result;
 use nu_engine::{convert_env_values, eval_block};
 use nu_parser::parse;
 use nu_protocol::engine::Stack;
-use nu_protocol::report_error;
 use nu_protocol::{
    engine::{EngineState, StateWorkingSet},
    PipelineData, Spanned, Value,
@@ -15,6 +15,7 @@ pub fn evaluate_commands(
    engine_state: &mut EngineState,
    stack: &mut Stack,
    input: PipelineData,
+    is_perf_true: bool,
    table_mode: Option<Value>,
 ) -> Result<Option<i64>> {
    // Translate environment variables from Strings to Values
@@ -34,9 +35,9 @@ pub fn evaluate_commands(

        let mut working_set = StateWorkingSet::new(engine_state);

-        let output = parse(&mut working_set, None, commands.item.as_bytes(), false);
-        if let Some(err) = working_set.parse_errors.first() {
-            report_error(&working_set, err);
+        let (output, err) = parse(&mut working_set, None, commands.item.as_bytes(), false, &[]);
+        if let Some(err) = err {
+            report_error(&working_set, &err);

            std::process::exit(1);
        }
@@ -67,7 +68,9 @@ pub fn evaluate_commands(
        }
    };

+    if is_perf_true {
        info!("evaluate {}:{}:{}", file!(), line!(), column!());
+    }

    Ok(exit_code)
 }
--- a/crates/nu-cli/src/commands/commandline.rs
+++ b/crates/nu-cli/src/commands/commandline.rs
@@ -1,137 +0,0 @@
-use nu_engine::CallExt;
-use nu_protocol::ast::Call;
-use nu_protocol::engine::{Command, EngineState, Stack};
-use nu_protocol::Category;
-use nu_protocol::IntoPipelineData;
-use nu_protocol::{PipelineData, ShellError, Signature, SyntaxShape, Type, Value};
-use unicode_segmentation::UnicodeSegmentation;
-
-#[derive(Clone)]
-pub struct Commandline;
-
-impl Command for Commandline {
-    fn name(&self) -> &str {
-        "commandline"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("commandline")
-            .input_output_types(vec![(Type::Nothing, Type::Nothing)])
-            .switch(
-                "cursor",
-                "Set or get the current cursor position",
-                Some('c'),
-            )
-            .switch(
-                "append",
-                "appends the string to the end of the buffer",
-                Some('a'),
-            )
-            .switch(
-                "insert",
-                "inserts the string into the buffer at the cursor position",
-                Some('i'),
-            )
-            .switch(
-                "replace",
-                "replaces the current contents of the buffer (default)",
-                Some('r'),
-            )
-            .optional(
-                "cmd",
-                SyntaxShape::String,
-                "the string to perform the operation with",
-            )
-            .category(Category::Core)
-    }
-
-    fn usage(&self) -> &str {
-        "View or modify the current command line input buffer."
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["repl", "interactive"]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        if let Some(cmd) = call.opt::<Value>(engine_state, stack, 0)? {
-            let mut buffer = engine_state
-                .repl_buffer_state
-                .lock()
-                .expect("repl buffer state mutex");
-            let mut cursor_pos = engine_state
-                .repl_cursor_pos
-                .lock()
-                .expect("repl cursor pos mutex");
-
-            if call.has_flag("cursor") {
-                let cmd_str = cmd.as_string()?;
-                match cmd_str.parse::<i64>() {
-                    Ok(n) => {
-                        *cursor_pos = if n <= 0 {
-                            0usize
-                        } else {
-                            buffer
-                                .grapheme_indices(true)
-                                .map(|(i, _c)| i)
-                                .nth(n as usize)
-                                .unwrap_or(buffer.len())
-                        }
-                    }
-                    Err(_) => {
-                        return Err(ShellError::CantConvert {
-                            to_type: "int".to_string(),
-                            from_type: "string".to_string(),
-                            span: cmd.span()?,
-                            help: Some(format!(
-                                r#"string "{cmd_str}" does not represent a valid integer"#
-                            )),
-                        })
-                    }
-                }
-            } else if call.has_flag("append") {
-                buffer.push_str(&cmd.as_string()?);
-            } else if call.has_flag("insert") {
-                let cmd_str = cmd.as_string()?;
-                buffer.insert_str(*cursor_pos, &cmd_str);
-                *cursor_pos += cmd_str.len();
-            } else {
-                *buffer = cmd.as_string()?;
-                *cursor_pos = buffer.len();
-            }
-            Ok(Value::Nothing { span: call.head }.into_pipeline_data())
-        } else {
-            let buffer = engine_state
-                .repl_buffer_state
-                .lock()
-                .expect("repl buffer state mutex");
-            if call.has_flag("cursor") {
-                let cursor_pos = engine_state
-                    .repl_cursor_pos
-                    .lock()
-                    .expect("repl cursor pos mutex");
-                let char_pos = buffer
-                    .grapheme_indices(true)
-                    .position(|(i, _c)| i == *cursor_pos)
-                    .unwrap_or(buffer.len());
-                Ok(Value::String {
-                    val: char_pos.to_string(),
-                    span: call.head,
-                }
-                .into_pipeline_data())
-            } else {
-                Ok(Value::String {
-                    val: buffer.to_string(),
-                    span: call.head,
-                }
-                .into_pipeline_data())
-            }
-        }
-    }
-}
--- a/crates/nu-cli/src/commands/default_context.rs
+++ b/crates/nu-cli/src/commands/default_context.rs
@@ -1,33 +0,0 @@
-use nu_protocol::engine::{EngineState, StateWorkingSet};
-
-use crate::commands::*;
-
-pub fn add_cli_context(mut engine_state: EngineState) -> EngineState {
-    let delta = {
-        let mut working_set = StateWorkingSet::new(&engine_state);
-
-        macro_rules! bind_command {
-            ( $( $command:expr ),* $(,)? ) => {
-                $( working_set.add_decl(Box::new($command)); )*
-            };
-        }
-
-        bind_command! {
-            Commandline,
-            History,
-            HistorySession,
-            Keybindings,
-            KeybindingsDefault,
-            KeybindingsList,
-            KeybindingsListen,
-        };
-
-        working_set.render()
-    };
-
-    if let Err(err) = engine_state.merge_delta(delta) {
-        eprintln!("Error creating default context: {err:?}");
-    }
-
-    engine_state
-}
--- a/crates/nu-cli/src/commands/history.rs
+++ b/crates/nu-cli/src/commands/history.rs
@@ -1,264 +0,0 @@
-use nu_protocol::ast::Call;
-use nu_protocol::engine::{Command, EngineState, Stack};
-use nu_protocol::{
-    Category, Example, HistoryFileFormat, IntoInterruptiblePipelineData, PipelineData, ShellError,
-    Signature, Span, Type, Value,
-};
-use reedline::{
-    FileBackedHistory, History as ReedlineHistory, HistoryItem, SearchDirection, SearchQuery,
-    SqliteBackedHistory,
-};
-
-#[derive(Clone)]
-pub struct History;
-
-impl Command for History {
-    fn name(&self) -> &str {
-        "history"
-    }
-
-    fn usage(&self) -> &str {
-        "Get the command history."
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("history")
-            .input_output_types(vec![
-                (Type::Nothing, Type::Table(vec![])),
-                (Type::Nothing, Type::Nothing),
-            ])
-            .allow_variants_without_examples(true)
-            .switch("clear", "Clears out the history entries", Some('c'))
-            .switch(
-                "long",
-                "Show long listing of entries for sqlite history",
-                Some('l'),
-            )
-            .category(Category::Misc)
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        _stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let head = call.head;
-
-        // todo for sqlite history this command should be an alias to `open ~/.config/nushell/history.sqlite3 | get history`
-        if let Some(config_path) = nu_path::config_dir() {
-            let clear = call.has_flag("clear");
-            let long = call.has_flag("long");
-            let ctrlc = engine_state.ctrlc.clone();
-
-            let mut history_path = config_path;
-            history_path.push("nushell");
-            match engine_state.config.history_file_format {
-                HistoryFileFormat::Sqlite => {
-                    history_path.push("history.sqlite3");
-                }
-                HistoryFileFormat::PlainText => {
-                    history_path.push("history.txt");
-                }
-            }
-
-            if clear {
-                let _ = std::fs::remove_file(history_path);
-                // TODO: FIXME also clear the auxiliary files when using sqlite
-                Ok(PipelineData::empty())
-            } else {
-                let history_reader: Option<Box<dyn ReedlineHistory>> =
-                    match engine_state.config.history_file_format {
-                        HistoryFileFormat::Sqlite => SqliteBackedHistory::with_file(history_path)
-                            .map(|inner| {
-                                let boxed: Box<dyn ReedlineHistory> = Box::new(inner);
-                                boxed
-                            })
-                            .ok(),
-
-                        HistoryFileFormat::PlainText => FileBackedHistory::with_file(
-                            engine_state.config.max_history_size as usize,
-                            history_path,
-                        )
-                        .map(|inner| {
-                            let boxed: Box<dyn ReedlineHistory> = Box::new(inner);
-                            boxed
-                        })
-                        .ok(),
-                    };
-
-                match engine_state.config.history_file_format {
-                    HistoryFileFormat::PlainText => Ok(history_reader
-                        .and_then(|h| {
-                            h.search(SearchQuery::everything(SearchDirection::Forward, None))
-                                .ok()
-                        })
-                        .map(move |entries| {
-                            entries
-                                .into_iter()
-                                .enumerate()
-                                .map(move |(idx, entry)| Value::Record {
-                                    cols: vec!["command".to_string(), "index".to_string()],
-                                    vals: vec![
-                                        Value::String {
-                                            val: entry.command_line,
-                                            span: head,
-                                        },
-                                        Value::int(idx as i64, head),
-                                    ],
-                                    span: head,
-                                })
-                        })
-                        .ok_or(ShellError::FileNotFound(head))?
-                        .into_pipeline_data(ctrlc)),
-                    HistoryFileFormat::Sqlite => Ok(history_reader
-                        .and_then(|h| {
-                            h.search(SearchQuery::everything(SearchDirection::Forward, None))
-                                .ok()
-                        })
-                        .map(move |entries| {
-                            entries.into_iter().enumerate().map(move |(idx, entry)| {
-                                create_history_record(idx, entry, long, head)
-                            })
-                        })
-                        .ok_or(ShellError::FileNotFound(head))?
-                        .into_pipeline_data(ctrlc)),
-                }
-            }
-        } else {
-            Err(ShellError::FileNotFound(head))
-        }
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                example: "history | length",
-                description: "Get current history length",
-                result: None,
-            },
-            Example {
-                example: "history | last 5",
-                description: "Show last 5 commands you have ran",
-                result: None,
-            },
-            Example {
-                example: "history | wrap cmd | where cmd =~ cargo",
-                description: "Search all the commands from history that contains 'cargo'",
-                result: None,
-            },
-        ]
-    }
-}
-
-fn create_history_record(idx: usize, entry: HistoryItem, long: bool, head: Span) -> Value {
-    //1. Format all the values
-    //2. Create a record of either short or long columns and values
-
-    let item_id_value = Value::Int {
-        val: match entry.id {
-            Some(id) => {
-                let ids = id.to_string();
-                match ids.parse::<i64>() {
-                    Ok(i) => i,
-                    _ => 0i64,
-                }
-            }
-            None => 0i64,
-        },
-        span: head,
-    };
-    let start_timestamp_value = Value::String {
-        val: match entry.start_timestamp {
-            Some(time) => time.to_string(),
-            None => "".into(),
-        },
-        span: head,
-    };
-    let command_value = Value::String {
-        val: entry.command_line,
-        span: head,
-    };
-    let session_id_value = Value::Int {
-        val: match entry.session_id {
-            Some(sid) => {
-                let sids = sid.to_string();
-                match sids.parse::<i64>() {
-                    Ok(i) => i,
-                    _ => 0i64,
-                }
-            }
-            None => 0i64,
-        },
-        span: head,
-    };
-    let hostname_value = Value::String {
-        val: match entry.hostname {
-            Some(host) => host,
-            None => "".into(),
-        },
-        span: head,
-    };
-    let cwd_value = Value::String {
-        val: match entry.cwd {
-            Some(cwd) => cwd,
-            None => "".into(),
-        },
-        span: head,
-    };
-    let duration_value = Value::Duration {
-        val: match entry.duration {
-            Some(d) => d.as_nanos().try_into().unwrap_or(0),
-            None => 0,
-        },
-        span: head,
-    };
-    let exit_status_value = Value::int(entry.exit_status.unwrap_or(0), head);
-    let index_value = Value::int(idx as i64, head);
-    if long {
-        Value::Record {
-            cols: vec![
-                "item_id".into(),
-                "start_timestamp".into(),
-                "command".to_string(),
-                "session_id".into(),
-                "hostname".into(),
-                "cwd".into(),
-                "duration".into(),
-                "exit_status".into(),
-                "idx".to_string(),
-            ],
-            vals: vec![
-                item_id_value,
-                start_timestamp_value,
-                command_value,
-                session_id_value,
-                hostname_value,
-                cwd_value,
-                duration_value,
-                exit_status_value,
-                index_value,
-            ],
-            span: head,
-        }
-    } else {
-        Value::Record {
-            cols: vec![
-                "start_timestamp".into(),
-                "command".to_string(),
-                "cwd".into(),
-                "duration".into(),
-                "exit_status".into(),
-            ],
-            vals: vec![
-                start_timestamp_value,
-                command_value,
-                cwd_value,
-                duration_value,
-                exit_status_value,
-            ],
-            span: head,
-        }
-    }
-}
--- a/crates/nu-cli/src/commands/history_session.rs
+++ b/crates/nu-cli/src/commands/history_session.rs
@@ -1,42 +0,0 @@
-use nu_protocol::ast::Call;
-use nu_protocol::engine::{Command, EngineState, Stack};
-use nu_protocol::{
-    Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, Type, Value,
-};
-
-#[derive(Clone)]
-pub struct HistorySession;
-
-impl Command for HistorySession {
-    fn name(&self) -> &str {
-        "history session"
-    }
-
-    fn usage(&self) -> &str {
-        "Get the command history session."
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("history session")
-            .category(Category::Misc)
-            .input_output_types(vec![(Type::Nothing, Type::Int)])
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            example: "history session",
-            description: "Get current history session",
-            result: None,
-        }]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        _stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        Ok(Value::int(engine_state.history_session_id, call.head).into_pipeline_data())
-    }
-}
--- a/crates/nu-cli/src/completions/command_completions.rs
+++ b/crates/nu-cli/src/completions/command_completions.rs
@@ -11,7 +11,6 @@ pub struct CommandCompletion {
    engine_state: Arc<EngineState>,
    flattened: Vec<(Span, FlatShape)>,
    flat_shape: FlatShape,
-    force_completion_after_space: bool,
 }

 impl CommandCompletion {
@@ -20,13 +19,11 @@ impl CommandCompletion {
        _: &StateWorkingSet,
        flattened: Vec<(Span, FlatShape)>,
        flat_shape: FlatShape,
-        force_completion_after_space: bool,
    ) -> Self {
        Self {
            engine_state,
            flattened,
            flat_shape,
-            force_completion_after_space,
        }
    }

@@ -37,8 +34,7 @@ impl CommandCompletion {
    ) -> Vec<String> {
        let mut executables = vec![];

-        // os agnostic way to get the PATH env var
-        let paths = self.engine_state.get_path_env_var();
+        let paths = self.engine_state.get_env_var("PATH");

        if let Some(paths) = paths {
            if let Ok(paths) = paths.as_list() {
@@ -61,7 +57,7 @@ impl CommandCompletion {
                                        .matches_str(&x.to_string_lossy(), prefix)),
                                    Some(true)
                                )
-                                && is_executable::is_executable(item.path())
+                                && is_executable::is_executable(&item.path())
                            {
                                if let Ok(name) = item.file_name().into_string() {
                                    executables.push(name);
@@ -88,22 +84,39 @@ impl CommandCompletion {

        let filter_predicate = |command: &[u8]| match_algorithm.matches_u8(command, partial);

-        let mut results = working_set
+        let results = working_set
            .find_commands_by_predicate(filter_predicate)
            .into_iter()
            .map(move |x| Suggestion {
                value: String::from_utf8_lossy(&x.0).to_string(),
                description: x.1,
                extra: None,
-                span: reedline::Span::new(span.start - offset, span.end - offset),
+                span: reedline::Span {
+                    start: span.start - offset,
+                    end: span.end - offset,
+                },
                append_whitespace: true,
-            })
-            .collect::<Vec<_>>();
+            });
+
+        let results_aliases = working_set
+            .find_aliases_by_predicate(filter_predicate)
+            .into_iter()
+            .map(move |x| Suggestion {
+                value: String::from_utf8_lossy(&x).to_string(),
+                description: None,
+                extra: None,
+                span: reedline::Span {
+                    start: span.start - offset,
+                    end: span.end - offset,
+                },
+                append_whitespace: true,
+            });
+
+        let mut results = results.chain(results_aliases).collect::<Vec<_>>();

        let partial = working_set.get_span_contents(span);
        let partial = String::from_utf8_lossy(partial).to_string();
-
-        if find_externals {
+        let results = if find_externals {
            let results_external = self
                .external_command_completion(&partial, match_algorithm)
                .into_iter()
@@ -111,15 +124,15 @@ impl CommandCompletion {
                    value: x,
                    description: None,
                    extra: None,
-                    span: reedline::Span::new(span.start - offset, span.end - offset),
+                    span: reedline::Span {
+                        start: span.start - offset,
+                        end: span.end - offset,
+                    },
                    append_whitespace: true,
                });

-            let results_strings: Vec<String> =
-                results.clone().into_iter().map(|x| x.value).collect();
-
            for external in results_external {
-                if results_strings.contains(&external.value) {
+                if results.contains(&external) {
                    results.push(Suggestion {
                        value: format!("^{}", external.value),
                        description: None,
@@ -135,7 +148,9 @@ impl CommandCompletion {
            results
        } else {
            results
-        }
+        };
+
+        results
    }
 }

@@ -157,7 +172,7 @@ impl Completer for CommandCompletion {
            .take_while(|x| {
                matches!(
                    x.1,
-                    FlatShape::InternalCall(_)
+                    FlatShape::InternalCall
                        | FlatShape::External
                        | FlatShape::ExternalArg
                        | FlatShape::Literal
@@ -170,7 +185,10 @@ impl Completer for CommandCompletion {
        let subcommands = if let Some(last) = last {
            self.complete_commands(
                working_set,
-                Span::new(last.0.start, pos),
+                Span {
+                    start: last.0.start,
+                    end: pos,
+                },
                offset,
                false,
                options.match_algorithm,
@@ -185,15 +203,10 @@ impl Completer for CommandCompletion {

        let config = working_set.get_config();
        let commands = if matches!(self.flat_shape, nu_parser::FlatShape::External)
-            || matches!(self.flat_shape, nu_parser::FlatShape::InternalCall(_))
+            || 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,
@@ -215,107 +228,3 @@ impl Completer for CommandCompletion {
        SortBy::LevenshteinDistance
    }
 }
-
-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: &[(Vec<u8>, usize, usize)]) -> bool {
-    for (contents, _, _) in working_set_file_contents {
-        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 "),
-            None => false,
-        };
-        if result {
-            return true;
-        }
-    }
-    false
-}
-
-#[cfg(test)]
-mod command_completions_tests {
-    use super::*;
-
-    #[test]
-    fn test_find_non_whitespace_index() {
-        let commands = vec![
-            ("    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(&Vec::from(ele.0.as_bytes()), 0);
-            assert_eq!(index, ele.1, "Failed on index {}", idx);
-        }
-    }
-
-    #[test]
-    fn test_is_last_command_passthrough() {
-        let commands = vec![
-            ("    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(), vec![]);
-
-            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
@@ -2,12 +2,10 @@ use crate::completions::{
    CommandCompletion, Completer, CompletionOptions, CustomCompletion, DirectoryCompletion,
    DotNuCompletion, FileCompletion, FlagCompletion, MatchAlgorithm, VariableCompletion,
 };
-use nu_engine::eval_block;
 use nu_parser::{flatten_expression, parse, FlatShape};
 use nu_protocol::{
-    ast::PipelineElement,
    engine::{EngineState, Stack, StateWorkingSet},
-    BlockId, PipelineData, Span, Value,
+    Span,
 };
 use reedline::{Completer as ReedlineCompleter, Suggestion};
 use std::str;
@@ -58,112 +56,42 @@ impl NuCompleter {
        suggestions
    }

-    fn external_completion(
-        &self,
-        block_id: BlockId,
-        spans: &[String],
-        offset: usize,
-        span: Span,
-    ) -> Option<Vec<Suggestion>> {
-        let stack = self.stack.clone();
-        let block = self.engine_state.get_block(block_id);
-        let mut callee_stack = stack.gather_captures(&block.captures);
-
-        // Line
-        if let Some(pos_arg) = block.signature.required_positional.get(0) {
-            if let Some(var_id) = pos_arg.var_id {
-                callee_stack.add_var(
-                    var_id,
-                    Value::List {
-                        vals: spans
-                            .iter()
-                            .map(|it| Value::string(it, Span::unknown()))
-                            .collect(),
-                        span: Span::unknown(),
-                    },
-                );
-            }
-        }
-
-        let result = eval_block(
-            &self.engine_state,
-            &mut callee_stack,
-            block,
-            PipelineData::empty(),
-            true,
-            true,
-        );
-
-        match result {
-            Ok(pd) => {
-                let value = pd.into_value(span);
-                if let Value::List { vals, span: _ } = value {
-                    let result =
-                        map_value_completions(vals.iter(), Span::new(span.start, span.end), offset);
-
-                    return Some(result);
-                }
-            }
-            Err(err) => println!("failed to eval completer block: {err}"),
-        }
-
-        None
-    }
-
    fn completion_helper(&mut self, line: &str, pos: usize) -> Vec<Suggestion> {
        let mut working_set = StateWorkingSet::new(&self.engine_state);
        let offset = working_set.next_span_start();
+        let (mut new_line, alias_offset) = try_find_alias(line.as_bytes(), &working_set);
        let initial_line = line.to_string();
-        let mut line = line.to_string();
-        line.insert(pos, 'a');
+        new_line.push(b'a');
        let pos = offset + pos;
-        let config = self.engine_state.get_config();
-
-        let output = parse(&mut working_set, Some("completer"), line.as_bytes(), false);
+        let (output, _err) = parse(&mut working_set, Some("completer"), &new_line, false, &[]);

        for pipeline in output.pipelines.into_iter() {
-            for pipeline_element in pipeline.elements {
-                match pipeline_element {
-                    PipelineElement::Expression(_, expr)
-                    | PipelineElement::Redirection(_, _, expr)
-                    | PipelineElement::And(_, expr)
-                    | PipelineElement::Or(_, expr)
-                    | PipelineElement::SeparateRedirection { out: (_, expr), .. } => {
+            for expr in pipeline.expressions {
                let flattened: Vec<_> = flatten_expression(&working_set, &expr);
-                        let mut spans: Vec<String> = vec![];
+                let span_offset: usize = alias_offset.iter().sum();

                for (flat_idx, flat) in flattened.iter().enumerate() {
-                            let is_passthrough_command = spans
-                                .first()
-                                .filter(|content| *content == &String::from("sudo"))
-                                .is_some();
-                            // Read the current spam to string
-                            let current_span = working_set.get_span_contents(flat.0).to_vec();
-                            let current_span_str = String::from_utf8_lossy(&current_span);
-
-                            // Skip the last 'a' as span item
-                            if flat_idx == flattened.len() - 1 {
-                                let mut chars = current_span_str.chars();
-                                chars.next_back();
-                                let current_span_str = chars.as_str().to_owned();
-                                spans.push(current_span_str.to_string());
-                            } else {
-                                spans.push(current_span_str.to_string());
-                            }
-
-                            // Complete based on the last span
-                            if pos >= flat.0.start && pos < flat.0.end {
+                    if pos + span_offset >= flat.0.start && pos + span_offset < flat.0.end {
                        // Context variables
                        let most_left_var =
                            most_left_variable(flat_idx, &working_set, flattened.clone());

                        // Create a new span
-                                let new_span = Span::new(flat.0.start, flat.0.end - 1);
+                        let new_span = if flat_idx == 0 {
+                            Span {
+                                start: flat.0.start,
+                                end: flat.0.end - 1 - span_offset,
+                            }
+                        } else {
+                            Span {
+                                start: flat.0.start - span_offset,
+                                end: flat.0.end - 1 - span_offset,
+                            }
+                        };

-                                // Parses the prefix. Completion should look up to the cursor position, not after.
+                        // Parses the prefix
                        let mut prefix = working_set.get_span_contents(flat.0).to_vec();
-                                let index = pos - flat.0.start;
-                                prefix.drain(index..);
+                        prefix.remove(pos - (flat.0.start - span_offset));

                        // Variables completion
                        if prefix.starts_with(b"$") || most_left_var.is_some() {
@@ -185,45 +113,8 @@ impl NuCompleter {

                        // Flags completion
                        if prefix.starts_with(b"-") {
-                                    // Try to complete flag internally
-                                    let mut completer = FlagCompletion::new(expr.clone());
-                                    let result = self.process_completion(
-                                        &mut completer,
-                                        &working_set,
-                                        prefix.clone(),
-                                        new_span,
-                                        offset,
-                                        pos,
-                                    );
+                            let mut completer = FlagCompletion::new(expr);

-                                    if !result.is_empty() {
-                                        return result;
-                                    }
-
-                                    // We got no results for internal completion
-                                    // now we can check if external completer is set and use it
-                                    if let Some(block_id) = config.external_completer {
-                                        if let Some(external_result) = self
-                                            .external_completion(block_id, &spans, offset, new_span)
-                                        {
-                                            return external_result;
-                                        }
-                                    }
-                                }
-
-                                // specially check if it is currently empty - always complete commands
-                                if (is_passthrough_command && flat_idx == 1)
-                                    || (flat_idx == 0
-                                        && working_set.get_span_contents(new_span).is_empty())
-                                {
-                                    let mut completer = CommandCompletion::new(
-                                        self.engine_state.clone(),
-                                        &working_set,
-                                        flattened.clone(),
-                                        // flat_idx,
-                                        FlatShape::String,
-                                        true,
-                                    );
                            return self.process_completion(
                                &mut completer,
                                &working_set,
@@ -234,16 +125,15 @@ impl NuCompleter {
                            );
                        }

-                                // Completions that depends on the previous expression (e.g: use, source-env)
-                                if (is_passthrough_command && flat_idx > 1) || flat_idx > 0 {
+                        // Completions that depends on the previous expression (e.g: use, source)
+                        if flat_idx > 0 {
                            if let Some(previous_expr) = flattened.get(flat_idx - 1) {
                                // Read the content for the previous expression
                                let prev_expr_str =
                                    working_set.get_span_contents(previous_expr.0).to_vec();

                                // Completion for .nu files
-                                        if prev_expr_str == b"use" || prev_expr_str == b"source-env"
-                                        {
+                                if prev_expr_str == b"use" || prev_expr_str == b"source" {
                                    let mut completer =
                                        DotNuCompletion::new(self.engine_state.clone());

@@ -304,8 +194,7 @@ impl NuCompleter {
                                );
                            }
                            FlatShape::Filepath | FlatShape::GlobPattern => {
-                                        let mut completer =
-                                            FileCompletion::new(self.engine_state.clone());
+                                let mut completer = FileCompletion::new(self.engine_state.clone());

                                return self.process_completion(
                                    &mut completer,
@@ -323,10 +212,9 @@ impl NuCompleter {
                                    flattened.clone(),
                                    // flat_idx,
                                    flat_shape.clone(),
-                                            false,
                                );

-                                        let mut out: Vec<_> = self.process_completion(
+                                let out: Vec<_> = self.process_completion(
                                    &mut completer,
                                    &working_set,
                                    prefix.clone(),
@@ -335,23 +223,11 @@ impl NuCompleter {
                                    pos,
                                );

-                                        if !out.is_empty() {
-                                            return out;
-                                        }
-
-                                        // Try to complete using an external completer (if set)
-                                        if let Some(block_id) = config.external_completer {
-                                            if let Some(external_result) = self.external_completion(
-                                                block_id, &spans, offset, new_span,
-                                            ) {
-                                                return external_result;
-                                            }
-                                        }
-
-                                        // Check for file completion
+                                if out.is_empty() {
                                    let mut completer =
                                        FileCompletion::new(self.engine_state.clone());
-                                        out = self.process_completion(
+
+                                    return self.process_completion(
                                        &mut completer,
                                        &working_set,
                                        prefix,
@@ -359,20 +235,17 @@ impl NuCompleter {
                                        offset,
                                        pos,
                                    );
-
-                                        if !out.is_empty() {
-                                            return out;
                                }
+
+                                return out;
                            }
                        };
                    }
                }
            }
        }
-            }
-        }

-        vec![]
+        return vec![];
    }
 }

@@ -382,6 +255,85 @@ impl ReedlineCompleter for NuCompleter {
    }
 }

+type MatchedAlias = Vec<(Vec<u8>, Vec<u8>)>;
+
+// Handler the completion when giving lines contains at least one alias. (e.g: `g checkout`)
+// that `g` is an alias of `git`
+fn try_find_alias(line: &[u8], working_set: &StateWorkingSet) -> (Vec<u8>, Vec<usize>) {
+    // An vector represents the offsets of alias
+    // e.g: the offset is 2 for the alias `g` of `git`
+    let mut alias_offset = vec![];
+    let mut output = vec![];
+    if let Some(matched_alias) = search_alias(line, working_set) {
+        let mut lens = matched_alias.len();
+        for (input_vec, line_vec) in matched_alias {
+            alias_offset.push(line_vec.len() - input_vec.len());
+            output.extend(line_vec);
+            if lens > 1 {
+                output.push(b' ');
+                lens -= 1;
+            }
+        }
+
+        if !line.is_empty() {
+            let last = line.last().expect("input is empty");
+            if last == &b' ' {
+                output.push(b' ');
+            }
+        }
+    } else {
+        output = line.to_vec();
+    }
+
+    (output, alias_offset)
+}
+
+fn search_alias(input: &[u8], working_set: &StateWorkingSet) -> Option<MatchedAlias> {
+    let mut vec_names = vec![];
+    let mut vec_alias = vec![];
+    let mut pos = 0;
+    let mut is_alias = false;
+    for (index, character) in input.iter().enumerate() {
+        if *character == b' ' {
+            let range = &input[pos..index];
+            vec_names.push(range.to_owned());
+            pos = index + 1;
+        }
+    }
+    // Push the rest to names vector.
+    if pos < input.len() {
+        vec_names.push((&input[pos..]).to_owned());
+    }
+
+    for name in &vec_names {
+        if let Some(alias_id) = working_set.find_alias(&name[..]) {
+            let alias_span = working_set.get_alias(alias_id);
+            let mut span_vec = vec![];
+            is_alias = true;
+            for alias in alias_span {
+                let name = working_set.get_span_contents(*alias);
+                if !name.is_empty() {
+                    span_vec.push(name);
+                }
+            }
+            // Join span of vector together for complex alias, e.g: `f` is an alias for `git remote -v`
+            let full_aliases = span_vec.join(&[b' '][..]);
+            vec_alias.push(full_aliases);
+        } else {
+            vec_alias.push(name.to_owned());
+        }
+    }
+
+    if is_alias {
+        // Zip names and alias vectors, the original inputs and its aliases mapping.
+        // e.g:(['g'], ['g','i','t'])
+        let output = vec_names.into_iter().zip(vec_alias).collect();
+        Some(output)
+    } else {
+        None
+    }
+}
+
 // reads the most left variable returning it's name (e.g: $myvar)
 // and the depth (a.b.c)
 fn most_left_variable(
@@ -402,7 +354,7 @@ fn most_left_variable(
        let result = working_set.get_span_contents(item.0).to_vec();

        match item.1 {
-            FlatShape::Variable(_) => {
+            FlatShape::Variable => {
                variables_found.push(result);
                found_var = true;

@@ -431,125 +383,3 @@ fn most_left_variable(

    Some((var, sublevels))
 }
-
-pub fn map_value_completions<'a>(
-    list: impl Iterator<Item = &'a Value>,
-    span: Span,
-    offset: usize,
-) -> Vec<Suggestion> {
-    list.filter_map(move |x| {
-        // Match for string values
-        if let Ok(s) = x.as_string() {
-            return Some(Suggestion {
-                value: s,
-                description: None,
-                extra: None,
-                span: reedline::Span {
-                    start: span.start - offset,
-                    end: span.end - offset,
-                },
-                append_whitespace: false,
-            });
-        }
-
-        // Match for record values
-        if let Ok((cols, vals)) = x.as_record() {
-            let mut suggestion = Suggestion {
-                value: String::from(""), // Initialize with empty string
-                description: None,
-                extra: None,
-                span: reedline::Span {
-                    start: span.start - offset,
-                    end: span.end - offset,
-                },
-                append_whitespace: false,
-            };
-
-            // Iterate the cols looking for `value` and `description`
-            cols.iter().zip(vals).for_each(|it| {
-                // Match `value` column
-                if it.0 == "value" {
-                    // Convert the value to string
-                    if let Ok(val_str) = it.1.as_string() {
-                        // Update the suggestion value
-                        suggestion.value = val_str;
-                    }
-                }
-
-                // Match `description` column
-                if it.0 == "description" {
-                    // Convert the value to string
-                    if let Ok(desc_str) = it.1.as_string() {
-                        // Update the suggestion value
-                        suggestion.description = Some(desc_str);
-                    }
-                }
-            });
-
-            return Some(suggestion);
-        }
-
-        None
-    })
-    .collect()
-}
-
-#[cfg(test)]
-mod completer_tests {
-    use super::*;
-
-    #[test]
-    fn test_completion_helper() {
-        let mut engine_state = nu_command::create_default_context();
-
-        // Custom additions
-        let delta = {
-            let working_set = nu_protocol::engine::StateWorkingSet::new(&engine_state);
-            working_set.render()
-        };
-
-        let result = engine_state.merge_delta(delta);
-        assert!(
-            result.is_ok(),
-            "Error merging delta: {:?}",
-            result.err().unwrap()
-        );
-
-        let mut completer = NuCompleter::new(engine_state.into(), Stack::new());
-        let dataset = vec![
-            ("sudo", false, "", Vec::new()),
-            ("sudo l", true, "l", vec!["ls", "let", "lines", "loop"]),
-            (" sudo", false, "", Vec::new()),
-            (" sudo le", true, "le", vec!["let", "length"]),
-            (
-                "ls | c",
-                true,
-                "c",
-                vec!["cd", "config", "const", "cp", "cal"],
-            ),
-            ("ls | sudo m", true, "m", vec!["mv", "mut", "move"]),
-        ];
-        for (line, has_result, begins_with, expected_values) in dataset {
-            let result = completer.completion_helper(line, line.len());
-            // Test whether the result is empty or not
-            assert_eq!(!result.is_empty(), has_result, "line: {}", line);
-
-            // Test whether the result begins with the expected value
-            result
-                .iter()
-                .for_each(|x| assert!(x.value.starts_with(begins_with)));
-
-            // Test whether the result contains all the expected values
-            assert_eq!(
-                result
-                    .iter()
-                    .map(|x| expected_values.contains(&x.value.as_str()))
-                    .filter(|x| *x)
-                    .count(),
-                expected_values.len(),
-                "line: {}",
-                line
-            );
-        }
-    }
-}
--- a/crates/nu-cli/src/completions/custom_completions.rs
+++ b/crates/nu-cli/src/completions/custom_completions.rs
@@ -6,9 +6,7 @@ use nu_protocol::{
    PipelineData, Span, Type, Value,
 };
 use reedline::Suggestion;
-use std::{collections::HashMap, sync::Arc};
-
-use super::completer::map_value_completions;
+use std::sync::Arc;

 pub struct CustomCompletion {
    engine_state: Arc<EngineState>,
@@ -28,6 +26,69 @@ impl CustomCompletion {
            sort_by: SortBy::None,
        }
    }
+
+    fn map_completions<'a>(
+        &self,
+        list: impl Iterator<Item = &'a Value>,
+        span: Span,
+        offset: usize,
+    ) -> Vec<Suggestion> {
+        list.filter_map(move |x| {
+            // Match for string values
+            if let Ok(s) = x.as_string() {
+                return Some(Suggestion {
+                    value: s,
+                    description: None,
+                    extra: None,
+                    span: reedline::Span {
+                        start: span.start - offset,
+                        end: span.end - offset,
+                    },
+                    append_whitespace: false,
+                });
+            }
+
+            // Match for record values
+            if let Ok((cols, vals)) = x.as_record() {
+                let mut suggestion = Suggestion {
+                    value: String::from(""), // Initialize with empty string
+                    description: None,
+                    extra: None,
+                    span: reedline::Span {
+                        start: span.start - offset,
+                        end: span.end - offset,
+                    },
+                    append_whitespace: false,
+                };
+
+                // Iterate the cols looking for `value` and `description`
+                cols.iter().zip(vals).for_each(|it| {
+                    // Match `value` column
+                    if it.0 == "value" {
+                        // Convert the value to string
+                        if let Ok(val_str) = it.1.as_string() {
+                            // Update the suggestion value
+                            suggestion.value = val_str;
+                        }
+                    }
+
+                    // Match `description` column
+                    if it.0 == "description" {
+                        // Convert the value to string
+                        if let Ok(desc_str) = it.1.as_string() {
+                            // Update the suggestion value
+                            suggestion.description = Some(desc_str);
+                        }
+                    }
+                });
+
+                return Some(suggestion);
+            }
+
+            None
+        })
+        .collect()
+    }
 }

 impl Completer for CustomCompletion {
@@ -52,13 +113,13 @@ impl Completer for CustomCompletion {
                head: span,
                arguments: vec![
                    Argument::Positional(Expression {
-                        span: Span::unknown(),
+                        span: Span { start: 0, end: 0 },
                        ty: Type::String,
                        expr: Expr::String(self.line.clone()),
                        custom_completion: None,
                    }),
                    Argument::Positional(Expression {
-                        span: Span::unknown(),
+                        span: Span { start: 0, end: 0 },
                        ty: Type::Int,
                        expr: Expr::Int(line_pos as i64),
                        custom_completion: None,
@@ -66,16 +127,15 @@ impl Completer for CustomCompletion {
                ],
                redirect_stdout: true,
                redirect_stderr: true,
-                parser_info: HashMap::new(),
            },
-            PipelineData::empty(),
+            PipelineData::new(span),
        );

        let mut custom_completion_options = None;

        // Parse result
-        let suggestions = result
-            .map(|pd| {
+        let suggestions = match result {
+            Ok(pd) => {
                let value = pd.into_value(span);
                match &value {
                    Value::Record { .. } => {
@@ -84,7 +144,7 @@ impl Completer for CustomCompletion {
                            .and_then(|val| {
                                val.as_list()
                                    .ok()
-                                    .map(|it| map_value_completions(it.iter(), span, offset))
+                                    .map(|it| self.map_completions(it.iter(), span, offset))
                            })
                            .unwrap_or_default();
                        let options = value.get_data_by_key("options");
@@ -129,11 +189,12 @@ impl Completer for CustomCompletion {

                        completions
                    }
-                    Value::List { vals, .. } => map_value_completions(vals.iter(), span, offset),
+                    Value::List { vals, .. } => self.map_completions(vals.iter(), span, offset),
                    _ => vec![],
                }
-            })
-            .unwrap_or_default();
+            }
+            _ => vec![],
+        };

        if let Some(custom_completion_options) = custom_completion_options {
            filter(&prefix, suggestions, &custom_completion_options)
--- a/crates/nu-cli/src/completions/directory_completions.rs
+++ b/crates/nu-cli/src/completions/directory_completions.rs
@@ -8,7 +8,7 @@ use std::fs;
 use std::path::Path;
 use std::sync::Arc;

-use super::{partial_from, prepend_base_dir, SortBy};
+use super::{partial_from, prepend_base_dir};

 const SEP: char = std::path::MAIN_SEPARATOR;

@@ -33,7 +33,14 @@ impl Completer for DirectoryCompletion {
        _: usize,
        options: &CompletionOptions,
    ) -> Vec<Suggestion> {
-        let cwd = self.engine_state.current_work_dir();
+        let cwd = if let Some(d) = self.engine_state.get_env_var("PWD") {
+            match d.as_string() {
+                Ok(s) => s,
+                Err(_) => "".to_string(),
+            }
+        } else {
+            "".to_string()
+        };
        let partial = String::from_utf8_lossy(&prefix).to_string();

        // Filter only the folders
@@ -60,20 +67,12 @@ impl Completer for DirectoryCompletion {

        // Sort items
        let mut sorted_items = items;
-
-        match self.get_sort_by() {
-            SortBy::Ascending => {
        sorted_items.sort_by(|a, b| a.value.cmp(&b.value));
-            }
-            SortBy::LevenshteinDistance => {
        sorted_items.sort_by(|a, b| {
            let a_distance = levenshtein_distance(&prefix_str, &a.value);
            let b_distance = levenshtein_distance(&prefix_str, &b.value);
            a_distance.cmp(&b_distance)
        });
-            }
-            _ => (),
-        }

        // Separate the results between hidden and non hidden
        let mut hidden: Vec<Suggestion> = vec![];
@@ -127,7 +126,7 @@ pub fn directory_completion(
                            let mut file_name = entry.file_name().to_string_lossy().into_owned();
                            if matches(&partial, &file_name, options) {
                                let mut path = if prepend_base_dir(original_input, &base_dir_name) {
-                                    format!("{base_dir_name}{file_name}")
+                                    format!("{}{}", base_dir_name, file_name)
                                } else {
                                    file_name.to_string()
                                };
@@ -137,13 +136,9 @@ pub fn directory_completion(
                                    file_name.push(SEP);
                                }

-                                // Fix files or folders with quotes or hash
-                                if path.contains('\'')
-                                    || path.contains('"')
-                                    || path.contains(' ')
-                                    || path.contains('#')
-                                {
-                                    path = format!("`{path}`");
+                                // Fix files or folders with quotes
+                                if path.contains('\'') || path.contains('"') || path.contains(' ') {
+                                    path = format!("`{}`", path);
                                }

                                Some((span, path))
--- a/crates/nu-cli/src/completions/dotnu_completions.rs
+++ b/crates/nu-cli/src/completions/dotnu_completions.rs
@@ -58,7 +58,7 @@ impl Completer for DotNuCompletion {
            };

        // Check if the base_dir is a folder
-        if base_dir != format!(".{SEP}") {
+        if base_dir != format!(".{}", SEP) {
            // Add the base dir into the directories to be searched
            search_dirs.push(base_dir.clone());

@@ -70,7 +70,14 @@ impl Completer for DotNuCompletion {
            partial = base_dir_partial;
        } else {
            // Fetch the current folder
-            let current_folder = self.engine_state.current_work_dir();
+            let current_folder = if let Some(d) = self.engine_state.get_env_var("PWD") {
+                match d.as_string() {
+                    Ok(s) => s,
+                    Err(_) => "".to_string(),
+                }
+            } else {
+                "".to_string()
+            };
            is_current_folder = true;

            // Add the current folder and the lib dirs into the
--- a/crates/nu-cli/src/completions/file_completions.rs
+++ b/crates/nu-cli/src/completions/file_completions.rs
@@ -7,8 +7,6 @@ use reedline::Suggestion;
 use std::path::{is_separator, Path};
 use std::sync::Arc;

-use super::SortBy;
-
 const SEP: char = std::path::MAIN_SEPARATOR;

 #[derive(Clone)]
@@ -32,7 +30,14 @@ impl Completer for FileCompletion {
        _: usize,
        options: &CompletionOptions,
    ) -> Vec<Suggestion> {
-        let cwd = self.engine_state.current_work_dir();
+        let cwd = if let Some(d) = self.engine_state.get_env_var("PWD") {
+            match d.as_string() {
+                Ok(s) => s,
+                Err(_) => "".to_string(),
+            }
+        } else {
+            "".to_string()
+        };
        let prefix = String::from_utf8_lossy(&prefix).to_string();
        let output: Vec<_> = file_path_completion(span, &prefix, &cwd, options)
            .into_iter()
@@ -57,20 +62,12 @@ impl Completer for FileCompletion {

        // Sort items
        let mut sorted_items = items;
-
-        match self.get_sort_by() {
-            SortBy::Ascending => {
        sorted_items.sort_by(|a, b| a.value.cmp(&b.value));
-            }
-            SortBy::LevenshteinDistance => {
        sorted_items.sort_by(|a, b| {
            let a_distance = levenshtein_distance(&prefix_str, &a.value);
            let b_distance = levenshtein_distance(&prefix_str, &b.value);
            a_distance.cmp(&b_distance)
        });
-            }
-            _ => (),
-        }

        // Separate the results between hidden and non hidden
        let mut hidden: Vec<Suggestion> = vec![];
@@ -134,7 +131,7 @@ pub fn file_path_completion(
                    let mut file_name = entry.file_name().to_string_lossy().into_owned();
                    if matches(&partial, &file_name, options) {
                        let mut path = if prepend_base_dir(original_input, &base_dir_name) {
-                            format!("{base_dir_name}{file_name}")
+                            format!("{}{}", base_dir_name, file_name)
                        } else {
                            file_name.to_string()
                        };
@@ -144,25 +141,9 @@ pub fn file_path_completion(
                            file_name.push(SEP);
                        }

-                        // Fix files or folders with quotes or hashes
-                        if path.contains('\'')
-                            || path.contains('"')
-                            || path.contains(' ')
-                            || path.contains('#')
-                            || path.contains('(')
-                            || path.contains(')')
-                            || path.starts_with('0')
-                            || path.starts_with('1')
-                            || path.starts_with('2')
-                            || path.starts_with('3')
-                            || path.starts_with('4')
-                            || path.starts_with('5')
-                            || path.starts_with('6')
-                            || path.starts_with('7')
-                            || path.starts_with('8')
-                            || path.starts_with('9')
-                        {
-                            path = format!("`{path}`");
+                        // Fix files or folders with quotes
+                        if path.contains('\'') || path.contains('"') || path.contains(' ') {
+                            path = format!("`{}`", path);
                        }

                        Some((span, path))
@@ -190,7 +171,7 @@ pub fn matches(partial: &str, from: &str, options: &CompletionOptions) -> bool {

 /// Returns whether the base_dir should be prepended to the file path
 pub fn prepend_base_dir(input: &str, base_dir: &str) -> bool {
-    if base_dir == format!(".{SEP}") {
+    if base_dir == format!(".{}", SEP) {
        // if the current base_dir path is the local folder we only add a "./" prefix if the user
        // input already includes a local folder prefix.
        let manually_entered = {
--- a/crates/nu-cli/src/completions/variable_completions.rs
+++ b/crates/nu-cli/src/completions/variable_completions.rs
@@ -9,8 +9,6 @@ use reedline::Suggestion;
 use std::str;
 use std::sync::Arc;

-use super::MatchAlgorithm;
-
 #[derive(Clone)]
 pub struct VariableCompletion {
    engine_state: Arc<EngineState>, // TODO: Is engine state necessary? It's already a part of working set in fetch()
@@ -75,11 +73,10 @@ impl Completer for VariableCompletion {
                        for suggestion in
                            nested_suggestions(val.clone(), nested_levels, current_span)
                        {
-                            if options.match_algorithm.matches_u8_insensitive(
-                                options.case_sensitive,
-                                suggestion.value.as_bytes(),
-                                &prefix,
-                            ) {
+                            if options
+                                .match_algorithm
+                                .matches_u8(suggestion.value.as_bytes(), &prefix)
+                            {
                                output.push(suggestion);
                            }
                        }
@@ -89,11 +86,10 @@ impl Completer for VariableCompletion {
                } else {
                    // No nesting provided, return all env vars
                    for env_var in env_vars {
-                        if options.match_algorithm.matches_u8_insensitive(
-                            options.case_sensitive,
-                            env_var.0.as_bytes(),
-                            &prefix,
-                        ) {
+                        if options
+                            .match_algorithm
+                            .matches_u8(env_var.0.as_bytes(), &prefix)
+                        {
                            output.push(Suggestion {
                                value: env_var.0,
                                description: None,
@@ -115,16 +111,18 @@ impl Completer for VariableCompletion {
                    &self.engine_state,
                    &self.stack,
                    nu_protocol::NU_VARIABLE_ID,
-                    nu_protocol::Span::new(current_span.start, current_span.end),
+                    nu_protocol::Span {
+                        start: current_span.start,
+                        end: current_span.end,
+                    },
                ) {
                    for suggestion in
                        nested_suggestions(nuval, self.var_context.1.clone(), current_span)
                    {
-                        if options.match_algorithm.matches_u8_insensitive(
-                            options.case_sensitive,
-                            suggestion.value.as_bytes(),
-                            &prefix,
-                        ) {
+                        if options
+                            .match_algorithm
+                            .matches_u8(suggestion.value.as_bytes(), &prefix)
+                        {
                            output.push(suggestion);
                        }
                    }
@@ -136,18 +134,23 @@ impl Completer for VariableCompletion {
            // Completion other variable types
            if let Some(var_id) = var_id {
                // Extract the variable value from the stack
-                let var = self.stack.get_var(var_id, Span::new(span.start, span.end));
+                let var = self.stack.get_var(
+                    var_id,
+                    Span {
+                        start: span.start,
+                        end: 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.clone(), current_span)
                    {
-                        if options.match_algorithm.matches_u8_insensitive(
-                            options.case_sensitive,
-                            suggestion.value.as_bytes(),
-                            &prefix,
-                        ) {
+                        if options
+                            .match_algorithm
+                            .matches_u8(suggestion.value.as_bytes(), &prefix)
+                        {
                            output.push(suggestion);
                        }
                    }
@@ -159,11 +162,10 @@ impl Completer for VariableCompletion {

        // Variable completion (e.g: $en<tab> to complete $env)
        for builtin in builtins {
-            if options.match_algorithm.matches_u8_insensitive(
-                options.case_sensitive,
-                builtin.as_bytes(),
-                &prefix,
-            ) {
+            if options
+                .match_algorithm
+                .matches_u8(builtin.as_bytes(), &prefix)
+            {
                output.push(Suggestion {
                    value: builtin.to_string(),
                    description: None,
@@ -179,13 +181,13 @@ impl Completer for VariableCompletion {
        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 overlay_frame in scope_frame
+                .active_overlays(&mut removed_overlays)
+                .iter()
+                .rev()
+            {
                for v in &overlay_frame.vars {
-                    if options.match_algorithm.matches_u8_insensitive(
-                        options.case_sensitive,
-                        v.0,
-                        &prefix,
-                    ) {
+                    if options.match_algorithm.matches_u8(v.0, &prefix) {
                        output.push(Suggestion {
                            value: String::from_utf8_lossy(v.0).to_string(),
                            description: None,
@@ -200,13 +202,14 @@ impl Completer for VariableCompletion {

        // Permanent state vars
        // for scope in &self.engine_state.scope {
-        for overlay_frame in self.engine_state.active_overlays(&removed_overlays).rev() {
+        for overlay_frame in self
+            .engine_state
+            .active_overlays(&removed_overlays)
+            .iter()
+            .rev()
+        {
            for v in &overlay_frame.vars {
-                if options.match_algorithm.matches_u8_insensitive(
-                    options.case_sensitive,
-                    v.0,
-                    &prefix,
-                ) {
+                if options.match_algorithm.matches_u8(v.0, &prefix) {
                    output.push(Suggestion {
                        value: String::from_utf8_lossy(v.0).to_string(),
                        description: None,
@@ -253,20 +256,6 @@ fn nested_suggestions(

            output
        }
-        Value::LazyRecord { val, .. } => {
-            // Add all the columns as completion
-            for column_name in val.column_names() {
-                output.push(Suggestion {
-                    value: column_name.to_string(),
-                    description: None,
-                    extra: None,
-                    span: current_span,
-                    append_whitespace: false,
-                });
-            }
-
-            output
-        }

        _ => output,
    }
@@ -292,7 +281,7 @@ fn recursive_value(val: Value, sublevels: Vec<Vec<u8>>) -> Value {

                // Current sublevel value not found
                return Value::Nothing {
-                    span: Span::unknown(),
+                    span: Span { start: 0, end: 0 },
                };
            }
            _ => return val,
@@ -301,13 +290,3 @@ fn recursive_value(val: Value, sublevels: Vec<Vec<u8>>) -> Value {

    val
 }
-
-impl MatchAlgorithm {
-    pub fn matches_u8_insensitive(&self, sensitive: bool, haystack: &[u8], needle: &[u8]) -> bool {
-        if sensitive {
-            self.matches_u8(haystack, needle)
-        } else {
-            self.matches_u8(&haystack.to_ascii_lowercase(), &needle.to_ascii_lowercase())
-        }
-    }
-}
--- a/crates/nu-cli/src/config_files.rs
+++ b/crates/nu-cli/src/config_files.rs
@@ -1,13 +1,14 @@
-use crate::util::eval_source;
+use crate::util::{eval_source, report_error};
+#[cfg(feature = "plugin")]
+use log::info;
+#[cfg(feature = "plugin")]
+use nu_parser::ParseError;
 #[cfg(feature = "plugin")]
 use nu_path::canonicalize_with;
 use nu_protocol::engine::{EngineState, Stack, StateWorkingSet};
-use nu_protocol::report_error;
-use nu_protocol::{HistoryFileFormat, PipelineData};
 #[cfg(feature = "plugin")]
-use nu_protocol::{ParseError, Spanned};
-#[cfg(feature = "plugin")]
-use nu_utils::utils::perf;
+use nu_protocol::Spanned;
+use nu_protocol::{HistoryFileFormat, PipelineData, Span};
 use std::path::PathBuf;

 #[cfg(feature = "plugin")]
@@ -22,37 +23,30 @@ pub fn read_plugin_file(
    stack: &mut Stack,
    plugin_file: Option<Spanned<String>>,
    storage_path: &str,
+    is_perf_true: bool,
 ) {
-    let start_time = std::time::Instant::now();
-    let mut plug_path = String::new();
    // Reading signatures from signature file
    // The plugin.nu file stores the parsed signature collected from each registered plugin
    add_plugin_file(engine_state, plugin_file, storage_path);

    let plugin_path = engine_state.plugin_signatures.clone();
    if let Some(plugin_path) = plugin_path {
-        let plugin_filename = plugin_path.to_string_lossy();
-        plug_path = plugin_filename.to_string();
+        let plugin_filename = plugin_path.to_string_lossy().to_owned();
+
        if let Ok(contents) = std::fs::read(&plugin_path) {
            eval_source(
                engine_state,
                stack,
                &contents,
                &plugin_filename,
-                PipelineData::empty(),
-                false,
+                PipelineData::new(Span::new(0, 0)),
            );
        }
    }

-    perf(
-        &format!("read_plugin_file {}", &plug_path),
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        engine_state.get_config().use_ansi_coloring,
-    );
+    if is_perf_true {
+        info!("read_plugin_file {}:{}:{}", file!(), line!(), column!());
+    }
 }

 #[cfg(feature = "plugin")]
@@ -65,12 +59,13 @@ pub fn add_plugin_file(
        let working_set = StateWorkingSet::new(engine_state);
        let cwd = working_set.get_cwd();

-        if let Ok(path) = canonicalize_with(&plugin_file.item, cwd) {
-            engine_state.plugin_signatures = Some(path)
-        } else {
+        match canonicalize_with(&plugin_file.item, cwd) {
+            Ok(path) => engine_state.plugin_signatures = Some(path),
+            Err(_) => {
                let e = ParseError::FileNotFound(plugin_file.item, plugin_file.span);
                report_error(&working_set, &e);
            }
+        }
    } else if let Some(mut plugin_path) = nu_path::config_dir() {
        // Path to store plugins signatures
        plugin_path.push(storage_path);
@@ -85,7 +80,7 @@ pub fn eval_config_contents(
    stack: &mut Stack,
 ) {
    if config_path.exists() & config_path.is_file() {
-        let config_filename = config_path.to_string_lossy();
+        let config_filename = config_path.to_string_lossy().to_owned();

        if let Ok(contents) = std::fs::read(&config_path) {
            eval_source(
@@ -93,8 +88,7 @@ pub fn eval_config_contents(
                stack,
                &contents,
                &config_filename,
-                PipelineData::empty(),
-                false,
+                PipelineData::new(Span::new(0, 0)),
            );

            // Merge the environment in case env vars changed in the config
--- a/crates/nu-cli/src/eval_file.rs
+++ b/crates/nu-cli/src/eval_file.rs
@@ -1,15 +1,14 @@
-use crate::util::eval_source;
+use crate::util::{eval_source, report_error};
 use log::info;
 use log::trace;
 use miette::{IntoDiagnostic, Result};
-use nu_engine::{convert_env_values, current_dir};
+use nu_engine::convert_env_values;
 use nu_parser::parse;
-use nu_path::canonicalize_with;
-use nu_protocol::report_error;
+use nu_protocol::Type;
 use nu_protocol::{
    ast::Call,
    engine::{EngineState, Stack, StateWorkingSet},
-    Config, PipelineData, ShellError, Span, Type, Value,
+    Config, PipelineData, Span, Value,
 };
 use nu_utils::stdout_write_all_and_flush;

@@ -20,6 +19,7 @@ pub fn evaluate_file(
    engine_state: &mut EngineState,
    stack: &mut Stack,
    input: PipelineData,
+    is_perf_true: bool,
 ) -> Result<()> {
    // Translate environment variables from Strings to Values
    if let Some(e) = convert_env_values(engine_state, stack) {
@@ -28,79 +28,12 @@ pub fn evaluate_file(
        std::process::exit(1);
    }

-    let cwd = current_dir(engine_state, stack)?;
-
-    let file_path = canonicalize_with(&path, cwd).unwrap_or_else(|e| {
-        let working_set = StateWorkingSet::new(engine_state);
-        report_error(
-            &working_set,
-            &ShellError::FileNotFoundCustom(
-                format!("Could not access file '{}': {:?}", path, e.to_string()),
-                Span::unknown(),
-            ),
-        );
-        std::process::exit(1);
-    });
-
-    let file_path_str = file_path.to_str().unwrap_or_else(|| {
-        let working_set = StateWorkingSet::new(engine_state);
-        report_error(
-            &working_set,
-            &ShellError::NonUtf8Custom(
-                format!(
-                    "Input file name '{}' is not valid UTF8",
-                    file_path.to_string_lossy()
-                ),
-                Span::unknown(),
-            ),
-        );
-        std::process::exit(1);
-    });
-
-    let file = std::fs::read(&file_path)
-        .into_diagnostic()
-        .unwrap_or_else(|e| {
-            let working_set = StateWorkingSet::new(engine_state);
-            report_error(
-                &working_set,
-                &ShellError::FileNotFoundCustom(
-                    format!(
-                        "Could not read file '{}': {:?}",
-                        file_path_str,
-                        e.to_string()
-                    ),
-                    Span::unknown(),
-                ),
-            );
-            std::process::exit(1);
-        });
-
-    engine_state.start_in_file(Some(file_path_str));
-
-    let parent = file_path.parent().unwrap_or_else(|| {
-        let working_set = StateWorkingSet::new(engine_state);
-        report_error(
-            &working_set,
-            &ShellError::FileNotFoundCustom(
-                format!("The file path '{file_path_str}' does not have a parent"),
-                Span::unknown(),
-            ),
-        );
-        std::process::exit(1);
-    });
-
-    stack.add_env_var(
-        "FILE_PWD".to_string(),
-        Value::string(parent.to_string_lossy(), Span::unknown()),
-    );
-    stack.add_env_var(
-        "CURRENT_FILE".to_string(),
-        Value::string(file_path.to_string_lossy(), Span::unknown()),
-    );
+    let file = std::fs::read(&path).into_diagnostic()?;

    let mut working_set = StateWorkingSet::new(engine_state);
-    trace!("parsing file: {}", file_path_str);
-    let _ = parse(&mut working_set, Some(file_path_str), &file, false);
+    trace!("parsing file: {}", path);
+
+    let _ = parse(&mut working_set, Some(&path), &file, false, &[]);

    if working_set.find_decl(b"main", &Type::Any).is_some() {
        let args = format!("main {}", args.join(" "));
@@ -109,32 +42,26 @@ pub fn evaluate_file(
            engine_state,
            stack,
            &file,
-            file_path_str,
-            PipelineData::empty(),
-            true,
+            &path,
+            PipelineData::new(Span::new(0, 0)),
        ) {
            std::process::exit(1);
        }
-        if !eval_source(
-            engine_state,
-            stack,
-            args.as_bytes(),
-            "<commandline>",
-            input,
-            true,
-        ) {
+        if !eval_source(engine_state, stack, args.as_bytes(), "<commandline>", input) {
            std::process::exit(1);
        }
-    } else if !eval_source(engine_state, stack, &file, file_path_str, input, true) {
+    } else if !eval_source(engine_state, stack, &file, &path, input) {
        std::process::exit(1);
    }

+    if is_perf_true {
        info!("evaluate {}:{}:{}", file!(), line!(), column!());
+    }

    Ok(())
 }

-pub(crate) fn print_table_or_error(
+pub fn print_table_or_error(
    engine_state: &mut EngineState,
    stack: &mut Stack,
    mut pipeline_data: PipelineData,
@@ -148,21 +75,18 @@ pub(crate) fn print_table_or_error(
    // Change the engine_state config to use the passed in configuration
    engine_state.set_config(config);

-    if let PipelineData::Value(Value::Error { error }, ..) = &pipeline_data {
-        let working_set = StateWorkingSet::new(engine_state);
-        report_error(&working_set, &**error);
-        std::process::exit(1);
-    }
-
-    if let Some(decl_id) = engine_state.find_decl("table".as_bytes(), &[]) {
+    match engine_state.find_decl("table".as_bytes(), &[]) {
+        Some(decl_id) => {
            let command = engine_state.get_decl(decl_id);
            if command.get_block_id().is_some() {
                print_or_exit(pipeline_data, engine_state, config);
            } else {
-            // The final call on table command, it's ok to set redirect_output to false.
-            let mut call = Call::new(Span::new(0, 0));
-            call.redirect_stdout = false;
-            let table = command.run(engine_state, stack, &call, pipeline_data);
+                let table = command.run(
+                    engine_state,
+                    stack,
+                    &Call::new(Span::new(0, 0)),
+                    pipeline_data,
+                );

                match table {
                    Ok(table) => {
@@ -170,14 +94,18 @@ pub(crate) fn print_table_or_error(
                    }
                    Err(error) => {
                        let working_set = StateWorkingSet::new(engine_state);
+
                        report_error(&working_set, &error);
+
                        std::process::exit(1);
                    }
                }
            }
-    } else {
+        }
+        None => {
            print_or_exit(pipeline_data, engine_state, config);
        }
+    };

    // Make sure everything has finished
    if let Some(exit_code) = exit_code {
@@ -198,12 +126,14 @@ fn print_or_exit(pipeline_data: PipelineData, engine_state: &mut EngineState, co
        if let Value::Error { error } = item {
            let working_set = StateWorkingSet::new(engine_state);

-            report_error(&working_set, &*error);
+            report_error(&working_set, &error);

            std::process::exit(1);
        }

-        let out = item.into_string("\n", config) + "\n";
-        let _ = stdout_write_all_and_flush(out).map_err(|err| eprintln!("{err}"));
+        let mut out = item.into_string("\n", config);
+        out.push('\n');
+
+        let _ = stdout_write_all_and_flush(out).map_err(|err| eprintln!("{}", err));
    }
 }
--- a/crates/nu-cli/src/lib.rs
+++ b/crates/nu-cli/src/lib.rs
@@ -1,7 +1,6 @@
 mod commands;
 mod completions;
 mod config_files;
-mod eval_cmds;
 mod eval_file;
 mod menus;
 mod nu_highlight;
@@ -14,19 +13,18 @@ mod syntax_highlight;
 mod util;
 mod validation;

-pub use commands::add_cli_context;
+pub use commands::evaluate_commands;
 pub use completions::{FileCompletion, NuCompleter};
 pub use config_files::eval_config_contents;
-pub use eval_cmds::evaluate_commands;
 pub use eval_file::evaluate_file;
 pub use menus::{DescriptionMenu, NuHelpCompleter};
-pub use nu_command::util::get_init_cwd;
 pub use nu_highlight::NuHighlight;
 pub use print::Print;
 pub use prompt::NushellPrompt;
 pub use repl::evaluate_repl;
+pub use repl::{eval_env_change_hook, eval_hook};
 pub use syntax_highlight::NuHighlighter;
-pub use util::{eval_source, gather_parent_env_vars};
+pub use util::{eval_source, gather_parent_env_vars, get_init_cwd, report_error, report_error_new};
 pub use validation::NuValidator;

 #[cfg(feature = "plugin")]
--- a/crates/nu-cli/src/menus/description_menu.rs
+++ b/crates/nu-cli/src/menus/description_menu.rs
@@ -1,8 +1,8 @@
 use {
    nu_ansi_term::{ansi::RESET, Style},
    reedline::{
-        menu_functions::string_difference, Completer, Editor, Menu, MenuEvent, MenuTextStyle,
-        Painter, Suggestion, UndoBehavior,
+        menu_functions::string_difference, Completer, LineBuffer, Menu, MenuEvent, MenuTextStyle,
+        Painter, Suggestion,
    },
 };

@@ -372,7 +372,7 @@ impl DescriptionMenu {
        let description = self
            .get_value()
            .and_then(|suggestion| suggestion.description)
-            .unwrap_or_default()
+            .unwrap_or_else(|| "".to_string())
            .lines()
            .skip(self.skipped_rows)
            .take(self.working_details.description_rows)
@@ -411,10 +411,10 @@ impl DescriptionMenu {
                            RESET
                        )
                    } else {
-                        format!("  {example}\r\n")
+                        format!("  {}\r\n", example)
                    }
                } else {
-                    format!("  {example}\r\n")
+                    format!("  {}\r\n", example)
                }
            })
            .collect();
@@ -429,7 +429,7 @@ impl DescriptionMenu {
                examples,
            )
        } else {
-            format!("\r\n\r\nExamples:\r\n{examples}",)
+            format!("\r\n\r\nExamples:\r\n{}", examples,)
        }
    }
 }
@@ -459,7 +459,7 @@ impl Menu for DescriptionMenu {
    fn can_partially_complete(
        &mut self,
        _values_updated: bool,
-        _editor: &mut Editor,
+        _line_buffer: &mut LineBuffer,
        _completer: &mut dyn Completer,
    ) -> bool {
        false
@@ -481,21 +481,19 @@ impl Menu for DescriptionMenu {
    }

    /// Updates menu values
-    fn update_values(&mut self, editor: &mut Editor, completer: &mut dyn Completer) {
+    fn update_values(&mut self, line_buffer: &mut LineBuffer, completer: &mut dyn Completer) {
        if self.only_buffer_difference {
            if let Some(old_string) = &self.input {
-                let (start, input) = string_difference(editor.get_buffer(), old_string);
+                let (start, input) = string_difference(line_buffer.get_buffer(), old_string);
                if !input.is_empty() {
                    self.reset_position();
                    self.values = completer.complete(input, start);
                }
            }
        } else {
-            let trimmed_buffer = editor.get_buffer().replace('\n', " ");
-            self.values = completer.complete(
-                trimmed_buffer.as_str(),
-                editor.line_buffer().insertion_point(),
-            );
+            let trimmed_buffer = line_buffer.get_buffer().replace('\n', " ");
+            self.values =
+                completer.complete(trimmed_buffer.as_str(), line_buffer.insertion_point());
            self.reset_position();
        }
    }
@@ -504,7 +502,7 @@ impl Menu for DescriptionMenu {
    /// collected from the completer
    fn update_working_details(
        &mut self,
-        editor: &mut Editor,
+        line_buffer: &mut LineBuffer,
        completer: &mut dyn Completer,
        painter: &Painter,
    ) {
@@ -562,13 +560,13 @@ impl Menu for DescriptionMenu {
            match event {
                MenuEvent::Activate(_) => {
                    self.reset_position();
-                    self.input = Some(editor.get_buffer().to_string());
-                    self.update_values(editor, completer);
+                    self.input = Some(line_buffer.get_buffer().to_string());
+                    self.update_values(line_buffer, completer);
                }
                MenuEvent::Deactivate => self.active = false,
                MenuEvent::Edit(_) => {
                    self.reset_position();
-                    self.update_values(editor, completer);
+                    self.update_values(line_buffer, completer);
                    self.update_examples()
                }
                MenuEvent::NextElement => {
@@ -610,7 +608,7 @@ impl Menu for DescriptionMenu {
                    let description_rows = self
                        .get_value()
                        .and_then(|suggestion| suggestion.description)
-                        .unwrap_or_default()
+                        .unwrap_or_else(|| "".to_string())
                        .lines()
                        .count();

@@ -629,28 +627,27 @@ impl Menu for DescriptionMenu {
    }

    /// The buffer gets replaced in the Span location
-    fn replace_in_buffer(&self, editor: &mut Editor) {
+    fn replace_in_buffer(&self, line_buffer: &mut LineBuffer) {
        if let Some(Suggestion { value, span, .. }) = self.get_value() {
-            let start = span.start.min(editor.line_buffer().len());
-            let end = span.end.min(editor.line_buffer().len());
+            let start = span.start.min(line_buffer.len());
+            let end = span.end.min(line_buffer.len());

-            let replacement = if let Some(example_index) = self.example_index {
-                self.examples
+            let string_len = if let Some(example_index) = self.example_index {
+                let example = self
+                    .examples
                    .get(example_index)
-                    .expect("the example index is always checked")
+                    .expect("the example index is always checked");
+
+                line_buffer.replace(start..end, example);
+                example.len()
            } else {
-                &value
+                line_buffer.replace(start..end, &value);
+                value.len()
            };

-            editor.edit_buffer(
-                |lb| {
-                    lb.replace_range(start..end, replacement);
-                    let mut offset = lb.insertion_point();
-                    offset += lb.len().saturating_sub(end.saturating_sub(start));
-                    lb.set_insertion_point(offset);
-                },
-                UndoBehavior::CreateUndoPoint,
-            );
+            let mut offset = line_buffer.insertion_point();
+            offset += string_len.saturating_sub(end.saturating_sub(start));
+            line_buffer.set_insertion_point(offset);
        }
    }

--- a/crates/nu-cli/src/menus/help_completions.rs
+++ b/crates/nu-cli/src/menus/help_completions.rs
@@ -17,7 +17,7 @@ impl NuHelpCompleter {
        //Vec<(Signature, Vec<Example>, bool, bool)> {
        let mut commands = full_commands
            .iter()
-            .filter(|(sig, _, _, _, _)| {
+            .filter(|(sig, _, _, _)| {
                sig.name.to_lowercase().contains(&line.to_lowercase())
                    || sig.usage.to_lowercase().contains(&line.to_lowercase())
                    || sig
@@ -31,7 +31,7 @@ impl NuHelpCompleter {
            })
            .collect::<Vec<_>>();

-        commands.sort_by(|(a, _, _, _, _), (b, _, _, _, _)| {
+        commands.sort_by(|(a, _, _, _), (b, _, _, _)| {
            let a_distance = levenshtein_distance(line, &a.name);
            let b_distance = levenshtein_distance(line, &b.name);
            a_distance.cmp(&b_distance)
@@ -39,7 +39,7 @@ impl NuHelpCompleter {

        commands
            .into_iter()
-            .map(|(sig, examples, _, _, _)| {
+            .map(|(sig, examples, _, _)| {
                let mut long_desc = String::new();

                let usage = &sig.usage;
--- a/crates/nu-cli/src/menus/menu_completions.rs
+++ b/crates/nu-cli/src/menus/menu_completions.rs
@@ -42,14 +42,20 @@ impl Completer for NuMenuCompleter {

        if let Some(buffer) = block.signature.get_positional(0) {
            if let Some(buffer_id) = &buffer.var_id {
-                let line_buffer = Value::string(parsed.remainder, self.span);
+                let line_buffer = Value::String {
+                    val: parsed.remainder.to_string(),
+                    span: self.span,
+                };
                self.stack.add_var(*buffer_id, line_buffer);
            }
        }

        if let Some(position) = block.signature.get_positional(1) {
            if let Some(position_id) = &position.var_id {
-                let line_buffer = Value::int(pos as i64, self.span);
+                let line_buffer = Value::Int {
+                    val: pos as i64,
+                    span: self.span,
+                };
                self.stack.add_var(*position_id, line_buffer);
            }
        }
@@ -81,10 +87,13 @@ fn convert_to_suggestions(
 ) -> Vec<Suggestion> {
    match value {
        Value::Record { .. } => {
-            let text = value
+            let text = match value
                .get_data_by_key("value")
                .and_then(|val| val.as_string().ok())
-                .unwrap_or_else(|| "No value key".to_string());
+            {
+                Some(val) => val,
+                None => "No value key".to_string(),
+            };

            let description = value
                .get_data_by_key("description")
@@ -154,7 +163,7 @@ fn convert_to_suggestions(
            .flat_map(|val| convert_to_suggestions(val, line, pos, only_buffer_difference))
            .collect(),
        _ => vec![Suggestion {
-            value: format!("Not a record: {value:?}"),
+            value: format!("Not a record: {:?}", value),
            description: None,
            extra: None,
            span: reedline::Span {
--- a/crates/nu-cli/src/nu_highlight.rs
+++ b/crates/nu-cli/src/nu_highlight.rs
@@ -1,6 +1,6 @@
 use nu_protocol::ast::Call;
 use nu_protocol::engine::{Command, EngineState, Stack};
-use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, Type, Value};
+use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, Value};
 use reedline::Highlighter;

 #[derive(Clone)]
@@ -12,9 +12,7 @@ impl Command for NuHighlight {
    }

    fn signature(&self) -> Signature {
-        Signature::build("nu-highlight")
-            .category(Category::Strings)
-            .input_output_types(vec![(Type::String, Type::String)])
+        Signature::build("nu-highlight").category(Category::Strings)
    }

    fn usage(&self) -> &str {
@@ -35,7 +33,7 @@ impl Command for NuHighlight {
        let head = call.head;

        let ctrlc = engine_state.ctrlc.clone();
-        let engine_state = std::sync::Arc::new(engine_state.clone());
+        let engine_state = engine_state.clone();
        let config = engine_state.get_config().clone();

        let highlighter = crate::NuHighlighter {
@@ -53,9 +51,7 @@ impl Command for NuHighlight {
                        span: head,
                    }
                }
-                Err(err) => Value::Error {
-                    error: Box::new(err),
-                },
+                Err(err) => Value::Error { error: err },
            },
            ctrlc,
        )
--- a/crates/nu-cli/src/print.rs
+++ b/crates/nu-cli/src/print.rs
@@ -2,8 +2,7 @@ use nu_engine::CallExt;
 use nu_protocol::ast::Call;
 use nu_protocol::engine::{Command, EngineState, Stack};
 use nu_protocol::{
-    Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, SyntaxShape, Type,
-    Value,
+    Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, SyntaxShape, Value,
 };

 #[derive(Clone)]
@@ -16,7 +15,6 @@ impl Command for Print {

    fn signature(&self) -> Signature {
        Signature::build("print")
-            .input_output_types(vec![(Type::Nothing, Type::Nothing)])
            .rest("rest", SyntaxShape::Any, "the values to print")
            .switch(
                "no-newline",
@@ -28,7 +26,7 @@ impl Command for Print {
    }

    fn usage(&self) -> &str {
-        "Print the given values to stdout."
+        "Print the given values to stdout"
    }

    fn extra_usage(&self) -> &str {
@@ -47,23 +45,19 @@ Since this command has no output, there is no point in piping it with other comm
        engine_state: &EngineState,
        stack: &mut Stack,
        call: &Call,
-        input: PipelineData,
+        _input: PipelineData,
    ) -> Result<PipelineData, ShellError> {
        let args: Vec<Value> = call.rest(engine_state, stack, 0)?;
        let no_newline = call.has_flag("no-newline");
        let to_stderr = call.has_flag("stderr");
+        let head = call.head;

-        // This will allow for easy printing of pipelines as well
-        if !args.is_empty() {
        for arg in args {
            arg.into_pipeline_data()
                .print(engine_state, stack, no_newline, to_stderr)?;
        }
-        } else if !input.is_nothing() {
-            input.print(engine_state, stack, no_newline, to_stderr)?;
-        }

-        Ok(PipelineData::empty())
+        Ok(PipelineData::new(head))
    }

    fn examples(&self) -> Vec<Example> {
--- a/crates/nu-cli/src/prompt.rs
+++ b/crates/nu-cli/src/prompt.rs
@@ -17,7 +17,6 @@ pub struct NushellPrompt {
    default_vi_insert_prompt_indicator: Option<String>,
    default_vi_normal_prompt_indicator: Option<String>,
    default_multiline_indicator: Option<String>,
-    render_right_prompt_on_last_line: bool,
 }

 impl Default for NushellPrompt {
@@ -35,7 +34,6 @@ impl NushellPrompt {
            default_vi_insert_prompt_indicator: None,
            default_vi_normal_prompt_indicator: None,
            default_multiline_indicator: None,
-            render_right_prompt_on_last_line: false,
        }
    }

@@ -43,13 +41,8 @@ impl NushellPrompt {
        self.left_prompt_string = prompt_string;
    }

-    pub fn update_prompt_right(
-        &mut self,
-        prompt_string: Option<String>,
-        render_right_prompt_on_last_line: bool,
-    ) {
+    pub fn update_prompt_right(&mut self, prompt_string: Option<String>) {
        self.right_prompt_string = prompt_string;
-        self.render_right_prompt_on_last_line = render_right_prompt_on_last_line;
    }

    pub fn update_prompt_indicator(&mut self, prompt_indicator_string: Option<String>) {
@@ -75,7 +68,6 @@ impl NushellPrompt {
        prompt_indicator_string: Option<String>,
        prompt_multiline_indicator_string: Option<String>,
        prompt_vi: (Option<String>, Option<String>),
-        render_right_prompt_on_last_line: bool,
    ) {
        let (prompt_vi_insert_string, prompt_vi_normal_string) = prompt_vi;

@@ -86,12 +78,10 @@ impl NushellPrompt {

        self.default_vi_insert_prompt_indicator = prompt_vi_insert_string;
        self.default_vi_normal_prompt_indicator = prompt_vi_normal_string;
-
-        self.render_right_prompt_on_last_line = render_right_prompt_on_last_line;
    }

    fn default_wrapped_custom_string(&self, str: String) -> String {
-        format!("({str})")
+        format!("({})", str)
    }
 }

@@ -105,7 +95,7 @@ impl Prompt for NushellPrompt {
        if let Some(prompt_string) = &self.left_prompt_string {
            prompt_string.replace('\n', "\r\n").into()
        } else {
-            let default = DefaultPrompt::default();
+            let default = DefaultPrompt::new();
            default
                .render_prompt_left()
                .to_string()
@@ -118,7 +108,7 @@ impl Prompt for NushellPrompt {
        if let Some(prompt_string) = &self.right_prompt_string {
            prompt_string.replace('\n', "\r\n").into()
        } else {
-            let default = DefaultPrompt::default();
+            let default = DefaultPrompt::new();
            default
                .render_prompt_right()
                .to_string()
@@ -130,36 +120,32 @@ impl Prompt for NushellPrompt {
    fn render_prompt_indicator(&self, edit_mode: PromptEditMode) -> Cow<str> {
        match edit_mode {
            PromptEditMode::Default => match &self.default_prompt_indicator {
-                Some(indicator) => indicator,
-                None => "> ",
-            }
-            .into(),
+                Some(indicator) => indicator.as_str().into(),
+                None => "〉".into(),
+            },
            PromptEditMode::Emacs => match &self.default_prompt_indicator {
-                Some(indicator) => indicator,
-                None => "> ",
-            }
-            .into(),
+                Some(indicator) => indicator.as_str().into(),
+                None => "〉".into(),
+            },
            PromptEditMode::Vi(vi_mode) => match vi_mode {
                PromptViMode::Normal => match &self.default_vi_normal_prompt_indicator {
-                    Some(indicator) => indicator,
-                    None => ": ",
+                    Some(indicator) => indicator.as_str().into(),
+                    None => ": ".into(),
                },
                PromptViMode::Insert => match &self.default_vi_insert_prompt_indicator {
-                    Some(indicator) => indicator,
-                    None => "> ",
+                    Some(indicator) => indicator.as_str().into(),
+                    None => "〉".into(),
+                },
            },
-            }
-            .into(),
            PromptEditMode::Custom(str) => self.default_wrapped_custom_string(str).into(),
        }
    }

    fn render_prompt_multiline_indicator(&self) -> Cow<str> {
        match &self.default_multiline_indicator {
-            Some(indicator) => indicator,
-            None => "::: ",
+            Some(indicator) => indicator.as_str().into(),
+            None => "::: ".into(),
        }
-        .into()
    }

    fn render_prompt_history_search_indicator(
@@ -176,8 +162,4 @@ impl Prompt for NushellPrompt {
            prefix, history_search.term
        ))
    }
-
-    fn right_prompt_on_last_line(&self) -> bool {
-        self.render_right_prompt_on_last_line
-    }
 }
--- a/crates/nu-cli/src/prompt_update.rs
+++ b/crates/nu-cli/src/prompt_update.rs
@@ -1,10 +1,10 @@
+use crate::util::report_error;
 use crate::NushellPrompt;
-use log::trace;
+use log::info;
 use nu_engine::eval_subexpression;
-use nu_protocol::report_error;
 use nu_protocol::{
    engine::{EngineState, Stack, StateWorkingSet},
-    Config, PipelineData, Value,
+    Config, PipelineData, Span, Value,
 };
 use reedline::Prompt;

@@ -25,11 +25,12 @@ fn get_prompt_string(
    config: &Config,
    engine_state: &EngineState,
    stack: &mut Stack,
+    is_perf_true: bool,
 ) -> Option<String> {
    stack
        .get_env_var(engine_state, prompt)
        .and_then(|v| match v {
-            Value::Closure {
+            Value::Block {
                val: block_id,
                captures,
                ..
@@ -37,39 +38,29 @@ fn get_prompt_string(
                let block = engine_state.get_block(block_id);
                let mut stack = stack.captures_to_stack(&captures);
                // Use eval_subexpression to force a redirection of output, so we can use everything in prompt
-                let ret_val =
-                    eval_subexpression(engine_state, &mut stack, block, PipelineData::empty());
-                trace!(
+                let ret_val = eval_subexpression(
+                    engine_state,
+                    &mut stack,
+                    block,
+                    PipelineData::new(Span::new(0, 0)), // Don't try this at home, 0 span is ignored
+                );
+                if is_perf_true {
+                    info!(
                        "get_prompt_string (block) {}:{}:{}",
                        file!(),
                        line!(),
                        column!()
                    );
-
-                ret_val
-                    .map_err(|err| {
-                        let working_set = StateWorkingSet::new(engine_state);
-                        report_error(&working_set, &err);
-                    })
-                    .ok()
                }
-            Value::Block { val: block_id, .. } => {
-                let block = engine_state.get_block(block_id);
-                // Use eval_subexpression to force a redirection of output, so we can use everything in prompt
-                let ret_val = eval_subexpression(engine_state, stack, block, PipelineData::empty());
-                trace!(
-                    "get_prompt_string (block) {}:{}:{}",
-                    file!(),
-                    line!(),
-                    column!()
-                );

-                ret_val
-                    .map_err(|err| {
+                match ret_val {
+                    Ok(ret_val) => Some(ret_val),
+                    Err(err) => {
                        let working_set = StateWorkingSet::new(engine_state);
                        report_error(&working_set, &err);
-                    })
-                    .ok()
+                        None
+                    }
+                }
            }
            Value::String { .. } => Some(PipelineData::Value(v.clone(), None)),
            _ => None,
@@ -77,7 +68,8 @@ fn get_prompt_string(
        .and_then(|pipeline_data| {
            let output = pipeline_data.collect_string("", config).ok();

-            output.map(|mut x| {
+            match output {
+                Some(mut x) => {
                    // Just remove the very last newline.
                    if x.ends_with('\n') {
                        x.pop();
@@ -86,8 +78,10 @@ fn get_prompt_string(
                    if x.ends_with('\r') {
                        x.pop();
                    }
-                x
-            })
+                    Some(x)
+                }
+                None => None,
+            }
        })
 }

@@ -96,39 +90,71 @@ pub(crate) fn update_prompt<'prompt>(
    engine_state: &EngineState,
    stack: &Stack,
    nu_prompt: &'prompt mut NushellPrompt,
+    is_perf_true: bool,
 ) -> &'prompt dyn Prompt {
    let mut stack = stack.clone();

-    let left_prompt_string = get_prompt_string(PROMPT_COMMAND, config, engine_state, &mut stack);
+    let left_prompt_string = get_prompt_string(
+        PROMPT_COMMAND,
+        config,
+        engine_state,
+        &mut stack,
+        is_perf_true,
+    );

    // Now that we have the prompt string lets ansify it.
    // <133 A><prompt><133 B><command><133 C><command output>
    let left_prompt_string = if config.shell_integration {
-        if let Some(prompt_string) = left_prompt_string {
-            Some(format!(
-                "{PRE_PROMPT_MARKER}{prompt_string}{POST_PROMPT_MARKER}"
-            ))
-        } else {
-            left_prompt_string
+        match left_prompt_string {
+            Some(prompt_string) => Some(format!(
+                "{}{}{}",
+                PRE_PROMPT_MARKER, prompt_string, POST_PROMPT_MARKER
+            )),
+            None => left_prompt_string,
        }
    } else {
        left_prompt_string
    };

-    let right_prompt_string =
-        get_prompt_string(PROMPT_COMMAND_RIGHT, config, engine_state, &mut stack);
+    let right_prompt_string = get_prompt_string(
+        PROMPT_COMMAND_RIGHT,
+        config,
+        engine_state,
+        &mut stack,
+        is_perf_true,
+    );

-    let prompt_indicator_string =
-        get_prompt_string(PROMPT_INDICATOR, config, engine_state, &mut stack);
+    let prompt_indicator_string = get_prompt_string(
+        PROMPT_INDICATOR,
+        config,
+        engine_state,
+        &mut stack,
+        is_perf_true,
+    );

-    let prompt_multiline_string =
-        get_prompt_string(PROMPT_MULTILINE_INDICATOR, config, engine_state, &mut stack);
+    let prompt_multiline_string = get_prompt_string(
+        PROMPT_MULTILINE_INDICATOR,
+        config,
+        engine_state,
+        &mut stack,
+        is_perf_true,
+    );

-    let prompt_vi_insert_string =
-        get_prompt_string(PROMPT_INDICATOR_VI_INSERT, config, engine_state, &mut stack);
+    let prompt_vi_insert_string = get_prompt_string(
+        PROMPT_INDICATOR_VI_INSERT,
+        config,
+        engine_state,
+        &mut stack,
+        is_perf_true,
+    );

-    let prompt_vi_normal_string =
-        get_prompt_string(PROMPT_INDICATOR_VI_NORMAL, config, engine_state, &mut stack);
+    let prompt_vi_normal_string = get_prompt_string(
+        PROMPT_INDICATOR_VI_NORMAL,
+        config,
+        engine_state,
+        &mut stack,
+        is_perf_true,
+    );

    // apply the other indicators
    nu_prompt.update_all_prompt_strings(
@@ -137,11 +163,12 @@ pub(crate) fn update_prompt<'prompt>(
        prompt_indicator_string,
        prompt_multiline_string,
        (prompt_vi_insert_string, prompt_vi_normal_string),
-        config.render_right_prompt_on_last_line,
    );

    let ret_val = nu_prompt as &dyn Prompt;
-    trace!("update_prompt {}:{}:{}", file!(), line!(), column!());
+    if is_perf_true {
+        info!("update_prompt {}:{}:{}", file!(), line!(), column!());
+    }

    ret_val
 }
--- a/crates/nu-cli/src/reedline_config.rs
+++ b/crates/nu-cli/src/reedline_config.rs
@@ -1,13 +1,14 @@
 use super::DescriptionMenu;
 use crate::{menus::NuMenuCompleter, NuHelpCompleter};
 use crossterm::event::{KeyCode, KeyModifiers};
-use nu_color_config::{color_record_to_nustyle, lookup_ansi_color_style};
+use nu_color_config::lookup_ansi_color_style;
 use nu_engine::eval_block;
 use nu_parser::parse;
 use nu_protocol::{
-    create_menus,
+    color_value_string, create_menus,
    engine::{EngineState, Stack, StateWorkingSet},
-    extract_value, Config, ParsedKeybinding, ParsedMenu, PipelineData, ShellError, Span, Value,
+    extract_value, Config, IntoPipelineData, ParsedKeybinding, ParsedMenu, PipelineData,
+    ShellError, Span, Value,
 };
 use reedline::{
    default_emacs_keybindings, default_vi_insert_keybindings, default_vi_normal_keybindings,
@@ -97,22 +98,23 @@ pub(crate) fn add_menus(
        {
            let (block, _) = {
                let mut working_set = StateWorkingSet::new(&engine_state);
-                let output = parse(
+                let (output, _) = parse(
                    &mut working_set,
                    Some(name), // format!("entry #{}", entry_num)
                    definition.as_bytes(),
                    true,
+                    &[],
                );

                (output, working_set.render())
            };

            let mut temp_stack = Stack::new();
-            let input = PipelineData::Empty;
+            let input = Value::nothing(Span::test_data()).into_pipeline_data();
            let res = eval_block(&engine_state, &mut temp_stack, &block, input, false, false)?;

            if let PipelineData::Value(value, None) = res {
-                for menu in create_menus(&value)? {
+                for menu in create_menus(&value, config)? {
                    line_editor =
                        add_menu(line_editor, &menu, engine_state.clone(), stack, config)?;
                }
@@ -157,11 +159,14 @@ macro_rules! add_style {
    ($name:expr, $cols: expr, $vals:expr, $span:expr, $config: expr, $menu:expr, $f:expr) => {
        $menu = match extract_value($name, $cols, $vals, $span) {
            Ok(text) => {
-                let style = match text {
-                    Value::String { val, .. } => lookup_ansi_color_style(&val),
-                    Value::Record { .. } => color_record_to_nustyle(&text),
-                    _ => lookup_ansi_color_style("green"),
+                let text = match text {
+                    Value::String { val, .. } => val.clone(),
+                    Value::Record { cols, vals, span } => {
+                        color_value_string(span, cols, vals, $config).into_string("", $config)
+                    }
+                    _ => "green".to_string(),
                };
+                let style = lookup_ansi_color_style(&text);
                $f($menu, style)
            }
            Err(_) => $menu,
@@ -246,7 +251,7 @@ pub(crate) fn add_columnar_menu(
        Value::Nothing { .. } => {
            Ok(line_editor.with_menu(ReedlineMenu::EngineCompleter(Box::new(columnar_menu))))
        }
-        Value::Closure {
+        Value::Block {
            val,
            captures,
            span,
@@ -332,7 +337,7 @@ pub(crate) fn add_list_menu(
        Value::Nothing { .. } => {
            Ok(line_editor.with_menu(ReedlineMenu::HistoryMenu(Box::new(list_menu))))
        }
-        Value::Closure {
+        Value::Block {
            val,
            captures,
            span,
@@ -454,7 +459,7 @@ pub(crate) fn add_description_menu(
                completer,
            }))
        }
-        Value::Closure {
+        Value::Block {
            val,
            captures,
            span,
@@ -472,7 +477,7 @@ pub(crate) fn add_description_menu(
            }))
        }
        _ => Err(ShellError::UnsupportedConfigValue(
-            "closure or omitted value".to_string(),
+            "block or omitted value".to_string(),
            menu.source.into_abbreviated_string(config),
            menu.source.span()?,
        )),
@@ -486,7 +491,7 @@ fn add_menu_keybindings(keybindings: &mut Keybindings) {
        KeyCode::Tab,
        ReedlineEvent::UntilFound(vec![
            ReedlineEvent::Menu("completion_menu".to_string()),
-            ReedlineEvent::Edit(vec![EditCommand::Complete]),
+            ReedlineEvent::MenuNext,
        ]),
    );

@@ -625,12 +630,9 @@ fn add_parsed_keybinding(
        "shift" => KeyModifiers::SHIFT,
        "alt" => KeyModifiers::ALT,
        "none" => KeyModifiers::NONE,
-        "shift_alt" | "alt_shift" => KeyModifiers::SHIFT | KeyModifiers::ALT,
-        "control_shift" | "shift_control" => KeyModifiers::CONTROL | KeyModifiers::SHIFT,
-        "control_alt" | "alt_control" => KeyModifiers::CONTROL | KeyModifiers::ALT,
-        "control_alt_shift" | "control_shift_alt" => {
-            KeyModifiers::CONTROL | KeyModifiers::ALT | KeyModifiers::SHIFT
-        }
+        "control | shift" => KeyModifiers::CONTROL | KeyModifiers::SHIFT,
+        "control | alt" => KeyModifiers::CONTROL | KeyModifiers::ALT,
+        "control | alt | shift" => KeyModifiers::CONTROL | KeyModifiers::ALT | KeyModifiers::SHIFT,
        _ => {
            return Err(ShellError::UnsupportedConfigValue(
                "CONTROL, SHIFT, ALT or NONE".to_string(),
@@ -653,19 +655,17 @@ fn add_parsed_keybinding(
            let pos1 = char_iter.next();
            let pos2 = char_iter.next();

-            let char = if let (Some(char), None) = (pos1, pos2) {
-                char
-            } else {
-                return Err(ShellError::UnsupportedConfigValue(
+            let char = match (pos1, pos2) {
+                (Some(char), None) => Ok(char),
+                _ => Err(ShellError::UnsupportedConfigValue(
                    "char_<CHAR: unicode codepoint>".to_string(),
                    c.to_string(),
                    keybinding.keycode.span()?,
-                ));
-            };
+                )),
+            }?;

            KeyCode::Char(char)
        }
-        "space" => KeyCode::Char(' '),
        "down" => KeyCode::Down,
        "up" => KeyCode::Up,
        "left" => KeyCode::Left,
@@ -682,10 +682,10 @@ fn add_parsed_keybinding(
            let fn_num: u8 = c[1..]
                .parse()
                .ok()
-                .filter(|num| matches!(num, 1..=20))
+                .filter(|num| matches!(num, 1..=12))
                .ok_or(ShellError::UnsupportedConfigValue(
-                    "(f1|f2|...|f20)".to_string(),
-                    format!("unknown function key: {c}"),
+                    "(f1|f2|...|f12)".to_string(),
+                    format!("unknown function key: {}", c),
                    keybinding.keycode.span()?,
                ))?;
            KeyCode::F(fn_num)
@@ -814,6 +814,7 @@ fn event_from_record(
 ) -> Result<ReedlineEvent, ShellError> {
    let event = match name {
        "none" => ReedlineEvent::None,
+        "actionhandler" => ReedlineEvent::ActionHandler,
        "clearscreen" => ReedlineEvent::ClearScreen,
        "clearscrollback" => ReedlineEvent::ClearScrollback,
        "historyhintcomplete" => ReedlineEvent::HistoryHintComplete,
@@ -821,8 +822,6 @@ fn event_from_record(
        "ctrld" => ReedlineEvent::CtrlD,
        "ctrlc" => ReedlineEvent::CtrlC,
        "enter" => ReedlineEvent::Enter,
-        "submit" => ReedlineEvent::Submit,
-        "submitornewline" => ReedlineEvent::SubmitOrNewline,
        "esc" | "escape" => ReedlineEvent::Esc,
        "up" => ReedlineEvent::Up,
        "down" => ReedlineEvent::Down,
@@ -963,7 +962,6 @@ fn edit_from_record(
            let char = extract_char(value, config)?;
            EditCommand::MoveLeftBefore(char)
        }
-        "complete" => EditCommand::Complete,
        e => {
            return Err(ShellError::UnsupportedConfigValue(
                "reedline EditCommand".to_string(),
@@ -992,7 +990,10 @@ mod test {
    #[test]
    fn test_send_event() {
        let cols = vec!["send".to_string()];
-        let vals = vec![Value::test_string("Enter")];
+        let vals = vec![Value::String {
+            val: "Enter".to_string(),
+            span: Span::test_data(),
+        }];

        let span = Span::test_data();
        let b = EventType::try_from_columns(&cols, &vals, &span).unwrap();
@@ -1012,7 +1013,10 @@ mod test {
    #[test]
    fn test_edit_event() {
        let cols = vec!["edit".to_string()];
-        let vals = vec![Value::test_string("Clear")];
+        let vals = vec![Value::String {
+            val: "Clear".to_string(),
+            span: Span::test_data(),
+        }];

        let span = Span::test_data();
        let b = EventType::try_from_columns(&cols, &vals, &span).unwrap();
@@ -1036,8 +1040,14 @@ mod test {
    fn test_send_menu() {
        let cols = vec!["send".to_string(), "name".to_string()];
        let vals = vec![
-            Value::test_string("Menu"),
-            Value::test_string("history_menu"),
+            Value::String {
+                val: "Menu".to_string(),
+                span: Span::test_data(),
+            },
+            Value::String {
+                val: "history_menu".to_string(),
+                span: Span::test_data(),
+            },
        ];

        let span = Span::test_data();
@@ -1063,8 +1073,14 @@ mod test {
        // Menu event
        let cols = vec!["send".to_string(), "name".to_string()];
        let vals = vec![
-            Value::test_string("Menu"),
-            Value::test_string("history_menu"),
+            Value::String {
+                val: "Menu".to_string(),
+                span: Span::test_data(),
+            },
+            Value::String {
+                val: "history_menu".to_string(),
+                span: Span::test_data(),
+            },
        ];

        let menu_event = Value::Record {
@@ -1075,7 +1091,10 @@ mod test {

        // Enter event
        let cols = vec!["send".to_string()];
-        let vals = vec![Value::test_string("Enter")];
+        let vals = vec![Value::String {
+            val: "Enter".to_string(),
+            span: Span::test_data(),
+        }];

        let enter_event = Value::Record {
            cols,
@@ -1116,8 +1135,14 @@ mod test {
        // Menu event
        let cols = vec!["send".to_string(), "name".to_string()];
        let vals = vec![
-            Value::test_string("Menu"),
-            Value::test_string("history_menu"),
+            Value::String {
+                val: "Menu".to_string(),
+                span: Span::test_data(),
+            },
+            Value::String {
+                val: "history_menu".to_string(),
+                span: Span::test_data(),
+            },
        ];

        let menu_event = Value::Record {
@@ -1128,7 +1153,10 @@ mod test {

        // Enter event
        let cols = vec!["send".to_string()];
-        let vals = vec![Value::test_string("Enter")];
+        let vals = vec![Value::String {
+            val: "Enter".to_string(),
+            span: Span::test_data(),
+        }];

        let enter_event = Value::Record {
            cols,
@@ -1156,7 +1184,10 @@ mod test {
    #[test]
    fn test_error() {
        let cols = vec!["not_exist".to_string()];
-        let vals = vec![Value::test_string("Enter")];
+        let vals = vec![Value::String {
+            val: "Enter".to_string(),
+            span: Span::test_data(),
+        }];

        let span = Span::test_data();
        let b = EventType::try_from_columns(&cols, &vals, &span);
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
--- a/crates/nu-cli/src/syntax_highlight.rs
+++ b/crates/nu-cli/src/syntax_highlight.rs
@@ -1,15 +1,13 @@
 use log::trace;
 use nu_ansi_term::Style;
-use nu_color_config::{get_matching_brackets_style, get_shape_color};
+use nu_color_config::get_shape_color;
 use nu_parser::{flatten_block, parse, FlatShape};
-use nu_protocol::ast::{Argument, Block, Expr, Expression, PipelineElement};
 use nu_protocol::engine::{EngineState, StateWorkingSet};
-use nu_protocol::{Config, Span};
+use nu_protocol::Config;
 use reedline::{Highlighter, StyledText};
-use std::sync::Arc;

 pub struct NuHighlighter {
-    pub engine_state: Arc<EngineState>,
+    pub engine_state: EngineState,
    pub config: Config,
 }

@@ -17,9 +15,10 @@ impl Highlighter for NuHighlighter {
    fn highlight(&self, line: &str, _cursor: usize) -> StyledText {
        trace!("highlighting: {}", line);

-        let mut working_set = StateWorkingSet::new(&self.engine_state);
-        let block = parse(&mut working_set, None, line.as_bytes(), false);
        let (shapes, global_span_offset) = {
+            let mut working_set = StateWorkingSet::new(&self.engine_state);
+            let (block, _) = parse(&mut working_set, None, line.as_bytes(), false, &[]);
+
            let shapes = flatten_block(&working_set, &block);
            (shapes, self.engine_state.next_span_start())
        };
@@ -27,15 +26,6 @@ impl Highlighter for NuHighlighter {
        let mut output = StyledText::default();
        let mut last_seen_span = global_span_offset;

-        let global_cursor_offset = _cursor + global_span_offset;
-        let matching_brackets_pos = find_matching_brackets(
-            line,
-            &working_set,
-            &block,
-            global_span_offset,
-            global_cursor_offset,
-        );
-
        for shape in &shapes {
            if shape.0.end <= last_seen_span
                || last_seen_span < global_span_offset
@@ -54,80 +44,166 @@ impl Highlighter for NuHighlighter {
            let next_token = line
                [(shape.0.start - global_span_offset)..(shape.0.end - global_span_offset)]
                .to_string();
-
-            macro_rules! add_colored_token_with_bracket_highlight {
-                ($shape:expr, $span:expr, $text:expr) => {{
-                    let spans = split_span_by_highlight_positions(
-                        line,
-                        &$span,
-                        &matching_brackets_pos,
-                        global_span_offset,
-                    );
-                    spans.iter().for_each(|(part, highlight)| {
-                        let start = part.start - $span.start;
-                        let end = part.end - $span.start;
-                        let text = (&next_token[start..end]).to_string();
-                        let mut style = get_shape_color($shape.to_string(), &self.config);
-                        if *highlight {
-                            style = get_matching_brackets_style(style, &self.config);
-                        }
-                        output.push((style, text));
-                    });
-                }};
-            }
-
-            let mut add_colored_token = |shape: &FlatShape, text: String| {
-                output.push((get_shape_color(shape.to_string(), &self.config), text));
-            };
-
            match shape.1 {
-                FlatShape::Garbage => add_colored_token(&shape.1, next_token),
-                FlatShape::Nothing => add_colored_token(&shape.1, next_token),
-                FlatShape::Binary => add_colored_token(&shape.1, next_token),
-                FlatShape::Bool => add_colored_token(&shape.1, next_token),
-                FlatShape::Int => add_colored_token(&shape.1, next_token),
-                FlatShape::Float => add_colored_token(&shape.1, next_token),
-                FlatShape::Range => add_colored_token(&shape.1, next_token),
-                FlatShape::InternalCall(_) => add_colored_token(&shape.1, next_token),
-                FlatShape::External => add_colored_token(&shape.1, next_token),
-                FlatShape::ExternalArg => add_colored_token(&shape.1, next_token),
-                FlatShape::Keyword => add_colored_token(&shape.1, next_token),
-                FlatShape::Literal => add_colored_token(&shape.1, next_token),
-                FlatShape::Operator => add_colored_token(&shape.1, next_token),
-                FlatShape::Signature => add_colored_token(&shape.1, next_token),
-                FlatShape::String => add_colored_token(&shape.1, next_token),
-                FlatShape::StringInterpolation => add_colored_token(&shape.1, next_token),
-                FlatShape::DateTime => add_colored_token(&shape.1, next_token),
+                FlatShape::Garbage => output.push((
+                    // nushell Garbage
+                    get_shape_color(shape.1.to_string(), &self.config),
+                    next_token,
+                )),
+                FlatShape::Nothing => output.push((
+                    // nushell Nothing
+                    get_shape_color(shape.1.to_string(), &self.config),
+                    next_token,
+                )),
+                FlatShape::Binary => {
+                    // nushell ?
+                    output.push((
+                        get_shape_color(shape.1.to_string(), &self.config),
+                        next_token,
+                    ))
+                }
+                FlatShape::Bool => {
+                    // nushell ?
+                    output.push((
+                        get_shape_color(shape.1.to_string(), &self.config),
+                        next_token,
+                    ))
+                }
+                FlatShape::Int => {
+                    // nushell Int
+                    output.push((
+                        get_shape_color(shape.1.to_string(), &self.config),
+                        next_token,
+                    ))
+                }
+                FlatShape::Float => {
+                    // nushell Decimal
+                    output.push((
+                        get_shape_color(shape.1.to_string(), &self.config),
+                        next_token,
+                    ))
+                }
+                FlatShape::Range => output.push((
+                    // nushell DotDot ?
+                    get_shape_color(shape.1.to_string(), &self.config),
+                    next_token,
+                )),
+                FlatShape::InternalCall => output.push((
+                    // nushell InternalCommand
+                    get_shape_color(shape.1.to_string(), &self.config),
+                    next_token,
+                )),
+                FlatShape::External => {
+                    // nushell ExternalCommand
+                    output.push((
+                        get_shape_color(shape.1.to_string(), &self.config),
+                        next_token,
+                    ))
+                }
+                FlatShape::ExternalArg => {
+                    // nushell ExternalWord
+                    output.push((
+                        get_shape_color(shape.1.to_string(), &self.config),
+                        next_token,
+                    ))
+                }
+                FlatShape::Literal => {
+                    // nushell ?
+                    output.push((
+                        get_shape_color(shape.1.to_string(), &self.config),
+                        next_token,
+                    ))
+                }
+                FlatShape::Operator => output.push((
+                    // nushell Operator
+                    get_shape_color(shape.1.to_string(), &self.config),
+                    next_token,
+                )),
+                FlatShape::Signature => output.push((
+                    // nushell ?
+                    get_shape_color(shape.1.to_string(), &self.config),
+                    next_token,
+                )),
+                FlatShape::String => {
+                    // nushell String
+                    output.push((
+                        get_shape_color(shape.1.to_string(), &self.config),
+                        next_token,
+                    ))
+                }
+                FlatShape::StringInterpolation => {
+                    // nushell ???
+                    output.push((
+                        get_shape_color(shape.1.to_string(), &self.config),
+                        next_token,
+                    ))
+                }
+                FlatShape::DateTime => {
+                    // nushell ???
+                    output.push((
+                        get_shape_color(shape.1.to_string(), &self.config),
+                        next_token,
+                    ))
+                }
                FlatShape::List => {
-                    add_colored_token_with_bracket_highlight!(shape.1, shape.0, next_token)
+                    // nushell ???
+                    output.push((
+                        get_shape_color(shape.1.to_string(), &self.config),
+                        next_token,
+                    ))
                }
                FlatShape::Table => {
-                    add_colored_token_with_bracket_highlight!(shape.1, shape.0, next_token)
+                    // nushell ???
+                    output.push((
+                        get_shape_color(shape.1.to_string(), &self.config),
+                        next_token,
+                    ))
                }
                FlatShape::Record => {
-                    add_colored_token_with_bracket_highlight!(shape.1, shape.0, next_token)
+                    // nushell ???
+                    output.push((
+                        get_shape_color(shape.1.to_string(), &self.config),
+                        next_token,
+                    ))
                }
-
                FlatShape::Block => {
-                    add_colored_token_with_bracket_highlight!(shape.1, shape.0, next_token)
+                    // nushell ???
+                    output.push((
+                        get_shape_color(shape.1.to_string(), &self.config),
+                        next_token,
+                    ))
                }
-                FlatShape::Closure => {
-                    add_colored_token_with_bracket_highlight!(shape.1, shape.0, next_token)
+                FlatShape::Filepath => output.push((
+                    // nushell Path
+                    get_shape_color(shape.1.to_string(), &self.config),
+                    next_token,
+                )),
+                FlatShape::Directory => output.push((
+                    // nushell Directory
+                    get_shape_color(shape.1.to_string(), &self.config),
+                    next_token,
+                )),
+                FlatShape::GlobPattern => output.push((
+                    // nushell GlobPattern
+                    get_shape_color(shape.1.to_string(), &self.config),
+                    next_token,
+                )),
+                FlatShape::Variable => output.push((
+                    // nushell Variable
+                    get_shape_color(shape.1.to_string(), &self.config),
+                    next_token,
+                )),
+                FlatShape::Flag => {
+                    // nushell Flag
+                    output.push((
+                        get_shape_color(shape.1.to_string(), &self.config),
+                        next_token,
+                    ))
                }
-
-                FlatShape::Filepath => add_colored_token(&shape.1, next_token),
-                FlatShape::Directory => add_colored_token(&shape.1, next_token),
-                FlatShape::GlobPattern => add_colored_token(&shape.1, next_token),
-                FlatShape::Variable(_) | FlatShape::VarDecl(_) => {
-                    add_colored_token(&shape.1, next_token)
-                }
-                FlatShape::Flag => add_colored_token(&shape.1, next_token),
-                FlatShape::Pipe => add_colored_token(&shape.1, next_token),
-                FlatShape::And => add_colored_token(&shape.1, next_token),
-                FlatShape::Or => add_colored_token(&shape.1, next_token),
-                FlatShape::Redirection => add_colored_token(&shape.1, next_token),
-                FlatShape::Custom(..) => add_colored_token(&shape.1, next_token),
-                FlatShape::MatchPattern => add_colored_token(&shape.1, next_token),
+                FlatShape::Custom(..) => output.push((
+                    get_shape_color(shape.1.to_string(), &self.config),
+                    next_token,
+                )),
            }
            last_seen_span = shape.0.end;
        }
@@ -140,303 +216,3 @@ impl Highlighter for NuHighlighter {
        output
    }
 }
-
-fn split_span_by_highlight_positions(
-    line: &str,
-    span: &Span,
-    highlight_positions: &Vec<usize>,
-    global_span_offset: usize,
-) -> Vec<(Span, bool)> {
-    let mut start = span.start;
-    let mut result: Vec<(Span, bool)> = Vec::new();
-    for pos in highlight_positions {
-        if start <= *pos && pos < &span.end {
-            if start < *pos {
-                result.push((Span::new(start, *pos), false));
-            }
-            let span_str = &line[pos - global_span_offset..span.end - global_span_offset];
-            let end = span_str
-                .chars()
-                .next()
-                .map(|c| pos + get_char_length(c))
-                .unwrap_or(pos + 1);
-            result.push((Span::new(*pos, end), true));
-            start = end;
-        }
-    }
-    if start < span.end {
-        result.push((Span::new(start, span.end), false));
-    }
-    result
-}
-
-fn find_matching_brackets(
-    line: &str,
-    working_set: &StateWorkingSet,
-    block: &Block,
-    global_span_offset: usize,
-    global_cursor_offset: usize,
-) -> Vec<usize> {
-    const BRACKETS: &str = "{}[]()";
-
-    // calculate first bracket position
-    let global_end_offset = line.len() + global_span_offset;
-    let global_bracket_pos =
-        if global_cursor_offset == global_end_offset && global_end_offset > global_span_offset {
-            // cursor is at the end of a non-empty string -- find block end at the previous position
-            if let Some(last_char) = line.chars().last() {
-                global_cursor_offset - get_char_length(last_char)
-            } else {
-                global_cursor_offset
-            }
-        } else {
-            // cursor is in the middle of a string -- find block end at the current position
-            global_cursor_offset
-        };
-
-    // check that position contains bracket
-    let match_idx = global_bracket_pos - global_span_offset;
-    if match_idx >= line.len()
-        || !BRACKETS.contains(get_char_at_index(line, match_idx).unwrap_or_default())
-    {
-        return Vec::new();
-    }
-
-    // find matching bracket by finding matching block end
-    let matching_block_end = find_matching_block_end_in_block(
-        line,
-        working_set,
-        block,
-        global_span_offset,
-        global_bracket_pos,
-    );
-    if let Some(pos) = matching_block_end {
-        let matching_idx = pos - global_span_offset;
-        if BRACKETS.contains(get_char_at_index(line, matching_idx).unwrap_or_default()) {
-            return if global_bracket_pos < pos {
-                vec![global_bracket_pos, pos]
-            } else {
-                vec![pos, global_bracket_pos]
-            };
-        }
-    }
-    Vec::new()
-}
-
-fn find_matching_block_end_in_block(
-    line: &str,
-    working_set: &StateWorkingSet,
-    block: &Block,
-    global_span_offset: usize,
-    global_cursor_offset: usize,
-) -> Option<usize> {
-    for p in &block.pipelines {
-        for e in &p.elements {
-            match e {
-                PipelineElement::Expression(_, e)
-                | PipelineElement::Redirection(_, _, e)
-                | PipelineElement::And(_, e)
-                | PipelineElement::Or(_, e)
-                | PipelineElement::SeparateRedirection { out: (_, e), .. } => {
-                    if e.span.contains(global_cursor_offset) {
-                        if let Some(pos) = find_matching_block_end_in_expr(
-                            line,
-                            working_set,
-                            e,
-                            global_span_offset,
-                            global_cursor_offset,
-                        ) {
-                            return Some(pos);
-                        }
-                    }
-                }
-            }
-        }
-    }
-    None
-}
-
-fn find_matching_block_end_in_expr(
-    line: &str,
-    working_set: &StateWorkingSet,
-    expression: &Expression,
-    global_span_offset: usize,
-    global_cursor_offset: usize,
-) -> Option<usize> {
-    macro_rules! find_in_expr_or_continue {
-        ($inner_expr:ident) => {
-            if let Some(pos) = find_matching_block_end_in_expr(
-                line,
-                working_set,
-                $inner_expr,
-                global_span_offset,
-                global_cursor_offset,
-            ) {
-                return Some(pos);
-            }
-        };
-    }
-
-    if expression.span.contains(global_cursor_offset) && expression.span.start >= global_span_offset
-    {
-        let expr_first = expression.span.start;
-        let span_str = &line
-            [expression.span.start - global_span_offset..expression.span.end - global_span_offset];
-        let expr_last = span_str
-            .chars()
-            .last()
-            .map(|c| expression.span.end - get_char_length(c))
-            .unwrap_or(expression.span.start);
-
-        return match &expression.expr {
-            Expr::Bool(_) => None,
-            Expr::Int(_) => None,
-            Expr::Float(_) => None,
-            Expr::Binary(_) => None,
-            Expr::Range(..) => None,
-            Expr::Var(_) => None,
-            Expr::VarDecl(_) => None,
-            Expr::ExternalCall(..) => None,
-            Expr::Operator(_) => None,
-            Expr::UnaryNot(_) => None,
-            Expr::Keyword(..) => None,
-            Expr::ValueWithUnit(..) => None,
-            Expr::DateTime(_) => None,
-            Expr::Filepath(_) => None,
-            Expr::Directory(_) => None,
-            Expr::GlobPattern(_) => None,
-            Expr::String(_) => None,
-            Expr::CellPath(_) => None,
-            Expr::ImportPattern(_) => None,
-            Expr::Overlay(_) => None,
-            Expr::Signature(_) => None,
-            Expr::MatchPattern(_) => None,
-            Expr::MatchBlock(_) => None,
-            Expr::Nothing => None,
-            Expr::Garbage => None,
-
-            Expr::Table(hdr, rows) => {
-                if expr_last == global_cursor_offset {
-                    // cursor is at table end
-                    Some(expr_first)
-                } else if expr_first == global_cursor_offset {
-                    // cursor is at table start
-                    Some(expr_last)
-                } else {
-                    // cursor is inside table
-                    for inner_expr in hdr {
-                        find_in_expr_or_continue!(inner_expr);
-                    }
-                    for row in rows {
-                        for inner_expr in row {
-                            find_in_expr_or_continue!(inner_expr);
-                        }
-                    }
-                    None
-                }
-            }
-
-            Expr::Record(exprs) => {
-                if expr_last == global_cursor_offset {
-                    // cursor is at record end
-                    Some(expr_first)
-                } else if expr_first == global_cursor_offset {
-                    // cursor is at record start
-                    Some(expr_last)
-                } else {
-                    // cursor is inside record
-                    for (k, v) in exprs {
-                        find_in_expr_or_continue!(k);
-                        find_in_expr_or_continue!(v);
-                    }
-                    None
-                }
-            }
-
-            Expr::Call(call) => {
-                for arg in &call.arguments {
-                    let opt_expr = match arg {
-                        Argument::Named((_, _, opt_expr)) => opt_expr.as_ref(),
-                        Argument::Positional(inner_expr) => Some(inner_expr),
-                        Argument::Unknown(inner_expr) => Some(inner_expr),
-                    };
-
-                    if let Some(inner_expr) = opt_expr {
-                        find_in_expr_or_continue!(inner_expr);
-                    }
-                }
-                None
-            }
-
-            Expr::FullCellPath(b) => find_matching_block_end_in_expr(
-                line,
-                working_set,
-                &b.head,
-                global_span_offset,
-                global_cursor_offset,
-            ),
-
-            Expr::BinaryOp(lhs, op, rhs) => {
-                find_in_expr_or_continue!(lhs);
-                find_in_expr_or_continue!(op);
-                find_in_expr_or_continue!(rhs);
-                None
-            }
-
-            Expr::Block(block_id)
-            | Expr::Closure(block_id)
-            | Expr::RowCondition(block_id)
-            | Expr::Subexpression(block_id) => {
-                if expr_last == global_cursor_offset {
-                    // cursor is at block end
-                    Some(expr_first)
-                } else if expr_first == global_cursor_offset {
-                    // cursor is at block start
-                    Some(expr_last)
-                } else {
-                    // cursor is inside block
-                    let nested_block = working_set.get_block(*block_id);
-                    find_matching_block_end_in_block(
-                        line,
-                        working_set,
-                        nested_block,
-                        global_span_offset,
-                        global_cursor_offset,
-                    )
-                }
-            }
-
-            Expr::StringInterpolation(inner_expr) => {
-                for inner_expr in inner_expr {
-                    find_in_expr_or_continue!(inner_expr);
-                }
-                None
-            }
-
-            Expr::List(inner_expr) => {
-                if expr_last == global_cursor_offset {
-                    // cursor is at list end
-                    Some(expr_first)
-                } else if expr_first == global_cursor_offset {
-                    // cursor is at list start
-                    Some(expr_last)
-                } else {
-                    // cursor is inside list
-                    for inner_expr in inner_expr {
-                        find_in_expr_or_continue!(inner_expr);
-                    }
-                    None
-                }
-            }
-        };
-    }
-    None
-}
-
-fn get_char_at_index(s: &str, index: usize) -> Option<char> {
-    s[index..].chars().next()
-}
-
-fn get_char_length(c: char) -> usize {
-    c.to_string().len()
-}
--- a/crates/nu-cli/src/util.rs
+++ b/crates/nu-cli/src/util.rs
@@ -1,16 +1,15 @@
-use nu_command::hook::eval_hook;
-use nu_engine::{eval_block, eval_block_with_early_return};
+use log::trace;
+use nu_engine::eval_block;
 use nu_parser::{escape_quote_string, lex, parse, unescape_unquote_string, Token, TokenContents};
 use nu_protocol::engine::StateWorkingSet;
+use nu_protocol::CliError;
 use nu_protocol::{
    engine::{EngineState, Stack},
-    print_if_stream, PipelineData, ShellError, Span, Value,
+    PipelineData, ShellError, Span, Value,
 };
-use nu_protocol::{report_error, report_error_new};
 #[cfg(windows)]
 use nu_utils::enable_vt_processing;
-use nu_utils::utils::perf;
-use std::path::Path;
+use std::path::{Path, PathBuf};

 // This will collect environment variables from std::env and adds them to a stack.
 //
@@ -44,7 +43,7 @@ fn gather_env_vars(
        report_error(
            &working_set,
            &ShellError::GenericError(
-                format!("Environment variable was not captured: {env_str}"),
+                format!("Environment variable was not captured: {}", env_str),
                "".to_string(),
                None,
                Some(msg.into()),
@@ -80,7 +79,8 @@ fn gather_env_vars(
                    "".to_string(),
                    None,
                    Some(format!(
-                        "Retrieving current directory failed: {init_cwd:?} not a valid utf-8 path"
+                        "Retrieving current directory failed: {:?} not a valid utf-8 path",
+                        init_cwd
                    )),
                    Vec::new(),
                ),
@@ -113,8 +113,7 @@ fn gather_env_vars(
                span,
            }) = parts.get(0)
            {
-                let mut working_set = StateWorkingSet::new(engine_state);
-                let bytes = working_set.get_span_contents(*span);
+                let bytes = engine_state.get_span_contents(span);

                if bytes.len() < 2 {
                    report_capture_error(
@@ -126,12 +125,9 @@ fn gather_env_vars(
                    continue;
                }

-                let (bytes, err) = unescape_unquote_string(bytes, *span);
-                if let Some(err) = err {
-                    working_set.error(err);
-                }
+                let (bytes, parse_error) = unescape_unquote_string(bytes, *span);

-                if working_set.parse_errors.first().is_some() {
+                if parse_error.is_some() {
                    report_capture_error(
                        engine_state,
                        &String::from_utf8_lossy(contents),
@@ -157,8 +153,7 @@ fn gather_env_vars(
                span,
            }) = parts.get(2)
            {
-                let mut working_set = StateWorkingSet::new(engine_state);
-                let bytes = working_set.get_span_contents(*span);
+                let bytes = engine_state.get_span_contents(span);

                if bytes.len() < 2 {
                    report_capture_error(
@@ -170,12 +165,9 @@ fn gather_env_vars(
                    continue;
                }

-                let (bytes, err) = unescape_unquote_string(bytes, *span);
-                if let Some(err) = err {
-                    working_set.error(err);
-                }
+                let (bytes, parse_error) = unescape_unquote_string(bytes, *span);

-                if working_set.parse_errors.first().is_some() {
+                if parse_error.is_some() {
                    report_capture_error(
                        engine_state,
                        &String::from_utf8_lossy(contents),
@@ -211,21 +203,21 @@ pub fn eval_source(
    source: &[u8],
    fname: &str,
    input: PipelineData,
-    allow_return: bool,
 ) -> bool {
-    let start_time = std::time::Instant::now();
+    trace!("eval_source");

    let (block, delta) = {
        let mut working_set = StateWorkingSet::new(engine_state);
-        let output = parse(
+        let (output, err) = parse(
            &mut working_set,
            Some(fname), // format!("entry #{}", entry_num)
            source,
            false,
+            &[],
        );
-        if let Some(err) = working_set.parse_errors.first() {
+        if let Some(err) = err {
            set_last_exit_code(stack, 1);
-            report_error(&working_set, err);
+            report_error(&working_set, &err);
            return false;
        }

@@ -238,49 +230,25 @@ pub fn eval_source(
        return false;
    }

-    let b = if allow_return {
-        eval_block_with_early_return(engine_state, stack, &block, input, false, false)
+    match eval_block(engine_state, stack, &block, input, false, false) {
+        Ok(mut pipeline_data) => {
+            if let PipelineData::ExternalStream { exit_code, .. } = &mut pipeline_data {
+                if let Some(exit_code) = exit_code.take().and_then(|it| it.last()) {
+                    stack.add_env_var("LAST_EXIT_CODE".to_string(), exit_code);
                } else {
-        eval_block(engine_state, stack, &block, input, false, false)
-    };
-
-    match b {
-        Ok(pipeline_data) => {
-            let config = engine_state.get_config();
-            let result;
-            if let PipelineData::ExternalStream {
-                stdout: stream,
-                stderr: stderr_stream,
-                exit_code,
-                ..
-            } = pipeline_data
-            {
-                result = print_if_stream(stream, stderr_stream, false, exit_code);
-            } else if let Some(hook) = config.hooks.display_output.clone() {
-                match eval_hook(engine_state, stack, Some(pipeline_data), vec![], &hook) {
-                    Err(err) => {
-                        result = Err(err);
-                    }
-                    Ok(val) => {
-                        result = val.print(engine_state, stack, false, false);
-                    }
+                    set_last_exit_code(stack, 0);
                }
            } else {
-                result = pipeline_data.print(engine_state, stack, true, false);
+                set_last_exit_code(stack, 0);
            }

-            match result {
-                Err(err) => {
+            if let Err(err) = pipeline_data.print(engine_state, stack, false, false) {
                let working_set = StateWorkingSet::new(engine_state);

                report_error(&working_set, &err);

                return false;
            }
-                Ok(exit_code) => {
-                    set_last_exit_code(stack, exit_code);
-                }
-            }

            // reset vt processing, aka ansi because illbehaved externals can break it
            #[cfg(windows)]
@@ -298,14 +266,6 @@ pub fn eval_source(
            return false;
        }
    }
-    perf(
-        &format!("eval_source {}", &fname),
-        start_time,
-        file!(),
-        line!(),
-        column!(),
-        engine_state.get_config().use_ansi_coloring,
-    );

    true
 }
@@ -313,10 +273,58 @@ pub fn eval_source(
 fn set_last_exit_code(stack: &mut Stack, exit_code: i64) {
    stack.add_env_var(
        "LAST_EXIT_CODE".to_string(),
-        Value::int(exit_code, Span::unknown()),
+        Value::Int {
+            val: exit_code,
+            span: Span { start: 0, end: 0 },
+        },
    );
 }

+pub fn report_error(
+    working_set: &StateWorkingSet,
+    error: &(dyn miette::Diagnostic + Send + Sync + 'static),
+) {
+    eprintln!("Error: {:?}", CliError(error, working_set));
+    // reset vt processing, aka ansi because illbehaved externals can break it
+    #[cfg(windows)]
+    {
+        let _ = nu_utils::enable_vt_processing();
+    }
+}
+
+pub fn report_error_new(
+    engine_state: &EngineState,
+    error: &(dyn miette::Diagnostic + Send + Sync + 'static),
+) {
+    let working_set = StateWorkingSet::new(engine_state);
+
+    report_error(&working_set, error);
+}
+
+pub fn get_init_cwd() -> PathBuf {
+    match std::env::current_dir() {
+        Ok(cwd) => cwd,
+        Err(_) => match std::env::var("PWD") {
+            Ok(cwd) => PathBuf::from(cwd),
+            Err(_) => match nu_path::home_dir() {
+                Some(cwd) => cwd,
+                None => PathBuf::new(),
+            },
+        },
+    }
+}
+
+pub fn get_guaranteed_cwd(engine_state: &EngineState, stack: &Stack) -> PathBuf {
+    match nu_engine::env::current_dir(engine_state, stack) {
+        Ok(p) => p,
+        Err(e) => {
+            let working_set = StateWorkingSet::new(engine_state);
+            report_error(&working_set, &e);
+            get_init_cwd()
+        }
+    }
+}
+
 #[cfg(test)]
 mod test {
    use super::*;
--- a/crates/nu-cli/src/validation.rs
+++ b/crates/nu-cli/src/validation.rs
@@ -1,24 +1,17 @@
-use nu_parser::parse;
-use nu_protocol::{
-    engine::{EngineState, StateWorkingSet},
-    ParseError,
-};
+use nu_parser::{parse, ParseError};
+use nu_protocol::engine::{EngineState, StateWorkingSet};
 use reedline::{ValidationResult, Validator};
-use std::sync::Arc;

 pub struct NuValidator {
-    pub engine_state: Arc<EngineState>,
+    pub engine_state: EngineState,
 }

 impl Validator for NuValidator {
    fn validate(&self, line: &str) -> ValidationResult {
        let mut working_set = StateWorkingSet::new(&self.engine_state);
-        parse(&mut working_set, None, line.as_bytes(), false);
+        let (_, err) = parse(&mut working_set, None, line.as_bytes(), false, &[]);

-        if matches!(
-            working_set.parse_errors.first(),
-            Some(ParseError::UnexpectedEof(..))
-        ) {
+        if matches!(err, Some(ParseError::UnexpectedEof(..))) {
            ValidationResult::Incomplete
        } else {
            ValidationResult::Complete
--- a/crates/nu-cli/tests/alias.rs
+++ b/crates/nu-cli/tests/alias.rs
@@ -0,0 +1,65 @@
+pub mod support;
+
+use nu_cli::NuCompleter;
+use reedline::Completer;
+use support::{match_suggestions, new_engine};
+
+#[test]
+fn alias_of_command_and_flags() {
+    let (dir, _, mut engine, mut stack) = new_engine();
+
+    // Create an alias
+    let alias = r#"alias ll = ls -l"#;
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+
+    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+
+    let suggestions = completer.complete("ll t", 4);
+    #[cfg(windows)]
+    let expected_paths: Vec<String> = vec!["test_a\\".to_string(), "test_b\\".to_string()];
+    #[cfg(not(windows))]
+    let expected_paths: Vec<String> = vec!["test_a/".to_string(), "test_b/".to_string()];
+
+    match_suggestions(expected_paths, suggestions)
+}
+
+#[test]
+fn alias_of_basic_command() {
+    let (dir, _, mut engine, mut stack) = new_engine();
+
+    // Create an alias
+    let alias = r#"alias ll = ls "#;
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+
+    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+
+    let suggestions = completer.complete("ll t", 4);
+    #[cfg(windows)]
+    let expected_paths: Vec<String> = vec!["test_a\\".to_string(), "test_b\\".to_string()];
+    #[cfg(not(windows))]
+    let expected_paths: Vec<String> = vec!["test_a/".to_string(), "test_b/".to_string()];
+
+    match_suggestions(expected_paths, suggestions)
+}
+
+#[test]
+fn alias_of_another_alias() {
+    let (dir, _, mut engine, mut stack) = new_engine();
+
+    // Create an alias
+    let alias = r#"alias ll = ls -la"#;
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir.clone()).is_ok());
+    // Create the second alias
+    let alias = r#"alias lf = ll -f"#;
+    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+
+    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+
+    let suggestions = completer.complete("lf t", 4);
+    #[cfg(windows)]
+    let expected_paths: Vec<String> = vec!["test_a\\".to_string(), "test_b\\".to_string()];
+    #[cfg(not(windows))]
+    let expected_paths: Vec<String> = vec!["test_a/".to_string(), "test_b/".to_string()];
+
+    match_suggestions(expected_paths, suggestions)
+}
--- a/crates/nu-cli/tests/completions.rs
+++ b/crates/nu-cli/tests/completions.rs
@@ -1,872 +0,0 @@
-pub mod support;
-
-use nu_cli::NuCompleter;
-use nu_parser::parse;
-use nu_protocol::engine::StateWorkingSet;
-use reedline::{Completer, Suggestion};
-use rstest::{fixture, rstest};
-use support::{completions_helpers::new_quote_engine, file, folder, match_suggestions, new_engine};
-
-#[fixture]
-fn completer() -> NuCompleter {
-    // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
-
-    // Add record value as example
-    let record = "def tst [--mod -s] {}";
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
-
-    // Instantiate a new completer
-    NuCompleter::new(std::sync::Arc::new(engine), stack)
-}
-
-#[fixture]
-fn completer_strings() -> NuCompleter {
-    // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
-
-    // Add record value as example
-    let record = r#"def animals [] { ["cat", "dog", "eel" ] }
-    def my-command [animal: string@animals] { print $animal }"#;
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
-
-    // Instantiate a new completer
-    NuCompleter::new(std::sync::Arc::new(engine), stack)
-}
-
-#[fixture]
-fn extern_completer() -> NuCompleter {
-    // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
-
-    // Add record value as example
-    let record = r#"
-        def animals [] { [ "cat", "dog", "eel" ] }
-        extern spam [
-            animal: string@animals
-            --foo (-f): string@animals
-            -b: string@animals
-        ]
-    "#;
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
-
-    // Instantiate a new completer
-    NuCompleter::new(std::sync::Arc::new(engine), stack)
-}
-
-#[test]
-fn variables_dollar_sign_with_varialblecompletion() {
-    let (_, _, engine, stack) = new_engine();
-
-    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
-
-    let target_dir = "$ ";
-    let suggestions = completer.complete(target_dir, target_dir.len());
-
-    assert_eq!(7, suggestions.len());
-}
-
-#[rstest]
-fn variables_double_dash_argument_with_flagcompletion(mut completer: NuCompleter) {
-    let suggestions = completer.complete("tst --", 6);
-    let expected: Vec<String> = vec!["--help".into(), "--mod".into()];
-    // dbg!(&expected, &suggestions);
-    match_suggestions(expected, suggestions);
-}
-
-#[rstest]
-fn variables_single_dash_argument_with_flagcompletion(mut completer: NuCompleter) {
-    let suggestions = completer.complete("tst -", 5);
-    let expected: Vec<String> = vec!["--help".into(), "--mod".into(), "-h".into(), "-s".into()];
-    match_suggestions(expected, suggestions);
-}
-
-#[rstest]
-fn variables_command_with_commandcompletion(mut completer_strings: NuCompleter) {
-    let suggestions = completer_strings.complete("my-c ", 4);
-    let expected: Vec<String> = vec!["my-command".into()];
-    match_suggestions(expected, suggestions);
-}
-
-#[rstest]
-fn variables_subcommands_with_customcompletion(mut completer_strings: NuCompleter) {
-    let suggestions = completer_strings.complete("my-command ", 11);
-    let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
-    match_suggestions(expected, suggestions);
-}
-
-#[rstest]
-fn variables_customcompletion_subcommands_with_customcompletion_2(
-    mut completer_strings: NuCompleter,
-) {
-    let suggestions = completer_strings.complete("my-command ", 11);
-    let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
-    match_suggestions(expected, suggestions);
-}
-
-#[test]
-fn dotnu_completions() {
-    // Create a new engine
-    let (_, _, engine, stack) = new_engine();
-
-    // Instantiate a new completer
-    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
-
-    // Test source completion
-    let completion_str = "source-env ".to_string();
-    let suggestions = completer.complete(&completion_str, completion_str.len());
-
-    assert_eq!(1, suggestions.len());
-    assert_eq!("custom_completion.nu", suggestions.get(0).unwrap().value);
-
-    // Test use completion
-    let completion_str = "use ".to_string();
-    let suggestions = completer.complete(&completion_str, completion_str.len());
-
-    assert_eq!(1, suggestions.len());
-    assert_eq!("custom_completion.nu", suggestions.get(0).unwrap().value);
-}
-
-#[test]
-#[ignore]
-fn external_completer_trailing_space() {
-    // https://github.com/nushell/nushell/issues/6378
-    let block = "let external_completer = {|spans| $spans}";
-    let input = "gh alias ".to_string();
-
-    let suggestions = run_external_completion(block, &input);
-    assert_eq!(3, suggestions.len());
-    assert_eq!("gh", suggestions.get(0).unwrap().value);
-    assert_eq!("alias", suggestions.get(1).unwrap().value);
-    assert_eq!("", suggestions.get(2).unwrap().value);
-}
-
-#[test]
-fn external_completer_no_trailing_space() {
-    let block = "let external_completer = {|spans| $spans}";
-    let input = "gh alias".to_string();
-
-    let suggestions = run_external_completion(block, &input);
-    assert_eq!(2, suggestions.len());
-    assert_eq!("gh", suggestions.get(0).unwrap().value);
-    assert_eq!("alias", suggestions.get(1).unwrap().value);
-}
-
-#[test]
-fn external_completer_pass_flags() {
-    let block = "let external_completer = {|spans| $spans}";
-    let input = "gh api --".to_string();
-
-    let suggestions = run_external_completion(block, &input);
-    assert_eq!(3, suggestions.len());
-    assert_eq!("gh", suggestions.get(0).unwrap().value);
-    assert_eq!("api", suggestions.get(1).unwrap().value);
-    assert_eq!("--", suggestions.get(2).unwrap().value);
-}
-
-#[test]
-fn file_completions() {
-    // Create a new engine
-    let (dir, dir_str, engine, stack) = new_engine();
-
-    // Instantiate a new completer
-    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
-
-    // Test completions for the current folder
-    let target_dir = format!("cp {dir_str}");
-    let suggestions = completer.complete(&target_dir, target_dir.len());
-
-    // Create the expected values
-    let expected_paths: Vec<String> = vec![
-        folder(dir.join("another")),
-        file(dir.join("custom_completion.nu")),
-        file(dir.join("nushell")),
-        folder(dir.join("test_a")),
-        folder(dir.join("test_b")),
-        file(dir.join(".hidden_file")),
-        folder(dir.join(".hidden_folder")),
-    ];
-
-    // Match the results
-    match_suggestions(expected_paths, suggestions);
-
-    // Test completions for a file
-    let target_dir = format!("cp {}", folder(dir.join("another")));
-    let suggestions = completer.complete(&target_dir, target_dir.len());
-
-    // Create the expected values
-    let expected_paths: Vec<String> = vec![file(dir.join("another").join("newfile"))];
-
-    // Match the results
-    match_suggestions(expected_paths, suggestions);
-}
-
-#[test]
-fn command_ls_with_filecompletion() {
-    let (_, _, engine, stack) = new_engine();
-
-    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
-
-    let target_dir = "ls ";
-    let suggestions = completer.complete(target_dir, target_dir.len());
-
-    #[cfg(windows)]
-    let expected_paths: Vec<String> = vec![
-        "another\\".to_string(),
-        "custom_completion.nu".to_string(),
-        "nushell".to_string(),
-        "test_a\\".to_string(),
-        "test_b\\".to_string(),
-        ".hidden_file".to_string(),
-        ".hidden_folder\\".to_string(),
-    ];
-    #[cfg(not(windows))]
-    let expected_paths: Vec<String> = vec![
-        "another/".to_string(),
-        "custom_completion.nu".to_string(),
-        "nushell".to_string(),
-        "test_a/".to_string(),
-        "test_b/".to_string(),
-        ".hidden_file".to_string(),
-        ".hidden_folder/".to_string(),
-    ];
-
-    match_suggestions(expected_paths, suggestions)
-}
-#[test]
-fn command_open_with_filecompletion() {
-    let (_, _, engine, stack) = new_engine();
-
-    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
-
-    let target_dir = "open ";
-    let suggestions = completer.complete(target_dir, target_dir.len());
-
-    #[cfg(windows)]
-    let expected_paths: Vec<String> = vec![
-        "another\\".to_string(),
-        "custom_completion.nu".to_string(),
-        "nushell".to_string(),
-        "test_a\\".to_string(),
-        "test_b\\".to_string(),
-        ".hidden_file".to_string(),
-        ".hidden_folder\\".to_string(),
-    ];
-    #[cfg(not(windows))]
-    let expected_paths: Vec<String> = vec![
-        "another/".to_string(),
-        "custom_completion.nu".to_string(),
-        "nushell".to_string(),
-        "test_a/".to_string(),
-        "test_b/".to_string(),
-        ".hidden_file".to_string(),
-        ".hidden_folder/".to_string(),
-    ];
-
-    match_suggestions(expected_paths, suggestions)
-}
-
-#[test]
-fn command_rm_with_globcompletion() {
-    let (_, _, engine, stack) = new_engine();
-
-    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
-
-    let target_dir = "rm ";
-    let suggestions = completer.complete(target_dir, target_dir.len());
-
-    #[cfg(windows)]
-    let expected_paths: Vec<String> = vec![
-        "another\\".to_string(),
-        "custom_completion.nu".to_string(),
-        "nushell".to_string(),
-        "test_a\\".to_string(),
-        "test_b\\".to_string(),
-        ".hidden_file".to_string(),
-        ".hidden_folder\\".to_string(),
-    ];
-    #[cfg(not(windows))]
-    let expected_paths: Vec<String> = vec![
-        "another/".to_string(),
-        "custom_completion.nu".to_string(),
-        "nushell".to_string(),
-        "test_a/".to_string(),
-        "test_b/".to_string(),
-        ".hidden_file".to_string(),
-        ".hidden_folder/".to_string(),
-    ];
-
-    match_suggestions(expected_paths, suggestions)
-}
-
-#[test]
-fn command_cp_with_globcompletion() {
-    let (_, _, engine, stack) = new_engine();
-
-    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
-
-    let target_dir = "cp ";
-    let suggestions = completer.complete(target_dir, target_dir.len());
-
-    #[cfg(windows)]
-    let expected_paths: Vec<String> = vec![
-        "another\\".to_string(),
-        "custom_completion.nu".to_string(),
-        "nushell".to_string(),
-        "test_a\\".to_string(),
-        "test_b\\".to_string(),
-        ".hidden_file".to_string(),
-        ".hidden_folder\\".to_string(),
-    ];
-    #[cfg(not(windows))]
-    let expected_paths: Vec<String> = vec![
-        "another/".to_string(),
-        "custom_completion.nu".to_string(),
-        "nushell".to_string(),
-        "test_a/".to_string(),
-        "test_b/".to_string(),
-        ".hidden_file".to_string(),
-        ".hidden_folder/".to_string(),
-    ];
-
-    match_suggestions(expected_paths, suggestions)
-}
-
-#[test]
-fn command_save_with_filecompletion() {
-    let (_, _, engine, stack) = new_engine();
-
-    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
-
-    let target_dir = "save ";
-    let suggestions = completer.complete(target_dir, target_dir.len());
-
-    #[cfg(windows)]
-    let expected_paths: Vec<String> = vec![
-        "another\\".to_string(),
-        "custom_completion.nu".to_string(),
-        "nushell".to_string(),
-        "test_a\\".to_string(),
-        "test_b\\".to_string(),
-        ".hidden_file".to_string(),
-        ".hidden_folder\\".to_string(),
-    ];
-    #[cfg(not(windows))]
-    let expected_paths: Vec<String> = vec![
-        "another/".to_string(),
-        "custom_completion.nu".to_string(),
-        "nushell".to_string(),
-        "test_a/".to_string(),
-        "test_b/".to_string(),
-        ".hidden_file".to_string(),
-        ".hidden_folder/".to_string(),
-    ];
-
-    match_suggestions(expected_paths, suggestions)
-}
-
-#[test]
-fn command_touch_with_filecompletion() {
-    let (_, _, engine, stack) = new_engine();
-
-    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
-
-    let target_dir = "touch ";
-    let suggestions = completer.complete(target_dir, target_dir.len());
-
-    #[cfg(windows)]
-    let expected_paths: Vec<String> = vec![
-        "another\\".to_string(),
-        "custom_completion.nu".to_string(),
-        "nushell".to_string(),
-        "test_a\\".to_string(),
-        "test_b\\".to_string(),
-        ".hidden_file".to_string(),
-        ".hidden_folder\\".to_string(),
-    ];
-    #[cfg(not(windows))]
-    let expected_paths: Vec<String> = vec![
-        "another/".to_string(),
-        "custom_completion.nu".to_string(),
-        "nushell".to_string(),
-        "test_a/".to_string(),
-        "test_b/".to_string(),
-        ".hidden_file".to_string(),
-        ".hidden_folder/".to_string(),
-    ];
-
-    match_suggestions(expected_paths, suggestions)
-}
-
-#[test]
-fn command_watch_with_filecompletion() {
-    let (_, _, engine, stack) = new_engine();
-
-    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
-
-    let target_dir = "watch ";
-    let suggestions = completer.complete(target_dir, target_dir.len());
-
-    #[cfg(windows)]
-    let expected_paths: Vec<String> = vec![
-        "another\\".to_string(),
-        "custom_completion.nu".to_string(),
-        "nushell".to_string(),
-        "test_a\\".to_string(),
-        "test_b\\".to_string(),
-        ".hidden_file".to_string(),
-        ".hidden_folder\\".to_string(),
-    ];
-    #[cfg(not(windows))]
-    let expected_paths: Vec<String> = vec![
-        "another/".to_string(),
-        "custom_completion.nu".to_string(),
-        "nushell".to_string(),
-        "test_a/".to_string(),
-        "test_b/".to_string(),
-        ".hidden_file".to_string(),
-        ".hidden_folder/".to_string(),
-    ];
-
-    match_suggestions(expected_paths, suggestions)
-}
-
-#[test]
-fn file_completion_quoted() {
-    let (_, _, engine, stack) = new_quote_engine();
-
-    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
-
-    let target_dir = "open ";
-    let suggestions = completer.complete(target_dir, target_dir.len());
-
-    let expected_paths: Vec<String> = vec![
-        "`te st.txt`".to_string(),
-        "`te#st.txt`".to_string(),
-        "`te'st.txt`".to_string(),
-        "`te(st).txt`".to_string(),
-    ];
-
-    match_suggestions(expected_paths, suggestions)
-}
-
-#[test]
-fn flag_completions() {
-    // Create a new engine
-    let (_, _, engine, stack) = new_engine();
-
-    // Instantiate a new completer
-    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
-    // Test completions for the 'ls' flags
-    let suggestions = completer.complete("ls -", 4);
-
-    assert_eq!(16, suggestions.len());
-
-    let expected: Vec<String> = vec![
-        "--all".into(),
-        "--directory".into(),
-        "--du".into(),
-        "--full-paths".into(),
-        "--help".into(),
-        "--long".into(),
-        "--mime-type".into(),
-        "--short-names".into(),
-        "-D".into(),
-        "-a".into(),
-        "-d".into(),
-        "-f".into(),
-        "-h".into(),
-        "-l".into(),
-        "-m".into(),
-        "-s".into(),
-    ];
-
-    // Match results
-    match_suggestions(expected, suggestions);
-}
-
-#[test]
-fn folder_with_directorycompletions() {
-    // Create a new engine
-    let (dir, dir_str, engine, stack) = new_engine();
-
-    // Instantiate a new completer
-    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
-
-    // Test completions for the current folder
-    let target_dir = format!("cd {dir_str}");
-    let suggestions = completer.complete(&target_dir, target_dir.len());
-
-    // Create the expected values
-    let expected_paths: Vec<String> = vec![
-        folder(dir.join("another")),
-        folder(dir.join("test_a")),
-        folder(dir.join("test_b")),
-        folder(dir.join(".hidden_folder")),
-    ];
-
-    // Match the results
-    match_suggestions(expected_paths, suggestions);
-}
-
-#[test]
-fn variables_completions() {
-    // Create a new engine
-    let (dir, _, mut engine, mut stack) = new_engine();
-
-    // Add record value as example
-    let record = "let actor = { name: 'Tom Hardy', age: 44 }";
-    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
-
-    // Instantiate a new completer
-    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
-
-    // Test completions for $nu
-    let suggestions = completer.complete("$nu.", 4);
-
-    assert_eq!(14, suggestions.len());
-
-    let expected: Vec<String> = vec![
-        "config-path".into(),
-        "current-exe".into(),
-        "default-config-dir".into(),
-        "env-path".into(),
-        "history-path".into(),
-        "home-path".into(),
-        "is-interactive".into(),
-        "is-login".into(),
-        "loginshell-path".into(),
-        "os-info".into(),
-        "pid".into(),
-        "scope".into(),
-        "startup-time".into(),
-        "temp-path".into(),
-    ];
-
-    // Match results
-    match_suggestions(expected, suggestions);
-
-    // Test completions for $nu.h (filter)
-    let suggestions = completer.complete("$nu.h", 5);
-
-    assert_eq!(2, suggestions.len());
-
-    let expected: Vec<String> = vec!["history-path".into(), "home-path".into()];
-
-    // Match results
-    match_suggestions(expected, suggestions);
-
-    // Test completions for custom var
-    let suggestions = completer.complete("$actor.", 7);
-
-    assert_eq!(2, suggestions.len());
-
-    let expected: Vec<String> = vec!["age".into(), "name".into()];
-
-    // Match results
-    match_suggestions(expected, suggestions);
-
-    // Test completions for custom var (filtering)
-    let suggestions = completer.complete("$actor.n", 8);
-
-    assert_eq!(1, suggestions.len());
-
-    let expected: Vec<String> = vec!["name".into()];
-
-    // Match results
-    match_suggestions(expected, suggestions);
-
-    // Test completions for $env
-    let suggestions = completer.complete("$env.", 5);
-
-    assert_eq!(3, suggestions.len());
-
-    #[cfg(windows)]
-    let expected: Vec<String> = vec!["PWD".into(), "Path".into(), "TEST".into()];
-    #[cfg(not(windows))]
-    let expected: Vec<String> = vec!["PATH".into(), "PWD".into(), "TEST".into()];
-
-    // Match results
-    match_suggestions(expected, suggestions);
-
-    // Test completions for $env
-    let suggestions = completer.complete("$env.T", 6);
-
-    assert_eq!(1, suggestions.len());
-
-    let expected: Vec<String> = vec!["TEST".into()];
-
-    // Match results
-    match_suggestions(expected, suggestions);
-}
-
-#[test]
-fn alias_of_command_and_flags() {
-    let (dir, _, mut engine, mut stack) = new_engine();
-
-    // Create an alias
-    let alias = r#"alias ll = ls -l"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
-
-    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
-
-    let suggestions = completer.complete("ll t", 4);
-    #[cfg(windows)]
-    let expected_paths: Vec<String> = vec!["test_a\\".to_string(), "test_b\\".to_string()];
-    #[cfg(not(windows))]
-    let expected_paths: Vec<String> = vec!["test_a/".to_string(), "test_b/".to_string()];
-
-    match_suggestions(expected_paths, suggestions)
-}
-
-#[test]
-fn alias_of_basic_command() {
-    let (dir, _, mut engine, mut stack) = new_engine();
-
-    // Create an alias
-    let alias = r#"alias ll = ls "#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
-
-    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
-
-    let suggestions = completer.complete("ll t", 4);
-    #[cfg(windows)]
-    let expected_paths: Vec<String> = vec!["test_a\\".to_string(), "test_b\\".to_string()];
-    #[cfg(not(windows))]
-    let expected_paths: Vec<String> = vec!["test_a/".to_string(), "test_b/".to_string()];
-
-    match_suggestions(expected_paths, suggestions)
-}
-
-#[test]
-fn alias_of_another_alias() {
-    let (dir, _, mut engine, mut stack) = new_engine();
-
-    // Create an alias
-    let alias = r#"alias ll = ls -la"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir.clone()).is_ok());
-    // Create the second alias
-    let alias = r#"alias lf = ll -f"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
-
-    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
-
-    let suggestions = completer.complete("lf t", 4);
-    #[cfg(windows)]
-    let expected_paths: Vec<String> = vec!["test_a\\".to_string(), "test_b\\".to_string()];
-    #[cfg(not(windows))]
-    let expected_paths: Vec<String> = vec!["test_a/".to_string(), "test_b/".to_string()];
-
-    match_suggestions(expected_paths, suggestions)
-}
-
-fn run_external_completion(block: &str, input: &str) -> Vec<Suggestion> {
-    // Create a new engine
-    let (dir, _, mut engine_state, mut stack) = new_engine();
-    let (_, delta) = {
-        let mut working_set = StateWorkingSet::new(&engine_state);
-        let block = parse(&mut working_set, None, block.as_bytes(), false);
-        assert!(working_set.parse_errors.is_empty());
-
-        (block, working_set.render())
-    };
-
-    assert!(engine_state.merge_delta(delta).is_ok());
-
-    // Merge environment into the permanent state
-    assert!(engine_state.merge_env(&mut stack, &dir).is_ok());
-
-    let latest_block_id = engine_state.num_blocks() - 1;
-
-    // Change config adding the external completer
-    let mut config = engine_state.get_config().clone();
-    config.external_completer = Some(latest_block_id);
-    engine_state.set_config(&config);
-
-    // Instantiate a new completer
-    let mut completer = NuCompleter::new(std::sync::Arc::new(engine_state), stack);
-
-    completer.complete(input, input.len())
-}
-
-#[test]
-fn unknown_command_completion() {
-    let (_, _, engine, stack) = new_engine();
-
-    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
-
-    let target_dir = "thiscommanddoesnotexist ";
-    let suggestions = completer.complete(target_dir, target_dir.len());
-
-    #[cfg(windows)]
-    let expected_paths: Vec<String> = vec![
-        "another\\".to_string(),
-        "custom_completion.nu".to_string(),
-        "nushell".to_string(),
-        "test_a\\".to_string(),
-        "test_b\\".to_string(),
-        ".hidden_file".to_string(),
-        ".hidden_folder\\".to_string(),
-    ];
-    #[cfg(not(windows))]
-    let expected_paths: Vec<String> = vec![
-        "another/".to_string(),
-        "custom_completion.nu".to_string(),
-        "nushell".to_string(),
-        "test_a/".to_string(),
-        "test_b/".to_string(),
-        ".hidden_file".to_string(),
-        ".hidden_folder/".to_string(),
-    ];
-
-    match_suggestions(expected_paths, suggestions)
-}
-
-#[rstest]
-fn flagcompletion_triggers_after_cursor(mut completer: NuCompleter) {
-    let suggestions = completer.complete("tst -h", 5);
-    let expected: Vec<String> = vec!["--help".into(), "--mod".into(), "-h".into(), "-s".into()];
-    match_suggestions(expected, suggestions);
-}
-
-#[rstest]
-fn customcompletion_triggers_after_cursor(mut completer_strings: NuCompleter) {
-    let suggestions = completer_strings.complete("my-command c", 11);
-    let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
-    match_suggestions(expected, suggestions);
-}
-
-#[rstest]
-fn customcompletion_triggers_after_cursor_piped(mut completer_strings: NuCompleter) {
-    let suggestions = completer_strings.complete("my-command c | ls", 11);
-    let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
-    match_suggestions(expected, suggestions);
-}
-
-#[rstest]
-fn flagcompletion_triggers_after_cursor_piped(mut completer: NuCompleter) {
-    let suggestions = completer.complete("tst -h | ls", 5);
-    let expected: Vec<String> = vec!["--help".into(), "--mod".into(), "-h".into(), "-s".into()];
-    match_suggestions(expected, suggestions);
-}
-
-#[test]
-fn filecompletions_triggers_after_cursor() {
-    let (_, _, engine, stack) = new_engine();
-
-    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
-
-    let suggestions = completer.complete("cp   test_c", 3);
-
-    #[cfg(windows)]
-    let expected_paths: Vec<String> = vec![
-        "another\\".to_string(),
-        "custom_completion.nu".to_string(),
-        "nushell".to_string(),
-        "test_a\\".to_string(),
-        "test_b\\".to_string(),
-        ".hidden_file".to_string(),
-        ".hidden_folder\\".to_string(),
-    ];
-    #[cfg(not(windows))]
-    let expected_paths: Vec<String> = vec![
-        "another/".to_string(),
-        "custom_completion.nu".to_string(),
-        "nushell".to_string(),
-        "test_a/".to_string(),
-        "test_b/".to_string(),
-        ".hidden_file".to_string(),
-        ".hidden_folder/".to_string(),
-    ];
-
-    match_suggestions(expected_paths, suggestions);
-}
-
-#[rstest]
-fn extern_custom_completion_positional(mut extern_completer: NuCompleter) {
-    let suggestions = extern_completer.complete("spam ", 5);
-    let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
-    match_suggestions(expected, suggestions);
-}
-
-#[rstest]
-fn extern_custom_completion_long_flag_1(mut extern_completer: NuCompleter) {
-    let suggestions = extern_completer.complete("spam --foo=", 11);
-    let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
-    match_suggestions(expected, suggestions);
-}
-
-#[rstest]
-fn extern_custom_completion_long_flag_2(mut extern_completer: NuCompleter) {
-    let suggestions = extern_completer.complete("spam --foo ", 11);
-    let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
-    match_suggestions(expected, suggestions);
-}
-
-#[rstest]
-fn extern_custom_completion_long_flag_short(mut extern_completer: NuCompleter) {
-    let suggestions = extern_completer.complete("spam -f ", 8);
-    let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
-    match_suggestions(expected, suggestions);
-}
-
-#[rstest]
-fn extern_custom_completion_short_flag(mut extern_completer: NuCompleter) {
-    let suggestions = extern_completer.complete("spam -b ", 8);
-    let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
-    match_suggestions(expected, suggestions);
-}
-
-#[rstest]
-fn extern_complete_flags(mut extern_completer: NuCompleter) {
-    let suggestions = extern_completer.complete("spam -", 6);
-    let expected: Vec<String> = vec!["--foo".into(), "-b".into(), "-f".into()];
-    match_suggestions(expected, suggestions);
-}
-
-#[ignore = "was reverted, still needs fixing"]
-#[rstest]
-fn alias_offset_bug_7648() {
-    let (dir, _, mut engine, mut stack) = new_engine();
-
-    // Create an alias
-    let alias = r#"alias ea = ^$env.EDITOR /tmp/test.s"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
-
-    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
-
-    // Issue #7648
-    // Nushell crashes when an alias name is shorter than the alias command
-    // and the alias command is a external command
-    // This happens because of offset is not correct.
-    // This crashes before PR #7779
-    let _suggestions = completer.complete("e", 1);
-}
-
-#[ignore = "was reverted, still needs fixing"]
-#[rstest]
-fn alias_offset_bug_7754() {
-    let (dir, _, mut engine, mut stack) = new_engine();
-
-    // Create an alias
-    let alias = r#"alias ll = ls -l"#;
-    assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
-
-    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
-
-    // Issue #7754
-    // Nushell crashes when an alias name is shorter than the alias command
-    // and the alias command contains pipes.
-    // This crashes before PR #7756
-    let _suggestions = completer.complete("ll -a | c", 9);
-}
-
-#[test]
-fn get_path_env_var_8003() {
-    // Create a new engine
-    let (_, _, engine, _) = new_engine();
-    // Get the path env var in a platform agnostic way
-    let the_path = engine.get_path_env_var();
-    // Make sure it's not empty
-    assert!(the_path.is_some());
-}
--- a/crates/nu-cli/tests/custom_completions.rs
+++ b/crates/nu-cli/tests/custom_completions.rs
@@ -0,0 +1,69 @@
+pub mod support;
+
+use nu_cli::NuCompleter;
+use reedline::Completer;
+use rstest::{fixture, rstest};
+use support::{match_suggestions, new_engine};
+
+#[fixture]
+fn completer() -> NuCompleter {
+    // Create a new engine
+    let (dir, _, mut engine, mut stack) = new_engine();
+
+    // Add record value as example
+    let record = "def tst [--mod -s] {}";
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+
+    // Instantiate a new completer
+    NuCompleter::new(std::sync::Arc::new(engine), stack)
+}
+
+#[fixture]
+fn completer_strings() -> NuCompleter {
+    // Create a new engine
+    let (dir, _, mut engine, mut stack) = new_engine();
+
+    // Add record value as example
+    let record = r#"def animals [] { ["cat", "dog", "eel" ] }
+    def my-command [animal: string@animals] { print $animal }"#;
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+
+    // Instantiate a new completer
+    NuCompleter::new(std::sync::Arc::new(engine), stack)
+}
+
+#[rstest]
+fn variables_completions_double_dash_argument(mut completer: NuCompleter) {
+    let suggestions = completer.complete("tst --", 6);
+    let expected: Vec<String> = vec!["--help".into(), "--mod".into()];
+    // dbg!(&expected, &suggestions);
+    match_suggestions(expected, suggestions);
+}
+
+#[rstest]
+fn variables_completions_single_dash_argument(mut completer: NuCompleter) {
+    let suggestions = completer.complete("tst -", 5);
+    let expected: Vec<String> = vec!["--help".into(), "--mod".into(), "-h".into(), "-s".into()];
+    match_suggestions(expected, suggestions);
+}
+
+#[rstest]
+fn variables_completions_command(mut completer_strings: NuCompleter) {
+    let suggestions = completer_strings.complete("my-command ", 9);
+    let expected: Vec<String> = vec!["my-command".into()];
+    match_suggestions(expected, suggestions);
+}
+
+#[rstest]
+fn variables_completions_subcommands(mut completer_strings: NuCompleter) {
+    let suggestions = completer_strings.complete("my-command ", 11);
+    let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
+    match_suggestions(expected, suggestions);
+}
+
+#[rstest]
+fn variables_completions_subcommands_2(mut completer_strings: NuCompleter) {
+    let suggestions = completer_strings.complete("my-command ", 11);
+    let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
+    match_suggestions(expected, suggestions);
+}
--- a/crates/nu-cli/tests/dotnu_completions.rs
+++ b/crates/nu-cli/tests/dotnu_completions.rs
@@ -0,0 +1,28 @@
+pub mod support;
+
+use nu_cli::NuCompleter;
+use reedline::Completer;
+use support::new_engine;
+
+#[test]
+fn dotnu_completions() {
+    // Create a new engine
+    let (_, _, engine, stack) = new_engine();
+
+    // Instatiate a new completer
+    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+
+    // Test source completion
+    let completion_str = "source ".to_string();
+    let suggestions = completer.complete(&completion_str, completion_str.len());
+
+    assert_eq!(1, suggestions.len());
+    assert_eq!("custom_completion.nu", suggestions.get(0).unwrap().value);
+
+    // Test use completion
+    let completion_str = "use ".to_string();
+    let suggestions = completer.complete(&completion_str, completion_str.len());
+
+    assert_eq!(1, suggestions.len());
+    assert_eq!("custom_completion.nu", suggestions.get(0).unwrap().value);
+}
--- a/crates/nu-cli/tests/file_completions.rs
+++ b/crates/nu-cli/tests/file_completions.rs
@@ -0,0 +1,272 @@
+pub mod support;
+
+use nu_cli::NuCompleter;
+use reedline::Completer;
+use support::{file, folder, match_suggestions, new_engine};
+
+#[test]
+fn file_completions() {
+    // Create a new engine
+    let (dir, dir_str, engine, stack) = new_engine();
+
+    // Instatiate a new completer
+    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+
+    // Test completions for the current folder
+    let target_dir = format!("cp {}", dir_str);
+    let suggestions = completer.complete(&target_dir, target_dir.len());
+
+    // Create the expected values
+    let expected_paths: Vec<String> = vec![
+        file(dir.join("nushell")),
+        folder(dir.join("test_a")),
+        folder(dir.join("test_b")),
+        folder(dir.join("another")),
+        file(dir.join("custom_completion.nu")),
+        file(dir.join(".hidden_file")),
+        folder(dir.join(".hidden_folder")),
+    ];
+
+    // Match the results
+    match_suggestions(expected_paths, suggestions);
+
+    // Test completions for a file
+    let target_dir = format!("cp {}", folder(dir.join("another")));
+    let suggestions = completer.complete(&target_dir, target_dir.len());
+
+    // Create the expected values
+    let expected_paths: Vec<String> = vec![file(dir.join("another").join("newfile"))];
+
+    // Match the results
+    match_suggestions(expected_paths, suggestions);
+}
+
+#[test]
+fn command_ls_completion() {
+    let (_, _, engine, stack) = new_engine();
+
+    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+
+    let target_dir = "ls ";
+    let suggestions = completer.complete(target_dir, target_dir.len());
+
+    #[cfg(windows)]
+    let expected_paths: Vec<String> = vec![
+        "nushell".to_string(),
+        "test_a\\".to_string(),
+        "test_b\\".to_string(),
+        "another\\".to_string(),
+        "custom_completion.nu".to_string(),
+        ".hidden_file".to_string(),
+        ".hidden_folder\\".to_string(),
+    ];
+    #[cfg(not(windows))]
+    let expected_paths: Vec<String> = vec![
+        "nushell".to_string(),
+        "test_a/".to_string(),
+        "test_b/".to_string(),
+        "another/".to_string(),
+        "custom_completion.nu".to_string(),
+        ".hidden_file".to_string(),
+        ".hidden_folder/".to_string(),
+    ];
+
+    match_suggestions(expected_paths, suggestions)
+}
+#[test]
+fn command_open_completion() {
+    let (_, _, engine, stack) = new_engine();
+
+    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+
+    let target_dir = "open ";
+    let suggestions = completer.complete(target_dir, target_dir.len());
+
+    #[cfg(windows)]
+    let expected_paths: Vec<String> = vec![
+        "nushell".to_string(),
+        "test_a\\".to_string(),
+        "test_b\\".to_string(),
+        "another\\".to_string(),
+        "custom_completion.nu".to_string(),
+        ".hidden_file".to_string(),
+        ".hidden_folder\\".to_string(),
+    ];
+    #[cfg(not(windows))]
+    let expected_paths: Vec<String> = vec![
+        "nushell".to_string(),
+        "test_a/".to_string(),
+        "test_b/".to_string(),
+        "another/".to_string(),
+        "custom_completion.nu".to_string(),
+        ".hidden_file".to_string(),
+        ".hidden_folder/".to_string(),
+    ];
+
+    match_suggestions(expected_paths, suggestions)
+}
+
+#[test]
+fn command_rm_completion() {
+    let (_, _, engine, stack) = new_engine();
+
+    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+
+    let target_dir = "rm ";
+    let suggestions = completer.complete(target_dir, target_dir.len());
+
+    #[cfg(windows)]
+    let expected_paths: Vec<String> = vec![
+        "nushell".to_string(),
+        "test_a\\".to_string(),
+        "test_b\\".to_string(),
+        "another\\".to_string(),
+        "custom_completion.nu".to_string(),
+        ".hidden_file".to_string(),
+        ".hidden_folder\\".to_string(),
+    ];
+    #[cfg(not(windows))]
+    let expected_paths: Vec<String> = vec![
+        "nushell".to_string(),
+        "test_a/".to_string(),
+        "test_b/".to_string(),
+        "another/".to_string(),
+        "custom_completion.nu".to_string(),
+        ".hidden_file".to_string(),
+        ".hidden_folder/".to_string(),
+    ];
+
+    match_suggestions(expected_paths, suggestions)
+}
+
+#[test]
+fn command_cp_completion() {
+    let (_, _, engine, stack) = new_engine();
+
+    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+
+    let target_dir = "cp ";
+    let suggestions = completer.complete(target_dir, target_dir.len());
+
+    #[cfg(windows)]
+    let expected_paths: Vec<String> = vec![
+        "nushell".to_string(),
+        "test_a\\".to_string(),
+        "test_b\\".to_string(),
+        "another\\".to_string(),
+        "custom_completion.nu".to_string(),
+        ".hidden_file".to_string(),
+        ".hidden_folder\\".to_string(),
+    ];
+    #[cfg(not(windows))]
+    let expected_paths: Vec<String> = vec![
+        "nushell".to_string(),
+        "test_a/".to_string(),
+        "test_b/".to_string(),
+        "another/".to_string(),
+        "custom_completion.nu".to_string(),
+        ".hidden_file".to_string(),
+        ".hidden_folder/".to_string(),
+    ];
+
+    match_suggestions(expected_paths, suggestions)
+}
+
+#[test]
+fn command_save_completion() {
+    let (_, _, engine, stack) = new_engine();
+
+    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+
+    let target_dir = "save ";
+    let suggestions = completer.complete(target_dir, target_dir.len());
+
+    #[cfg(windows)]
+    let expected_paths: Vec<String> = vec![
+        "nushell".to_string(),
+        "test_a\\".to_string(),
+        "test_b\\".to_string(),
+        "another\\".to_string(),
+        "custom_completion.nu".to_string(),
+        ".hidden_file".to_string(),
+        ".hidden_folder\\".to_string(),
+    ];
+    #[cfg(not(windows))]
+    let expected_paths: Vec<String> = vec![
+        "nushell".to_string(),
+        "test_a/".to_string(),
+        "test_b/".to_string(),
+        "another/".to_string(),
+        "custom_completion.nu".to_string(),
+        ".hidden_file".to_string(),
+        ".hidden_folder/".to_string(),
+    ];
+
+    match_suggestions(expected_paths, suggestions)
+}
+
+#[test]
+fn command_touch_completion() {
+    let (_, _, engine, stack) = new_engine();
+
+    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+
+    let target_dir = "touch ";
+    let suggestions = completer.complete(target_dir, target_dir.len());
+
+    #[cfg(windows)]
+    let expected_paths: Vec<String> = vec![
+        "nushell".to_string(),
+        "test_a\\".to_string(),
+        "test_b\\".to_string(),
+        "another\\".to_string(),
+        "custom_completion.nu".to_string(),
+        ".hidden_file".to_string(),
+        ".hidden_folder\\".to_string(),
+    ];
+    #[cfg(not(windows))]
+    let expected_paths: Vec<String> = vec![
+        "nushell".to_string(),
+        "test_a/".to_string(),
+        "test_b/".to_string(),
+        "another/".to_string(),
+        "custom_completion.nu".to_string(),
+        ".hidden_file".to_string(),
+        ".hidden_folder/".to_string(),
+    ];
+
+    match_suggestions(expected_paths, suggestions)
+}
+
+#[test]
+fn command_watch_completion() {
+    let (_, _, engine, stack) = new_engine();
+
+    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+
+    let target_dir = "watch ";
+    let suggestions = completer.complete(target_dir, target_dir.len());
+
+    #[cfg(windows)]
+    let expected_paths: Vec<String> = vec![
+        "nushell".to_string(),
+        "test_a\\".to_string(),
+        "test_b\\".to_string(),
+        "another\\".to_string(),
+        "custom_completion.nu".to_string(),
+        ".hidden_file".to_string(),
+        ".hidden_folder\\".to_string(),
+    ];
+    #[cfg(not(windows))]
+    let expected_paths: Vec<String> = vec![
+        "nushell".to_string(),
+        "test_a/".to_string(),
+        "test_b/".to_string(),
+        "another/".to_string(),
+        "custom_completion.nu".to_string(),
+        ".hidden_file".to_string(),
+        ".hidden_folder/".to_string(),
+    ];
+
+    match_suggestions(expected_paths, suggestions)
+}
--- a/crates/nu-cli/tests/flag_completions.rs
+++ b/crates/nu-cli/tests/flag_completions.rs
@@ -0,0 +1,38 @@
+pub mod support;
+
+use nu_cli::NuCompleter;
+use reedline::Completer;
+use support::{match_suggestions, new_engine};
+
+#[test]
+fn flag_completions() {
+    // Create a new engine
+    let (_, _, engine, stack) = new_engine();
+
+    // Instatiate a new completer
+    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+    // Test completions for the 'ls' flags
+    let suggestions = completer.complete("ls -", 4);
+
+    assert_eq!(14, suggestions.len());
+
+    let expected: Vec<String> = vec![
+        "--all".into(),
+        "--directory".into(),
+        "--du".into(),
+        "--full-paths".into(),
+        "--help".into(),
+        "--long".into(),
+        "--short-names".into(),
+        "-D".into(),
+        "-a".into(),
+        "-d".into(),
+        "-f".into(),
+        "-h".into(),
+        "-l".into(),
+        "-s".into(),
+    ];
+
+    // Match results
+    match_suggestions(expected, suggestions);
+}
--- a/crates/nu-cli/tests/folder_completions.rs
+++ b/crates/nu-cli/tests/folder_completions.rs
@@ -0,0 +1,29 @@
+pub mod support;
+
+use nu_cli::NuCompleter;
+use reedline::Completer;
+use support::{folder, match_suggestions, new_engine};
+
+#[test]
+fn folder_completions() {
+    // Create a new engine
+    let (dir, dir_str, engine, stack) = new_engine();
+
+    // Instatiate a new completer
+    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+
+    // Test completions for the current folder
+    let target_dir = format!("cd {}", dir_str);
+    let suggestions = completer.complete(&target_dir, target_dir.len());
+
+    // Create the expected values
+    let expected_paths: Vec<String> = vec![
+        folder(dir.join("test_a")),
+        folder(dir.join("test_b")),
+        folder(dir.join("another")),
+        folder(dir.join(".hidden_folder")),
+    ];
+
+    // Match the results
+    match_suggestions(expected_paths, suggestions);
+}
--- a/crates/nu-cli/tests/support/completions_helpers.rs
+++ b/crates/nu-cli/tests/support/completions_helpers.rs
@@ -33,69 +33,20 @@ pub fn new_engine() -> (PathBuf, String, EngineState, Stack) {
        "PWD".to_string(),
        Value::String {
            val: dir_str.clone(),
-            span: nu_protocol::Span::new(0, dir_str.len()),
+            span: nu_protocol::Span {
+                start: 0,
+                end: dir_str.len(),
+            },
        },
    );
    stack.add_env_var(
        "TEST".to_string(),
        Value::String {
            val: "NUSHELL".to_string(),
-            span: nu_protocol::Span::new(0, dir_str.len()),
+            span: nu_protocol::Span {
+                start: 0,
+                end: dir_str.len(),
            },
-    );
-    #[cfg(windows)]
-    stack.add_env_var(
-        "Path".to_string(),
-        Value::String {
-            val: "c:\\some\\path;c:\\some\\other\\path".to_string(),
-            span: nu_protocol::Span::new(0, dir_str.len()),
-        },
-    );
-    #[cfg(not(windows))]
-    stack.add_env_var(
-        "PATH".to_string(),
-        Value::String {
-            val: "/some/path:/some/other/path".to_string(),
-            span: nu_protocol::Span::new(0, dir_str.len()),
-        },
-    );
-
-    // Merge environment into the permanent state
-    let merge_result = engine_state.merge_env(&mut stack, &dir);
-    assert!(merge_result.is_ok());
-
-    (dir, dir_str, engine_state, stack)
-}
-
-pub fn new_quote_engine() -> (PathBuf, String, EngineState, Stack) {
-    // Target folder inside assets
-    let dir = fs::fixtures().join("quoted_completions");
-    let mut dir_str = dir
-        .clone()
-        .into_os_string()
-        .into_string()
-        .unwrap_or_default();
-    dir_str.push(SEP);
-
-    // Create a new engine with default context
-    let mut engine_state = create_default_context();
-
-    // New stack
-    let mut stack = Stack::new();
-
-    // Add pwd as env var
-    stack.add_env_var(
-        "PWD".to_string(),
-        Value::String {
-            val: dir_str.clone(),
-            span: nu_protocol::Span::new(0, dir_str.len()),
-        },
-    );
-    stack.add_env_var(
-        "TEST".to_string(),
-        Value::String {
-            val: "NUSHELL".to_string(),
-            span: nu_protocol::Span::new(0, dir_str.len()),
        },
    );

@@ -146,14 +97,16 @@ pub fn merge_input(
    let (block, delta) = {
        let mut working_set = StateWorkingSet::new(engine_state);

-        let block = parse(&mut working_set, None, input, false);
+        let (block, err) = parse(&mut working_set, None, input, false, &[]);

-        assert!(working_set.parse_errors.is_empty());
+        assert!(err.is_none());

        (block, working_set.render())
    };

-    engine_state.merge_delta(delta)?;
+    if let Err(err) = engine_state.merge_delta(delta) {
+        return Err(err);
+    }

    assert!(eval_block(
        engine_state,
@@ -161,7 +114,7 @@ pub fn merge_input(
        &block,
        PipelineData::Value(
            Value::Nothing {
-                span: Span::unknown(),
+                span: Span { start: 0, end: 0 },
            },
            None
        ),
--- a/crates/nu-cli/tests/variables_completions.rs
+++ b/crates/nu-cli/tests/variables_completions.rs
@@ -0,0 +1,88 @@
+pub mod support;
+
+use nu_cli::NuCompleter;
+use reedline::Completer;
+use support::{match_suggestions, new_engine};
+
+#[test]
+fn variables_completions() {
+    // Create a new engine
+    let (dir, _, mut engine, mut stack) = new_engine();
+
+    // Add record value as example
+    let record = "let actor = { name: 'Tom Hardy', age: 44 }";
+    assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
+
+    // Instatiate a new completer
+    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+
+    // Test completions for $nu
+    let suggestions = completer.complete("$nu.", 4);
+
+    assert_eq!(9, suggestions.len());
+
+    let expected: Vec<String> = vec![
+        "config-path".into(),
+        "env-path".into(),
+        "history-path".into(),
+        "home-path".into(),
+        "loginshell-path".into(),
+        "os-info".into(),
+        "pid".into(),
+        "scope".into(),
+        "temp-path".into(),
+    ];
+
+    // Match results
+    match_suggestions(expected, suggestions);
+
+    // Test completions for $nu.h (filter)
+    let suggestions = completer.complete("$nu.h", 5);
+
+    assert_eq!(2, suggestions.len());
+
+    let expected: Vec<String> = vec!["history-path".into(), "home-path".into()];
+
+    // Match results
+    match_suggestions(expected, suggestions);
+
+    // Test completions for custom var
+    let suggestions = completer.complete("$actor.", 7);
+
+    assert_eq!(2, suggestions.len());
+
+    let expected: Vec<String> = vec!["age".into(), "name".into()];
+
+    // Match results
+    match_suggestions(expected, suggestions);
+
+    // Test completions for custom var (filtering)
+    let suggestions = completer.complete("$actor.n", 8);
+
+    assert_eq!(1, suggestions.len());
+
+    let expected: Vec<String> = vec!["name".into()];
+
+    // Match results
+    match_suggestions(expected, suggestions);
+
+    // Test completions for $env
+    let suggestions = completer.complete("$env.", 5);
+
+    assert_eq!(2, suggestions.len());
+
+    let expected: Vec<String> = vec!["PWD".into(), "TEST".into()];
+
+    // Match results
+    match_suggestions(expected, suggestions);
+
+    // Test completions for $env
+    let suggestions = completer.complete("$env.T", 6);
+
+    assert_eq!(1, suggestions.len());
+
+    let expected: Vec<String> = vec!["TEST".into()];
+
+    // Match results
+    match_suggestions(expected, suggestions);
+}
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@@ -1,32 +0,0 @@
-[package]
-authors = ["The Nushell Project Developers"]
-build = "build.rs"
-description = "Nushell's core language commands"
-repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
-edition = "2021"
-license = "MIT"
-name = "nu-cmd-lang"
-version = "0.79.0"
-
-[lib]
-bench = false
-
-[dependencies]
-nu-color-config = { path = "../nu-color-config", version = "0.79.0" }
-nu-engine = { path = "../nu-engine", version = "0.79.0" }
-nu-parser = { path = "../nu-parser", version = "0.79.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.79.0"  }
-nu-utils = { path = "../nu-utils", version = "0.79.0" }
-
-nu-ansi-term = "0.47.0"
-
-fancy-regex = "0.11.0"
-itertools = "0.10.0"
-log = "0.4.14"
-shadow-rs = { version = "0.21.0", default-features = false }
-
-[build-dependencies]
-shadow-rs = { version = "0.21.0", default-features = false }
-
-[dev-dependencies]
-nu-test-support = { path="../nu-test-support", version = "0.79.0"  }
--- a/crates/nu-cmd-lang/LICENSE
+++ b/crates/nu-cmd-lang/LICENSE
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 - 2023 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
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/crates/nu-cmd-lang/build.rs
+++ b/crates/nu-cmd-lang/build.rs
@@ -1,20 +0,0 @@
-use std::process::Command;
-
-fn main() -> shadow_rs::SdResult<()> {
-    // Look up the current Git commit ourselves instead of relying on shadow_rs,
-    // because shadow_rs does it in a really slow-to-compile way (it builds libgit2)
-    let hash = get_git_hash().unwrap_or_default();
-    println!("cargo:rustc-env=NU_COMMIT_HASH={hash}");
-
-    shadow_rs::new()
-}
-
-fn get_git_hash() -> Option<String> {
-    Command::new("git")
-        .args(["rev-parse", "HEAD"])
-        .output()
-        .ok()
-        .filter(|output| output.status.success())
-        .and_then(|output| String::from_utf8(output.stdout).ok())
-        .map(|hash| hash.trim().to_string())
-}
--- a/crates/nu-cmd-lang/src/core_commands/break_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/break_.rs
@@ -1,40 +0,0 @@
-use nu_protocol::ast::Call;
-use nu_protocol::engine::{Command, EngineState, Stack};
-use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, Type};
-
-#[derive(Clone)]
-pub struct Break;
-
-impl Command for Break {
-    fn name(&self) -> &str {
-        "break"
-    }
-
-    fn usage(&self) -> &str {
-        "Break a loop."
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("break")
-            .input_output_types(vec![(Type::Nothing, Type::Nothing)])
-            .category(Category::Core)
-    }
-
-    fn run(
-        &self,
-        _engine_state: &EngineState,
-        _stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        Err(ShellError::Break(call.head))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Break out of a loop",
-            example: r#"loop { break }"#,
-            result: None,
-        }]
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/collect.rs
+++ b/crates/nu-cmd-lang/src/core_commands/collect.rs
@@ -1,105 +0,0 @@
-use nu_engine::{eval_block, redirect_env, CallExt};
-use nu_protocol::ast::Call;
-use nu_protocol::engine::{Closure, Command, EngineState, Stack};
-use nu_protocol::{
-    Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, SyntaxShape, Type,
-    Value,
-};
-
-#[derive(Clone)]
-pub struct Collect;
-
-impl Command for Collect {
-    fn name(&self) -> &str {
-        "collect"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("collect")
-            .input_output_types(vec![(Type::List(Box::new(Type::Any)), Type::Any)])
-            .required(
-                "closure",
-                SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
-                "the closure to run once the stream is collected",
-            )
-            .switch(
-                "keep-env",
-                "let the block affect environment variables",
-                None,
-            )
-            .category(Category::Filters)
-    }
-
-    fn usage(&self) -> &str {
-        "Collect the stream and pass it to a block."
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let capture_block: Closure = call.req(engine_state, stack, 0)?;
-
-        let block = engine_state.get_block(capture_block.block_id).clone();
-        let mut stack_captures = stack.captures_to_stack(&capture_block.captures);
-
-        let metadata = input.metadata();
-        let input: Value = input.into_value(call.head);
-
-        let mut saved_positional = None;
-        if let Some(var) = block.signature.get_positional(0) {
-            if let Some(var_id) = &var.var_id {
-                stack_captures.add_var(*var_id, input.clone());
-                saved_positional = Some(*var_id);
-            }
-        }
-
-        let result = eval_block(
-            engine_state,
-            &mut stack_captures,
-            &block,
-            input.into_pipeline_data(),
-            call.redirect_stdout,
-            call.redirect_stderr,
-        )
-        .map(|x| x.set_metadata(metadata));
-
-        if call.has_flag("keep-env") {
-            redirect_env(engine_state, stack, &stack_captures);
-            // for when we support `data | let x = $in;`
-            // remove the variables added earlier
-            for var_id in capture_block.captures.keys() {
-                stack_captures.remove_var(*var_id);
-            }
-            if let Some(u) = saved_positional {
-                stack_captures.remove_var(u);
-            }
-            // add any new variables to the stack
-            stack.vars.extend(stack_captures.vars);
-        }
-        result
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Use the second value in the stream",
-            example: "[1 2 3] | collect { |x| $x.1 }",
-            result: Some(Value::test_int(2)),
-        }]
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        use crate::test_examples;
-
-        test_examples(Collect {})
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/const_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/const_.rs
@@ -1,104 +0,0 @@
-use nu_protocol::ast::Call;
-use nu_protocol::engine::{Command, EngineState, Stack};
-use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type};
-
-#[derive(Clone)]
-pub struct Const;
-
-impl Command for Const {
-    fn name(&self) -> &str {
-        "const"
-    }
-
-    fn usage(&self) -> &str {
-        "Create a parse-time constant."
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("const")
-            .input_output_types(vec![(Type::Nothing, Type::Nothing)])
-            .allow_variants_without_examples(true)
-            .required("const_name", SyntaxShape::VarWithOptType, "constant name")
-            .required(
-                "initial_value",
-                SyntaxShape::Keyword(b"=".to_vec(), Box::new(SyntaxShape::MathExpression)),
-                "equals sign followed by constant value",
-            )
-            .category(Category::Core)
-    }
-
-    fn extra_usage(&self) -> &str {
-        r#"This command is a parser keyword. For details, check:
-  https://www.nushell.sh/book/thinking_in_nu.html"#
-    }
-
-    fn is_parser_keyword(&self) -> bool {
-        true
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["set", "let"]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let var_id = call
-            .positional_nth(0)
-            .expect("checked through parser")
-            .as_var()
-            .expect("internal error: missing variable");
-
-        if let Some(constval) = engine_state.find_constant(var_id, &[]) {
-            // Instead of creating a second copy of the value in the stack, we could change
-            // stack.get_var() to check engine_state.find_constant().
-            stack.add_var(var_id, constval.clone());
-
-            Ok(PipelineData::empty())
-        } else {
-            Err(ShellError::NushellFailedSpanned {
-                msg: "Missing Constant".to_string(),
-                label: "constant not added by the parser".to_string(),
-                span: call.head,
-            })
-        }
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Create a new parse-time constant.",
-                example: "const x = 10",
-                result: None,
-            },
-            Example {
-                description: "Create a composite constant value",
-                example: "const x = { a: 10, b: 20 }",
-                result: None,
-            },
-        ]
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use nu_protocol::engine::CommandType;
-
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        use crate::test_examples;
-
-        test_examples(Const {})
-    }
-
-    #[test]
-    fn test_command_type() {
-        assert!(matches!(Const.command_type(), CommandType::Keyword));
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/continue_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/continue_.rs
@@ -1,40 +0,0 @@
-use nu_protocol::ast::Call;
-use nu_protocol::engine::{Command, EngineState, Stack};
-use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, Type};
-
-#[derive(Clone)]
-pub struct Continue;
-
-impl Command for Continue {
-    fn name(&self) -> &str {
-        "continue"
-    }
-
-    fn usage(&self) -> &str {
-        "Continue a loop from the next iteration."
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("continue")
-            .input_output_types(vec![(Type::Nothing, Type::Nothing)])
-            .category(Category::Core)
-    }
-
-    fn run(
-        &self,
-        _engine_state: &EngineState,
-        _stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        Err(ShellError::Continue(call.head))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Continue a loop from the next iteration",
-            example: r#"for i in 1..10 { if $i == 5 { continue }; print $i }"#,
-            result: None,
-        }]
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/describe.rs
+++ b/crates/nu-cmd-lang/src/core_commands/describe.rs
@@ -1,107 +0,0 @@
-use nu_protocol::ast::Call;
-use nu_protocol::engine::{Command, EngineState, Stack};
-use nu_protocol::{
-    Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, Type, Value,
-};
-
-#[derive(Clone)]
-pub struct Describe;
-
-impl Command for Describe {
-    fn name(&self) -> &str {
-        "describe"
-    }
-
-    fn usage(&self) -> &str {
-        "Describe the type and structure of the value(s) piped in."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("describe")
-            .input_output_types(vec![(Type::Any, Type::String)])
-            .switch(
-                "no-collect",
-                "do not collect streams of structured data",
-                Some('n'),
-            )
-            .category(Category::Core)
-    }
-
-    fn run(
-        &self,
-        _engine_state: &EngineState,
-        _stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let head = call.head;
-
-        let no_collect: bool = call.has_flag("no-collect");
-
-        let description = match input {
-            PipelineData::ExternalStream { .. } => "raw input".into(),
-            PipelineData::ListStream(_, _) => {
-                if no_collect {
-                    "stream".into()
-                } else {
-                    let value = input.into_value(head);
-                    let base_description = match value {
-                        Value::CustomValue { val, .. } => val.value_string(),
-                        _ => value.get_type().to_string(),
-                    };
-
-                    format!("{base_description} (stream)")
-                }
-            }
-            _ => {
-                let value = input.into_value(head);
-                match value {
-                    Value::CustomValue { val, .. } => val.value_string(),
-                    _ => value.get_type().to_string(),
-                }
-            }
-        };
-
-        Ok(Value::String {
-            val: description,
-            span: head,
-        }
-        .into_pipeline_data())
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Describe the type of a string",
-                example: "'hello' | describe",
-                result: Some(Value::test_string("string")),
-            },
-            /*
-            Example {
-                description: "Describe a stream of data, collecting it first",
-                example: "[1 2 3] | each {|i| $i} | describe",
-                result: Some(Value::test_string("list<int> (stream)")),
-            },
-            Example {
-                description: "Describe the input but do not collect streams",
-                example: "[1 2 3] | each {|i| $i} | describe --no-collect",
-                result: Some(Value::test_string("stream")),
-            },
-            */
-        ]
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["type", "typeof", "info", "structure"]
-    }
-}
-
-#[cfg(test)]
-mod test {
-    #[test]
-    fn test_examples() {
-        use super::Describe;
-        use crate::test_examples;
-        test_examples(Describe {})
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/do_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/do_.rs
@@ -1,309 +0,0 @@
-use std::thread;
-
-use nu_engine::{eval_block_with_early_return, CallExt};
-use nu_protocol::ast::Call;
-use nu_protocol::engine::{Closure, Command, EngineState, Stack};
-use nu_protocol::{
-    Category, Example, ListStream, PipelineData, RawStream, ShellError, Signature, SyntaxShape,
-    Type, Value,
-};
-
-#[derive(Clone)]
-pub struct Do;
-
-impl Command for Do {
-    fn name(&self) -> &str {
-        "do"
-    }
-
-    fn usage(&self) -> &str {
-        "Run a closure, providing it with the pipeline input."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("do")
-            .required(
-                "closure",
-                SyntaxShape::OneOf(vec![SyntaxShape::Closure(None), SyntaxShape::Any]),
-                "the closure to run",
-            )
-            .input_output_types(vec![(Type::Any, Type::Any)])
-            .switch(
-                "ignore-errors",
-                "ignore errors as the closure runs",
-                Some('i'),
-            )
-            .switch(
-                "ignore-shell-errors",
-                "ignore shell errors as the closure runs",
-                Some('s'),
-            )
-            .switch(
-                "ignore-program-errors",
-                "ignore external program errors as the closure runs",
-                Some('p'),
-            )
-            .switch(
-                "capture-errors",
-                "catch errors as the closure runs, and return them",
-                Some('c'),
-            )
-            .rest("rest", SyntaxShape::Any, "the parameter(s) for the closure")
-            .category(Category::Core)
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let block: Closure = call.req(engine_state, stack, 0)?;
-        let rest: Vec<Value> = call.rest(engine_state, stack, 1)?;
-        let ignore_all_errors = call.has_flag("ignore-errors");
-        let ignore_shell_errors = ignore_all_errors || call.has_flag("ignore-shell-errors");
-        let ignore_program_errors = ignore_all_errors || call.has_flag("ignore-program-errors");
-        let capture_errors = call.has_flag("capture-errors");
-
-        let mut stack = stack.captures_to_stack(&block.captures);
-        let block = engine_state.get_block(block.block_id);
-
-        let params: Vec<_> = block
-            .signature
-            .required_positional
-            .iter()
-            .chain(block.signature.optional_positional.iter())
-            .collect();
-
-        for param in params.iter().zip(&rest) {
-            if let Some(var_id) = param.0.var_id {
-                stack.add_var(var_id, param.1.clone())
-            }
-        }
-
-        if let Some(param) = &block.signature.rest_positional {
-            if rest.len() > params.len() {
-                let mut rest_items = vec![];
-
-                for r in rest.into_iter().skip(params.len()) {
-                    rest_items.push(r);
-                }
-
-                let span = if let Some(rest_item) = rest_items.first() {
-                    rest_item.span()?
-                } else {
-                    call.head
-                };
-
-                stack.add_var(
-                    param
-                        .var_id
-                        .expect("Internal error: rest positional parameter lacks var_id"),
-                    Value::List {
-                        vals: rest_items,
-                        span,
-                    },
-                )
-            }
-        }
-        let result = eval_block_with_early_return(
-            engine_state,
-            &mut stack,
-            block,
-            input,
-            call.redirect_stdout,
-            call.redirect_stdout,
-        );
-
-        match result {
-            Ok(PipelineData::ExternalStream {
-                stdout,
-                stderr,
-                exit_code,
-                span,
-                metadata,
-                trim_end_newline,
-            }) if capture_errors => {
-                // Use a thread to receive stdout message.
-                // Or we may get a deadlock if child process sends out too much bytes to stderr.
-                //
-                // For example: in normal linux system, stderr pipe's limit is 65535 bytes.
-                // if child process sends out 65536 bytes, the process will be hanged because no consumer
-                // consumes the first 65535 bytes
-                // So we need a thread to receive stdout message, then the current thread can continue to consume
-                // stderr messages.
-                let stdout_handler = stdout.map(|stdout_stream| {
-                    thread::Builder::new()
-                        .name("stderr redirector".to_string())
-                        .spawn(move || {
-                            let ctrlc = stdout_stream.ctrlc.clone();
-                            let span = stdout_stream.span;
-                            RawStream::new(
-                                Box::new(
-                                    vec![stdout_stream.into_bytes().map(|s| s.item)].into_iter(),
-                                ),
-                                ctrlc,
-                                span,
-                                None,
-                            )
-                        })
-                        .expect("Failed to create thread")
-                });
-
-                // Intercept stderr so we can return it in the error if the exit code is non-zero.
-                // The threading issues mentioned above dictate why we also need to intercept stdout.
-                let mut stderr_ctrlc = None;
-                let stderr_msg = match stderr {
-                    None => "".to_string(),
-                    Some(stderr_stream) => {
-                        stderr_ctrlc = stderr_stream.ctrlc.clone();
-                        stderr_stream.into_string().map(|s| s.item)?
-                    }
-                };
-
-                let stdout = if let Some(handle) = stdout_handler {
-                    match handle.join() {
-                        Err(err) => {
-                            return Err(ShellError::ExternalCommand {
-                                label: "Fail to receive external commands stdout message"
-                                    .to_string(),
-                                help: format!("{err:?}"),
-                                span,
-                            });
-                        }
-                        Ok(res) => Some(res),
-                    }
-                } else {
-                    None
-                };
-
-                let mut exit_code_ctrlc = None;
-                let exit_code: Vec<Value> = match exit_code {
-                    None => vec![],
-                    Some(exit_code_stream) => {
-                        exit_code_ctrlc = exit_code_stream.ctrlc.clone();
-                        exit_code_stream.into_iter().collect()
-                    }
-                };
-                if let Some(Value::Int { val: code, .. }) = exit_code.last() {
-                    if *code != 0 {
-                        return Err(ShellError::ExternalCommand {
-                            label: "External command failed".to_string(),
-                            help: stderr_msg,
-                            span,
-                        });
-                    }
-                }
-
-                Ok(PipelineData::ExternalStream {
-                    stdout,
-                    stderr: Some(RawStream::new(
-                        Box::new(vec![Ok(stderr_msg.into_bytes())].into_iter()),
-                        stderr_ctrlc,
-                        span,
-                        None,
-                    )),
-                    exit_code: Some(ListStream::from_stream(
-                        exit_code.into_iter(),
-                        exit_code_ctrlc,
-                    )),
-                    span,
-                    metadata,
-                    trim_end_newline,
-                })
-            }
-            Ok(PipelineData::ExternalStream {
-                stdout,
-                stderr,
-                exit_code: _,
-                span,
-                metadata,
-                trim_end_newline,
-            }) if ignore_program_errors && !call.redirect_stdout => {
-                Ok(PipelineData::ExternalStream {
-                    stdout,
-                    stderr,
-                    exit_code: None,
-                    span,
-                    metadata,
-                    trim_end_newline,
-                })
-            }
-            Ok(PipelineData::Value(Value::Error { .. }, ..)) | Err(_) if ignore_shell_errors => {
-                Ok(PipelineData::empty())
-            }
-            Ok(PipelineData::ListStream(ls, metadata)) if ignore_shell_errors => {
-                // check if there is a `Value::Error` in given list stream first.
-                let mut values = vec![];
-                let ctrlc = ls.ctrlc.clone();
-                for v in ls {
-                    if let Value::Error { .. } = v {
-                        values.push(Value::nothing(call.head));
-                    } else {
-                        values.push(v)
-                    }
-                }
-                Ok(PipelineData::ListStream(
-                    ListStream::from_stream(values.into_iter(), ctrlc),
-                    metadata,
-                ))
-            }
-            r => r,
-        }
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Run the closure",
-                example: r#"do { echo hello }"#,
-                result: Some(Value::test_string("hello")),
-            },
-            Example {
-                description: "Run a stored first-class closure",
-                example: r#"let text = "I am enclosed"; let hello = {|| echo $text}; do $hello"#,
-                result: Some(Value::test_string("I am enclosed")),
-            },
-            Example {
-                description: "Run the closure and ignore both shell and external program errors",
-                example: r#"do -i { thisisnotarealcommand }"#,
-                result: None,
-            },
-            Example {
-                description: "Run the closure and ignore shell errors",
-                example: r#"do -s { thisisnotarealcommand }"#,
-                result: None,
-            },
-            Example {
-                description: "Run the closure and ignore external program errors",
-                example: r#"do -p { nu -c 'exit 1' }; echo "I'll still run""#,
-                result: None,
-            },
-            Example {
-                description: "Abort the pipeline if a program returns a non-zero exit code",
-                example: r#"do -c { nu -c 'exit 1' } | myscarycommand"#,
-                result: None,
-            },
-            Example {
-                description: "Run the closure, with a positional parameter",
-                example: r#"do {|x| 100 + $x } 77"#,
-                result: Some(Value::test_int(177)),
-            },
-            Example {
-                description: "Run the closure, with input",
-                example: r#"77 | do {|x| 100 + $in }"#,
-                result: None, // TODO: returns 177
-            },
-        ]
-    }
-}
-
-mod test {
-    #[test]
-    fn test_examples() {
-        use super::Do;
-        use crate::test_examples;
-        test_examples(Do {})
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/error_make.rs
+++ b/crates/nu-cmd-lang/src/core_commands/error_make.rs
@@ -1,212 +0,0 @@
-use nu_engine::CallExt;
-use nu_protocol::ast::Call;
-use nu_protocol::engine::{Command, EngineState, Stack};
-use nu_protocol::{
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
-
-#[derive(Clone)]
-pub struct ErrorMake;
-
-impl Command for ErrorMake {
-    fn name(&self) -> &str {
-        "error make"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("error make")
-            .input_output_types(vec![(Type::Nothing, Type::Error)])
-            .required("error_struct", SyntaxShape::Record, "the error to create")
-            .switch(
-                "unspanned",
-                "remove the origin label from the error",
-                Some('u'),
-            )
-            .category(Category::Core)
-    }
-
-    fn usage(&self) -> &str {
-        "Create an error."
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["panic", "crash", "throw"]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let span = call.head;
-        let arg: Value = call.req(engine_state, stack, 0)?;
-        let unspanned = call.has_flag("unspanned");
-
-        let throw_error = if unspanned { None } else { Some(span) };
-        Err(make_error(&arg, throw_error).unwrap_or_else(|| {
-            ShellError::GenericError(
-                "Creating error value not supported.".into(),
-                "unsupported error format".into(),
-                Some(span),
-                None,
-                Vec::new(),
-            )
-        }))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Create a simple custom error",
-                example: r#"error make {msg: "my custom error message"}"#,
-                result: Some(Value::Error {
-                    error: Box::new(ShellError::GenericError(
-                        "my custom error message".to_string(),
-                        "".to_string(),
-                        None,
-                        None,
-                        Vec::new(),
-                    )),
-                }),
-            },
-            Example {
-                description: "Create a more complex custom error",
-                example: r#"error make {
-        msg: "my custom error message"
-        label: {
-            text: "my custom label text"  # not mandatory unless $.label exists
-            start: 123  # not mandatory unless $.label.end is set
-            end: 456  # not mandatory unless $.label.start is set
-        }
-    }"#,
-                result: Some(Value::Error {
-                    error: Box::new(ShellError::GenericError(
-                        "my custom error message".to_string(),
-                        "my custom label text".to_string(),
-                        Some(Span::new(123, 456)),
-                        None,
-                        Vec::new(),
-                    )),
-                }),
-            },
-            Example {
-                description:
-                    "Create a custom error for a custom command that shows the span of the argument",
-                example: r#"def foo [x] {
-        let span = (metadata $x).span;
-        error make {
-            msg: "this is fishy"
-            label: {
-                text: "fish right here"
-                start: $span.start
-                end: $span.end
-            }
-        }
-    }"#,
-                result: None,
-            },
-        ]
-    }
-}
-
-fn make_error(value: &Value, throw_span: Option<Span>) -> Option<ShellError> {
-    if let Value::Record { span, .. } = &value {
-        let msg = value.get_data_by_key("msg");
-        let label = value.get_data_by_key("label");
-
-        match (msg, &label) {
-            (Some(Value::String { val: message, .. }), Some(label)) => {
-                let label_start = label.get_data_by_key("start");
-                let label_end = label.get_data_by_key("end");
-                let label_text = label.get_data_by_key("text");
-
-                let label_span = match label.span() {
-                    Ok(lspan) => Some(lspan),
-                    Err(_) => None,
-                };
-
-                match (label_start, label_end, label_text) {
-                    (
-                        Some(Value::Int { val: start, .. }),
-                        Some(Value::Int { val: end, .. }),
-                        Some(Value::String {
-                            val: label_text, ..
-                        }),
-                    ) => {
-                        if start > end {
-                            Some(ShellError::GenericError(
-                                "invalid error format.".into(),
-                                "`$.label.start` should be smaller than `$.label.end`".into(),
-                                label_span,
-                                Some(format!("{} > {}", start, end)),
-                                Vec::new(),
-                            ))
-                        } else {
-                            Some(ShellError::GenericError(
-                                message,
-                                label_text,
-                                Some(Span::new(start as usize, end as usize)),
-                                None,
-                                Vec::new(),
-                            ))
-                        }
-                    }
-                    (
-                        None,
-                        None,
-                        Some(Value::String {
-                            val: label_text, ..
-                        }),
-                    ) => Some(ShellError::GenericError(
-                        message,
-                        label_text,
-                        throw_span,
-                        None,
-                        Vec::new(),
-                    )),
-                    (_, _, None) => Some(ShellError::GenericError(
-                        "Unable to parse error format.".into(),
-                        "missing required member `$.label.text`".into(),
-                        label_span,
-                        None,
-                        Vec::new(),
-                    )),
-                    (Some(Value::Int { .. }), None, _) => Some(ShellError::GenericError(
-                        "Unable to parse error format.".into(),
-                        "missing required member `$.label.end`".into(),
-                        label_span,
-                        Some("required because `$.label.start` is set".to_string()),
-                        Vec::new(),
-                    )),
-                    (None, Some(Value::Int { .. }), _) => Some(ShellError::GenericError(
-                        "Unable to parse error format.".into(),
-                        "missing required member `$.label.start`".into(),
-                        label_span,
-                        Some("required because `$.label.end` is set".to_string()),
-                        Vec::new(),
-                    )),
-                    _ => None,
-                }
-            }
-            (Some(Value::String { val: message, .. }), None) => Some(ShellError::GenericError(
-                message,
-                "originates from here".to_string(),
-                throw_span,
-                None,
-                Vec::new(),
-            )),
-            (None, _) => Some(ShellError::GenericError(
-                "Unable to parse error format.".into(),
-                "missing required member `$.msg`".into(),
-                Some(*span),
-                None,
-                Vec::new(),
-            )),
-            _ => None,
-        }
-    } else {
-        None
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/export_alias.rs
+++ b/crates/nu-cmd-lang/src/core_commands/export_alias.rs
@@ -1,61 +0,0 @@
-use nu_protocol::ast::Call;
-use nu_protocol::engine::{Command, EngineState, Stack};
-use nu_protocol::{
-    Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
-};
-
-#[derive(Clone)]
-pub struct ExportAlias;
-
-impl Command for ExportAlias {
-    fn name(&self) -> &str {
-        "export alias"
-    }
-
-    fn usage(&self) -> &str {
-        "Alias a command (with optional flags) to a new name and export it from a module."
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("export alias")
-            .input_output_types(vec![(Type::Nothing, Type::Nothing)])
-            .required("name", SyntaxShape::String, "name of the alias")
-            .required(
-                "initial_value",
-                SyntaxShape::Keyword(b"=".to_vec(), Box::new(SyntaxShape::Expression)),
-                "equals sign followed by value",
-            )
-            .category(Category::Core)
-    }
-
-    fn extra_usage(&self) -> &str {
-        r#"This command is a parser keyword. For details, check:
-  https://www.nushell.sh/book/thinking_in_nu.html"#
-    }
-
-    fn is_parser_keyword(&self) -> bool {
-        true
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["abbr", "aka", "fn", "func", "function"]
-    }
-
-    fn run(
-        &self,
-        _engine_state: &EngineState,
-        _stack: &mut Stack,
-        _call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        Ok(PipelineData::empty())
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Alias ll to ls -l and export it from a module",
-            example: "module spam { export alias ll = ls -l }",
-            result: Some(Value::nothing(Span::test_data())),
-        }]
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/export_use.rs
+++ b/crates/nu-cmd-lang/src/core_commands/export_use.rs
@@ -1,65 +0,0 @@
-use nu_protocol::ast::Call;
-use nu_protocol::engine::{Command, EngineState, Stack};
-use nu_protocol::{
-    Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
-};
-
-#[derive(Clone)]
-pub struct ExportUse;
-
-impl Command for ExportUse {
-    fn name(&self) -> &str {
-        "export use"
-    }
-
-    fn usage(&self) -> &str {
-        "Use definitions from a module and export them from this module."
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("export use")
-            .input_output_types(vec![(Type::Nothing, Type::Nothing)])
-            .required("module", SyntaxShape::String, "Module or module file")
-            .optional(
-                "members",
-                SyntaxShape::Any,
-                "Which members of the module to import",
-            )
-            .category(Category::Core)
-    }
-
-    fn extra_usage(&self) -> &str {
-        r#"This command is a parser keyword. For details, check:
-  https://www.nushell.sh/book/thinking_in_nu.html"#
-    }
-
-    fn is_parser_keyword(&self) -> bool {
-        true
-    }
-
-    fn run(
-        &self,
-        _engine_state: &EngineState,
-        _stack: &mut Stack,
-        _call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        Ok(PipelineData::empty())
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Re-export a command from another module",
-            example: r#"module spam { export def foo [] { "foo" } }
-    module eggs { export use spam foo }
-    use eggs foo
-    foo
-            "#,
-            result: Some(Value::test_string("foo")),
-        }]
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["reexport", "import", "module"]
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/for_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/for_.rs
@@ -1,226 +0,0 @@
-use nu_engine::{eval_block, eval_expression, CallExt};
-use nu_protocol::ast::Call;
-use nu_protocol::engine::{Block, Command, EngineState, Stack};
-use nu_protocol::{
-    Category, Example, ListStream, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
-};
-
-#[derive(Clone)]
-pub struct For;
-
-impl Command for For {
-    fn name(&self) -> &str {
-        "for"
-    }
-
-    fn usage(&self) -> &str {
-        "Loop over a range."
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("for")
-            .input_output_types(vec![(Type::Nothing, Type::Nothing)])
-            .allow_variants_without_examples(true)
-            .required(
-                "var_name",
-                SyntaxShape::VarWithOptType,
-                "name of the looping variable",
-            )
-            .required(
-                "range",
-                SyntaxShape::Keyword(b"in".to_vec(), Box::new(SyntaxShape::Any)),
-                "range of the loop",
-            )
-            .required("block", SyntaxShape::Block, "the block to run")
-            .switch(
-                "numbered",
-                "return a numbered item ($it.index and $it.item)",
-                Some('n'),
-            )
-            .creates_scope()
-            .category(Category::Core)
-    }
-
-    fn extra_usage(&self) -> &str {
-        r#"This command is a parser keyword. For details, check:
-  https://www.nushell.sh/book/thinking_in_nu.html"#
-    }
-
-    fn is_parser_keyword(&self) -> bool {
-        true
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let head = call.head;
-        let var_id = call
-            .positional_nth(0)
-            .expect("checked through parser")
-            .as_var()
-            .expect("internal error: missing variable");
-
-        let keyword_expr = call
-            .positional_nth(1)
-            .expect("checked through parser")
-            .as_keyword()
-            .expect("internal error: missing keyword");
-        let values = eval_expression(engine_state, stack, keyword_expr)?;
-
-        let block: Block = call.req(engine_state, stack, 2)?;
-
-        let numbered = call.has_flag("numbered");
-
-        let ctrlc = engine_state.ctrlc.clone();
-        let engine_state = engine_state.clone();
-        let block = engine_state.get_block(block.block_id).clone();
-        let redirect_stdout = call.redirect_stdout;
-        let redirect_stderr = call.redirect_stderr;
-
-        match values {
-            Value::List { vals, .. } => {
-                for (idx, x) in ListStream::from_stream(vals.into_iter(), ctrlc).enumerate() {
-                    // with_env() is used here to ensure that each iteration uses
-                    // a different set of environment variables.
-                    // Hence, a 'cd' in the first loop won't affect the next loop.
-
-                    stack.add_var(
-                        var_id,
-                        if numbered {
-                            Value::Record {
-                                cols: vec!["index".into(), "item".into()],
-                                vals: vec![Value::int(idx as i64, head), x],
-                                span: head,
-                            }
-                        } else {
-                            x
-                        },
-                    );
-
-                    //let block = engine_state.get_block(block_id);
-                    match eval_block(
-                        &engine_state,
-                        stack,
-                        &block,
-                        PipelineData::empty(),
-                        redirect_stdout,
-                        redirect_stderr,
-                    ) {
-                        Err(ShellError::Break(_)) => {
-                            break;
-                        }
-                        Err(ShellError::Continue(_)) => {
-                            continue;
-                        }
-                        Err(err) => {
-                            return Err(err);
-                        }
-                        Ok(pipeline) => {
-                            let exit_code = pipeline.drain_with_exit_code()?;
-                            if exit_code != 0 {
-                                return Ok(PipelineData::new_external_stream_with_only_exit_code(
-                                    exit_code,
-                                ));
-                            }
-                        }
-                    }
-                }
-            }
-            Value::Range { val, .. } => {
-                for (idx, x) in val.into_range_iter(ctrlc)?.enumerate() {
-                    stack.add_var(
-                        var_id,
-                        if numbered {
-                            Value::Record {
-                                cols: vec!["index".into(), "item".into()],
-                                vals: vec![Value::int(idx as i64, head), x],
-                                span: head,
-                            }
-                        } else {
-                            x
-                        },
-                    );
-
-                    //let block = engine_state.get_block(block_id);
-                    match eval_block(
-                        &engine_state,
-                        stack,
-                        &block,
-                        PipelineData::empty(),
-                        redirect_stdout,
-                        redirect_stderr,
-                    ) {
-                        Err(ShellError::Break(_)) => {
-                            break;
-                        }
-                        Err(ShellError::Continue(_)) => {
-                            continue;
-                        }
-                        Err(err) => {
-                            return Err(err);
-                        }
-                        Ok(pipeline) => {
-                            let exit_code = pipeline.drain_with_exit_code()?;
-                            if exit_code != 0 {
-                                return Ok(PipelineData::new_external_stream_with_only_exit_code(
-                                    exit_code,
-                                ));
-                            }
-                        }
-                    }
-                }
-            }
-            x => {
-                stack.add_var(var_id, x);
-
-                eval_block(
-                    &engine_state,
-                    stack,
-                    &block,
-                    PipelineData::empty(),
-                    redirect_stdout,
-                    redirect_stderr,
-                )?
-                .into_value(head);
-            }
-        }
-        Ok(PipelineData::empty())
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Echo the square of each integer",
-                example: "for x in [1 2 3] { print ($x * $x) }",
-                result: None,
-            },
-            Example {
-                description: "Work with elements of a range",
-                example: "for $x in 1..3 { print $x }",
-                result: None,
-            },
-            Example {
-                description: "Number each item and echo a message",
-                example:
-                    "for $it in ['bob' 'fred'] --numbered { print $\"($it.index) is ($it.item)\" }",
-                result: None,
-            },
-        ]
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        use crate::test_examples;
-
-        test_examples(For {})
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/help.rs
+++ b/crates/nu-cmd-lang/src/core_commands/help.rs
@@ -1,260 +0,0 @@
-use crate::help_aliases::help_aliases;
-use crate::help_commands::help_commands;
-use crate::help_modules::help_modules;
-use fancy_regex::Regex;
-use nu_ansi_term::{
-    Color::{Red, White},
-    Style,
-};
-use nu_engine::CallExt;
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    span, Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, Span, Spanned,
-    SyntaxShape, Type, Value,
-};
-#[derive(Clone)]
-pub struct Help;
-
-impl Command for Help {
-    fn name(&self) -> &str {
-        "help"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("help")
-            .input_output_types(vec![(Type::Nothing, Type::String)])
-            .rest(
-                "rest",
-                SyntaxShape::String,
-                "the name of command, alias or module to get help on",
-            )
-            .named(
-                "find",
-                SyntaxShape::String,
-                "string to find in command names, usage, and search terms",
-                Some('f'),
-            )
-            .category(Category::Core)
-    }
-
-    fn usage(&self) -> &str {
-        "Display help information about different parts of Nushell."
-    }
-
-    fn extra_usage(&self) -> &str {
-        r#"`help word` searches for "word" in commands, aliases and modules, in that order."#
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let head = call.head;
-        let find: Option<Spanned<String>> = call.get_flag(engine_state, stack, "find")?;
-        let rest: Vec<Spanned<String>> = call.rest(engine_state, stack, 0)?;
-
-        if rest.is_empty() && find.is_none() {
-            let msg = r#"Welcome to Nushell.
-
-Here are some tips to help you get started.
-  * help -h or help help - show available `help` subcommands and examples
-  * help commands - list all available commands
-  * help <name> - display help about a particular command, alias, or module
-  * help --find <text to search> - search through all help commands table
-
-Nushell works on the idea of a "pipeline". Pipelines are commands connected with the '|' character.
-Each stage in the pipeline works together to load, parse, and display information to you.
-
-[Examples]
-
-List the files in the current directory, sorted by size:
-    ls | sort-by size
-
-Get information about the current system:
-    sys | get host
-
-Get the processes on your system actively using CPU:
-    ps | where cpu > 0
-
-You can also learn more at https://www.nushell.sh/book/"#;
-
-            Ok(Value::string(msg, head).into_pipeline_data())
-        } else if find.is_some() {
-            help_commands(engine_state, stack, call)
-        } else {
-            let result = help_aliases(engine_state, stack, call);
-
-            let result = if let Err(ShellError::AliasNotFound(_)) = result {
-                help_commands(engine_state, stack, call)
-            } else {
-                result
-            };
-
-            let result = if let Err(ShellError::CommandNotFound(_)) = result {
-                help_modules(engine_state, stack, call)
-            } else {
-                result
-            };
-
-            if let Err(ShellError::ModuleNotFoundAtRuntime {
-                mod_name: _,
-                span: _,
-            }) = result
-            {
-                let rest_spans: Vec<Span> = rest.iter().map(|arg| arg.span).collect();
-                Err(ShellError::NotFound {
-                    span: span(&rest_spans),
-                })
-            } else {
-                result
-            }
-        }
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "show help for single command, alias, or module",
-                example: "help match",
-                result: None,
-            },
-            Example {
-                description: "show help for single sub-command, alias, or module",
-                example: "help str lpad",
-                result: None,
-            },
-            Example {
-                description: "search for string in command names, usage and search terms",
-                example: "help --find char",
-                result: None,
-            },
-        ]
-    }
-}
-
-pub fn highlight_search_in_table(
-    table: Vec<Value>, // list of records
-    search_string: &str,
-    searched_cols: &[&str],
-    string_style: &Style,
-) -> Result<Vec<Value>, ShellError> {
-    let orig_search_string = search_string;
-    let search_string = search_string.to_lowercase();
-    let mut matches = vec![];
-
-    for record in table {
-        let (cols, mut vals, record_span) = if let Value::Record { cols, vals, span } = record {
-            (cols, vals, span)
-        } else {
-            return Err(ShellError::NushellFailedSpanned {
-                msg: "Expected record".to_string(),
-                label: format!("got {}", record.get_type()),
-                span: record.span()?,
-            });
-        };
-
-        let has_match = cols.iter().zip(vals.iter_mut()).fold(
-            Ok(false),
-            |acc: Result<bool, ShellError>, (col, val)| {
-                if searched_cols.contains(&col.as_str()) {
-                    if let Value::String { val: s, span } = val {
-                        if s.to_lowercase().contains(&search_string) {
-                            *val = Value::String {
-                                val: highlight_search_string(s, orig_search_string, string_style)?,
-                                span: *span,
-                            };
-                            Ok(true)
-                        } else {
-                            // column does not contain the searched string
-                            acc
-                        }
-                    } else {
-                        // ignore non-string values
-                        acc
-                    }
-                } else {
-                    // don't search this column
-                    acc
-                }
-            },
-        )?;
-
-        if has_match {
-            matches.push(Value::Record {
-                cols,
-                vals,
-                span: record_span,
-            });
-        }
-    }
-
-    Ok(matches)
-}
-
-// Highlight the search string using ANSI escape sequences and regular expressions.
-pub fn highlight_search_string(
-    haystack: &str,
-    needle: &str,
-    string_style: &Style,
-) -> Result<String, ShellError> {
-    let regex_string = format!("(?i){needle}");
-    let regex = match Regex::new(&regex_string) {
-        Ok(regex) => regex,
-        Err(err) => {
-            return Err(ShellError::GenericError(
-                "Could not compile regex".into(),
-                err.to_string(),
-                Some(Span::test_data()),
-                None,
-                Vec::new(),
-            ));
-        }
-    };
-    // strip haystack to remove existing ansi style
-    let stripped_haystack = nu_utils::strip_ansi_likely(haystack);
-    let mut last_match_end = 0;
-    let style = Style::new().fg(White).on(Red);
-    let mut highlighted = String::new();
-
-    for cap in regex.captures_iter(stripped_haystack.as_ref()) {
-        match cap {
-            Ok(capture) => {
-                let start = match capture.get(0) {
-                    Some(acap) => acap.start(),
-                    None => 0,
-                };
-                let end = match capture.get(0) {
-                    Some(acap) => acap.end(),
-                    None => 0,
-                };
-                highlighted.push_str(
-                    &string_style
-                        .paint(&stripped_haystack[last_match_end..start])
-                        .to_string(),
-                );
-                highlighted.push_str(&style.paint(&stripped_haystack[start..end]).to_string());
-                last_match_end = end;
-            }
-            Err(e) => {
-                return Err(ShellError::GenericError(
-                    "Error with regular expression capture".into(),
-                    e.to_string(),
-                    None,
-                    None,
-                    Vec::new(),
-                ));
-            }
-        }
-    }
-
-    highlighted.push_str(
-        &string_style
-            .paint(&stripped_haystack[last_match_end..])
-            .to_string(),
-    );
-    Ok(highlighted)
-}
--- a/crates/nu-cmd-lang/src/core_commands/help_aliases.rs
+++ b/crates/nu-cmd-lang/src/core_commands/help_aliases.rs
@@ -1,178 +0,0 @@
-use crate::help::highlight_search_in_table;
-use nu_color_config::StyleComputer;
-use nu_engine::{scope::ScopeData, CallExt};
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    span, Category, Example, IntoInterruptiblePipelineData, IntoPipelineData, PipelineData,
-    ShellError, Signature, Span, Spanned, SyntaxShape, Type, Value,
-};
-
-#[derive(Clone)]
-pub struct HelpAliases;
-
-impl Command for HelpAliases {
-    fn name(&self) -> &str {
-        "help aliases"
-    }
-
-    fn usage(&self) -> &str {
-        "Show help on nushell aliases."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("help aliases")
-            .category(Category::Core)
-            .rest(
-                "rest",
-                SyntaxShape::String,
-                "the name of alias to get help on",
-            )
-            .named(
-                "find",
-                SyntaxShape::String,
-                "string to find in alias names and usage",
-                Some('f'),
-            )
-            .input_output_types(vec![(Type::Nothing, Type::Table(vec![]))])
-            .allow_variants_without_examples(true)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "show all aliases",
-                example: "help aliases",
-                result: None,
-            },
-            Example {
-                description: "show help for single alias",
-                example: "help aliases my-alias",
-                result: None,
-            },
-            Example {
-                description: "search for string in alias names and usages",
-                example: "help aliases --find my-alias",
-                result: None,
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        help_aliases(engine_state, stack, call)
-    }
-}
-
-pub fn help_aliases(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-) -> Result<PipelineData, ShellError> {
-    let head = call.head;
-    let find: Option<Spanned<String>> = call.get_flag(engine_state, stack, "find")?;
-    let rest: Vec<Spanned<String>> = call.rest(engine_state, stack, 0)?;
-
-    // 🚩The following two-lines are copied from filters/find.rs:
-    let style_computer = StyleComputer::from_config(engine_state, stack);
-    // Currently, search results all use the same style.
-    // Also note that this sample string is passed into user-written code (the closure that may or may not be
-    // defined for "string").
-    let string_style = style_computer.compute("string", &Value::string("search result", head));
-
-    if let Some(f) = find {
-        let all_cmds_vec = build_help_aliases(engine_state, stack, head);
-        let found_cmds_vec =
-            highlight_search_in_table(all_cmds_vec, &f.item, &["name", "usage"], &string_style)?;
-
-        return Ok(found_cmds_vec
-            .into_iter()
-            .into_pipeline_data(engine_state.ctrlc.clone()));
-    }
-
-    if rest.is_empty() {
-        let found_cmds_vec = build_help_aliases(engine_state, stack, head);
-
-        Ok(found_cmds_vec
-            .into_iter()
-            .into_pipeline_data(engine_state.ctrlc.clone()))
-    } else {
-        let mut name = String::new();
-
-        for r in &rest {
-            if !name.is_empty() {
-                name.push(' ');
-            }
-            name.push_str(&r.item);
-        }
-
-        let Some(alias) = engine_state.find_decl(name.as_bytes(), &[]) else {
-            return Err(ShellError::AliasNotFound(span(
-                &rest.iter().map(|r| r.span).collect::<Vec<Span>>(),
-            )));
-        };
-
-        let Some(alias) = engine_state.get_decl(alias).as_alias() else {
-            return Err(ShellError::AliasNotFound(span(
-                &rest.iter().map(|r| r.span).collect::<Vec<Span>>(),
-            )));
-        };
-
-        let alias_expansion =
-            String::from_utf8_lossy(engine_state.get_span_contents(&alias.wrapped_call.span));
-        let usage = alias.usage();
-        let extra_usage = alias.extra_usage();
-
-        // TODO: merge this into documentation.rs at some point
-        const G: &str = "\x1b[32m"; // green
-        const C: &str = "\x1b[36m"; // cyan
-        const RESET: &str = "\x1b[0m"; // reset
-
-        let mut long_desc = String::new();
-
-        long_desc.push_str(usage);
-        long_desc.push_str("\n\n");
-
-        if !extra_usage.is_empty() {
-            long_desc.push_str(extra_usage);
-            long_desc.push_str("\n\n");
-        }
-
-        long_desc.push_str(&format!("{G}Alias{RESET}: {C}{name}{RESET}"));
-        long_desc.push_str("\n\n");
-        long_desc.push_str(&format!("{G}Expansion{RESET}:\n  {alias_expansion}"));
-
-        let config = engine_state.get_config();
-        if !config.use_ansi_coloring {
-            long_desc = nu_utils::strip_ansi_string_likely(long_desc);
-        }
-
-        Ok(Value::String {
-            val: long_desc,
-            span: call.head,
-        }
-        .into_pipeline_data())
-    }
-}
-
-fn build_help_aliases(engine_state: &EngineState, stack: &Stack, span: Span) -> Vec<Value> {
-    let mut scope_data = ScopeData::new(engine_state, stack);
-    scope_data.populate_all();
-
-    scope_data.collect_aliases(span)
-}
-
-#[cfg(test)]
-mod test {
-    #[test]
-    fn test_examples() {
-        use super::HelpAliases;
-        use crate::test_examples;
-        test_examples(HelpAliases {})
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/help_commands.rs
+++ b/crates/nu-cmd-lang/src/core_commands/help_commands.rs
@@ -1,185 +0,0 @@
-use crate::help::highlight_search_in_table;
-use nu_color_config::StyleComputer;
-use nu_engine::{get_full_help, CallExt};
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    span, Category, IntoInterruptiblePipelineData, IntoPipelineData, PipelineData, ShellError,
-    Signature, Span, Spanned, SyntaxShape, Type, Value,
-};
-use std::borrow::Borrow;
-
-#[derive(Clone)]
-pub struct HelpCommands;
-
-impl Command for HelpCommands {
-    fn name(&self) -> &str {
-        "help commands"
-    }
-
-    fn usage(&self) -> &str {
-        "Show help on nushell commands."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("help commands")
-            .category(Category::Core)
-            .rest(
-                "rest",
-                SyntaxShape::String,
-                "the name of command to get help on",
-            )
-            .named(
-                "find",
-                SyntaxShape::String,
-                "string to find in command names, usage, and search terms",
-                Some('f'),
-            )
-            .input_output_types(vec![(Type::Nothing, Type::Table(vec![]))])
-            .allow_variants_without_examples(true)
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        help_commands(engine_state, stack, call)
-    }
-}
-
-pub fn help_commands(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-) -> Result<PipelineData, ShellError> {
-    let head = call.head;
-    let find: Option<Spanned<String>> = call.get_flag(engine_state, stack, "find")?;
-    let rest: Vec<Spanned<String>> = call.rest(engine_state, stack, 0)?;
-
-    // 🚩The following two-lines are copied from filters/find.rs:
-    let style_computer = StyleComputer::from_config(engine_state, stack);
-    // Currently, search results all use the same style.
-    // Also note that this sample string is passed into user-written code (the closure that may or may not be
-    // defined for "string").
-    let string_style = style_computer.compute("string", &Value::string("search result", head));
-
-    if let Some(f) = find {
-        let all_cmds_vec = build_help_commands(engine_state, head);
-        let found_cmds_vec = highlight_search_in_table(
-            all_cmds_vec,
-            &f.item,
-            &["name", "usage", "search_terms"],
-            &string_style,
-        )?;
-
-        return Ok(found_cmds_vec
-            .into_iter()
-            .into_pipeline_data(engine_state.ctrlc.clone()));
-    }
-
-    if rest.is_empty() {
-        let found_cmds_vec = build_help_commands(engine_state, head);
-
-        Ok(found_cmds_vec
-            .into_iter()
-            .into_pipeline_data(engine_state.ctrlc.clone()))
-    } else {
-        let mut name = String::new();
-
-        for r in &rest {
-            if !name.is_empty() {
-                name.push(' ');
-            }
-            name.push_str(&r.item);
-        }
-
-        let output = engine_state
-            .get_signatures_with_examples(false)
-            .iter()
-            .filter(|(signature, _, _, _, _)| signature.name == name)
-            .map(|(signature, examples, _, _, is_parser_keyword)| {
-                get_full_help(signature, examples, engine_state, stack, *is_parser_keyword)
-            })
-            .collect::<Vec<String>>();
-
-        if !output.is_empty() {
-            Ok(Value::String {
-                val: output.join("======================\n\n"),
-                span: call.head,
-            }
-            .into_pipeline_data())
-        } else {
-            Err(ShellError::CommandNotFound(span(&[
-                rest[0].span,
-                rest[rest.len() - 1].span,
-            ])))
-        }
-    }
-}
-
-fn build_help_commands(engine_state: &EngineState, span: Span) -> Vec<Value> {
-    let commands = engine_state.get_decls_sorted(false);
-    let mut found_cmds_vec = Vec::new();
-
-    for (name_bytes, decl_id) in commands {
-        let mut cols = vec![];
-        let mut vals = vec![];
-
-        let name = String::from_utf8_lossy(&name_bytes).to_string();
-        let decl = engine_state.get_decl(decl_id);
-        let sig = decl.signature().update_from_command(name, decl.borrow());
-
-        let signatures = sig.to_string().trim_start().replace("\n  ", "\n");
-        let key = sig.name;
-        let usage = sig.usage;
-        let search_terms = sig.search_terms;
-
-        cols.push("name".into());
-        vals.push(Value::String { val: key, span });
-
-        cols.push("category".into());
-        vals.push(Value::string(sig.category.to_string(), span));
-
-        cols.push("command_type".into());
-        vals.push(Value::String {
-            val: format!("{:?}", decl.command_type()).to_lowercase(),
-            span,
-        });
-
-        cols.push("usage".into());
-        vals.push(Value::String { val: usage, span });
-
-        cols.push("signatures".into());
-        vals.push(Value::String {
-            val: if decl.is_parser_keyword() {
-                "".to_string()
-            } else {
-                signatures
-            },
-            span,
-        });
-
-        cols.push("search_terms".into());
-        vals.push(Value::String {
-            val: search_terms.join(", "),
-            span,
-        });
-
-        found_cmds_vec.push(Value::Record { cols, vals, span });
-    }
-
-    found_cmds_vec
-}
-
-#[cfg(test)]
-mod test {
-    #[test]
-    fn test_examples() {
-        use super::HelpCommands;
-        use crate::test_examples;
-        test_examples(HelpCommands {})
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/help_externs.rs
+++ b/crates/nu-cmd-lang/src/core_commands/help_externs.rs
@@ -1,152 +0,0 @@
-use crate::help::highlight_search_in_table;
-use nu_color_config::StyleComputer;
-use nu_engine::{get_full_help, scope::ScopeData, CallExt};
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    span, Category, Example, IntoInterruptiblePipelineData, IntoPipelineData, PipelineData,
-    ShellError, Signature, Span, Spanned, SyntaxShape, Type, Value,
-};
-
-#[derive(Clone)]
-pub struct HelpExterns;
-
-impl Command for HelpExterns {
-    fn name(&self) -> &str {
-        "help externs"
-    }
-
-    fn usage(&self) -> &str {
-        "Show help on nushell externs."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("help externs")
-            .category(Category::Core)
-            .rest(
-                "rest",
-                SyntaxShape::String,
-                "the name of extern to get help on",
-            )
-            .named(
-                "find",
-                SyntaxShape::String,
-                "string to find in extern names and usage",
-                Some('f'),
-            )
-            .input_output_types(vec![(Type::Nothing, Type::Table(vec![]))])
-            .allow_variants_without_examples(true)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "show all externs",
-                example: "help externs",
-                result: None,
-            },
-            Example {
-                description: "show help for single extern",
-                example: "help externs smth",
-                result: None,
-            },
-            Example {
-                description: "search for string in extern names and usages",
-                example: "help externs --find smth",
-                result: None,
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        help_externs(engine_state, stack, call)
-    }
-}
-
-pub fn help_externs(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-) -> Result<PipelineData, ShellError> {
-    let head = call.head;
-    let find: Option<Spanned<String>> = call.get_flag(engine_state, stack, "find")?;
-    let rest: Vec<Spanned<String>> = call.rest(engine_state, stack, 0)?;
-
-    // 🚩The following two-lines are copied from filters/find.rs:
-    let style_computer = StyleComputer::from_config(engine_state, stack);
-    // Currently, search results all use the same style.
-    // Also note that this sample string is passed into user-written code (the closure that may or may not be
-    // defined for "string").
-    let string_style = style_computer.compute("string", &Value::string("search result", head));
-
-    if let Some(f) = find {
-        let all_cmds_vec = build_help_externs(engine_state, stack, head);
-        let found_cmds_vec =
-            highlight_search_in_table(all_cmds_vec, &f.item, &["name", "usage"], &string_style)?;
-
-        return Ok(found_cmds_vec
-            .into_iter()
-            .into_pipeline_data(engine_state.ctrlc.clone()));
-    }
-
-    if rest.is_empty() {
-        let found_cmds_vec = build_help_externs(engine_state, stack, head);
-
-        Ok(found_cmds_vec
-            .into_iter()
-            .into_pipeline_data(engine_state.ctrlc.clone()))
-    } else {
-        let mut name = String::new();
-
-        for r in &rest {
-            if !name.is_empty() {
-                name.push(' ');
-            }
-            name.push_str(&r.item);
-        }
-
-        let output = engine_state
-            .get_signatures_with_examples(false)
-            .iter()
-            .filter(|(signature, _, _, _, _)| signature.name == name)
-            .map(|(signature, examples, _, _, is_parser_keyword)| {
-                get_full_help(signature, examples, engine_state, stack, *is_parser_keyword)
-            })
-            .collect::<Vec<String>>();
-
-        if !output.is_empty() {
-            Ok(Value::String {
-                val: output.join("======================\n\n"),
-                span: call.head,
-            }
-            .into_pipeline_data())
-        } else {
-            Err(ShellError::CommandNotFound(span(&[
-                rest[0].span,
-                rest[rest.len() - 1].span,
-            ])))
-        }
-    }
-}
-
-fn build_help_externs(engine_state: &EngineState, stack: &Stack, span: Span) -> Vec<Value> {
-    let mut scope = ScopeData::new(engine_state, stack);
-    scope.populate_all();
-    scope.collect_externs(span)
-}
-
-#[cfg(test)]
-mod test {
-    #[test]
-    fn test_examples() {
-        use super::HelpExterns;
-        use crate::test_examples;
-        test_examples(HelpExterns {})
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/help_modules.rs
+++ b/crates/nu-cmd-lang/src/core_commands/help_modules.rs
@@ -1,262 +0,0 @@
-use crate::help::highlight_search_in_table;
-use nu_color_config::StyleComputer;
-use nu_engine::{scope::ScopeData, CallExt};
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    span, Category, DeclId, Example, IntoInterruptiblePipelineData, IntoPipelineData, PipelineData,
-    ShellError, Signature, Span, Spanned, SyntaxShape, Type, Value,
-};
-
-#[derive(Clone)]
-pub struct HelpModules;
-
-impl Command for HelpModules {
-    fn name(&self) -> &str {
-        "help modules"
-    }
-
-    fn usage(&self) -> &str {
-        "Show help on nushell modules."
-    }
-
-    fn extra_usage(&self) -> &str {
-        r#"When requesting help for a single module, its commands and aliases will be highlighted if they
-are also available in the current scope. Commands/aliases that were imported under a different name
-(such as with a prefix after `use some-module`) will be highlighted in parentheses."#
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("help modules")
-            .category(Category::Core)
-            .rest(
-                "rest",
-                SyntaxShape::String,
-                "the name of module to get help on",
-            )
-            .named(
-                "find",
-                SyntaxShape::String,
-                "string to find in module names and usage",
-                Some('f'),
-            )
-            .input_output_types(vec![(Type::Nothing, Type::Table(vec![]))])
-            .allow_variants_without_examples(true)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "show all modules",
-                example: "help modules",
-                result: None,
-            },
-            Example {
-                description: "show help for single module",
-                example: "help modules my-module",
-                result: None,
-            },
-            Example {
-                description: "search for string in module names and usages",
-                example: "help modules --find my-module",
-                result: None,
-            },
-        ]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        help_modules(engine_state, stack, call)
-    }
-}
-
-pub fn help_modules(
-    engine_state: &EngineState,
-    stack: &mut Stack,
-    call: &Call,
-) -> Result<PipelineData, ShellError> {
-    let head = call.head;
-    let find: Option<Spanned<String>> = call.get_flag(engine_state, stack, "find")?;
-    let rest: Vec<Spanned<String>> = call.rest(engine_state, stack, 0)?;
-
-    // 🚩The following two-lines are copied from filters/find.rs:
-    let style_computer = StyleComputer::from_config(engine_state, stack);
-    // Currently, search results all use the same style.
-    // Also note that this sample string is passed into user-written code (the closure that may or may not be
-    // defined for "string").
-    let string_style = style_computer.compute("string", &Value::string("search result", head));
-
-    if let Some(f) = find {
-        let all_cmds_vec = build_help_modules(engine_state, stack, head);
-        let found_cmds_vec =
-            highlight_search_in_table(all_cmds_vec, &f.item, &["name", "usage"], &string_style)?;
-
-        return Ok(found_cmds_vec
-            .into_iter()
-            .into_pipeline_data(engine_state.ctrlc.clone()));
-    }
-
-    if rest.is_empty() {
-        let found_cmds_vec = build_help_modules(engine_state, stack, head);
-
-        Ok(found_cmds_vec
-            .into_iter()
-            .into_pipeline_data(engine_state.ctrlc.clone()))
-    } else {
-        let mut name = String::new();
-
-        for r in &rest {
-            if !name.is_empty() {
-                name.push(' ');
-            }
-            name.push_str(&r.item);
-        }
-
-        let Some(module_id) = engine_state.find_module(name.as_bytes(), &[]) else {
-            return Err(ShellError::ModuleNotFoundAtRuntime {
-                mod_name: name,
-                span: span(&rest.iter().map(|r| r.span).collect::<Vec<Span>>()),
-            });
-        };
-
-        let module = engine_state.get_module(module_id);
-
-        let module_usage = engine_state.build_module_usage(module_id);
-
-        // TODO: merge this into documentation.rs at some point
-        const G: &str = "\x1b[32m"; // green
-        const C: &str = "\x1b[36m"; // cyan
-        const CB: &str = "\x1b[1;36m"; // cyan bold
-        const RESET: &str = "\x1b[0m"; // reset
-
-        let mut long_desc = String::new();
-
-        if let Some((usage, extra_usage)) = module_usage {
-            long_desc.push_str(&usage);
-            long_desc.push_str("\n\n");
-
-            if !extra_usage.is_empty() {
-                long_desc.push_str(&extra_usage);
-                long_desc.push_str("\n\n");
-            }
-        }
-
-        long_desc.push_str(&format!("{G}Module{RESET}: {C}{name}{RESET}"));
-        long_desc.push_str("\n\n");
-
-        if !module.decls.is_empty() || module.main.is_some() {
-            let commands: Vec<(Vec<u8>, DeclId)> = engine_state
-                .get_decls_sorted(false)
-                .filter(|(_, id)| !engine_state.get_decl(*id).is_alias())
-                .collect();
-
-            let mut module_commands: Vec<(Vec<u8>, DeclId)> = module
-                .decls()
-                .into_iter()
-                .filter(|(_, id)| !engine_state.get_decl(*id).is_alias())
-                .collect();
-            module_commands.sort_by(|a, b| a.0.cmp(&b.0));
-
-            let commands_str = module_commands
-                .iter()
-                .map(|(name_bytes, id)| {
-                    let name = String::from_utf8_lossy(name_bytes);
-                    if let Some((used_name_bytes, _)) =
-                        commands.iter().find(|(_, decl_id)| id == decl_id)
-                    {
-                        if engine_state.find_decl(name.as_bytes(), &[]).is_some() {
-                            format!("{CB}{name}{RESET}")
-                        } else {
-                            let command_name = String::from_utf8_lossy(used_name_bytes);
-                            format!("{name} ({CB}{command_name}{RESET})")
-                        }
-                    } else {
-                        format!("{name}")
-                    }
-                })
-                .collect::<Vec<String>>()
-                .join(", ");
-
-            long_desc.push_str(&format!("{G}Exported commands{RESET}:\n  {commands_str}"));
-            long_desc.push_str("\n\n");
-        }
-
-        if !module.decls.is_empty() {
-            let aliases: Vec<(Vec<u8>, DeclId)> = engine_state
-                .get_decls_sorted(false)
-                .filter(|(_, id)| engine_state.get_decl(*id).is_alias())
-                .collect();
-
-            let mut module_aliases: Vec<(Vec<u8>, DeclId)> = module
-                .decls()
-                .into_iter()
-                .filter(|(_, id)| engine_state.get_decl(*id).is_alias())
-                .collect();
-            module_aliases.sort_by(|a, b| a.0.cmp(&b.0));
-
-            let aliases_str = module_aliases
-                .iter()
-                .map(|(name_bytes, id)| {
-                    let name = String::from_utf8_lossy(name_bytes);
-                    if let Some((used_name_bytes, _)) =
-                        aliases.iter().find(|(_, alias_id)| id == alias_id)
-                    {
-                        if engine_state.find_decl(name.as_bytes(), &[]).is_some() {
-                            format!("{CB}{name}{RESET}")
-                        } else {
-                            let alias_name = String::from_utf8_lossy(used_name_bytes);
-                            format!("{name} ({CB}{alias_name}{RESET})")
-                        }
-                    } else {
-                        format!("{name}")
-                    }
-                })
-                .collect::<Vec<String>>()
-                .join(", ");
-
-            long_desc.push_str(&format!("{G}Exported aliases{RESET}:\n  {aliases_str}"));
-            long_desc.push_str("\n\n");
-        }
-
-        if module.env_block.is_some() {
-            long_desc.push_str(&format!("This module {C}exports{RESET} environment."));
-        } else {
-            long_desc.push_str(&format!(
-                "This module {C}does not export{RESET} environment."
-            ));
-        }
-
-        let config = engine_state.get_config();
-        if !config.use_ansi_coloring {
-            long_desc = nu_utils::strip_ansi_string_likely(long_desc);
-        }
-
-        Ok(Value::String {
-            val: long_desc,
-            span: call.head,
-        }
-        .into_pipeline_data())
-    }
-}
-
-fn build_help_modules(engine_state: &EngineState, stack: &Stack, span: Span) -> Vec<Value> {
-    let mut scope_data = ScopeData::new(engine_state, stack);
-    scope_data.populate_modules();
-
-    scope_data.collect_modules(span)
-}
-
-#[cfg(test)]
-mod test {
-    #[test]
-    fn test_examples() {
-        use super::HelpModules;
-        use crate::test_examples;
-        test_examples(HelpModules {})
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/help_operators.rs
+++ b/crates/nu-cmd-lang/src/core_commands/help_operators.rs
@@ -1,329 +0,0 @@
-use nu_protocol::{
-    ast::Call,
-    engine::{Command, EngineState, Stack},
-    Category, IntoInterruptiblePipelineData, PipelineData, ShellError, Signature, Type, Value,
-};
-
-#[derive(Clone)]
-pub struct HelpOperators;
-
-impl Command for HelpOperators {
-    fn name(&self) -> &str {
-        "help operators"
-    }
-
-    fn usage(&self) -> &str {
-        "Show help on nushell operators."
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("help operators")
-            .category(Category::Core)
-            .input_output_types(vec![(Type::Nothing, Type::Table(vec![]))])
-            .allow_variants_without_examples(true)
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        _stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let head = call.head;
-        let op_info = generate_operator_info();
-        let mut recs = vec![];
-
-        for op in op_info {
-            let mut cols = vec![];
-            let mut vals = vec![];
-            cols.push("type".into());
-            vals.push(Value::string(op.op_type, head));
-            cols.push("operator".into());
-            vals.push(Value::string(op.operator, head));
-            cols.push("name".into());
-            vals.push(Value::string(op.name, head));
-            cols.push("description".into());
-            vals.push(Value::string(op.description, head));
-            cols.push("precedence".into());
-            vals.push(Value::int(op.precedence, head));
-            recs.push(Value::Record {
-                cols,
-                vals,
-                span: head,
-            })
-        }
-
-        Ok(recs
-            .into_iter()
-            .into_pipeline_data(engine_state.ctrlc.clone()))
-    }
-}
-
-struct OperatorInfo {
-    op_type: String,
-    operator: String,
-    name: String,
-    description: String,
-    precedence: i64,
-}
-
-fn generate_operator_info() -> Vec<OperatorInfo> {
-    vec![
-        OperatorInfo {
-            op_type: "Assignment".into(),
-            operator: "=".into(),
-            name: "Assign".into(),
-            description: "Assigns a value to a variable.".into(),
-            precedence: 10,
-        },
-        OperatorInfo {
-            op_type: "Assignment".into(),
-            operator: "+=".into(),
-            name: "PlusAssign".into(),
-            description: "Adds a value to a variable.".into(),
-            precedence: 10,
-        },
-        OperatorInfo {
-            op_type: "Assignment".into(),
-            operator: "++=".into(),
-            name: "AppendAssign".into(),
-            description: "Appends a list or a value to a variable.".into(),
-            precedence: 10,
-        },
-        OperatorInfo {
-            op_type: "Assignment".into(),
-            operator: "-=".into(),
-            name: "MinusAssign".into(),
-            description: "Subtracts a value from a variable.".into(),
-            precedence: 10,
-        },
-        OperatorInfo {
-            op_type: "Assignment".into(),
-            operator: "*=".into(),
-            name: "MultiplyAssign".into(),
-            description: "Multiplies a variable by a value.".into(),
-            precedence: 10,
-        },
-        OperatorInfo {
-            op_type: "Assignment".into(),
-            operator: "/=".into(),
-            name: "DivideAssign".into(),
-            description: "Divides a variable by a value.".into(),
-            precedence: 10,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: "==".into(),
-            name: "Equal".into(),
-            description: "Checks if two values are equal.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: "!=".into(),
-            name: "NotEqual".into(),
-            description: "Checks if two values are not equal.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: "<".into(),
-            name: "LessThan".into(),
-            description: "Checks if a value is less than another.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: "<=".into(),
-            name: "LessThanOrEqual".into(),
-            description: "Checks if a value is less than or equal to another.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: ">".into(),
-            name: "GreaterThan".into(),
-            description: "Checks if a value is greater than another.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: ">=".into(),
-            name: "GreaterThanOrEqual".into(),
-            description: "Checks if a value is greater than or equal to another.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: "=~".into(),
-            name: "RegexMatch".into(),
-            description: "Checks if a value matches a regular expression.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: "!~".into(),
-            name: "NotRegexMatch".into(),
-            description: "Checks if a value does not match a regular expression.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: "in".into(),
-            name: "In".into(),
-            description: "Checks if a value is in a list or string.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: "not-in".into(),
-            name: "NotIn".into(),
-            description: "Checks if a value is not in a list or string.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: "starts-with".into(),
-            name: "StartsWith".into(),
-            description: "Checks if a string starts with another.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: "ends-with".into(),
-            name: "EndsWith".into(),
-            description: "Checks if a string ends with another.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Comparison".into(),
-            operator: "not".into(),
-            name: "UnaryNot".into(),
-            description: "Negates a value or expression.".into(),
-            precedence: 0,
-        },
-        OperatorInfo {
-            op_type: "Math".into(),
-            operator: "+".into(),
-            name: "Plus".into(),
-            description: "Adds two values.".into(),
-            precedence: 90,
-        },
-        OperatorInfo {
-            op_type: "Math".into(),
-            operator: "++".into(),
-            name: "Append".into(),
-            description: "Appends two lists or a list and a value.".into(),
-            precedence: 80,
-        },
-        OperatorInfo {
-            op_type: "Math".into(),
-            operator: "-".into(),
-            name: "Minus".into(),
-            description: "Subtracts two values.".into(),
-            precedence: 90,
-        },
-        OperatorInfo {
-            op_type: "Math".into(),
-            operator: "*".into(),
-            name: "Multiply".into(),
-            description: "Multiplies two values.".into(),
-            precedence: 95,
-        },
-        OperatorInfo {
-            op_type: "Math".into(),
-            operator: "/".into(),
-            name: "Divide".into(),
-            description: "Divides two values.".into(),
-            precedence: 95,
-        },
-        OperatorInfo {
-            op_type: "Math".into(),
-            operator: "//".into(),
-            name: "FloorDivision".into(),
-            description: "Divides two values and floors the result.".into(),
-            precedence: 95,
-        },
-        OperatorInfo {
-            op_type: "Math".into(),
-            operator: "mod".into(),
-            name: "Modulo".into(),
-            description: "Divides two values and returns the remainder.".into(),
-            precedence: 95,
-        },
-        OperatorInfo {
-            op_type: "Math".into(),
-            operator: "**".into(),
-            name: "Pow ".into(),
-            description: "Raises one value to the power of another.".into(),
-            precedence: 100,
-        },
-        OperatorInfo {
-            op_type: "Bitwise".into(),
-            operator: "bit-or".into(),
-            name: "BitOr".into(),
-            description: "Performs a bitwise OR on two values.".into(),
-            precedence: 60,
-        },
-        OperatorInfo {
-            op_type: "Bitwise".into(),
-            operator: "bit-xor".into(),
-            name: "BitXor".into(),
-            description: "Performs a bitwise XOR on two values.".into(),
-            precedence: 70,
-        },
-        OperatorInfo {
-            op_type: "Bitwise".into(),
-            operator: "bit-and".into(),
-            name: "BitAnd".into(),
-            description: "Performs a bitwise AND on two values.".into(),
-            precedence: 75,
-        },
-        OperatorInfo {
-            op_type: "Bitwise".into(),
-            operator: "bit-shl".into(),
-            name: "ShiftLeft".into(),
-            description: "Shifts a value left by another.".into(),
-            precedence: 85,
-        },
-        OperatorInfo {
-            op_type: "Bitwise".into(),
-            operator: "bit-shr".into(),
-            name: "ShiftRight".into(),
-            description: "Shifts a value right by another.".into(),
-            precedence: 85,
-        },
-        OperatorInfo {
-            op_type: "Boolean".into(),
-            operator: "and".into(),
-            name: "And".into(),
-            description: "Checks if two values are true.".into(),
-            precedence: 50,
-        },
-        OperatorInfo {
-            op_type: "Boolean".into(),
-            operator: "or".into(),
-            name: "Or".into(),
-            description: "Checks if either value is true.".into(),
-            precedence: 40,
-        },
-        OperatorInfo {
-            op_type: "Boolean".into(),
-            operator: "xor".into(),
-            name: "Xor".into(),
-            description: "Checks if one value is true and the other is false.".into(),
-            precedence: 45,
-        },
-    ]
-}
-
-#[cfg(test)]
-mod test {
-    #[test]
-    fn test_examples() {
-        use super::HelpOperators;
-        use crate::test_examples;
-        test_examples(HelpOperators {})
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/hide.rs
+++ b/crates/nu-cmd-lang/src/core_commands/hide.rs
@@ -1,64 +0,0 @@
-use nu_protocol::ast::Call;
-use nu_protocol::engine::{Command, EngineState, Stack};
-use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type};
-
-#[derive(Clone)]
-pub struct Hide;
-
-impl Command for Hide {
-    fn name(&self) -> &str {
-        "hide"
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("hide")
-            .input_output_types(vec![(Type::Nothing, Type::Nothing)])
-            .required("module", SyntaxShape::String, "Module or module file")
-            .optional(
-                "members",
-                SyntaxShape::Any,
-                "Which members of the module to import",
-            )
-            .category(Category::Core)
-    }
-
-    fn usage(&self) -> &str {
-        "Hide definitions in the current scope."
-    }
-
-    fn extra_usage(&self) -> &str {
-        r#"Definitions are hidden by priority: First aliases, then custom commands.
-
-This command is a parser keyword. For details, check:
-  https://www.nushell.sh/book/thinking_in_nu.html"#
-    }
-
-    fn is_parser_keyword(&self) -> bool {
-        true
-    }
-
-    fn run(
-        &self,
-        _engine_state: &EngineState,
-        _stack: &mut Stack,
-        _call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        Ok(PipelineData::empty())
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Hide the alias just defined",
-                example: r#"alias lll = ls -l; hide lll"#,
-                result: None,
-            },
-            Example {
-                description: "Hide a custom command",
-                example: r#"def say-hi [] { echo 'Hi!' }; hide say-hi"#,
-                result: None,
-            },
-        ]
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/hide_env.rs
+++ b/crates/nu-cmd-lang/src/core_commands/hide_env.rs
@@ -1,79 +0,0 @@
-use nu_engine::CallExt;
-use nu_protocol::ast::Call;
-use nu_protocol::engine::{Command, EngineState, Stack};
-use nu_protocol::{
-    did_you_mean, Category, Example, PipelineData, ShellError, Signature, Spanned, SyntaxShape,
-    Type, Value,
-};
-
-#[derive(Clone)]
-pub struct HideEnv;
-
-impl Command for HideEnv {
-    fn name(&self) -> &str {
-        "hide-env"
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("hide-env")
-            .input_output_types(vec![(Type::Nothing, Type::Nothing)])
-            .rest(
-                "name",
-                SyntaxShape::String,
-                "environment variable names to hide",
-            )
-            .switch(
-                "ignore-errors",
-                "do not throw an error if an environment variable was not found",
-                Some('i'),
-            )
-            .category(Category::Core)
-    }
-
-    fn usage(&self) -> &str {
-        "Hide environment variables in the current scope."
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let env_var_names: Vec<Spanned<String>> = call.rest(engine_state, stack, 0)?;
-        let ignore_errors = call.has_flag("ignore-errors");
-
-        for name in env_var_names {
-            if !stack.remove_env_var(engine_state, &name.item) && !ignore_errors {
-                let all_names: Vec<String> = stack
-                    .get_env_var_names(engine_state)
-                    .iter()
-                    .cloned()
-                    .collect();
-                if let Some(closest_match) = did_you_mean(&all_names, &name.item) {
-                    return Err(ShellError::DidYouMeanCustom(
-                        format!("Environment variable '{}' not found", name.item),
-                        closest_match,
-                        name.span,
-                    ));
-                } else {
-                    return Err(ShellError::EnvVarNotFoundAtRuntime {
-                        envvar_name: name.item,
-                        span: name.span,
-                    });
-                }
-            }
-        }
-
-        Ok(PipelineData::empty())
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Hide an environment variable",
-            example: r#"let-env HZ_ENV_ABC = 1; hide-env HZ_ENV_ABC; 'HZ_ENV_ABC' in (env).name"#,
-            result: Some(Value::test_bool(false)),
-        }]
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/loop_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/loop_.rs
@@ -1,92 +0,0 @@
-use nu_engine::{eval_block, CallExt};
-use nu_protocol::ast::Call;
-use nu_protocol::engine::{Block, Command, EngineState, Stack};
-use nu_protocol::{
-    Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
-};
-
-#[derive(Clone)]
-pub struct Loop;
-
-impl Command for Loop {
-    fn name(&self) -> &str {
-        "loop"
-    }
-
-    fn usage(&self) -> &str {
-        "Run a block in a loop."
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("loop")
-            .input_output_types(vec![(Type::Nothing, Type::Nothing)])
-            .allow_variants_without_examples(true)
-            .required("block", SyntaxShape::Block, "block to loop")
-            .category(Category::Core)
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let block: Block = call.req(engine_state, stack, 0)?;
-
-        loop {
-            if nu_utils::ctrl_c::was_pressed(&engine_state.ctrlc) {
-                break;
-            }
-
-            let block = engine_state.get_block(block.block_id);
-            match eval_block(
-                engine_state,
-                stack,
-                block,
-                PipelineData::empty(),
-                call.redirect_stdout,
-                call.redirect_stderr,
-            ) {
-                Err(ShellError::Break(_)) => {
-                    break;
-                }
-                Err(ShellError::Continue(_)) => {
-                    continue;
-                }
-                Err(err) => {
-                    return Err(err);
-                }
-                Ok(pipeline) => {
-                    let exit_code = pipeline.drain_with_exit_code()?;
-                    if exit_code != 0 {
-                        return Ok(PipelineData::new_external_stream_with_only_exit_code(
-                            exit_code,
-                        ));
-                    }
-                }
-            }
-        }
-        Ok(PipelineData::empty())
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Loop while a condition is true",
-            example: "mut x = 0; loop { if $x > 10 { break }; $x = $x + 1 }; $x",
-            result: Some(Value::test_int(11)),
-        }]
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        use crate::test_examples;
-
-        test_examples(Loop {})
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/match_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/match_.rs
@@ -1,124 +0,0 @@
-use nu_engine::{eval_block, eval_expression_with_input, CallExt};
-use nu_protocol::ast::{Call, Expr, Expression};
-use nu_protocol::engine::{Command, EngineState, Matcher, Stack};
-use nu_protocol::{
-    Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
-};
-
-#[derive(Clone)]
-pub struct Match;
-
-impl Command for Match {
-    fn name(&self) -> &str {
-        "match"
-    }
-
-    fn usage(&self) -> &str {
-        "Conditionally run a block on a matched value."
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("match")
-            .input_output_types(vec![(Type::Any, Type::Any)])
-            .required("value", SyntaxShape::Any, "value to check")
-            .required(
-                "match_block",
-                SyntaxShape::MatchBlock,
-                "block to run if check succeeds",
-            )
-            .category(Category::Core)
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let value: Value = call.req(engine_state, stack, 0)?;
-        let block = call.positional_nth(1);
-
-        if let Some(Expression {
-            expr: Expr::MatchBlock(matches),
-            ..
-        }) = block
-        {
-            for match_ in matches {
-                let mut match_variables = vec![];
-                if match_.0.match_value(&value, &mut match_variables) {
-                    // This case does match, go ahead and return the evaluated expression
-                    for match_variable in match_variables {
-                        stack.add_var(match_variable.0, match_variable.1);
-                    }
-
-                    if let Some(block_id) = match_.1.as_block() {
-                        let block = engine_state.get_block(block_id);
-                        return eval_block(
-                            engine_state,
-                            stack,
-                            block,
-                            input,
-                            call.redirect_stdout,
-                            call.redirect_stderr,
-                        );
-                    } else {
-                        return eval_expression_with_input(
-                            engine_state,
-                            stack,
-                            &match_.1,
-                            input,
-                            call.redirect_stdout,
-                            call.redirect_stderr,
-                        )
-                        .map(|x| x.0);
-                    }
-                }
-            }
-        }
-
-        Ok(PipelineData::Empty)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Match on a value in range",
-                example: "match 3 { 1..10 => 'yes!' }",
-                result: Some(Value::test_string("yes!")),
-            },
-            Example {
-                description: "Match on a field in a record",
-                example: "match {a: 100} { {a: $my_value} => { $my_value } }",
-                result: Some(Value::test_int(100)),
-            },
-            Example {
-                description: "Match with a catch-all",
-                example: "match 3 { 1 => { 'yes!' }, _ => { 'no!' } }",
-                result: Some(Value::test_string("no!")),
-            },
-            Example {
-                description: "Match against a list",
-                example: "match [1, 2, 3] { [$a, $b, $c] => { $a + $b + $c }, _ => 0 }",
-                result: Some(Value::test_int(6)),
-            },
-            Example {
-                description: "Match against pipeline input",
-                example: "{a: {b: 3}} | match $in {{a: { $b }} => ($b + 10) }",
-                result: Some(Value::test_int(13)),
-            },
-        ]
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        use crate::test_examples;
-
-        test_examples(Match {})
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/mut_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/mut_.rs
@@ -1,122 +0,0 @@
-use nu_engine::eval_expression_with_input;
-use nu_protocol::ast::Call;
-use nu_protocol::engine::{Command, EngineState, Stack};
-use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type};
-
-#[derive(Clone)]
-pub struct Mut;
-
-impl Command for Mut {
-    fn name(&self) -> &str {
-        "mut"
-    }
-
-    fn usage(&self) -> &str {
-        "Create a mutable variable and give it a value."
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("mut")
-            .input_output_types(vec![(Type::Nothing, Type::Nothing)])
-            .allow_variants_without_examples(true)
-            .required("var_name", SyntaxShape::VarWithOptType, "variable name")
-            .required(
-                "initial_value",
-                SyntaxShape::Keyword(b"=".to_vec(), Box::new(SyntaxShape::MathExpression)),
-                "equals sign followed by value",
-            )
-            .category(Category::Core)
-    }
-
-    fn extra_usage(&self) -> &str {
-        r#"This command is a parser keyword. For details, check:
-  https://www.nushell.sh/book/thinking_in_nu.html"#
-    }
-
-    fn is_parser_keyword(&self) -> bool {
-        true
-    }
-
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["set", "mutable"]
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let var_id = call
-            .positional_nth(0)
-            .expect("checked through parser")
-            .as_var()
-            .expect("internal error: missing variable");
-
-        let keyword_expr = call
-            .positional_nth(1)
-            .expect("checked through parser")
-            .as_keyword()
-            .expect("internal error: missing keyword");
-
-        let rhs = eval_expression_with_input(
-            engine_state,
-            stack,
-            keyword_expr,
-            input,
-            call.redirect_stdout,
-            call.redirect_stderr,
-        )?
-        .0;
-
-        //println!("Adding: {:?} to {}", rhs, var_id);
-
-        stack.add_var(var_id, rhs.into_value(call.head));
-        Ok(PipelineData::empty())
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Set a mutable variable to a value, then update it",
-                example: "mut x = 10; $x = 12",
-                result: None,
-            },
-            Example {
-                description: "Upsert a value inside a mutable data structure",
-                example: "mut a = {b:{c:1}}; $a.b.c = 2",
-                result: None,
-            },
-            Example {
-                description: "Set a mutable variable to the result of an expression",
-                example: "mut x = 10 + 100",
-                result: None,
-            },
-            Example {
-                description: "Set a mutable variable based on the condition",
-                example: "mut x = if false { -1 } else { 1 }",
-                result: None,
-            },
-        ]
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use nu_protocol::engine::CommandType;
-
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        use crate::test_examples;
-
-        test_examples(Mut {})
-    }
-
-    #[test]
-    fn test_command_type() {
-        assert!(matches!(Mut.command_type(), CommandType::Keyword));
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/overlay/list.rs
+++ b/crates/nu-cmd-lang/src/core_commands/overlay/list.rs
@@ -1,58 +0,0 @@
-use nu_protocol::ast::Call;
-use nu_protocol::engine::{Command, EngineState, Stack};
-use nu_protocol::{
-    Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, Type, Value,
-};
-
-#[derive(Clone)]
-pub struct OverlayList;
-
-impl Command for OverlayList {
-    fn name(&self) -> &str {
-        "overlay list"
-    }
-
-    fn usage(&self) -> &str {
-        "List all active overlays."
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("overlay list")
-            .category(Category::Core)
-            .input_output_types(vec![(Type::Nothing, Type::List(Box::new(Type::String)))])
-    }
-
-    fn extra_usage(&self) -> &str {
-        "The overlays are listed in the order they were activated."
-    }
-
-    fn run(
-        &self,
-        _engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let active_overlays_engine: Vec<Value> = stack
-            .active_overlays
-            .iter()
-            .map(|s| Value::string(s, call.head))
-            .collect();
-
-        Ok(Value::List {
-            vals: active_overlays_engine,
-            span: call.head,
-        }
-        .into_pipeline_data())
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Get the last activated overlay",
-            example: r#"module spam { export def foo [] { "foo" } }
-    overlay use spam
-    overlay list | last"#,
-            result: Some(Value::test_string("spam")),
-        }]
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs
@@ -1,210 +0,0 @@
-use nu_engine::{eval_block, find_in_dirs_env, get_dirs_var_from_call, redirect_env, CallExt};
-use nu_parser::trim_quotes_str;
-use nu_protocol::ast::{Call, Expr};
-use nu_protocol::engine::{Command, EngineState, Stack};
-use nu_protocol::{
-    Category, Example, PipelineData, ShellError, Signature, Spanned, SyntaxShape, Type, Value,
-};
-
-use std::path::Path;
-
-#[derive(Clone)]
-pub struct OverlayUse;
-
-impl Command for OverlayUse {
-    fn name(&self) -> &str {
-        "overlay use"
-    }
-
-    fn usage(&self) -> &str {
-        "Use definitions from a module as an overlay."
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("overlay use")
-            .input_output_types(vec![(Type::Nothing, Type::Nothing)])
-            .allow_variants_without_examples(true)
-            .required(
-                "name",
-                SyntaxShape::String,
-                "Module name to use overlay for",
-            )
-            .optional(
-                "as",
-                SyntaxShape::Keyword(b"as".to_vec(), Box::new(SyntaxShape::String)),
-                "as keyword followed by a new name",
-            )
-            .switch(
-                "prefix",
-                "Prepend module name to the imported commands and aliases",
-                Some('p'),
-            )
-            .switch(
-                "reload",
-                "If the overlay already exists, reload its definitions and environment.",
-                Some('r'),
-            )
-            .category(Category::Core)
-    }
-
-    fn extra_usage(&self) -> &str {
-        r#"This command is a parser keyword. For details, check:
-  https://www.nushell.sh/book/thinking_in_nu.html"#
-    }
-
-    fn is_parser_keyword(&self) -> bool {
-        true
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        caller_stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let mut name_arg: Spanned<String> = call.req(engine_state, caller_stack, 0)?;
-        name_arg.item = trim_quotes_str(&name_arg.item).to_string();
-
-        let maybe_origin_module_id =
-            if let Some(overlay_expr) = call.get_parser_info("overlay_expr") {
-                if let Expr::Overlay(module_id) = overlay_expr.expr {
-                    module_id
-                } else {
-                    return Err(ShellError::NushellFailedSpanned {
-                        msg: "Not an overlay".to_string(),
-                        label: "requires an overlay (path or a string)".to_string(),
-                        span: overlay_expr.span,
-                    });
-                }
-            } else {
-                return Err(ShellError::NushellFailedSpanned {
-                    msg: "Missing positional".to_string(),
-                    label: "missing required overlay".to_string(),
-                    span: call.head,
-                });
-            };
-
-        let overlay_name = if let Some(name) = call.opt(engine_state, caller_stack, 1)? {
-            name
-        } else if engine_state
-            .find_overlay(name_arg.item.as_bytes())
-            .is_some()
-        {
-            name_arg.item.clone()
-        } else if let Some(os_str) = Path::new(&name_arg.item).file_stem() {
-            if let Some(name) = os_str.to_str() {
-                name.to_string()
-            } else {
-                return Err(ShellError::NonUtf8(name_arg.span));
-            }
-        } else {
-            return Err(ShellError::OverlayNotFoundAtRuntime {
-                overlay_name: name_arg.item,
-                span: name_arg.span,
-            });
-        };
-
-        if let Some(module_id) = maybe_origin_module_id {
-            // Add environment variables only if:
-            // a) adding a new overlay
-            // b) refreshing an active overlay (the origin module changed)
-
-            let module = engine_state.get_module(module_id);
-
-            // 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(
-                    &name_arg.item,
-                    engine_state,
-                    caller_stack,
-                    get_dirs_var_from_call(call),
-                )?;
-
-                let block = engine_state.get_block(block_id);
-                let mut callee_stack = caller_stack.gather_captures(&block.captures);
-
-                if let Some(path) = &maybe_path {
-                    // Set the currently evaluated directory, if the argument is a valid path
-                    let mut parent = path.clone();
-                    parent.pop();
-
-                    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 {
-                    let file_path = Value::string(file_path.to_string_lossy(), call.head);
-                    callee_stack.add_env_var("CURRENT_FILE".to_string(), file_path);
-                }
-
-                let _ = eval_block(
-                    engine_state,
-                    &mut callee_stack,
-                    block,
-                    input,
-                    call.redirect_stdout,
-                    call.redirect_stderr,
-                );
-
-                // The export-env block should see the env vars *before* activating this overlay
-                caller_stack.add_overlay(overlay_name);
-
-                // Merge the block's environment to the current stack
-                redirect_env(engine_state, caller_stack, &callee_stack);
-            } else {
-                caller_stack.add_overlay(overlay_name);
-            }
-        } else {
-            caller_stack.add_overlay(overlay_name);
-        }
-
-        Ok(PipelineData::empty())
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Create an overlay from a module",
-                example: r#"module spam { export def foo [] { "foo" } }
-    overlay use spam
-    foo"#,
-                result: None,
-            },
-            Example {
-                description: "Create an overlay from a module and rename it",
-                example: r#"module spam { export def foo [] { "foo" } }
-    overlay use spam as spam_new
-    foo"#,
-                result: None,
-            },
-            Example {
-                description: "Create an overlay with a prefix",
-                example: r#"'export def foo { "foo" }'
-    overlay use --prefix spam
-    spam foo"#,
-                result: None,
-            },
-            Example {
-                description: "Create an overlay from a file",
-                example: r#"'export-env { let-env FOO = "foo" }' | save spam.nu
-    overlay use spam.nu
-    $env.FOO"#,
-                result: None,
-            },
-        ]
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        use crate::test_examples;
-
-        test_examples(OverlayUse {})
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/return_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/return_.rs
@@ -1,61 +0,0 @@
-use nu_engine::CallExt;
-use nu_protocol::ast::Call;
-use nu_protocol::engine::{Command, EngineState, Stack};
-use nu_protocol::{
-    Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
-};
-
-#[derive(Clone)]
-pub struct Return;
-
-impl Command for Return {
-    fn name(&self) -> &str {
-        "return"
-    }
-
-    fn usage(&self) -> &str {
-        "Return early from a function."
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("return")
-            .input_output_types(vec![(Type::Nothing, Type::Nothing)])
-            .optional("return_value", SyntaxShape::Any, "optional value to return")
-            .category(Category::Core)
-    }
-
-    fn extra_usage(&self) -> &str {
-        r#"This command is a parser keyword. For details, check:
-  https://www.nushell.sh/book/thinking_in_nu.html"#
-    }
-
-    fn is_parser_keyword(&self) -> bool {
-        true
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let return_value: Option<Value> = call.opt(engine_state, stack, 0)?;
-        if let Some(value) = return_value {
-            Err(ShellError::Return(call.head, Box::new(value)))
-        } else {
-            Err(ShellError::Return(
-                call.head,
-                Box::new(Value::nothing(call.head)),
-            ))
-        }
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Return early",
-            example: r#"def foo [] { return }"#,
-            result: None,
-        }]
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/try_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/try_.rs
@@ -1,161 +0,0 @@
-use nu_engine::{eval_block, CallExt};
-use nu_protocol::ast::Call;
-use nu_protocol::engine::{Block, Closure, Command, EngineState, Stack};
-use nu_protocol::{
-    Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, Span, SyntaxShape,
-    Type, Value,
-};
-
-#[derive(Clone)]
-pub struct Try;
-
-impl Command for Try {
-    fn name(&self) -> &str {
-        "try"
-    }
-
-    fn usage(&self) -> &str {
-        "Try to run a block, if it fails optionally run a catch block."
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("try")
-            .input_output_types(vec![(Type::Any, Type::Any)])
-            .required("try_block", SyntaxShape::Block, "block to run")
-            .optional(
-                "catch_block",
-                SyntaxShape::Keyword(
-                    b"catch".to_vec(),
-                    Box::new(SyntaxShape::OneOf(vec![
-                        SyntaxShape::Closure(None),
-                        SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
-                    ])),
-                ),
-                "block to run if try block fails",
-            )
-            .category(Category::Core)
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let try_block: Block = call.req(engine_state, stack, 0)?;
-        let catch_block: Option<Closure> = call.opt(engine_state, stack, 1)?;
-
-        let try_block = engine_state.get_block(try_block.block_id);
-
-        let result = eval_block(engine_state, stack, try_block, input, false, false);
-
-        match result {
-            Err(error) => {
-                let error = intercept_block_control(error)?;
-                let err_record = err_to_record(error, call.head);
-                handle_catch(err_record, catch_block, engine_state, stack)
-            }
-            Ok(PipelineData::Value(Value::Error { error }, ..)) => {
-                let error = intercept_block_control(*error)?;
-                let err_record = err_to_record(error, call.head);
-                handle_catch(err_record, catch_block, engine_state, stack)
-            }
-            // external command may fail to run
-            Ok(pipeline) => {
-                let (pipeline, external_failed) = pipeline.is_external_failed();
-                if external_failed {
-                    // Because external command errors aren't "real" errors,
-                    // (unless do -c is in effect)
-                    // they can't be passed in as Nushell values.
-                    let err_value = Value::nothing(call.head);
-                    handle_catch(err_value, catch_block, engine_state, stack)
-                } else {
-                    Ok(pipeline)
-                }
-            }
-        }
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Try to run a missing command",
-                example: "try { asdfasdf }",
-                result: None,
-            },
-            Example {
-                description: "Try to run a missing command",
-                example: "try { asdfasdf } catch { echo 'missing' } ",
-                result: Some(Value::test_string("missing")),
-            },
-        ]
-    }
-}
-
-fn handle_catch(
-    err_value: Value,
-    catch_block: Option<Closure>,
-    engine_state: &EngineState,
-    stack: &mut Stack,
-) -> Result<PipelineData, ShellError> {
-    if let Some(catch_block) = catch_block {
-        let catch_block = engine_state.get_block(catch_block.block_id);
-        // Put the error value in the positional closure var
-        if let Some(var) = catch_block.signature.get_positional(0) {
-            if let Some(var_id) = &var.var_id {
-                stack.add_var(*var_id, err_value.clone());
-            }
-        }
-
-        eval_block(
-            engine_state,
-            stack,
-            catch_block,
-            // Make the error accessible with $in, too
-            err_value.into_pipeline_data(),
-            false,
-            false,
-        )
-    } else {
-        Ok(PipelineData::empty())
-    }
-}
-
-/// The flow control commands `break`/`continue`/`return` emit their own [`ShellError`] variants
-/// We need to ignore those in `try` and bubble them through
-///
-/// `Err` when flow control to bubble up with `?`
-fn intercept_block_control(error: ShellError) -> Result<ShellError, ShellError> {
-    match error {
-        nu_protocol::ShellError::Break(_) => Err(error),
-        nu_protocol::ShellError::Continue(_) => Err(error),
-        nu_protocol::ShellError::Return(_, _) => Err(error),
-        _ => Ok(error),
-    }
-}
-
-/// Convert from `error` to [`Value::Record`] so the error information can be easily accessed in catch.
-fn err_to_record(error: ShellError, head: Span) -> Value {
-    let cols = vec!["msg".to_string(), "debug".to_string(), "raw".to_string()];
-    let vals = vec![
-        Value::string(error.to_string(), head),
-        Value::string(format!("{error:?}"), head),
-        Value::Error {
-            error: Box::new(error),
-        },
-    ];
-    Value::record(cols, vals, head)
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        use crate::test_examples;
-
-        test_examples(Try {})
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/use_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/use_.rs
@@ -1,139 +0,0 @@
-use nu_engine::{eval_block, find_in_dirs_env, get_dirs_var_from_call, redirect_env};
-use nu_protocol::ast::{Call, Expr, Expression};
-use nu_protocol::engine::{Command, EngineState, Stack};
-use nu_protocol::{
-    Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
-};
-
-#[derive(Clone)]
-pub struct Use;
-
-impl Command for Use {
-    fn name(&self) -> &str {
-        "use"
-    }
-
-    fn usage(&self) -> &str {
-        "Use definitions from a module."
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("use")
-            .input_output_types(vec![(Type::Nothing, Type::Nothing)])
-            .required("module", SyntaxShape::String, "Module or module file")
-            .optional(
-                "members",
-                SyntaxShape::Any,
-                "Which members of the module to import",
-            )
-            .category(Category::Core)
-    }
-
-    fn extra_usage(&self) -> &str {
-        r#"This command is a parser keyword. For details, check:
-  https://www.nushell.sh/book/thinking_in_nu.html"#
-    }
-
-    fn is_parser_keyword(&self) -> bool {
-        true
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        caller_stack: &mut Stack,
-        call: &Call,
-        input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let Some(Expression {
-            expr: Expr::ImportPattern(import_pattern),
-            ..
-        }) = call.get_parser_info("import_pattern") else {
-            return Err(ShellError::GenericError(
-                "Unexpected import".into(),
-                "import pattern not supported".into(),
-                Some(call.head),
-                None,
-                Vec::new(),
-            ));
-        };
-
-        if let Some(module_id) = import_pattern.head.id {
-            let module = engine_state.get_module(module_id);
-
-            // Evaluate the export-env block if there is one
-            if let Some(block_id) = module.env_block {
-                let block = engine_state.get_block(block_id);
-
-                // See if the module is a file
-                let module_arg_str = String::from_utf8_lossy(
-                    engine_state.get_span_contents(&import_pattern.head.span),
-                );
-
-                let maybe_file_path = find_in_dirs_env(
-                    &module_arg_str,
-                    engine_state,
-                    caller_stack,
-                    get_dirs_var_from_call(call),
-                )?;
-                let maybe_parent = maybe_file_path
-                    .as_ref()
-                    .and_then(|path| path.parent().map(|p| p.to_path_buf()));
-
-                let mut callee_stack = caller_stack.gather_captures(&block.captures);
-
-                // If so, set the currently evaluated directory (file-relative PWD)
-                if let Some(parent) = maybe_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_file_path {
-                    let file_path = Value::string(file_path.to_string_lossy(), call.head);
-                    callee_stack.add_env_var("CURRENT_FILE".to_string(), file_path);
-                }
-
-                // Run the block (discard the result)
-                let _ = eval_block(
-                    engine_state,
-                    &mut callee_stack,
-                    block,
-                    input,
-                    call.redirect_stdout,
-                    call.redirect_stderr,
-                )?;
-
-                // Merge the block's environment to the current stack
-                redirect_env(engine_state, caller_stack, &callee_stack);
-            }
-        } else {
-            return Err(ShellError::GenericError(
-                format!(
-                    "Could not import from '{}'",
-                    String::from_utf8_lossy(&import_pattern.head.name)
-                ),
-                "module does not exist".to_string(),
-                Some(import_pattern.head.span),
-                None,
-                Vec::new(),
-            ));
-        }
-
-        Ok(PipelineData::empty())
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Define a custom command in a module and call it",
-                example: r#"module spam { export def foo [] { "foo" } }; use spam foo; foo"#,
-                result: Some(Value::test_string("foo")),
-            },
-            Example {
-                description: "Define a custom command that participates in the environment in a module and call it",
-                example: r#"module foo { export def-env bar [] { let-env FOO_BAR = "BAZ" } }; use foo bar; bar; $env.FOO_BAR"#,
-                result: Some(Value::test_string("BAZ")),
-            },
-        ]
-    }
-}
--- a/crates/nu-cmd-lang/src/core_commands/while_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/while_.rs
@@ -1,117 +0,0 @@
-use nu_engine::{eval_block, eval_expression, CallExt};
-use nu_protocol::ast::Call;
-use nu_protocol::engine::{Block, Command, EngineState, Stack};
-use nu_protocol::{
-    Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
-};
-
-#[derive(Clone)]
-pub struct While;
-
-impl Command for While {
-    fn name(&self) -> &str {
-        "while"
-    }
-
-    fn usage(&self) -> &str {
-        "Conditionally run a block in a loop."
-    }
-
-    fn signature(&self) -> nu_protocol::Signature {
-        Signature::build("while")
-            .input_output_types(vec![(Type::Nothing, Type::Nothing)])
-            .allow_variants_without_examples(true)
-            .required("cond", SyntaxShape::MathExpression, "condition to check")
-            .required(
-                "block",
-                SyntaxShape::Block,
-                "block to loop if check succeeds",
-            )
-            .category(Category::Core)
-    }
-
-    fn run(
-        &self,
-        engine_state: &EngineState,
-        stack: &mut Stack,
-        call: &Call,
-        _input: PipelineData,
-    ) -> Result<PipelineData, ShellError> {
-        let cond = call.positional_nth(0).expect("checked through parser");
-        let block: Block = call.req(engine_state, stack, 1)?;
-
-        loop {
-            if nu_utils::ctrl_c::was_pressed(&engine_state.ctrlc) {
-                break;
-            }
-
-            let result = eval_expression(engine_state, stack, cond)?;
-            match &result {
-                Value::Bool { val, .. } => {
-                    if *val {
-                        let block = engine_state.get_block(block.block_id);
-                        match eval_block(
-                            engine_state,
-                            stack,
-                            block,
-                            PipelineData::empty(),
-                            call.redirect_stdout,
-                            call.redirect_stderr,
-                        ) {
-                            Err(ShellError::Break(_)) => {
-                                break;
-                            }
-                            Err(ShellError::Continue(_)) => {
-                                continue;
-                            }
-                            Err(err) => {
-                                return Err(err);
-                            }
-                            Ok(pipeline) => {
-                                let exit_code = pipeline.drain_with_exit_code()?;
-                                if exit_code != 0 {
-                                    return Ok(
-                                        PipelineData::new_external_stream_with_only_exit_code(
-                                            exit_code,
-                                        ),
-                                    );
-                                }
-                            }
-                        }
-                    } else {
-                        break;
-                    }
-                }
-                x => {
-                    return Err(ShellError::CantConvert {
-                        to_type: "bool".into(),
-                        from_type: x.get_type().to_string(),
-                        span: result.span()?,
-                        help: None,
-                    })
-                }
-            }
-        }
-        Ok(PipelineData::empty())
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Loop while a condition is true",
-            example: "mut x = 0; while $x < 10 { $x = $x + 1 }",
-            result: None,
-        }]
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_examples() {
-        use crate::test_examples;
-
-        test_examples(While {})
-    }
-}
--- a/Show More
+++ b/Show More