bumped version number to 0.97 (#13655 )

Fix clippy lints (#13645 )
Drop outdated touch -d example (#13631 )
2025-07-05 09:00:25 +02:00 · 2024-08-20 16:28:19 -07:00 · 2024-08-19 11:12:45 +02:00 · 2024-08-15 23:57:25 +02:00 · 2024-08-15 21:03:13 +02:00 · 2024-08-15 19:25:50 +02:00
733 changed files with 25758 additions and 8281 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -26,6 +26,13 @@ updates:
        patterns:
          - "polars"
          - "polars-*"
      # uutils/coreutils also versions all their workspace crates the same at the moment
      # Most of them have bleeding edge version requirements (some not)
      # see: https://github.com/uutils/coreutils/blob/main/Cargo.toml
      uutils:
        patterns:
          - "uucore"
          - "uu_*"
  - package-ecosystem: "github-actions"
    directory: "/"
    schedule:
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@ -36,10 +36,10 @@ jobs:
          token: ${{ secrets.WORKFLOW_TOKEN }}
      - name: Setup Nushell
-        uses: hustcer/setup-nu@v3.11
+        uses: hustcer/setup-nu@v3.12
        if: github.repository == 'nushell/nightly'
        with:
-          version: 0.93.0
+          version: 0.95.0
      # Synchronize the main branch of nightly repo with the main branch of Nushell official repo
      - name: Prepare for Nightly Release
@ -99,13 +99,13 @@ jobs:
          extra: msi
          os: windows-latest
        - target: x86_64-unknown-linux-gnu
-          os: ubuntu-20.04
+          os: ubuntu-22.04
        - target: x86_64-unknown-linux-musl
-          os: ubuntu-20.04
+          os: ubuntu-22.04
        - target: aarch64-unknown-linux-gnu
-          os: ubuntu-20.04
+          os: ubuntu-22.04
        - target: armv7-unknown-linux-gnueabihf
-          os: ubuntu-20.04
+          os: ubuntu-22.04
        - target: riscv64gc-unknown-linux-gnu
          os: ubuntu-latest
@ -128,9 +128,9 @@ jobs:
        rustflags: ''
    - name: Setup Nushell
-      uses: hustcer/setup-nu@v3.11
+      uses: hustcer/setup-nu@v3.12
      with:
-        version: 0.93.0
+        version: 0.95.0
    - name: Release Nu Binary
      id: nu
@ -161,7 +161,7 @@ jobs:
    # REF: https://github.com/marketplace/actions/gh-release
    # Create a release only in nushell/nightly repo
    - name: Publish Archive
-      uses: softprops/action-gh-release@v2.0.5
+      uses: softprops/action-gh-release@v2.0.8
      if: ${{ startsWith(github.repository, 'nushell/nightly') }}
      with:
        prerelease: true
@ -186,9 +186,9 @@ jobs:
          ref: main
      - name: Setup Nushell
-        uses: hustcer/setup-nu@v3.11
+        uses: hustcer/setup-nu@v3.12
        with:
-          version: 0.93.0
+          version: 0.95.0
      # Keep the last a few releases
      - name: Delete Older Releases
--- a/.github/workflows/release-pkg.nu
+++ b/.github/workflows/release-pkg.nu
@ -161,8 +161,12 @@ if $os in ['macos-latest'] or $USE_UBUNTU {
    let releaseStem = $'($bin)-($version)-($target)'
    print $'(char nl)Download less related stuffs...'; hr-line
    # todo: less-v661 is out but is released as a zip file. maybe we should switch to that and extract it?
    aria2c https://github.com/jftuga/less-Windows/releases/download/less-v608/less.exe -o less.exe
-    aria2c https://raw.githubusercontent.com/jftuga/less-Windows/master/LICENSE -o LICENSE-for-less.txt
+    # the below was renamed because it was failing to download for darren. it should work but it wasn't
    # todo: maybe we should get rid of this aria2c dependency and just use http get?
    #aria2c https://raw.githubusercontent.com/jftuga/less-Windows/master/LICENSE -o LICENSE-for-less.txt
    aria2c https://github.com/jftuga/less-Windows/blob/master/LICENSE -o LICENSE-for-less.txt
    # Create Windows msi release package
    if (get-env _EXTRA_) == 'msi' {
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -49,13 +49,13 @@ jobs:
          extra: msi
          os: windows-latest
        - target: x86_64-unknown-linux-gnu
-          os: ubuntu-20.04
+          os: ubuntu-22.04
        - target: x86_64-unknown-linux-musl
-          os: ubuntu-20.04
+          os: ubuntu-22.04
        - target: aarch64-unknown-linux-gnu
-          os: ubuntu-20.04
+          os: ubuntu-22.04
        - target: armv7-unknown-linux-gnueabihf
-          os: ubuntu-20.04
+          os: ubuntu-22.04
        - target: riscv64gc-unknown-linux-gnu
          os: ubuntu-latest
@ -76,9 +76,9 @@ jobs:
        rustflags: ''
    - name: Setup Nushell
-      uses: hustcer/setup-nu@v3.11
+      uses: hustcer/setup-nu@v3.12
      with:
-        version: 0.93.0
+        version: 0.95.0
    - name: Release Nu Binary
      id: nu
@ -91,7 +91,7 @@ jobs:
    # REF: https://github.com/marketplace/actions/gh-release
    - name: Publish Archive
-      uses: softprops/action-gh-release@v2.0.5
+      uses: softprops/action-gh-release@v2.0.8
      if: ${{ startsWith(github.ref, 'refs/tags/') }}
      with:
        draft: true
--- a/.github/workflows/typos.yml
+++ b/.github/workflows/typos.yml
@ -10,4 +10,4 @@ jobs:
        uses: actions/checkout@v4.1.7
      - name: Check spelling
-        uses: crate-ci/typos@v1.22.7
+        uses: crate-ci/typos@v1.23.6
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@ -10,8 +10,8 @@ homepage = "https://www.nushell.sh"
 license = "MIT"
 name = "nu"
 repository = "https://github.com/nushell/nushell"
-rust-version = "1.77.2"
+rust-version = "1.78.0"
-version = "0.95.0"
+version = "0.97.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@ -80,20 +80,20 @@ crossbeam-channel = "0.5.8"
 crossterm = "0.27"
 csv = "1.3"
 ctrlc = "3.4"
 deunicode = "1.6.0"
 dialoguer = { default-features = false, version = "0.11" }
 digest = { default-features = false, version = "0.10" }
-dirs-next = "2.0"
+dirs = "5.0"
 dirs-sys = "0.4"
 dtparse = "2.0"
 encoding_rs = "0.8"
 fancy-regex = "0.13"
 filesize = "0.2"
 filetime = "0.2"
 fs_extra = "1.3"
 fuzzy-matcher = "0.3"
 hamcrest2 = "0.3"
 heck = "0.5.0"
 human-date-parser = "0.1.1"
-indexmap = "2.2"
+indexmap = "2.4"
 indicatif = "0.17"
 interprocess = "2.2.0"
 is_executable = "1.0"
@ -108,18 +108,19 @@ lsp-types = "0.95.0"
 mach2 = "0.4"
 md5 = { version = "0.10", package = "md-5" }
 miette = "7.2"
-mime = "0.3"
+mime = "0.3.17"
 mime_guess = "2.0"
-mockito = { version = "1.4", default-features = false }
+mockito = { version = "1.5", default-features = false }
 multipart-rs = "0.1.11"
 native-tls = "0.2"
 nix = { version = "0.28", default-features = false }
 notify-debouncer-full = { version = "0.3", default-features = false }
-nu-ansi-term = "0.50.0"
+nu-ansi-term = "0.50.1"
 num-format = "0.4"
 num-traits = "0.2"
 omnipath = "0.1"
 once_cell = "1.18"
-open = "5.1"
+open = "5.3"
 os_pipe = { version = "1.2", features = ["io_safety"] }
 pathdiff = "0.2"
 percent-encoding = "2"
@ -129,14 +130,14 @@ proc-macro-error = { version = "1.0", default-features = false }
 proc-macro2 = "1.0"
 procfs = "0.16.0"
 pwd = "1.3"
-quick-xml = "0.31.0"
+quick-xml = "0.32.0"
 quickcheck = "1.0"
 quickcheck_macros = "1.0"
 quote = "1.0"
 rand = "0.8"
 ratatui = "0.26"
 rayon = "1.10"
-reedline = "0.32.0"
+reedline = "0.34.0"
 regex = "1.9.5"
 rmp = "0.8"
 rmp-serde = "1.3"
@ -144,7 +145,7 @@ ropey = "1.6.1"
 roxmltree = "0.19"
 rstest = { version = "0.18", default-features = false }
 rusqlite = "0.31"
-rust-embed = "8.4.0"
+rust-embed = "8.5.0"
 same-file = "1.0"
 serde = { version = "1.0", default-features = false }
 serde_json = "1.0"
@ -163,48 +164,49 @@ trash = "3.3"
 umask = "2.1"
 unicode-segmentation = "1.11"
 unicode-width = "0.1"
-ureq = { version = "2.9", default-features = false }
+ureq = { version = "2.10", default-features = false }
 url = "2.2"
-uu_cp = "0.0.26"
+uu_cp = "0.0.27"
-uu_mkdir = "0.0.26"
+uu_mkdir = "0.0.27"
-uu_mktemp = "0.0.26"
+uu_mktemp = "0.0.27"
-uu_mv = "0.0.26"
+uu_mv = "0.0.27"
-uu_whoami = "0.0.26"
+uu_whoami = "0.0.27"
-uu_uname = "0.0.26"
+uu_uname = "0.0.27"
-uucore = "0.0.26"
+uucore = "0.0.27"
-uuid = "1.8.0"
+uuid = "1.10.0"
 v_htmlescape = "0.15.0"
 wax = "0.6"
 which = "6.0.0"
 windows = "0.54"
 windows-sys = "0.48"
 winreg = "0.52"
 [dependencies]
-nu-cli = { path = "./crates/nu-cli", version = "0.95.0" }
+nu-cli = { path = "./crates/nu-cli", version = "0.97.0" }
-nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.95.0" }
+nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.97.0" }
-nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.95.0" }
+nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.97.0" }
-nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.95.0", optional = true }
+nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.97.0", optional = true }
-nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.95.0" }
+nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.97.0" }
-nu-command = { path = "./crates/nu-command", version = "0.95.0" }
+nu-command = { path = "./crates/nu-command", version = "0.97.0" }
-nu-engine = { path = "./crates/nu-engine", version = "0.95.0" }
+nu-engine = { path = "./crates/nu-engine", version = "0.97.0" }
-nu-explore = { path = "./crates/nu-explore", version = "0.95.0" }
+nu-explore = { path = "./crates/nu-explore", version = "0.97.0" }
-nu-lsp = { path = "./crates/nu-lsp/", version = "0.95.0" }
+nu-lsp = { path = "./crates/nu-lsp/", version = "0.97.0" }
-nu-parser = { path = "./crates/nu-parser", version = "0.95.0" }
+nu-parser = { path = "./crates/nu-parser", version = "0.97.0" }
-nu-path = { path = "./crates/nu-path", version = "0.95.0" }
+nu-path = { path = "./crates/nu-path", version = "0.97.0" }
-nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.95.0" }
+nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.97.0" }
-nu-protocol = { path = "./crates/nu-protocol", version = "0.95.0" }
+nu-protocol = { path = "./crates/nu-protocol", version = "0.97.0" }
-nu-std = { path = "./crates/nu-std", version = "0.95.0" }
+nu-std = { path = "./crates/nu-std", version = "0.97.0" }
-nu-system = { path = "./crates/nu-system", version = "0.95.0" }
+nu-system = { path = "./crates/nu-system", version = "0.97.0" }
-nu-utils = { path = "./crates/nu-utils", version = "0.95.0" }
+nu-utils = { path = "./crates/nu-utils", version = "0.97.0" }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
 crossterm = { workspace = true }
 ctrlc = { workspace = true }
-dirs-next = { workspace = true }
+dirs = { workspace = true }
 log = { workspace = true }
 miette = { workspace = true, features = ["fancy-no-backtrace", "fancy"] }
 mimalloc = { version = "0.1.42", default-features = false, optional = true }
 multipart-rs = { workspace = true }
 serde_json = { workspace = true }
 simplelog = "0.12"
 time = "0.3"
@ -225,13 +227,14 @@ nix = { workspace = true, default-features = false, features = [
 ] }
 [dev-dependencies]
-nu-test-support = { path = "./crates/nu-test-support", version = "0.95.0" }
+nu-test-support = { path = "./crates/nu-test-support", version = "0.97.0" }
-nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.95.0" }
+nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.97.0" }
-nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.95.0" }
+nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.97.0" }
 assert_cmd = "2.0"
-dirs-next = { workspace = true }
+dirs = { workspace = true }
 tango-bench = "0.5"
 pretty_assertions = { workspace = true }
 regex = { workspace = true }
 rstest = { workspace = true, default-features = false }
 serial_test = "3.1"
 tempfile = { workspace = true }
@ -303,11 +306,11 @@ bench = false
 # To use a development version of a dependency please use a global override here
 # changing versions in each sub-crate of the workspace is tedious
 [patch.crates-io]
-# reedline = { git = "https://github.com/nushell/reedline", branch = "main" }
+reedline = { git = "https://github.com/nushell/reedline", branch = "main" }
 # nu-ansi-term = {git = "https://github.com/nushell/nu-ansi-term.git", branch = "main"}
 # Run all benchmarks with `cargo bench`
 # Run individual benchmarks like `cargo bench -- <regex>` e.g. `cargo bench -- parse`
 [[bench]]
 name = "benchmarks"
-harness = false
+harness = false
--- a/SECURITY.md
+++ b/SECURITY.md
@ -0,0 +1,29 @@
 # Security Policy
 As a shell and programming language Nushell provides you with great powers and the potential to do dangerous things to your computer and data. Whenever there is a risk that a malicious actor can abuse a bug or a violation of documented behavior/assumptions in Nushell to harm you this is a *security* risk. 
 We want to fix those issues without exposing our users to unnecessary risk. Thus we want to explain our security policy.
 Additional issues may be part of *safety* where the behavior of Nushell as designed and implemented can cause unintended harm or a bug causes damage without the involvement of a third party.
 ## Supported Versions
 As Nushell is still under very active pre-stable development, the only version the core team prioritizes for security and safety fixes is the [most recent version as published on GitHub](https://github.com/nushell/nushell/releases/latest).
 Only if you provide a strong reasoning and the necessary resources, will we consider blessing a backported fix with an official patch release for a previous version.
 ## Reporting a Vulnerability
 If you suspect that a bug or behavior of Nushell can affect security or may be potentially exploitable, please report the issue to us in private. 
 Either reach out to the core team on [our Discord server](https://discord.gg/NtAbbGn) to arrange a private channel or use the [GitHub vulnerability reporting form](https://github.com/nushell/nushell/security/advisories/new).
 Please try to answer the following questions:
 - How can we reach you for further questions?
 - What is the bug? Which system of Nushell may be affected?
 - Do you have proof-of-concept for a potential exploit or have you observed an exploit in the wild?
 - What is your assessment of the severity based on what could be impacted should the bug be exploited?
 - Are additional people aware of the issue or deserve credit for identifying the issue?
 We will try to get back to you within a week with:
 - acknowledging the receipt of the report
 - an initial plan of how we want to address this including the primary points of contact for further communication
 - our preliminary assessment of how severe we judge the issue
 - a proposal for how we can coordinate responsible disclosure (e.g. how we ship the bugfix, if we need to coordinate with distribution maintainers, when you can release a blog post if you want to etc.)
 For purely *safety* related issues where the impact is severe by direct user action instead of malicious input or third parties, feel free to open a regular issue. If we deem that there may be an additional *security* risk on a *safety* issue we may continue discussions in a restricted forum.
--- a/benches/benchmarks.rs
+++ b/benches/benchmarks.rs
@ -4,11 +4,14 @@ use nu_plugin_protocol::{PluginCallResponse, PluginOutput};
 use nu_protocol::{
    engine::{EngineState, Stack},
-    PipelineData, Span, Spanned, Value,
+    PipelineData, Signals, Span, Spanned, Value,
 };
 use nu_std::load_standard_library;
 use nu_utils::{get_default_config, get_default_env};
-use std::rc::Rc;
+use std::{
    rc::Rc,
    sync::{atomic::AtomicBool, Arc},
 };
 use std::hint::black_box;
@ -42,6 +45,10 @@ fn setup_stack_and_engine_from_command(command: &str) -> (Stack, EngineState) {
    };
    let mut stack = Stack::new();
    // Support running benchmarks with IR mode
    stack.use_ir = std::env::var_os("NU_USE_IR").is_some();
    evaluate_commands(
        &commands,
        &mut engine,
@ -248,14 +255,12 @@ fn bench_eval_interleave(n: i32) -> impl IntoBenchmarks {
    )
 }
-fn bench_eval_interleave_with_ctrlc(n: i32) -> impl IntoBenchmarks {
+fn bench_eval_interleave_with_interrupt(n: i32) -> impl IntoBenchmarks {
    let mut engine = setup_engine();
-    engine.ctrlc = Some(std::sync::Arc::new(std::sync::atomic::AtomicBool::new(
+    engine.set_signals(Signals::new(Arc::new(AtomicBool::new(false))));
        false,
    )));
    let stack = Stack::new();
    bench_command(
-        &format!("eval_interleave_with_ctrlc_{n}"),
+        &format!("eval_interleave_with_interrupt_{n}"),
        &format!("seq 1 {n} | wrap a | interleave {{ seq 1 {n} | wrap b }} | ignore"),
        stack,
        engine,
@ -443,9 +448,9 @@ tango_benchmarks!(
    bench_eval_interleave(100),
    bench_eval_interleave(1_000),
    bench_eval_interleave(10_000),
-    bench_eval_interleave_with_ctrlc(100),
+    bench_eval_interleave_with_interrupt(100),
-    bench_eval_interleave_with_ctrlc(1_000),
+    bench_eval_interleave_with_interrupt(1_000),
-    bench_eval_interleave_with_ctrlc(10_000),
+    bench_eval_interleave_with_interrupt(10_000),
    // For
    bench_eval_for(1),
    bench_eval_for(10),
--- a/crates/nu-cli/Cargo.toml
+++ b/crates/nu-cli/Cargo.toml
@ -5,27 +5,27 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cli"
 edition = "2021"
 license = "MIT"
 name = "nu-cli"
-version = "0.95.0"
+version = "0.97.0"
 [lib]
 bench = false
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.0" }
-nu-command = { path = "../nu-command", version = "0.95.0" }
+nu-command = { path = "../nu-command", version = "0.97.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.95.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.97.0" }
 rstest = { workspace = true, default-features = false }
 tempfile = { workspace = true }
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.95.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.0" }
-nu-engine = { path = "../nu-engine", version = "0.95.0" }
+nu-engine = { path = "../nu-engine", version = "0.97.0" }
-nu-path = { path = "../nu-path", version = "0.95.0" }
+nu-path = { path = "../nu-path", version = "0.97.0" }
-nu-parser = { path = "../nu-parser", version = "0.95.0" }
+nu-parser = { path = "../nu-parser", version = "0.97.0" }
-nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.95.0", optional = true }
+nu-plugin-engine = { path = "../nu-plugin-engine", version = "0.97.0", optional = true }
-nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
-nu-utils = { path = "../nu-utils", version = "0.95.0" }
+nu-utils = { path = "../nu-utils", version = "0.97.0" }
-nu-color-config = { path = "../nu-color-config", version = "0.95.0" }
+nu-color-config = { path = "../nu-color-config", version = "0.97.0" }
 nu-ansi-term = { workspace = true }
 reedline = { workspace = true, features = ["bashisms", "sqlite"] }
--- a/crates/nu-cli/README.md
+++ b/crates/nu-cli/README.md
@ -0,0 +1,7 @@
 This crate implements the core functionality of the interactive Nushell REPL and interfaces with `reedline`.
 Currently implements the syntax highlighting and completions logic.
 Furthermore includes a few commands that are specific to `reedline`
 ## Internal Nushell crate
 This crate implements components of Nushell and is not designed to support plugin authors or other users directly.
--- a/crates/nu-cli/src/commands/history/history_.rs
+++ b/crates/nu-cli/src/commands/history/history_.rs
@ -47,7 +47,7 @@ impl Command for History {
        if let Some(config_path) = nu_path::config_dir() {
            let clear = call.has_flag(engine_state, stack, "clear")?;
            let long = call.has_flag(engine_state, stack, "long")?;
-            let ctrlc = engine_state.ctrlc.clone();
+            let signals = engine_state.signals().clone();
            let mut history_path = config_path;
            history_path.push("nushell");
@ -67,7 +67,7 @@ impl Command for History {
            } else {
                let history_reader: Option<Box<dyn ReedlineHistory>> = match history.file_format {
                    HistoryFileFormat::Sqlite => {
-                        SqliteBackedHistory::with_file(history_path.clone(), None, None)
+                        SqliteBackedHistory::with_file(history_path.clone().into(), None, None)
                            .map(|inner| {
                                let boxed: Box<dyn ReedlineHistory> = Box::new(inner);
                                boxed
@ -77,7 +77,7 @@ impl Command for History {
                    HistoryFileFormat::PlainText => FileBackedHistory::with_file(
                        history.max_size as usize,
-                        history_path.clone(),
+                        history_path.clone().into(),
                    )
                    .map(|inner| {
                        let boxed: Box<dyn ReedlineHistory> = Box::new(inner);
@ -107,7 +107,7 @@ impl Command for History {
                            file: history_path.display().to_string(),
                            span: head,
                        })?
-                        .into_pipeline_data(head, ctrlc)),
+                        .into_pipeline_data(head, signals)),
                    HistoryFileFormat::Sqlite => Ok(history_reader
                        .and_then(|h| {
                            h.search(SearchQuery::everything(SearchDirection::Forward, None))
@ -122,7 +122,7 @@ impl Command for History {
                            file: history_path.display().to_string(),
                            span: head,
                        })?
-                        .into_pipeline_data(head, ctrlc)),
+                        .into_pipeline_data(head, signals)),
                }
            }
        } else {
@ -156,58 +156,34 @@ fn create_history_record(idx: usize, entry: HistoryItem, long: bool, head: Span)
    //2. Create a record of either short or long columns and values
    let item_id_value = Value::int(
-        match entry.id {
+        entry
-            Some(id) => {
+            .id
-                let ids = id.to_string();
+            .and_then(|id| id.to_string().parse::<i64>().ok())
-                match ids.parse::<i64>() {
+            .unwrap_or_default(),
                    Ok(i) => i,
                    _ => 0i64,
                }
            }
            None => 0i64,
        },
        head,
    );
    let start_timestamp_value = Value::string(
-        match entry.start_timestamp {
+        entry
-            Some(time) => time.to_string(),
+            .start_timestamp
-            None => "".into(),
+            .map(|time| time.to_string())
-        },
+            .unwrap_or_default(),
        head,
    );
    let command_value = Value::string(entry.command_line, head);
    let session_id_value = Value::int(
-        match entry.session_id {
+        entry
-            Some(sid) => {
+            .session_id
-                let sids = sid.to_string();
+            .and_then(|id| id.to_string().parse::<i64>().ok())
-                match sids.parse::<i64>() {
+            .unwrap_or_default(),
                    Ok(i) => i,
                    _ => 0i64,
                }
            }
            None => 0i64,
        },
        head,
    );
    let hostname_value = Value::string(
        match entry.hostname {
            Some(host) => host,
            None => "".into(),
        },
        head,
    );
    let cwd_value = Value::string(
        match entry.cwd {
            Some(cwd) => cwd,
            None => "".into(),
        },
        head,
    );
    let hostname_value = Value::string(entry.hostname.unwrap_or_default(), head);
    let cwd_value = Value::string(entry.cwd.unwrap_or_default(), head);
    let duration_value = Value::duration(
-        match entry.duration {
+        entry
-            Some(d) => d.as_nanos().try_into().unwrap_or(0),
+            .duration
-            None => 0,
+            .and_then(|d| d.as_nanos().try_into().ok())
-        },
+            .unwrap_or(0),
        head,
    );
    let exit_status_value = Value::int(entry.exit_status.unwrap_or(0), head);
--- a/crates/nu-cli/src/commands/keybindings_list.rs
+++ b/crates/nu-cli/src/commands/keybindings_list.rs
@ -49,22 +49,26 @@ impl Command for KeybindingsList {
    fn run(
        &self,
-        _engine_state: &EngineState,
+        engine_state: &EngineState,
-        _stack: &mut Stack,
+        stack: &mut Stack,
        call: &Call,
        _input: PipelineData,
    ) -> Result<PipelineData, ShellError> {
-        let records = if call.named_len() == 0 {
+        let all_options = ["modifiers", "keycodes", "edits", "modes", "events"];
-            let all_options = ["modifiers", "keycodes", "edits", "modes", "events"];
+
-            all_options
+        let presence = all_options
-                .iter()
+            .iter()
-                .flat_map(|argument| get_records(argument, call.head))
+            .map(|option| call.has_flag(engine_state, stack, option))
-                .collect()
+            .collect::<Result<Vec<_>, ShellError>>()?;
-        } else {
+
-            call.named_iter()
+        let no_option_specified = presence.iter().all(|present| !*present);
-                .flat_map(|(argument, _, _)| get_records(argument.item.as_str(), call.head))
+
-                .collect()
+        let records = all_options
-        };
+            .iter()
            .zip(presence)
            .filter(|(_, present)| no_option_specified || *present)
            .flat_map(|(option, _)| get_records(option, call.head))
            .collect();
        Ok(Value::list(records, call.head).into_pipeline_data())
    }
--- a/crates/nu-cli/src/completions/base.rs
+++ b/crates/nu-cli/src/completions/base.rs
@ -1,13 +1,12 @@
-use crate::completions::{CompletionOptions, SortBy};
+use crate::completions::CompletionOptions;
 use nu_protocol::{
    engine::{Stack, StateWorkingSet},
-    levenshtein_distance, Span,
+    Span,
 };
 use reedline::Suggestion;
 // Completer trait represents the three stages of the completion
 // fetch, filter and sort
 pub trait Completer {
    /// Fetch, filter, and sort completions
    #[allow(clippy::too_many_arguments)]
    fn fetch(
        &mut self,
@ -19,32 +18,6 @@ pub trait Completer {
        pos: usize,
        options: &CompletionOptions,
    ) -> Vec<SemanticSuggestion>;
    fn get_sort_by(&self) -> SortBy {
        SortBy::Ascending
    }
    fn sort(&self, items: Vec<SemanticSuggestion>, prefix: Vec<u8>) -> Vec<SemanticSuggestion> {
        let prefix_str = String::from_utf8_lossy(&prefix).to_string();
        let mut filtered_items = items;
        // Sort items
        match self.get_sort_by() {
            SortBy::LevenshteinDistance => {
                filtered_items.sort_by(|a, b| {
                    let a_distance = levenshtein_distance(&prefix_str, &a.suggestion.value);
                    let b_distance = levenshtein_distance(&prefix_str, &b.suggestion.value);
                    a_distance.cmp(&b_distance)
                });
            }
            SortBy::Ascending => {
                filtered_items.sort_by(|a, b| a.suggestion.value.cmp(&b.suggestion.value));
            }
            SortBy::None => {}
        };
        filtered_items
    }
 }
 #[derive(Debug, Default, PartialEq)]
--- a/crates/nu-cli/src/completions/command_completions.rs
+++ b/crates/nu-cli/src/completions/command_completions.rs
@ -1,5 +1,5 @@
 use crate::{
-    completions::{Completer, CompletionOptions, MatchAlgorithm, SortBy},
+    completions::{Completer, CompletionOptions, MatchAlgorithm},
    SuggestionKind,
 };
 use nu_parser::FlatShape;
@ -9,7 +9,7 @@ use nu_protocol::{
 };
 use reedline::Suggestion;
-use super::SemanticSuggestion;
+use super::{completion_common::sort_suggestions, SemanticSuggestion};
 pub struct CommandCompletion {
    flattened: Vec<(Span, FlatShape)>,
@ -99,10 +99,9 @@ impl CommandCompletion {
                suggestion: Suggestion {
                    value: String::from_utf8_lossy(&x.0).to_string(),
                    description: x.1,
                    style: None,
                    extra: None,
                    span: reedline::Span::new(span.start - offset, span.end - offset),
                    append_whitespace: true,
                    ..Suggestion::default()
                },
                kind: Some(SuggestionKind::Command(x.2)),
            })
@ -118,11 +117,9 @@ impl CommandCompletion {
                .map(move |x| SemanticSuggestion {
                    suggestion: Suggestion {
                        value: x,
                        description: None,
                        style: None,
                        extra: None,
                        span: reedline::Span::new(span.start - offset, span.end - offset),
                        append_whitespace: true,
                        ..Suggestion::default()
                    },
                    // TODO: is there a way to create a test?
                    kind: None,
@ -136,11 +133,9 @@ impl CommandCompletion {
                    results.push(SemanticSuggestion {
                        suggestion: Suggestion {
                            value: format!("^{}", external.suggestion.value),
                            description: None,
                            style: None,
                            extra: None,
                            span: external.suggestion.span,
                            append_whitespace: true,
                            ..Suggestion::default()
                        },
                        kind: external.kind,
                    })
@ -161,7 +156,7 @@ impl Completer for CommandCompletion {
        &mut self,
        working_set: &StateWorkingSet,
        _stack: &Stack,
-        _prefix: Vec<u8>,
+        prefix: Vec<u8>,
        span: Span,
        offset: usize,
        pos: usize,
@ -198,7 +193,7 @@ impl Completer for CommandCompletion {
        };
        if !subcommands.is_empty() {
-            return subcommands;
+            return sort_suggestions(&String::from_utf8_lossy(&prefix), subcommands, options);
        }
        let config = working_set.get_config();
@ -223,11 +218,7 @@ impl Completer for CommandCompletion {
            vec![]
        };
-        subcommands.into_iter().chain(commands).collect::<Vec<_>>()
+        sort_suggestions(&String::from_utf8_lossy(&prefix), commands, options)
    }
    fn get_sort_by(&self) -> SortBy {
        SortBy::LevenshteinDistance
    }
 }
--- a/crates/nu-cli/src/completions/completer.rs
+++ b/crates/nu-cli/src/completions/completer.rs
@ -48,11 +48,11 @@ impl NuCompleter {
        let options = CompletionOptions {
            case_sensitive: config.case_sensitive_completions,
            match_algorithm: config.completion_algorithm.into(),
            sort: config.completion_sort,
            ..Default::default()
        };
-        // Fetch
+        completer.fetch(
        let mut suggestions = completer.fetch(
            working_set,
            &self.stack,
            prefix.clone(),
@ -60,12 +60,7 @@ impl NuCompleter {
            offset,
            pos,
            &options,
-        );
+        )
        // Sort
        suggestions = completer.sort(suggestions, prefix);
        suggestions
    }
    fn external_completion(
@ -449,14 +444,11 @@ pub fn map_value_completions<'a>(
            return Some(SemanticSuggestion {
                suggestion: Suggestion {
                    value: s,
                    description: None,
                    style: None,
                    extra: None,
                    span: reedline::Span {
                        start: span.start - offset,
                        end: span.end - offset,
                    },
-                    append_whitespace: false,
+                    ..Suggestion::default()
                },
                kind: Some(SuggestionKind::Type(x.get_type())),
            });
@ -466,14 +458,11 @@ pub fn map_value_completions<'a>(
        if let Ok(record) = x.as_record() {
            let mut suggestion = Suggestion {
                value: String::from(""), // Initialize with empty string
                description: None,
                style: None,
                extra: None,
                span: reedline::Span {
                    start: span.start - offset,
                    end: span.end - offset,
                },
-                append_whitespace: false,
+                ..Suggestion::default()
            };
            // Iterate the cols looking for `value` and `description`
--- a/crates/nu-cli/src/completions/completion_common.rs
+++ b/crates/nu-cli/src/completions/completion_common.rs
@ -1,15 +1,19 @@
-use crate::completions::{matches, CompletionOptions};
+use crate::{
    completions::{matches, CompletionOptions},
    SemanticSuggestion,
 };
 use fuzzy_matcher::{skim::SkimMatcherV2, FuzzyMatcher};
 use nu_ansi_term::Style;
 use nu_engine::env_to_string;
 use nu_path::{expand_to_real_path, home_dir};
 use nu_protocol::{
    engine::{EngineState, Stack, StateWorkingSet},
-    Span,
+    CompletionSort, Span,
 };
 use nu_utils::get_ls_colors;
-use std::path::{
+use std::path::{is_separator, Component, Path, PathBuf, MAIN_SEPARATOR as SEP};
-    is_separator, Component, Path, PathBuf, MAIN_SEPARATOR as SEP, MAIN_SEPARATOR_STR,
+
-};
+use super::MatchAlgorithm;
 #[derive(Clone, Default)]
 pub struct PathBuiltFromString {
@ -17,12 +21,21 @@ pub struct PathBuiltFromString {
    isdir: bool,
 }
-fn complete_rec(
+/// Recursively goes through paths that match a given `partial`.
 /// built: State struct for a valid matching path built so far.
 ///
 /// `isdir`: whether the current partial path has a trailing slash.
 /// Parsing a path string into a pathbuf loses that bit of information.
 ///
 /// want_directory: Whether we want only directories as completion matches.
 /// Some commands like `cd` can only be run on directories whereas others
 /// like `ls` can be run on regular files as well.
 pub fn complete_rec(
    partial: &[&str],
    built: &PathBuiltFromString,
    cwd: &Path,
    options: &CompletionOptions,
-    dir: bool,
+    want_directory: bool,
    isdir: bool,
 ) -> Vec<PathBuiltFromString> {
    let mut completions = vec![];
@ -32,7 +45,7 @@ fn complete_rec(
            let mut built = built.clone();
            built.parts.push(base.to_string());
            built.isdir = true;
-            return complete_rec(rest, &built, cwd, options, dir, isdir);
+            return complete_rec(rest, &built, cwd, options, want_directory, isdir);
        }
    }
@ -45,6 +58,7 @@ fn complete_rec(
        return completions;
    };
    let mut entries = Vec::new();
    for entry in result.filter_map(|e| e.ok()) {
        let entry_name = entry.file_name().to_string_lossy().into_owned();
        let entry_isdir = entry.path().is_dir();
@ -52,22 +66,45 @@ fn complete_rec(
        built.parts.push(entry_name.clone());
        built.isdir = entry_isdir;
-        if !dir || entry_isdir {
+        if !want_directory || entry_isdir {
-            match partial.split_first() {
+            entries.push((entry_name, built));
-                Some((base, rest)) => {
+        }
-                    if matches(base, &entry_name, options) {
+    }
-                        if !rest.is_empty() || isdir {
+
-                            completions
+    let prefix = partial.first().unwrap_or(&"");
-                                .extend(complete_rec(rest, &built, cwd, options, dir, isdir));
+    let sorted_entries = sort_completions(prefix, entries, options, |(entry, _)| entry);
-                        } else {
+
-                            completions.push(built);
+    for (entry_name, built) in sorted_entries {
-                        }
+        match partial.split_first() {
            Some((base, rest)) => {
                if matches(base, &entry_name, options) {
                    // We use `isdir` to confirm that the current component has
                    // at least one next component or a slash.
                    // Serves as confirmation to ignore longer completions for
                    // components in between.
                    if !rest.is_empty() || isdir {
                        completions.extend(complete_rec(
                            rest,
                            &built,
                            cwd,
                            options,
                            want_directory,
                            isdir,
                        ));
                    } else {
                        completions.push(built);
                    }
                }
-                None => {
+                if entry_name.eq(base)
-                    completions.push(built);
+                    && matches!(options.match_algorithm, MatchAlgorithm::Prefix)
                    && isdir
                {
                    break;
                }
            }
            None => {
                completions.push(built);
            }
        }
    }
    completions
@ -81,16 +118,16 @@ enum OriginalCwd {
 }
 impl OriginalCwd {
-    fn apply(&self, mut p: PathBuiltFromString) -> String {
+    fn apply(&self, mut p: PathBuiltFromString, path_separator: char) -> String {
        match self {
            Self::None => {}
            Self::Home => p.parts.insert(0, "~".to_string()),
            Self::Prefix(s) => p.parts.insert(0, s.clone()),
        };
-        let mut ret = p.parts.join(MAIN_SEPARATOR_STR);
+        let mut ret = p.parts.join(&path_separator.to_string());
        if p.isdir {
-            ret.push(SEP);
+            ret.push(path_separator);
        }
        ret
    }
@ -121,6 +158,14 @@ pub fn complete_item(
 ) -> Vec<(nu_protocol::Span, String, Option<Style>)> {
    let partial = surround_remove(partial);
    let isdir = partial.ends_with(is_separator);
    #[cfg(unix)]
    let path_separator = SEP;
    #[cfg(windows)]
    let path_separator = partial
        .chars()
        .rfind(|c: &char| is_separator(*c))
        .unwrap_or(SEP);
    let cwd_pathbuf = Path::new(cwd).to_path_buf();
    let ls_colors = (engine_state.config.use_ls_colors_completions
        && engine_state.config.use_ansi_coloring)
@ -158,7 +203,7 @@ pub fn complete_item(
        }
        Some(Component::Normal(home)) if home.to_string_lossy() == "~" => {
            components.next();
-            cwd = home_dir().unwrap_or(cwd_pathbuf);
+            cwd = home_dir().map(Into::into).unwrap_or(cwd_pathbuf);
            prefix_len = 1;
            original_cwd = OriginalCwd::Home;
        }
@ -183,7 +228,7 @@ pub fn complete_item(
    )
    .into_iter()
    .map(|p| {
-        let path = original_cwd.apply(p);
+        let path = original_cwd.apply(p, path_separator);
        let style = ls_colors.as_ref().map(|lsc| {
            lsc.style_for_path_with_metadata(
                &path,
@ -256,3 +301,42 @@ pub fn adjust_if_intermediate(
        readjusted,
    }
 }
 /// Convenience function to sort suggestions using [`sort_completions`]
 pub fn sort_suggestions(
    prefix: &str,
    items: Vec<SemanticSuggestion>,
    options: &CompletionOptions,
 ) -> Vec<SemanticSuggestion> {
    sort_completions(prefix, items, options, |it| &it.suggestion.value)
 }
 /// # Arguments
 /// * `prefix` - What the user's typed, for sorting by fuzzy matcher score
 pub fn sort_completions<T>(
    prefix: &str,
    mut items: Vec<T>,
    options: &CompletionOptions,
    get_value: fn(&T) -> &str,
 ) -> Vec<T> {
    // Sort items
    if options.sort == CompletionSort::Smart && options.match_algorithm == MatchAlgorithm::Fuzzy {
        let mut matcher = SkimMatcherV2::default();
        if options.case_sensitive {
            matcher = matcher.respect_case();
        } else {
            matcher = matcher.ignore_case();
        };
        items.sort_by(|a, b| {
            let a_str = get_value(a);
            let b_str = get_value(b);
            let a_score = matcher.fuzzy_match(a_str, prefix).unwrap_or_default();
            let b_score = matcher.fuzzy_match(b_str, prefix).unwrap_or_default();
            b_score.cmp(&a_score).then(a_str.cmp(b_str))
        });
    } else {
        items.sort_by(|a, b| get_value(a).cmp(get_value(b)));
    }
    items
 }
--- a/crates/nu-cli/src/completions/completion_options.rs
+++ b/crates/nu-cli/src/completions/completion_options.rs
@ -1,17 +1,10 @@
 use fuzzy_matcher::{skim::SkimMatcherV2, FuzzyMatcher};
 use nu_parser::trim_quotes_str;
-use nu_protocol::CompletionAlgorithm;
+use nu_protocol::{CompletionAlgorithm, CompletionSort};
 use std::fmt::Display;
 #[derive(Copy, Clone)]
 pub enum SortBy {
    LevenshteinDistance,
    Ascending,
    None,
 }
 /// Describes how suggestions should be matched.
-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone, Debug, PartialEq)]
 pub enum MatchAlgorithm {
    /// Only show suggestions which begin with the given input
    ///
@ -96,6 +89,7 @@ pub struct CompletionOptions {
    pub case_sensitive: bool,
    pub positional: bool,
    pub match_algorithm: MatchAlgorithm,
    pub sort: CompletionSort,
 }
 impl Default for CompletionOptions {
@ -104,6 +98,7 @@ impl Default for CompletionOptions {
            case_sensitive: true,
            positional: true,
            match_algorithm: MatchAlgorithm::Prefix,
            sort: Default::default(),
        }
    }
 }
--- a/crates/nu-cli/src/completions/custom_completions.rs
+++ b/crates/nu-cli/src/completions/custom_completions.rs
@ -1,22 +1,23 @@
 use crate::completions::{
    completer::map_value_completions, Completer, CompletionOptions, MatchAlgorithm,
-    SemanticSuggestion, SortBy,
+    SemanticSuggestion,
 };
 use nu_engine::eval_call;
 use nu_protocol::{
    ast::{Argument, Call, Expr, Expression},
    debugger::WithoutDebug,
    engine::{Stack, StateWorkingSet},
-    PipelineData, Span, Type, Value,
+    CompletionSort, PipelineData, Span, Type, Value,
 };
 use nu_utils::IgnoreCaseExt;
 use std::collections::HashMap;
 use super::completion_common::sort_suggestions;
 pub struct CustomCompletion {
    stack: Stack,
    decl_id: usize,
    line: String,
    sort_by: SortBy,
 }
 impl CustomCompletion {
@ -25,7 +26,6 @@ impl CustomCompletion {
            stack,
            decl_id,
            line,
            sort_by: SortBy::None,
        }
    }
 }
@ -91,10 +91,6 @@ impl Completer for CustomCompletion {
                            .and_then(|val| val.as_bool().ok())
                            .unwrap_or(false);
                        if should_sort {
                            self.sort_by = SortBy::Ascending;
                        }
                        custom_completion_options = Some(CompletionOptions {
                            case_sensitive: options
                                .get("case_sensitive")
@ -112,6 +108,11 @@ impl Completer for CustomCompletion {
                                    .unwrap_or(MatchAlgorithm::Prefix),
                                None => completion_options.match_algorithm,
                            },
                            sort: if should_sort {
                                CompletionSort::Alphabetical
                            } else {
                                CompletionSort::Smart
                            },
                        });
                    }
@ -122,15 +123,11 @@ impl Completer for CustomCompletion {
            })
            .unwrap_or_default();
-        if let Some(custom_completion_options) = custom_completion_options {
+        let options = custom_completion_options
-            filter(&prefix, suggestions, &custom_completion_options)
+            .as_ref()
-        } else {
+            .unwrap_or(completion_options);
-            filter(&prefix, suggestions, completion_options)
+        let suggestions = filter(&prefix, suggestions, completion_options);
-        }
+        sort_suggestions(&String::from_utf8_lossy(&prefix), suggestions, options)
    }
    fn get_sort_by(&self) -> SortBy {
        self.sort_by
    }
 }
--- a/crates/nu-cli/src/completions/directory_completions.rs
+++ b/crates/nu-cli/src/completions/directory_completions.rs
@ -1,14 +1,14 @@
 use crate::completions::{
    completion_common::{adjust_if_intermediate, complete_item, AdjustView},
-    Completer, CompletionOptions, SortBy,
+    Completer, CompletionOptions,
 };
 use nu_ansi_term::Style;
 use nu_protocol::{
    engine::{EngineState, Stack, StateWorkingSet},
-    levenshtein_distance, Span,
+    Span,
 };
 use reedline::Suggestion;
-use std::path::{Path, MAIN_SEPARATOR as SEP};
+use std::path::Path;
 use super::SemanticSuggestion;
@ -36,7 +36,7 @@ impl Completer for DirectoryCompletion {
        // Filter only the folders
        #[allow(deprecated)]
-        let output: Vec<_> = directory_completion(
+        let items: Vec<_> = directory_completion(
            span,
            &prefix,
            &working_set.permanent_state.current_work_dir(),
@ -48,55 +48,23 @@ impl Completer for DirectoryCompletion {
        .map(move |x| SemanticSuggestion {
            suggestion: Suggestion {
                value: x.1,
                description: None,
                style: x.2,
                extra: None,
                span: reedline::Span {
                    start: x.0.start - offset,
                    end: x.0.end - offset,
                },
-                append_whitespace: false,
+                ..Suggestion::default()
            },
            // TODO????
            kind: None,
        })
        .collect();
        output
    }
    // Sort results prioritizing the non hidden folders
    fn sort(&self, items: Vec<SemanticSuggestion>, prefix: Vec<u8>) -> Vec<SemanticSuggestion> {
        let prefix_str = String::from_utf8_lossy(&prefix).to_string();
        // Sort items
        let mut sorted_items = items;
        match self.get_sort_by() {
            SortBy::Ascending => {
                sorted_items.sort_by(|a, b| {
                    // Ignore trailing slashes in folder names when sorting
                    a.suggestion
                        .value
                        .trim_end_matches(SEP)
                        .cmp(b.suggestion.value.trim_end_matches(SEP))
                });
            }
            SortBy::LevenshteinDistance => {
                sorted_items.sort_by(|a, b| {
                    let a_distance = levenshtein_distance(&prefix_str, &a.suggestion.value);
                    let b_distance = levenshtein_distance(&prefix_str, &b.suggestion.value);
                    a_distance.cmp(&b_distance)
                });
            }
            _ => (),
        }
        // Separate the results between hidden and non hidden
        let mut hidden: Vec<SemanticSuggestion> = vec![];
        let mut non_hidden: Vec<SemanticSuggestion> = vec![];
-        for item in sorted_items.into_iter() {
+        for item in items.into_iter() {
            let item_path = Path::new(&item.suggestion.value);
            if let Some(value) = item_path.file_name() {
--- a/crates/nu-cli/src/completions/dotnu_completions.rs
+++ b/crates/nu-cli/src/completions/dotnu_completions.rs
@ -1,4 +1,4 @@
-use crate::completions::{file_path_completion, Completer, CompletionOptions, SortBy};
+use crate::completions::{file_path_completion, Completer, CompletionOptions};
 use nu_protocol::{
    engine::{Stack, StateWorkingSet},
    Span,
@ -6,7 +6,7 @@ use nu_protocol::{
 use reedline::Suggestion;
 use std::path::{is_separator, Path, MAIN_SEPARATOR as SEP, MAIN_SEPARATOR_STR};
-use super::SemanticSuggestion;
+use super::{completion_common::sort_suggestions, SemanticSuggestion};
 #[derive(Clone, Default)]
 pub struct DotNuCompletion {}
@ -116,14 +116,13 @@ impl Completer for DotNuCompletion {
                    .map(move |x| SemanticSuggestion {
                        suggestion: Suggestion {
                            value: x.1,
                            description: None,
                            style: x.2,
                            extra: None,
                            span: reedline::Span {
                                start: x.0.start - offset,
                                end: x.0.end - offset,
                            },
                            append_whitespace: true,
                            ..Suggestion::default()
                        },
                        // TODO????
                        kind: None,
@ -131,10 +130,6 @@ impl Completer for DotNuCompletion {
            })
            .collect();
-        output
+        sort_suggestions(&prefix_str, output, options)
    }
    fn get_sort_by(&self) -> SortBy {
        SortBy::LevenshteinDistance
    }
 }
--- a/crates/nu-cli/src/completions/file_completions.rs
+++ b/crates/nu-cli/src/completions/file_completions.rs
@ -1,15 +1,15 @@
 use crate::completions::{
    completion_common::{adjust_if_intermediate, complete_item, AdjustView},
-    Completer, CompletionOptions, SortBy,
+    Completer, CompletionOptions,
 };
 use nu_ansi_term::Style;
 use nu_protocol::{
    engine::{EngineState, Stack, StateWorkingSet},
-    levenshtein_distance, Span,
+    Span,
 };
 use nu_utils::IgnoreCaseExt;
 use reedline::Suggestion;
-use std::path::{Path, MAIN_SEPARATOR as SEP};
+use std::path::Path;
 use super::SemanticSuggestion;
@ -40,7 +40,7 @@ impl Completer for FileCompletion {
        } = adjust_if_intermediate(&prefix, working_set, span);
        #[allow(deprecated)]
-        let output: Vec<_> = complete_item(
+        let items: Vec<_> = complete_item(
            readjusted,
            span,
            &prefix,
@ -53,55 +53,25 @@ impl Completer for FileCompletion {
        .map(move |x| SemanticSuggestion {
            suggestion: Suggestion {
                value: x.1,
                description: None,
                style: x.2,
                extra: None,
                span: reedline::Span {
                    start: x.0.start - offset,
                    end: x.0.end - offset,
                },
-                append_whitespace: false,
+                ..Suggestion::default()
            },
            // TODO????
            kind: None,
        })
        .collect();
-        output
+        // Sort results prioritizing the non hidden folders
    }
    // Sort results prioritizing the non hidden folders
    fn sort(&self, items: Vec<SemanticSuggestion>, prefix: Vec<u8>) -> Vec<SemanticSuggestion> {
        let prefix_str = String::from_utf8_lossy(&prefix).to_string();
        // Sort items
        let mut sorted_items = items;
        match self.get_sort_by() {
            SortBy::Ascending => {
                sorted_items.sort_by(|a, b| {
                    // Ignore trailing slashes in folder names when sorting
                    a.suggestion
                        .value
                        .trim_end_matches(SEP)
                        .cmp(b.suggestion.value.trim_end_matches(SEP))
                });
            }
            SortBy::LevenshteinDistance => {
                sorted_items.sort_by(|a, b| {
                    let a_distance = levenshtein_distance(&prefix_str, &a.suggestion.value);
                    let b_distance = levenshtein_distance(&prefix_str, &b.suggestion.value);
                    a_distance.cmp(&b_distance)
                });
            }
            _ => (),
        }
        // Separate the results between hidden and non hidden
        let mut hidden: Vec<SemanticSuggestion> = vec![];
        let mut non_hidden: Vec<SemanticSuggestion> = vec![];
-        for item in sorted_items.into_iter() {
+        for item in items.into_iter() {
            let item_path = Path::new(&item.suggestion.value);
            if let Some(value) = item_path.file_name() {
--- a/crates/nu-cli/src/completions/flag_completions.rs
+++ b/crates/nu-cli/src/completions/flag_completions.rs
@ -1,4 +1,4 @@
-use crate::completions::{Completer, CompletionOptions};
+use crate::completions::{completion_common::sort_suggestions, Completer, CompletionOptions};
 use nu_protocol::{
    ast::{Expr, Expression},
    engine::{Stack, StateWorkingSet},
@ -49,13 +49,12 @@ impl Completer for FlagCompletion {
                            suggestion: Suggestion {
                                value: String::from_utf8_lossy(&named).to_string(),
                                description: Some(flag_desc.to_string()),
                                style: None,
                                extra: None,
                                span: reedline::Span {
                                    start: span.start - offset,
                                    end: span.end - offset,
                                },
                                append_whitespace: true,
                                ..Suggestion::default()
                            },
                            // TODO????
                            kind: None,
@ -76,13 +75,12 @@ impl Completer for FlagCompletion {
                        suggestion: Suggestion {
                            value: String::from_utf8_lossy(&named).to_string(),
                            description: Some(flag_desc.to_string()),
                            style: None,
                            extra: None,
                            span: reedline::Span {
                                start: span.start - offset,
                                end: span.end - offset,
                            },
                            append_whitespace: true,
                            ..Suggestion::default()
                        },
                        // TODO????
                        kind: None,
@ -90,7 +88,7 @@ impl Completer for FlagCompletion {
                }
            }
-            return output;
+            return sort_suggestions(&String::from_utf8_lossy(&prefix), output, options);
        }
        vec![]
--- a/crates/nu-cli/src/completions/mod.rs
+++ b/crates/nu-cli/src/completions/mod.rs
@ -13,7 +13,7 @@ mod variable_completions;
 pub use base::{Completer, SemanticSuggestion, SuggestionKind};
 pub use command_completions::CommandCompletion;
 pub use completer::NuCompleter;
-pub use completion_options::{CompletionOptions, MatchAlgorithm, SortBy};
+pub use completion_options::{CompletionOptions, MatchAlgorithm};
 pub use custom_completions::CustomCompletion;
 pub use directory_completions::DirectoryCompletion;
 pub use dotnu_completions::DotNuCompletion;
--- a/crates/nu-cli/src/completions/variable_completions.rs
+++ b/crates/nu-cli/src/completions/variable_completions.rs
@ -9,6 +9,8 @@ use nu_protocol::{
 use reedline::Suggestion;
 use std::str;
 use super::completion_common::sort_suggestions;
 #[derive(Clone)]
 pub struct VariableCompletion {
    var_context: (Vec<u8>, Vec<Vec<u8>>), // tuple with $var and the sublevels (.b.c.d)
@ -40,6 +42,7 @@ impl Completer for VariableCompletion {
            end: span.end - offset,
        };
        let sublevels_count = self.var_context.1.len();
        let prefix_str = String::from_utf8_lossy(&prefix);
        // Completions for the given variable
        if !var_str.is_empty() {
@ -69,7 +72,7 @@ impl Completer for VariableCompletion {
                            }
                        }
-                        return output;
+                        return sort_suggestions(&prefix_str, output, options);
                    }
                } else {
                    // No nesting provided, return all env vars
@ -82,18 +85,15 @@ impl Completer for VariableCompletion {
                            output.push(SemanticSuggestion {
                                suggestion: Suggestion {
                                    value: env_var.0,
                                    description: None,
                                    style: None,
                                    extra: None,
                                    span: current_span,
-                                    append_whitespace: false,
+                                    ..Suggestion::default()
                                },
                                kind: Some(SuggestionKind::Type(env_var.1.get_type())),
                            });
                        }
                    }
-                    return output;
+                    return sort_suggestions(&prefix_str, output, options);
                }
            }
@ -117,7 +117,7 @@ impl Completer for VariableCompletion {
                        }
                    }
-                    return output;
+                    return sort_suggestions(&prefix_str, output, options);
                }
            }
@ -139,7 +139,7 @@ impl Completer for VariableCompletion {
                        }
                    }
-                    return output;
+                    return sort_suggestions(&prefix_str, output, options);
                }
            }
        }
@ -154,11 +154,8 @@ impl Completer for VariableCompletion {
                output.push(SemanticSuggestion {
                    suggestion: Suggestion {
                        value: builtin.to_string(),
                        description: None,
                        style: None,
                        extra: None,
                        span: current_span,
-                        append_whitespace: false,
+                        ..Suggestion::default()
                    },
                    // TODO is there a way to get the VarId to get the type???
                    kind: None,
@ -181,11 +178,8 @@ impl Completer for VariableCompletion {
                        output.push(SemanticSuggestion {
                            suggestion: Suggestion {
                                value: String::from_utf8_lossy(v.0).to_string(),
                                description: None,
                                style: None,
                                extra: None,
                                span: current_span,
-                                append_whitespace: false,
+                                ..Suggestion::default()
                            },
                            kind: Some(SuggestionKind::Type(
                                working_set.get_variable(*v.1).ty.clone(),
@ -212,11 +206,8 @@ impl Completer for VariableCompletion {
                    output.push(SemanticSuggestion {
                        suggestion: Suggestion {
                            value: String::from_utf8_lossy(v.0).to_string(),
                            description: None,
                            style: None,
                            extra: None,
                            span: current_span,
-                            append_whitespace: false,
+                            ..Suggestion::default()
                        },
                        kind: Some(SuggestionKind::Type(
                            working_set.get_variable(*v.1).ty.clone(),
@ -226,6 +217,8 @@ impl Completer for VariableCompletion {
            }
        }
        output = sort_suggestions(&prefix_str, output, options);
        output.dedup(); // TODO: Removes only consecutive duplicates, is it intended?
        output
@ -250,11 +243,8 @@ fn nested_suggestions(
                output.push(SemanticSuggestion {
                    suggestion: Suggestion {
                        value: col.clone(),
                        description: None,
                        style: None,
                        extra: None,
                        span: current_span,
-                        append_whitespace: false,
+                        ..Suggestion::default()
                    },
                    kind: Some(kind.clone()),
                });
@ -267,11 +257,8 @@ fn nested_suggestions(
                output.push(SemanticSuggestion {
                    suggestion: Suggestion {
                        value: column_name,
                        description: None,
                        style: None,
                        extra: None,
                        span: current_span,
-                        append_whitespace: false,
+                        ..Suggestion::default()
                    },
                    kind: Some(kind.clone()),
                });
--- a/crates/nu-cli/src/config_files.rs
+++ b/crates/nu-cli/src/config_files.rs
@ -8,7 +8,7 @@ use nu_protocol::{
    report_error_new, HistoryFileFormat, PipelineData,
 };
 #[cfg(feature = "plugin")]
-use nu_utils::utils::perf;
+use nu_utils::perf;
 use std::path::PathBuf;
 #[cfg(feature = "plugin")]
@ -53,13 +53,10 @@ pub fn read_plugin_file(
    // Reading signatures from plugin registry file
    // The plugin.msgpackz file stores the parsed signature collected from each registered plugin
    add_plugin_file(engine_state, plugin_file.clone(), storage_path);
-    perf(
+    perf!(
        "add plugin file to engine_state",
        start_time,
-        file!(),
+        engine_state.get_config().use_ansi_coloring
        line!(),
        column!(),
        engine_state.get_config().use_ansi_coloring,
    );
    start_time = std::time::Instant::now();
@ -137,13 +134,10 @@ pub fn read_plugin_file(
            }
        };
-        perf(
+        perf!(
            &format!("read plugin file {}", plugin_path.display()),
            start_time,
-            file!(),
+            engine_state.get_config().use_ansi_coloring
            line!(),
            column!(),
            engine_state.get_config().use_ansi_coloring,
        );
        start_time = std::time::Instant::now();
@ -156,13 +150,10 @@ pub fn read_plugin_file(
            return;
        }
-        perf(
+        perf!(
            &format!("load plugin file {}", plugin_path.display()),
            start_time,
-            file!(),
+            engine_state.get_config().use_ansi_coloring
            line!(),
            column!(),
            engine_state.get_config().use_ansi_coloring,
        );
    }
 }
@ -201,7 +192,8 @@ pub fn add_plugin_file(
        } else if let Some(mut plugin_path) = nu_path::config_dir() {
            // Path to store plugins signatures
            plugin_path.push(storage_path);
-            let mut plugin_path = canonicalize_with(&plugin_path, &cwd).unwrap_or(plugin_path);
+            let mut plugin_path =
                canonicalize_with(&plugin_path, &cwd).unwrap_or(plugin_path.into());
            plugin_path.push(PLUGIN_FILE);
            let plugin_path = canonicalize_with(&plugin_path, &cwd).unwrap_or(plugin_path);
            engine_state.plugin_path = Some(plugin_path);
@ -256,7 +248,7 @@ pub(crate) fn get_history_path(storage_path: &str, mode: HistoryFileFormat) -> O
            HistoryFileFormat::PlainText => HISTORY_FILE_TXT,
            HistoryFileFormat::Sqlite => HISTORY_FILE_SQLITE,
        });
-        history_path
+        history_path.into()
    })
 }
@ -381,13 +373,10 @@ pub fn migrate_old_plugin_file(engine_state: &EngineState, storage_path: &str) -
        );
    }
-    perf(
+    perf!(
        "migrate old plugin file",
        start_time,
-        file!(),
+        engine_state.get_config().use_ansi_coloring
        line!(),
        column!(),
        engine_state.get_config().use_ansi_coloring,
    );
    true
 }
--- a/crates/nu-cli/src/eval_cmds.rs
+++ b/crates/nu-cli/src/eval_cmds.rs
@ -53,9 +53,8 @@ pub fn evaluate_commands(
    // Parse the source code
    let (block, delta) = {
        if let Some(ref t_mode) = table_mode {
-            let mut config = engine_state.get_config().clone();
+            Arc::make_mut(&mut engine_state.config).table_mode =
-            config.table_mode = t_mode.coerce_str()?.parse().unwrap_or_default();
+                t_mode.coerce_str()?.parse().unwrap_or_default();
            engine_state.set_config(config);
        }
        let mut working_set = StateWorkingSet::new(engine_state);
@ -70,6 +69,11 @@ pub fn evaluate_commands(
            std::process::exit(1);
        }
        if let Some(err) = working_set.compile_errors.first() {
            report_error(&working_set, err);
            // Not a fatal error, for now
        }
        (output, working_set.render())
    };
--- a/crates/nu-cli/src/eval_file.rs
+++ b/crates/nu-cli/src/eval_file.rs
@ -76,12 +76,21 @@ pub fn evaluate_file(
    trace!("parsing file: {}", file_path_str);
    let block = parse(&mut working_set, Some(file_path_str), &file, false);
    if let Some(warning) = working_set.parse_warnings.first() {
        report_error(&working_set, warning);
    }
    // If any parse errors were found, report the first error and exit.
    if let Some(err) = working_set.parse_errors.first() {
        report_error(&working_set, err);
        std::process::exit(1);
    }
    if let Some(err) = working_set.compile_errors.first() {
        report_error(&working_set, err);
        // Not a fatal error, for now
    }
    // Look for blocks whose name starts with "main" and replace it with the filename.
    for block in working_set.delta.blocks.iter_mut().map(Arc::make_mut) {
        if block.signature.name == "main" {
--- a/crates/nu-cli/src/lib.rs
+++ b/crates/nu-cli/src/lib.rs
@ -1,3 +1,4 @@
 #![doc = include_str!("../README.md")]
 mod commands;
 mod completions;
 mod config_files;
--- a/crates/nu-cli/src/menus/help_completions.rs
+++ b/crates/nu-cli/src/menus/help_completions.rs
@ -1,25 +1,34 @@
-use nu_engine::documentation::get_flags_section;
+use nu_engine::documentation::{get_flags_section, HelpStyle};
-use nu_protocol::{engine::EngineState, levenshtein_distance};
+use nu_protocol::{engine::EngineState, levenshtein_distance, Config};
 use nu_utils::IgnoreCaseExt;
 use reedline::{Completer, Suggestion};
 use std::{fmt::Write, sync::Arc};
-pub struct NuHelpCompleter(Arc<EngineState>);
+pub struct NuHelpCompleter {
    engine_state: Arc<EngineState>,
    config: Arc<Config>,
 }
 impl NuHelpCompleter {
-    pub fn new(engine_state: Arc<EngineState>) -> Self {
+    pub fn new(engine_state: Arc<EngineState>, config: Arc<Config>) -> Self {
-        Self(engine_state)
+        Self {
            engine_state,
            config,
        }
    }
    fn completion_helper(&self, line: &str, pos: usize) -> Vec<Suggestion> {
        let folded_line = line.to_folded_case();
        let mut help_style = HelpStyle::default();
        help_style.update_from_config(&self.engine_state, &self.config);
        let mut commands = self
-            .0
+            .engine_state
            .get_decls_sorted(false)
            .into_iter()
            .filter_map(|(_, decl_id)| {
-                let decl = self.0.get_decl(decl_id);
+                let decl = self.engine_state.get_decl(decl_id);
                (decl.name().to_folded_case().contains(&folded_line)
                    || decl.usage().to_folded_case().contains(&folded_line)
                    || decl
@ -54,8 +63,8 @@ impl NuHelpCompleter {
                let _ = write!(long_desc, "Usage:\r\n  > {}\r\n", sig.call_signature());
                if !sig.named.is_empty() {
-                    long_desc.push_str(&get_flags_section(Some(&*self.0.clone()), &sig, |v| {
+                    long_desc.push_str(&get_flags_section(&sig, &help_style, |v| {
-                        v.to_parsable_string(", ", &self.0.config)
+                        v.to_parsable_string(", ", &self.config)
                    }))
                }
@ -71,7 +80,7 @@ impl NuHelpCompleter {
                        let opt_suffix = if let Some(value) = &positional.default_value {
                            format!(
                                " (optional, default: {})",
-                                &value.to_parsable_string(", ", &self.0.config),
+                                &value.to_parsable_string(", ", &self.config),
                            )
                        } else {
                            (" (optional)").to_string()
@ -101,13 +110,12 @@ impl NuHelpCompleter {
                Suggestion {
                    value: decl.name().into(),
                    description: Some(long_desc),
                    style: None,
                    extra: Some(extra),
                    span: reedline::Span {
                        start: pos - line.len(),
                        end: pos,
                    },
-                    append_whitespace: false,
+                    ..Suggestion::default()
                }
            })
            .collect()
@ -138,7 +146,8 @@ mod test {
    ) {
        let engine_state =
            nu_command::add_shell_command_context(nu_cmd_lang::create_default_context());
-        let mut completer = NuHelpCompleter::new(engine_state.into());
+        let config = engine_state.get_config().clone();
        let mut completer = NuHelpCompleter::new(engine_state.into(), config);
        let suggestions = completer.complete(line, end);
        assert_eq!(
--- a/crates/nu-cli/src/menus/menu_completions.rs
+++ b/crates/nu-cli/src/menus/menu_completions.rs
@ -142,10 +142,9 @@ fn convert_to_suggestions(
            vec![Suggestion {
                value: text,
                description,
                style: None,
                extra,
                span,
-                append_whitespace: false,
+                ..Suggestion::default()
            }]
        }
        Value::List { vals, .. } => vals
@ -154,9 +153,6 @@ fn convert_to_suggestions(
            .collect(),
        _ => vec![Suggestion {
            value: format!("Not a record: {value:?}"),
            description: None,
            style: None,
            extra: None,
            span: reedline::Span {
                start: if only_buffer_difference {
                    pos - line.len()
@ -169,7 +165,7 @@ fn convert_to_suggestions(
                    line.len()
                },
            },
-            append_whitespace: false,
+            ..Suggestion::default()
        }],
    }
 }
--- a/crates/nu-cli/src/nu_highlight.rs
+++ b/crates/nu-cli/src/nu_highlight.rs
@ -1,3 +1,5 @@
 use std::sync::Arc;
 use nu_engine::command_prelude::*;
 use reedline::{Highlighter, StyledText};
@ -32,14 +34,11 @@ impl Command for NuHighlight {
    ) -> Result<PipelineData, ShellError> {
        let head = call.head;
-        let ctrlc = engine_state.ctrlc.clone();
+        let signals = engine_state.signals();
        let engine_state = std::sync::Arc::new(engine_state.clone());
        let config = engine_state.get_config().clone();
        let highlighter = crate::NuHighlighter {
-            engine_state,
+            engine_state: Arc::new(engine_state.clone()),
-            stack: std::sync::Arc::new(stack.clone()),
+            stack: Arc::new(stack.clone()),
            config,
        };
        input.map(
@ -50,7 +49,7 @@ impl Command for NuHighlight {
                }
                Err(err) => Value::error(err, head),
            },
-            ctrlc,
+            signals,
        )
    }
--- a/crates/nu-cli/src/print.rs
+++ b/crates/nu-cli/src/print.rs
@ -22,6 +22,11 @@ impl Command for Print {
                Some('n'),
            )
            .switch("stderr", "print to stderr instead of stdout", Some('e'))
            .switch(
                "raw",
                "print without formatting (including binary data)",
                Some('r'),
            )
            .category(Category::Strings)
    }
@ -50,15 +55,25 @@ Since this command has no output, there is no point in piping it with other comm
        let args: Vec<Value> = call.rest(engine_state, stack, 0)?;
        let no_newline = call.has_flag(engine_state, stack, "no-newline")?;
        let to_stderr = call.has_flag(engine_state, stack, "stderr")?;
        let raw = call.has_flag(engine_state, stack, "raw")?;
        // This will allow for easy printing of pipelines as well
        if !args.is_empty() {
            for arg in args {
-                arg.into_pipeline_data()
+                if raw {
-                    .print(engine_state, stack, no_newline, to_stderr)?;
+                    arg.into_pipeline_data()
                        .print_raw(engine_state, no_newline, to_stderr)?;
                } else {
                    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)?;
+            if raw {
                input.print_raw(engine_state, no_newline, to_stderr)?;
            } else {
                input.print(engine_state, stack, no_newline, to_stderr)?;
            }
        }
        Ok(PipelineData::empty())
@ -76,6 +91,11 @@ Since this command has no output, there is no point in piping it with other comm
                example: r#"print (2 + 3)"#,
                result: None,
            },
            Example {
                description: "Print 'ABC' from binary data",
                example: r#"0x[41 42 43] | print --raw"#,
                result: None,
            },
        ]
    }
 }
--- a/crates/nu-cli/src/prompt_update.rs
+++ b/crates/nu-cli/src/prompt_update.rs
@ -46,7 +46,10 @@ pub(crate) const VSCODE_POST_EXECUTION_MARKER_PREFIX: &str = "\x1b]633;D;";
 #[allow(dead_code)]
 pub(crate) const VSCODE_POST_EXECUTION_MARKER_SUFFIX: &str = "\x1b\\";
 #[allow(dead_code)]
-pub(crate) const VSCODE_COMMANDLINE_MARKER: &str = "\x1b]633;E\x1b\\";
+//"\x1b]633;E;{}\x1b\\"
 pub(crate) const VSCODE_COMMANDLINE_MARKER_PREFIX: &str = "\x1b]633;E;";
 #[allow(dead_code)]
 pub(crate) const VSCODE_COMMANDLINE_MARKER_SUFFIX: &str = "\x1b\\";
 #[allow(dead_code)]
 // "\x1b]633;P;Cwd={}\x1b\\"
 pub(crate) const VSCODE_CWD_PROPERTY_MARKER_PREFIX: &str = "\x1b]633;P;Cwd=";
--- a/crates/nu-cli/src/reedline_config.rs
+++ b/crates/nu-cli/src/reedline_config.rs
@ -77,13 +77,19 @@ pub(crate) fn add_menus(
    mut line_editor: Reedline,
    engine_state_ref: Arc<EngineState>,
    stack: &Stack,
-    config: &Config,
+    config: Arc<Config>,
 ) -> Result<Reedline, ShellError> {
    //log::trace!("add_menus: config: {:#?}", &config);
    line_editor = line_editor.clear_menus();
    for menu in &config.menus {
-        line_editor = add_menu(line_editor, menu, engine_state_ref.clone(), stack, config)?
+        line_editor = add_menu(
            line_editor,
            menu,
            engine_state_ref.clone(),
            stack,
            config.clone(),
        )?
    }
    // Checking if the default menus have been added from the config file
@ -100,7 +106,7 @@ pub(crate) fn add_menus(
        if !config
            .menus
            .iter()
-            .any(|menu| menu.name.to_expanded_string("", config) == name)
+            .any(|menu| menu.name.to_expanded_string("", &config) == name)
        {
            let (block, delta) = {
                let mut working_set = StateWorkingSet::new(&engine_state);
@ -137,7 +143,7 @@ pub(crate) fn add_menus(
                    &menu,
                    new_engine_state_ref.clone(),
                    stack,
-                    config,
+                    config.clone(),
                )?;
            }
        }
@ -151,27 +157,27 @@ fn add_menu(
    menu: &ParsedMenu,
    engine_state: Arc<EngineState>,
    stack: &Stack,
-    config: &Config,
+    config: Arc<Config>,
 ) -> Result<Reedline, ShellError> {
    let span = menu.menu_type.span();
    if let Value::Record { val, .. } = &menu.menu_type {
-        let layout = extract_value("layout", val, span)?.to_expanded_string("", config);
+        let layout = extract_value("layout", val, span)?.to_expanded_string("", &config);
        match layout.as_str() {
-            "columnar" => add_columnar_menu(line_editor, menu, engine_state, stack, config),
+            "columnar" => add_columnar_menu(line_editor, menu, engine_state, stack, &config),
            "list" => add_list_menu(line_editor, menu, engine_state, stack, config),
            "ide" => add_ide_menu(line_editor, menu, engine_state, stack, config),
            "description" => add_description_menu(line_editor, menu, engine_state, stack, config),
            _ => Err(ShellError::UnsupportedConfigValue {
                expected: "columnar, list, ide or description".to_string(),
-                value: menu.menu_type.to_abbreviated_string(config),
+                value: menu.menu_type.to_abbreviated_string(&config),
                span: menu.menu_type.span(),
            }),
        }
    } else {
        Err(ShellError::UnsupportedConfigValue {
            expected: "only record type".to_string(),
-            value: menu.menu_type.to_abbreviated_string(config),
+            value: menu.menu_type.to_abbreviated_string(&config),
            span: menu.menu_type.span(),
        })
    }
@ -187,6 +193,29 @@ fn get_style(record: &Record, name: &str, span: Span) -> Option<Style> {
        })
 }
 fn set_menu_style<M: MenuBuilder>(mut menu: M, style: &Value) -> M {
    let span = style.span();
    let Value::Record { val, .. } = &style else {
        return menu;
    };
    if let Some(style) = get_style(val, "text", span) {
        menu = menu.with_text_style(style);
    }
    if let Some(style) = get_style(val, "selected_text", span) {
        menu = menu.with_selected_text_style(style);
    }
    if let Some(style) = get_style(val, "description_text", span) {
        menu = menu.with_description_text_style(style);
    }
    if let Some(style) = get_style(val, "match_text", span) {
        menu = menu.with_match_text_style(style);
    }
    if let Some(style) = get_style(val, "selected_match_text", span) {
        menu = menu.with_selected_match_text_style(style);
    }
    menu
 }
 // Adds a columnar menu to the editor engine
 pub(crate) fn add_columnar_menu(
    line_editor: Reedline,
@ -225,24 +254,7 @@ pub(crate) fn add_columnar_menu(
        };
    }
-    let span = menu.style.span();
+    columnar_menu = set_menu_style(columnar_menu, &menu.style);
    if let Value::Record { val, .. } = &menu.style {
        if let Some(style) = get_style(val, "text", span) {
            columnar_menu = columnar_menu.with_text_style(style);
        }
        if let Some(style) = get_style(val, "selected_text", span) {
            columnar_menu = columnar_menu.with_selected_text_style(style);
        }
        if let Some(style) = get_style(val, "description_text", span) {
            columnar_menu = columnar_menu.with_description_text_style(style);
        }
        if let Some(style) = get_style(val, "match_text", span) {
            columnar_menu = columnar_menu.with_match_text_style(style);
        }
        if let Some(style) = get_style(val, "selected_match_text", span) {
            columnar_menu = columnar_menu.with_selected_match_text_style(style);
        }
    }
    let marker = menu.marker.to_expanded_string("", config);
    columnar_menu = columnar_menu.with_marker(&marker);
@ -282,9 +294,9 @@ pub(crate) fn add_list_menu(
    menu: &ParsedMenu,
    engine_state: Arc<EngineState>,
    stack: &Stack,
-    config: &Config,
+    config: Arc<Config>,
 ) -> Result<Reedline, ShellError> {
-    let name = menu.name.to_expanded_string("", config);
+    let name = menu.name.to_expanded_string("", &config);
    let mut list_menu = ListMenu::default().with_name(&name);
    let span = menu.menu_type.span();
@ -298,20 +310,9 @@ pub(crate) fn add_list_menu(
        };
    }
-    let span = menu.style.span();
+    list_menu = set_menu_style(list_menu, &menu.style);
    if let Value::Record { val, .. } = &menu.style {
        if let Some(style) = get_style(val, "text", span) {
            list_menu = list_menu.with_text_style(style);
        }
        if let Some(style) = get_style(val, "selected_text", span) {
            list_menu = list_menu.with_selected_text_style(style);
        }
        if let Some(style) = get_style(val, "description_text", span) {
            list_menu = list_menu.with_description_text_style(style);
        }
    }
-    let marker = menu.marker.to_expanded_string("", config);
+    let marker = menu.marker.to_expanded_string("", &config);
    list_menu = list_menu.with_marker(&marker);
    let only_buffer_difference = menu.only_buffer_difference.as_bool()?;
@ -337,7 +338,7 @@ pub(crate) fn add_list_menu(
        }
        _ => Err(ShellError::UnsupportedConfigValue {
            expected: "block or omitted value".to_string(),
-            value: menu.source.to_abbreviated_string(config),
+            value: menu.source.to_abbreviated_string(&config),
            span: menu.source.span(),
        }),
    }
@ -349,10 +350,10 @@ pub(crate) fn add_ide_menu(
    menu: &ParsedMenu,
    engine_state: Arc<EngineState>,
    stack: &Stack,
-    config: &Config,
+    config: Arc<Config>,
 ) -> Result<Reedline, ShellError> {
    let span = menu.menu_type.span();
-    let name = menu.name.to_expanded_string("", config);
+    let name = menu.name.to_expanded_string("", &config);
    let mut ide_menu = IdeMenu::default().with_name(&name);
    if let Value::Record { val, .. } = &menu.menu_type {
@ -417,7 +418,7 @@ pub(crate) fn add_ide_menu(
                } else {
                    return Err(ShellError::UnsupportedConfigValue {
                        expected: "bool or record".to_string(),
-                        value: border.to_abbreviated_string(config),
+                        value: border.to_abbreviated_string(&config),
                        span: border.span(),
                    });
                }
@ -441,7 +442,7 @@ pub(crate) fn add_ide_menu(
                _ => {
                    return Err(ShellError::UnsupportedConfigValue {
                        expected: "\"left\", \"right\" or \"prefer_right\"".to_string(),
-                        value: description_mode.to_abbreviated_string(config),
+                        value: description_mode.to_abbreviated_string(&config),
                        span: description_mode.span(),
                    });
                }
@ -490,26 +491,9 @@ pub(crate) fn add_ide_menu(
        };
    }
-    let span = menu.style.span();
+    ide_menu = set_menu_style(ide_menu, &menu.style);
    if let Value::Record { val, .. } = &menu.style {
        if let Some(style) = get_style(val, "text", span) {
            ide_menu = ide_menu.with_text_style(style);
        }
        if let Some(style) = get_style(val, "selected_text", span) {
            ide_menu = ide_menu.with_selected_text_style(style);
        }
        if let Some(style) = get_style(val, "description_text", span) {
            ide_menu = ide_menu.with_description_text_style(style);
        }
        if let Some(style) = get_style(val, "match_text", span) {
            ide_menu = ide_menu.with_match_text_style(style);
        }
        if let Some(style) = get_style(val, "selected_match_text", span) {
            ide_menu = ide_menu.with_selected_match_text_style(style);
        }
    }
-    let marker = menu.marker.to_expanded_string("", config);
+    let marker = menu.marker.to_expanded_string("", &config);
    ide_menu = ide_menu.with_marker(&marker);
    let only_buffer_difference = menu.only_buffer_difference.as_bool()?;
@ -535,7 +519,7 @@ pub(crate) fn add_ide_menu(
        }
        _ => Err(ShellError::UnsupportedConfigValue {
            expected: "block or omitted value".to_string(),
-            value: menu.source.to_abbreviated_string(config),
+            value: menu.source.to_abbreviated_string(&config),
            span,
        }),
    }
@ -547,9 +531,9 @@ pub(crate) fn add_description_menu(
    menu: &ParsedMenu,
    engine_state: Arc<EngineState>,
    stack: &Stack,
-    config: &Config,
+    config: Arc<Config>,
 ) -> Result<Reedline, ShellError> {
-    let name = menu.name.to_expanded_string("", config);
+    let name = menu.name.to_expanded_string("", &config);
    let mut description_menu = DescriptionMenu::default().with_name(&name);
    let span = menu.menu_type.span();
@ -595,20 +579,9 @@ pub(crate) fn add_description_menu(
        };
    }
-    let span = menu.style.span();
+    description_menu = set_menu_style(description_menu, &menu.style);
    if let Value::Record { val, .. } = &menu.style {
        if let Some(style) = get_style(val, "text", span) {
            description_menu = description_menu.with_text_style(style);
        }
        if let Some(style) = get_style(val, "selected_text", span) {
            description_menu = description_menu.with_selected_text_style(style);
        }
        if let Some(style) = get_style(val, "description_text", span) {
            description_menu = description_menu.with_description_text_style(style);
        }
    }
-    let marker = menu.marker.to_expanded_string("", config);
+    let marker = menu.marker.to_expanded_string("", &config);
    description_menu = description_menu.with_marker(&marker);
    let only_buffer_difference = menu.only_buffer_difference.as_bool()?;
@ -617,7 +590,7 @@ pub(crate) fn add_description_menu(
    let span = menu.source.span();
    match &menu.source {
        Value::Nothing { .. } => {
-            let completer = Box::new(NuHelpCompleter::new(engine_state));
+            let completer = Box::new(NuHelpCompleter::new(engine_state, config));
            Ok(line_editor.with_menu(ReedlineMenu::WithCompleter {
                menu: Box::new(description_menu),
                completer,
@ -638,7 +611,7 @@ pub(crate) fn add_description_menu(
        }
        _ => Err(ShellError::UnsupportedConfigValue {
            expected: "closure or omitted value".to_string(),
-            value: menu.source.to_abbreviated_string(config),
+            value: menu.source.to_abbreviated_string(&config),
            span: menu.source.span(),
        }),
    }
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@ -1,6 +1,7 @@
 use crate::prompt_update::{
    POST_EXECUTION_MARKER_PREFIX, POST_EXECUTION_MARKER_SUFFIX, PRE_EXECUTION_MARKER,
-    RESET_APPLICATION_MODE, VSCODE_CWD_PROPERTY_MARKER_PREFIX, VSCODE_CWD_PROPERTY_MARKER_SUFFIX,
+    RESET_APPLICATION_MODE, VSCODE_COMMANDLINE_MARKER_PREFIX, VSCODE_COMMANDLINE_MARKER_SUFFIX,
    VSCODE_CWD_PROPERTY_MARKER_PREFIX, VSCODE_CWD_PROPERTY_MARKER_SUFFIX,
    VSCODE_POST_EXECUTION_MARKER_PREFIX, VSCODE_POST_EXECUTION_MARKER_SUFFIX,
    VSCODE_PRE_EXECUTION_MARKER,
 };
@ -31,7 +32,7 @@ use nu_protocol::{
 };
 use nu_utils::{
    filesystem::{have_permission, PermissionResult},
-    utils::perf,
+    perf,
 };
 use reedline::{
    CursorConfig, CwdAwareHinter, DefaultCompleter, EditCommand, Emacs, FileBackedHistory,
@ -43,7 +44,7 @@ use std::{
    io::{self, IsTerminal, Write},
    panic::{catch_unwind, AssertUnwindSafe},
    path::{Path, PathBuf},
-    sync::{atomic::Ordering, Arc},
+    sync::Arc,
    time::{Duration, Instant},
 };
 use sysinfo::System;
@ -89,14 +90,7 @@ pub fn evaluate_repl(
    if let Err(e) = convert_env_values(engine_state, &unique_stack) {
        report_error_new(engine_state, &e);
    }
-    perf(
+    perf!("translate env vars", start_time, use_color);
        "translate env vars",
        start_time,
        file!(),
        line!(),
        column!(),
        use_color,
    );
    // seed env vars
    unique_stack.add_env_var(
@ -138,7 +132,26 @@ pub fn evaluate_repl(
        run_shell_integration_osc9_9(engine_state, &mut unique_stack, use_color);
    }
    if shell_integration_osc633 {
-        run_shell_integration_osc633(engine_state, &mut unique_stack, use_color);
+        // escape a few things because this says so
        // https://code.visualstudio.com/docs/terminal/shell-integration#_vs-code-custom-sequences-osc-633-st
        let cmd_text = line_editor.current_buffer_contents().to_string();
        let replaced_cmd_text = cmd_text
            .chars()
            .map(|c| match c {
                '\n' => '\x0a',
                '\r' => '\x0d',
                '\x1b' => '\x1b',
                _ => c,
            })
            .collect();
        run_shell_integration_osc633(
            engine_state,
            &mut unique_stack,
            use_color,
            replaced_cmd_text,
        );
    }
    engine_state.set_startup_time(entire_start_time.elapsed().as_nanos() as i64);
@ -225,28 +238,14 @@ fn get_line_editor(
    // Now that reedline is created, get the history session id and store it in engine_state
    store_history_id_in_engine(engine_state, &line_editor);
-    perf(
+    perf!("setup reedline", start_time, use_color);
        "setup reedline",
        start_time,
        file!(),
        line!(),
        column!(),
        use_color,
    );
    if let Some(history) = engine_state.history_config() {
        start_time = std::time::Instant::now();
        line_editor = setup_history(nushell_path, engine_state, line_editor, history)?;
-        perf(
+        perf!("setup history", start_time, use_color);
            "setup history",
            start_time,
            file!(),
            line!(),
            column!(),
            use_color,
        );
    }
    Ok(line_editor)
 }
@ -289,28 +288,14 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
    if let Err(err) = engine_state.merge_env(&mut stack, cwd) {
        report_error_new(engine_state, &err);
    }
-    perf(
+    // Check whether $env.NU_USE_IR is set, so that the user can change it in the REPL
-        "merge env",
+    // Temporary while IR eval is optional
-        start_time,
+    stack.use_ir = stack.has_env_var(engine_state, "NU_USE_IR");
-        file!(),
+    perf!("merge env", start_time, use_color);
        line!(),
        column!(),
        use_color,
    );
    start_time = std::time::Instant::now();
-    // Reset the ctrl-c handler
+    engine_state.reset_signals();
-    if let Some(ctrlc) = &mut engine_state.ctrlc {
+    perf!("reset signals", start_time, use_color);
        ctrlc.store(false, Ordering::SeqCst);
    }
    perf(
        "reset ctrlc",
        start_time,
        file!(),
        line!(),
        column!(),
        use_color,
    );
    start_time = std::time::Instant::now();
    // Right before we start our prompt and take input from the user,
@ -320,14 +305,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
            report_error_new(engine_state, &err);
        }
    }
-    perf(
+    perf!("pre-prompt hook", start_time, use_color);
        "pre-prompt hook",
        start_time,
        file!(),
        line!(),
        column!(),
        use_color,
    );
    start_time = std::time::Instant::now();
    // Next, check all the environment variables they ask for
@ -336,17 +314,10 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
    if let Err(error) = hook::eval_env_change_hook(env_change, engine_state, &mut stack) {
        report_error_new(engine_state, &error)
    }
-    perf(
+    perf!("env-change hook", start_time, use_color);
        "env-change hook",
        start_time,
        file!(),
        line!(),
        column!(),
        use_color,
    );
    let engine_reference = Arc::new(engine_state.clone());
-    let config = engine_state.get_config();
+    let config = stack.get_config(engine_state);
    start_time = std::time::Instant::now();
    // Find the configured cursor shapes for each mode
@ -355,14 +326,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
        vi_normal: map_nucursorshape_to_cursorshape(config.cursor_shape_vi_normal),
        emacs: map_nucursorshape_to_cursorshape(config.cursor_shape_emacs),
    };
-    perf(
+    perf!("get config/cursor config", start_time, use_color);
        "get config/cursor config",
        start_time,
        file!(),
        line!(),
        column!(),
        use_color,
    );
    start_time = std::time::Instant::now();
    // at this line we have cloned the state for the completer and the transient prompt
@ -379,7 +343,6 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
            engine_state: engine_reference.clone(),
            // STACK-REFERENCE 1
            stack: stack_arc.clone(),
            config: config.clone(),
        }))
        .with_validator(Box::new(NuValidator {
            engine_state: engine_reference.clone(),
@ -392,16 +355,17 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
        .with_quick_completions(config.quick_completions)
        .with_partial_completions(config.partial_completions)
        .with_ansi_colors(config.use_ansi_coloring)
        .with_cwd(Some(
            engine_state
                .cwd(None)
                .map(|cwd| cwd.into_std_path_buf())
                .unwrap_or_default()
                .to_string_lossy()
                .to_string(),
        ))
        .with_cursor_config(cursor_config);
-    perf(
+    perf!("reedline builder", start_time, use_color);
        "reedline builder",
        start_time,
        file!(),
        line!(),
        column!(),
        use_color,
    );
    let style_computer = StyleComputer::from_config(engine_state, &stack_arc);
@ -416,14 +380,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
        line_editor.disable_hints()
    };
-    perf(
+    perf!("reedline coloring/style_computer", start_time, use_color);
        "reedline coloring/style_computer",
        start_time,
        file!(),
        line!(),
        column!(),
        use_color,
    );
    start_time = std::time::Instant::now();
    trace!("adding menus");
@ -433,14 +390,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
            Reedline::create()
        });
-    perf(
+    perf!("reedline adding menus", start_time, use_color);
        "reedline adding menus",
        start_time,
        file!(),
        line!(),
        column!(),
        use_color,
    );
    start_time = std::time::Instant::now();
    let buffer_editor = get_editor(engine_state, &stack_arc, Span::unknown());
@ -457,14 +407,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
        line_editor
    };
-    perf(
+    perf!("reedline buffer_editor", start_time, use_color);
        "reedline buffer_editor",
        start_time,
        file!(),
        line!(),
        column!(),
        use_color,
    );
    if let Some(history) = engine_state.history_config() {
        start_time = std::time::Instant::now();
@ -474,28 +417,14 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
            }
        }
-        perf(
+        perf!("sync_history", start_time, use_color);
            "sync_history",
            start_time,
            file!(),
            line!(),
            column!(),
            use_color,
        );
    }
    start_time = std::time::Instant::now();
    // Changing the line editor based on the found keybindings
    line_editor = setup_keybindings(engine_state, line_editor);
-    perf(
+    perf!("keybindings", start_time, use_color);
        "keybindings",
        start_time,
        file!(),
        line!(),
        column!(),
        use_color,
    );
    start_time = std::time::Instant::now();
    let config = &engine_state.get_config().clone();
@ -512,14 +441,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
        nu_prompt,
    );
-    perf(
+    perf!("update_prompt", start_time, use_color);
        "update_prompt",
        start_time,
        file!(),
        line!(),
        column!(),
        use_color,
    );
    *entry_num += 1;
@ -546,25 +468,23 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
    // so we should avoid it or making stack cheaper to clone.
    let mut stack = Arc::unwrap_or_clone(stack_arc);
-    perf(
+    perf!("line_editor setup", start_time, use_color);
        "line_editor setup",
        start_time,
        file!(),
        line!(),
        column!(),
        use_color,
    );
    let line_editor_input_time = std::time::Instant::now();
    match input {
-        Ok(Signal::Success(s)) => {
+        Ok(Signal::Success(repl_cmd_line_text)) => {
            let history_supports_meta = matches!(
                engine_state.history_config().map(|h| h.file_format),
                Some(HistoryFileFormat::Sqlite)
            );
            if history_supports_meta {
-                prepare_history_metadata(&s, hostname, engine_state, &mut line_editor);
+                prepare_history_metadata(
                    &repl_cmd_line_text,
                    hostname,
                    engine_state,
                    &mut line_editor,
                );
            }
            // For pre_exec_hook
@ -575,7 +495,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
            if let Some(hook) = config.hooks.pre_execution.clone() {
                // Set the REPL buffer to the current command for the "pre_execution" hook
                let mut repl = engine_state.repl_state.lock().expect("repl state mutex");
-                repl.buffer = s.to_string();
+                repl.buffer = repl_cmd_line_text.to_string();
                drop(repl);
                if let Err(err) = eval_hook(
@ -590,14 +510,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
                }
            }
-            perf(
+            perf!("pre_execution_hook", start_time, use_color);
                "pre_execution_hook",
                start_time,
                file!(),
                line!(),
                column!(),
                use_color,
            );
            let mut repl = engine_state.repl_state.lock().expect("repl state mutex");
            repl.cursor_pos = line_editor.current_insertion_point();
@ -612,26 +525,20 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
                    run_ansi_sequence(VSCODE_PRE_EXECUTION_MARKER);
-                    perf(
+                    perf!(
                        "pre_execute_marker (633;C) ansi escape sequence",
                        start_time,
-                        file!(),
+                        use_color
                        line!(),
                        column!(),
                        use_color,
                    );
                } else if shell_integration_osc133 {
                    start_time = Instant::now();
                    run_ansi_sequence(PRE_EXECUTION_MARKER);
-                    perf(
+                    perf!(
                        "pre_execute_marker (133;C) ansi escape sequence",
                        start_time,
-                        file!(),
+                        use_color
                        line!(),
                        column!(),
                        use_color,
                    );
                }
            } else if shell_integration_osc133 {
@ -639,20 +546,17 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
                run_ansi_sequence(PRE_EXECUTION_MARKER);
-                perf(
+                perf!(
                    "pre_execute_marker (133;C) ansi escape sequence",
                    start_time,
-                    file!(),
+                    use_color
                    line!(),
                    column!(),
                    use_color,
                );
            }
            // Actual command execution logic starts from here
            let cmd_execution_start_time = Instant::now();
-            match parse_operation(s.clone(), engine_state, &stack) {
+            match parse_operation(repl_cmd_line_text.clone(), engine_state, &stack) {
                Ok(operation) => match operation {
                    ReplOperation::AutoCd { cwd, target, span } => {
                        do_auto_cd(target, cwd, &mut stack, engine_state, span);
@ -698,7 +602,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
            if history_supports_meta {
                if let Err(e) = fill_in_result_related_history_metadata(
-                    &s,
+                    &repl_cmd_line_text,
                    engine_state,
                    cmd_duration,
                    &mut stack,
@ -718,7 +622,12 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
                run_shell_integration_osc9_9(engine_state, &mut stack, use_color);
            }
            if shell_integration_osc633 {
-                run_shell_integration_osc633(engine_state, &mut stack, use_color);
+                run_shell_integration_osc633(
                    engine_state,
                    &mut stack,
                    use_color,
                    repl_cmd_line_text,
                );
            }
            if shell_integration_reset_application_mode {
                run_shell_integration_reset_application_mode();
@ -769,22 +678,16 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
            );
        }
    }
-    perf(
+    perf!(
        "processing line editor input",
        line_editor_input_time,
-        file!(),
+        use_color
        line!(),
        column!(),
        use_color,
    );
-    perf(
+    perf!(
        "time between prompts in line editor loop",
        loop_start_time,
-        file!(),
+        use_color
        line!(),
        column!(),
        use_color,
    );
    (true, stack, line_editor)
@ -800,13 +703,14 @@ fn prepare_history_metadata(
    line_editor: &mut Reedline,
 ) {
    if !s.is_empty() && line_editor.has_last_command_context() {
        #[allow(deprecated)]
        let result = line_editor
            .update_last_command_context(&|mut c| {
                c.start_timestamp = Some(chrono::Utc::now());
                c.hostname = hostname.map(str::to_string);
-
+                c.cwd = engine_state
-                c.cwd = Some(StateWorkingSet::new(engine_state).get_cwd());
+                    .cwd(None)
                    .ok()
                    .map(|path| path.to_string_lossy().to_string());
                c
            })
            .into_diagnostic();
@ -1037,7 +941,12 @@ fn run_shell_integration_osc2(
        // Try to abbreviate string for windows title
        let maybe_abbrev_path = if let Some(p) = nu_path::home_dir() {
-            path.replace(&p.as_path().display().to_string(), "~")
+            let home_dir_str = p.as_path().display().to_string();
            if path.starts_with(&home_dir_str) {
                path.replacen(&home_dir_str, "~", 1)
            } else {
                path
            }
        } else {
            path
        };
@ -1061,14 +970,7 @@ fn run_shell_integration_osc2(
        // ESC]2;stringBEL -- Set window title to string
        run_ansi_sequence(&format!("\x1b]2;{title}\x07"));
-        perf(
+        perf!("set title with command osc2", start_time, use_color);
            "set title with command osc2",
            start_time,
            file!(),
            line!(),
            column!(),
            use_color,
        );
    }
 }
@ -1093,13 +995,10 @@ fn run_shell_integration_osc7(
            percent_encoding::utf8_percent_encode(&path, percent_encoding::CONTROLS)
        ));
-        perf(
+        perf!(
            "communicate path to terminal with osc7",
            start_time,
-            file!(),
+            use_color
            line!(),
            column!(),
            use_color,
        );
    }
 }
@ -1116,18 +1015,20 @@ fn run_shell_integration_osc9_9(engine_state: &EngineState, stack: &mut Stack, u
            percent_encoding::utf8_percent_encode(&path, percent_encoding::CONTROLS)
        ));
-        perf(
+        perf!(
            "communicate path to terminal with osc9;9",
            start_time,
-            file!(),
+            use_color
            line!(),
            column!(),
            use_color,
        );
    }
 }
-fn run_shell_integration_osc633(engine_state: &EngineState, stack: &mut Stack, use_color: bool) {
+fn run_shell_integration_osc633(
    engine_state: &EngineState,
    stack: &mut Stack,
    use_color: bool,
    repl_cmd_line_text: String,
 ) {
    #[allow(deprecated)]
    if let Ok(path) = current_dir_str(engine_state, stack) {
        // Supported escape sequences of Microsoft's Visual Studio Code (vscode)
@ -1142,14 +1043,32 @@ fn run_shell_integration_osc633(engine_state: &EngineState, stack: &mut Stack, u
                VSCODE_CWD_PROPERTY_MARKER_PREFIX, path, VSCODE_CWD_PROPERTY_MARKER_SUFFIX
            ));
-            perf(
+            perf!(
                "communicate path to terminal with osc633;P",
                start_time,
-                file!(),
+                use_color
                line!(),
                column!(),
                use_color,
            );
            // escape a few things because this says so
            // https://code.visualstudio.com/docs/terminal/shell-integration#_vs-code-custom-sequences-osc-633-st
            let replaced_cmd_text: String = repl_cmd_line_text
                .chars()
                .map(|c| match c {
                    '\n' => '\x0a',
                    '\r' => '\x0d',
                    '\x1b' => '\x1b',
                    _ => c,
                })
                .collect();
            //OSC 633 ; E ; <commandline> [; <nonce] ST - Explicitly set the command line with an optional nonce.
            run_ansi_sequence(&format!(
                "{}{}{}",
                VSCODE_COMMANDLINE_MARKER_PREFIX,
                replaced_cmd_text,
                VSCODE_COMMANDLINE_MARKER_SUFFIX
            ));
        }
    }
 }
@ -1371,13 +1290,10 @@ fn run_finaliziation_ansi_sequence(
                shell_integration_osc133,
            ));
-            perf(
+            perf!(
                "post_execute_marker (633;D) ansi escape sequences",
                start_time,
-                file!(),
+                use_color
                line!(),
                column!(),
                use_color,
            );
        } else if shell_integration_osc133 {
            let start_time = Instant::now();
@ -1389,13 +1305,10 @@ fn run_finaliziation_ansi_sequence(
                shell_integration_osc133,
            ));
-            perf(
+            perf!(
                "post_execute_marker (133;D) ansi escape sequences",
                start_time,
-                file!(),
+                use_color
                line!(),
                column!(),
                use_color,
            );
        }
    } else if shell_integration_osc133 {
@ -1408,13 +1321,10 @@ fn run_finaliziation_ansi_sequence(
            shell_integration_osc133,
        ));
-        perf(
+        perf!(
            "post_execute_marker (133;D) ansi escape sequences",
            start_time,
-            file!(),
+            use_color
            line!(),
            column!(),
            use_color,
        );
    }
 }
@ -1488,20 +1398,26 @@ fn are_session_ids_in_sync() {
 #[cfg(test)]
 mod test_auto_cd {
    use super::{do_auto_cd, parse_operation, ReplOperation};
    use nu_path::AbsolutePath;
    use nu_protocol::engine::{EngineState, Stack};
    use std::path::Path;
    use tempfile::tempdir;
    /// Create a symlink. Works on both Unix and Windows.
    #[cfg(any(unix, windows))]
-    fn symlink(original: impl AsRef<Path>, link: impl AsRef<Path>) -> std::io::Result<()> {
+    fn symlink(
        original: impl AsRef<AbsolutePath>,
        link: impl AsRef<AbsolutePath>,
    ) -> std::io::Result<()> {
        let original = original.as_ref();
        let link = link.as_ref();
        #[cfg(unix)]
        {
            std::os::unix::fs::symlink(original, link)
        }
        #[cfg(windows)]
        {
-            if original.as_ref().is_dir() {
+            if original.is_dir() {
                std::os::windows::fs::symlink_dir(original, link)
            } else {
                std::os::windows::fs::symlink_file(original, link)
@ -1513,11 +1429,11 @@ mod test_auto_cd {
    /// `before`, and after `input` is parsed and evaluated, PWD should be
    /// changed to `after`.
    #[track_caller]
-    fn check(before: impl AsRef<Path>, input: &str, after: impl AsRef<Path>) {
+    fn check(before: impl AsRef<AbsolutePath>, input: &str, after: impl AsRef<AbsolutePath>) {
        // Setup EngineState and Stack.
        let mut engine_state = EngineState::new();
        let mut stack = Stack::new();
-        stack.set_cwd(before).unwrap();
+        stack.set_cwd(before.as_ref()).unwrap();
        // Parse the input. It must be an auto-cd operation.
        let op = parse_operation(input.to_string(), &engine_state, &stack).unwrap();
@ -1533,54 +1449,66 @@ mod test_auto_cd {
        // don't have to be byte-wise equal (on Windows, the 8.3 filename
        // conversion messes things up),
        let updated_cwd = std::fs::canonicalize(updated_cwd).unwrap();
-        let after = std::fs::canonicalize(after).unwrap();
+        let after = std::fs::canonicalize(after.as_ref()).unwrap();
        assert_eq!(updated_cwd, after);
    }
    #[test]
    fn auto_cd_root() {
        let tempdir = tempdir().unwrap();
-        let root = if cfg!(windows) { r"C:\" } else { "/" };
+        let tempdir = AbsolutePath::try_new(tempdir.path()).unwrap();
-        check(&tempdir, root, root);
+
        let input = if cfg!(windows) { r"C:\" } else { "/" };
        let root = AbsolutePath::try_new(input).unwrap();
        check(tempdir, input, root);
    }
    #[test]
    fn auto_cd_tilde() {
        let tempdir = tempdir().unwrap();
        let tempdir = AbsolutePath::try_new(tempdir.path()).unwrap();
        let home = nu_path::home_dir().unwrap();
-        check(&tempdir, "~", home);
+        check(tempdir, "~", home);
    }
    #[test]
    fn auto_cd_dot() {
        let tempdir = tempdir().unwrap();
-        check(&tempdir, ".", &tempdir);
+        let tempdir = AbsolutePath::try_new(tempdir.path()).unwrap();
        check(tempdir, ".", tempdir);
    }
    #[test]
    fn auto_cd_double_dot() {
        let tempdir = tempdir().unwrap();
-        let dir = tempdir.path().join("foo");
+        let tempdir = AbsolutePath::try_new(tempdir.path()).unwrap();
        let dir = tempdir.join("foo");
        std::fs::create_dir_all(&dir).unwrap();
-        check(dir, "..", &tempdir);
+        check(dir, "..", tempdir);
    }
    #[test]
    fn auto_cd_triple_dot() {
        let tempdir = tempdir().unwrap();
-        let dir = tempdir.path().join("foo").join("bar");
+        let tempdir = AbsolutePath::try_new(tempdir.path()).unwrap();
        let dir = tempdir.join("foo").join("bar");
        std::fs::create_dir_all(&dir).unwrap();
-        check(dir, "...", &tempdir);
+        check(dir, "...", tempdir);
    }
    #[test]
    fn auto_cd_relative() {
        let tempdir = tempdir().unwrap();
-        let foo = tempdir.path().join("foo");
+        let tempdir = AbsolutePath::try_new(tempdir.path()).unwrap();
-        let bar = tempdir.path().join("bar");
+
        let foo = tempdir.join("foo");
        let bar = tempdir.join("bar");
        std::fs::create_dir_all(&foo).unwrap();
        std::fs::create_dir_all(&bar).unwrap();
        let input = if cfg!(windows) { r"..\bar" } else { "../bar" };
        check(foo, input, bar);
    }
@ -1588,32 +1516,35 @@ mod test_auto_cd {
    #[test]
    fn auto_cd_trailing_slash() {
        let tempdir = tempdir().unwrap();
-        let dir = tempdir.path().join("foo");
+        let tempdir = AbsolutePath::try_new(tempdir.path()).unwrap();
        std::fs::create_dir_all(&dir).unwrap();
        let dir = tempdir.join("foo");
        std::fs::create_dir_all(&dir).unwrap();
        let input = if cfg!(windows) { r"foo\" } else { "foo/" };
-        check(&tempdir, input, dir);
+        check(tempdir, input, dir);
    }
    #[test]
    fn auto_cd_symlink() {
        let tempdir = tempdir().unwrap();
-        let dir = tempdir.path().join("foo");
+        let tempdir = AbsolutePath::try_new(tempdir.path()).unwrap();
        std::fs::create_dir_all(&dir).unwrap();
        let link = tempdir.path().join("link");
        symlink(&dir, &link).unwrap();
        let dir = tempdir.join("foo");
        std::fs::create_dir_all(&dir).unwrap();
        let link = tempdir.join("link");
        symlink(&dir, &link).unwrap();
        let input = if cfg!(windows) { r".\link" } else { "./link" };
-        check(&tempdir, input, link);
+        check(tempdir, input, link);
    }
    #[test]
    #[should_panic(expected = "was not parsed into an auto-cd operation")]
    fn auto_cd_nonexistent_directory() {
        let tempdir = tempdir().unwrap();
-        let dir = tempdir.path().join("foo");
+        let tempdir = AbsolutePath::try_new(tempdir.path()).unwrap();
        let dir = tempdir.join("foo");
        let input = if cfg!(windows) { r"foo\" } else { "foo/" };
-        check(&tempdir, input, dir);
+        check(tempdir, input, dir);
    }
 }
--- a/crates/nu-cli/src/syntax_highlight.rs
+++ b/crates/nu-cli/src/syntax_highlight.rs
@ -6,7 +6,7 @@ use nu_parser::{flatten_block, parse, FlatShape};
 use nu_protocol::{
    ast::{Block, Expr, Expression, PipelineRedirection, RecordItem},
    engine::{EngineState, Stack, StateWorkingSet},
-    Config, Span,
+    Span,
 };
 use reedline::{Highlighter, StyledText};
 use std::sync::Arc;
@ -14,15 +14,14 @@ use std::sync::Arc;
 pub struct NuHighlighter {
    pub engine_state: Arc<EngineState>,
    pub stack: Arc<Stack>,
    pub config: Config,
 }
 impl Highlighter for NuHighlighter {
    fn highlight(&self, line: &str, _cursor: usize) -> StyledText {
        trace!("highlighting: {}", line);
-        let highlight_resolved_externals =
+        let config = self.stack.get_config(&self.engine_state);
-            self.engine_state.get_config().highlight_resolved_externals;
+        let highlight_resolved_externals = config.highlight_resolved_externals;
        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) = {
@ -88,7 +87,7 @@ impl Highlighter for NuHighlighter {
                .to_string();
            let mut add_colored_token = |shape: &FlatShape, text: String| {
-                output.push((get_shape_color(shape.as_str(), &self.config), text));
+                output.push((get_shape_color(shape.as_str(), &config), text));
            };
            match shape.1 {
@ -128,9 +127,9 @@ impl Highlighter for NuHighlighter {
                        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.as_str(), &self.config);
+                        let mut style = get_shape_color(shape.as_str(), &config);
                        if highlight {
-                            style = get_matching_brackets_style(style, &self.config);
+                            style = get_matching_brackets_style(style, &config);
                        }
                        output.push((style, text));
                    }
@ -430,6 +429,14 @@ fn find_matching_block_end_in_expr(
                )
            }),
            Expr::Collect(_, expr) => find_matching_block_end_in_expr(
                line,
                working_set,
                expr,
                global_span_offset,
                global_cursor_offset,
            ),
            Expr::Block(block_id)
            | Expr::Closure(block_id)
            | Expr::RowCondition(block_id)
--- a/crates/nu-cli/src/util.rs
+++ b/crates/nu-cli/src/util.rs
@ -8,7 +8,7 @@ use nu_protocol::{
 };
 #[cfg(windows)]
 use nu_utils::enable_vt_processing;
-use nu_utils::utils::perf;
+use nu_utils::perf;
 use std::path::Path;
 // This will collect environment variables from std::env and adds them to a stack.
@ -228,13 +228,10 @@ pub fn eval_source(
        let _ = enable_vt_processing();
    }
-    perf(
+    perf!(
        &format!("eval_source {}", &fname),
        start_time,
-        file!(),
+        engine_state.get_config().use_ansi_coloring
        line!(),
        column!(),
        engine_state.get_config().use_ansi_coloring,
    );
    exit_code
@ -265,6 +262,11 @@ fn evaluate_source(
            return Ok(Some(1));
        }
        if let Some(err) = working_set.compile_errors.first() {
            report_error(&working_set, err);
            // Not a fatal error, for now
        }
        (output, working_set.render())
    };
@ -319,16 +321,10 @@ mod test {
        let env = engine_state.render_env_vars();
-        assert!(
+        assert!(matches!(env.get("FOO"), Some(&Value::String { val, .. }) if val == "foo"));
-            matches!(env.get(&"FOO".to_string()), Some(&Value::String { val, .. }) if val == "foo")
+        assert!(matches!(env.get("SYMBOLS"), Some(&Value::String { val, .. }) if val == symbols));
-        );
+        assert!(matches!(env.get(symbols), Some(&Value::String { val, .. }) if val == "symbols"));
-        assert!(
+        assert!(env.contains_key("PWD"));
            matches!(env.get(&"SYMBOLS".to_string()), Some(&Value::String { val, .. }) if val == symbols)
        );
        assert!(
            matches!(env.get(&symbols.to_string()), Some(&Value::String { val, .. }) if val == "symbols")
        );
        assert!(env.get(&"PWD".to_string()).is_some());
        assert_eq!(env.len(), 4);
    }
 }
--- a/crates/nu-cli/tests/commands/keybindings_list.rs
+++ b/crates/nu-cli/tests/commands/keybindings_list.rs
@ -0,0 +1,7 @@
 use nu_test_support::nu;
 #[test]
 fn not_empty() {
    let result = nu!("keybindings list | is-not-empty");
    assert_eq!(result.out, "true");
 }
--- a/crates/nu-cli/tests/commands/mod.rs
+++ b/crates/nu-cli/tests/commands/mod.rs
@ -1 +1,2 @@
 mod keybindings_list;
 mod nu_highlight;
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@ -11,7 +11,7 @@ use std::{
    sync::Arc,
 };
 use support::{
-    completions_helpers::{new_partial_engine, new_quote_engine},
+    completions_helpers::{new_dotnu_engine, new_partial_engine, new_quote_engine},
    file, folder, match_suggestions, new_engine,
 };
@ -32,7 +32,6 @@ fn completer() -> NuCompleter {
 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 }"#;
@ -85,8 +84,43 @@ fn custom_completer() -> NuCompleter {
    NuCompleter::new(Arc::new(engine), Arc::new(stack))
 }
 #[fixture]
 fn subcommand_completer() -> NuCompleter {
    // Create a new engine
    let (dir, _, mut engine, mut stack) = new_engine();
    let commands = r#"
            $env.config.completions.algorithm = "fuzzy"
            def foo [] {}
            def "foo bar" [] {}
            def "foo abaz" [] {}
            def "foo aabcrr" [] {}
            def food [] {}
        "#;
    assert!(support::merge_input(commands.as_bytes(), &mut engine, &mut stack, dir).is_ok());
    // Instantiate a new completer
    NuCompleter::new(Arc::new(engine), Arc::new(stack))
 }
 /// Use fuzzy completions but sort in alphabetical order
 #[fixture]
 fn fuzzy_alpha_sort_completer() -> NuCompleter {
    // Create a new engine
    let (dir, _, mut engine, mut stack) = new_engine();
    let config = r#"
        $env.config.completions.algorithm = "fuzzy"
        $env.config.completions.sort = "alphabetical"
    "#;
    assert!(support::merge_input(config.as_bytes(), &mut engine, &mut stack, dir).is_ok());
    // Instantiate a new completer
    NuCompleter::new(Arc::new(engine), Arc::new(stack))
 }
 #[test]
-fn variables_dollar_sign_with_varialblecompletion() {
+fn variables_dollar_sign_with_variablecompletion() {
    let (_, _, engine, stack) = new_engine();
    let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
@ -102,28 +136,28 @@ 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);
+    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);
+    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);
+    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);
+    match_suggestions(&expected, &suggestions);
 }
 #[rstest]
@ -132,49 +166,48 @@ fn variables_customcompletion_subcommands_with_customcompletion_2(
 ) {
    let suggestions = completer_strings.complete("my-command ", 11);
    let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
-    match_suggestions(expected, suggestions);
+    match_suggestions(&expected, &suggestions);
 }
 #[test]
 fn dotnu_completions() {
    // Create a new engine
-    let (_, _, engine, stack) = new_engine();
+    let (_, _, engine, stack) = new_dotnu_engine();
    // Instantiate a new completer
    let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
    let expected = vec![
        "asdf.nu".into(),
        "bar.nu".into(),
        "bat.nu".into(),
        "baz.nu".into(),
        #[cfg(windows)]
        "dir_module\\".into(),
        #[cfg(not(windows))]
        "dir_module/".into(),
        "foo.nu".into(),
        "spam.nu".into(),
        "xyzzy.nu".into(),
    ];
    // Test source completion
    let completion_str = "source-env ".to_string();
    let suggestions = completer.complete(&completion_str, completion_str.len());
-    assert_eq!(2, suggestions.len());
+    match_suggestions(&expected, &suggestions);
    assert_eq!("custom_completion.nu", suggestions.first().unwrap().value);
    #[cfg(windows)]
    assert_eq!("directory_completion\\", suggestions.get(1).unwrap().value);
    #[cfg(not(windows))]
    assert_eq!("directory_completion/", suggestions.get(1).unwrap().value);
    // Test use completion
    let completion_str = "use ".to_string();
    let suggestions = completer.complete(&completion_str, completion_str.len());
-    assert_eq!(2, suggestions.len());
+    match_suggestions(&expected, &suggestions);
    assert_eq!("custom_completion.nu", suggestions.first().unwrap().value);
    #[cfg(windows)]
    assert_eq!("directory_completion\\", suggestions.get(1).unwrap().value);
    #[cfg(not(windows))]
    assert_eq!("directory_completion/", suggestions.get(1).unwrap().value);
    // Test overlay use completion
    let completion_str = "overlay use ".to_string();
    let suggestions = completer.complete(&completion_str, completion_str.len());
-    assert_eq!(2, suggestions.len());
+    match_suggestions(&expected, &suggestions);
    assert_eq!("custom_completion.nu", suggestions.first().unwrap().value);
    #[cfg(windows)]
    assert_eq!("directory_completion\\", suggestions.get(1).unwrap().value);
    #[cfg(not(windows))]
    assert_eq!("directory_completion/", suggestions.get(1).unwrap().value);
 }
 #[test]
@ -238,8 +271,22 @@ fn file_completions() {
        folder(dir.join(".hidden_folder")),
    ];
    #[cfg(windows)]
    {
        let separator = '/';
        let target_dir = format!("cp {dir_str}{separator}");
        let slash_suggestions = completer.complete(&target_dir, target_dir.len());
        let expected_slash_paths: Vec<String> = expected_paths
            .iter()
            .map(|s| s.replace('\\', "/"))
            .collect();
        match_suggestions(&expected_slash_paths, &slash_suggestions);
    }
    // Match the results
-    match_suggestions(expected_paths, suggestions);
+    match_suggestions(&expected_paths, &suggestions);
    // Test completions for a file
    let target_dir = format!("cp {}", folder(dir.join("another")));
@ -249,17 +296,91 @@ fn file_completions() {
    let expected_paths: Vec<String> = vec![file(dir.join("another").join("newfile"))];
    // Match the results
-    match_suggestions(expected_paths, suggestions);
+    match_suggestions(&expected_paths, &suggestions);
    // Test completions for hidden files
-    let target_dir = format!("ls {}/.", folder(dir.join(".hidden_folder")));
+    let target_dir = format!("ls {}{MAIN_SEPARATOR}.", folder(dir.join(".hidden_folder")));
    let suggestions = completer.complete(&target_dir, target_dir.len());
    let expected_paths: Vec<String> =
        vec![file(dir.join(".hidden_folder").join(".hidden_subfile"))];
    #[cfg(windows)]
    {
        let target_dir = format!("ls {}/.", folder(dir.join(".hidden_folder")));
        let slash_suggestions = completer.complete(&target_dir, target_dir.len());
        let expected_slash: Vec<String> = expected_paths
            .iter()
            .map(|s| s.replace('\\', "/"))
            .collect();
        match_suggestions(&expected_slash, &slash_suggestions);
    }
    // Match the results
-    match_suggestions(expected_paths, suggestions);
+    match_suggestions(&expected_paths, &suggestions);
 }
 #[cfg(windows)]
 #[test]
 fn file_completions_with_mixed_separators() {
    // Create a new engine
    let (dir, dir_str, engine, stack) = new_dotnu_engine();
    // Instantiate a new completer
    let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
    // Create Expected values
    let expected_paths: Vec<String> = vec![
        file(dir.join("lib-dir1").join("bar.nu")),
        file(dir.join("lib-dir1").join("baz.nu")),
        file(dir.join("lib-dir1").join("xyzzy.nu")),
    ];
    let expecetd_slash_paths: Vec<String> = expected_paths
        .iter()
        .map(|s| s.replace(MAIN_SEPARATOR, "/"))
        .collect();
    let target_dir = format!("ls {dir_str}/lib-dir1/");
    let suggestions = completer.complete(&target_dir, target_dir.len());
    match_suggestions(&expecetd_slash_paths, &suggestions);
    let target_dir = format!("cp {dir_str}\\lib-dir1/");
    let suggestions = completer.complete(&target_dir, target_dir.len());
    match_suggestions(&expecetd_slash_paths, &suggestions);
    let target_dir = format!("ls {dir_str}/lib-dir1\\/");
    let suggestions = completer.complete(&target_dir, target_dir.len());
    match_suggestions(&expecetd_slash_paths, &suggestions);
    let target_dir = format!("ls {dir_str}\\lib-dir1\\/");
    let suggestions = completer.complete(&target_dir, target_dir.len());
    match_suggestions(&expecetd_slash_paths, &suggestions);
    let target_dir = format!("ls {dir_str}\\lib-dir1\\");
    let suggestions = completer.complete(&target_dir, target_dir.len());
    match_suggestions(&expected_paths, &suggestions);
    let target_dir = format!("ls {dir_str}/lib-dir1\\");
    let suggestions = completer.complete(&target_dir, target_dir.len());
    match_suggestions(&expected_paths, &suggestions);
    let target_dir = format!("ls {dir_str}/lib-dir1/\\");
    let suggestions = completer.complete(&target_dir, target_dir.len());
    match_suggestions(&expected_paths, &suggestions);
    let target_dir = format!("ls {dir_str}\\lib-dir1/\\");
    let suggestions = completer.complete(&target_dir, target_dir.len());
    match_suggestions(&expected_paths, &suggestions);
 }
 #[test]
@ -276,13 +397,14 @@ fn partial_completions() {
    // Create the expected values
    let expected_paths: Vec<String> = vec![
-        folder(dir.join("partial_a")),
+        folder(dir.join("partial")),
-        folder(dir.join("partial_b")),
+        folder(dir.join("partial-a")),
-        folder(dir.join("partial_c")),
+        folder(dir.join("partial-b")),
        folder(dir.join("partial-c")),
    ];
    // Match the results
-    match_suggestions(expected_paths, suggestions);
+    match_suggestions(&expected_paths, &suggestions);
    // Test completions for the files whose name begin with "h"
    // and are present under directories whose names begin with "pa"
@ -292,17 +414,18 @@ fn partial_completions() {
    // Create the expected values
    let expected_paths: Vec<String> = vec![
-        file(dir.join("partial_a").join("have_ext.exe")),
+        file(dir.join("partial").join("hello.txt")),
-        file(dir.join("partial_a").join("have_ext.txt")),
+        file(dir.join("partial-a").join("have_ext.exe")),
-        file(dir.join("partial_a").join("hello")),
+        file(dir.join("partial-a").join("have_ext.txt")),
-        file(dir.join("partial_a").join("hola")),
+        file(dir.join("partial-a").join("hello")),
-        file(dir.join("partial_b").join("hello_b")),
+        file(dir.join("partial-a").join("hola")),
-        file(dir.join("partial_b").join("hi_b")),
+        file(dir.join("partial-b").join("hello_b")),
-        file(dir.join("partial_c").join("hello_c")),
+        file(dir.join("partial-b").join("hi_b")),
        file(dir.join("partial-c").join("hello_c")),
    ];
    // Match the results
-    match_suggestions(expected_paths, suggestions);
+    match_suggestions(&expected_paths, &suggestions);
    // Test completion for all files under directories whose names begin with "pa"
    let dir_str = folder(dir.join("pa"));
@ -311,18 +434,19 @@ fn partial_completions() {
    // Create the expected values
    let expected_paths: Vec<String> = vec![
-        file(dir.join("partial_a").join("anotherfile")),
+        file(dir.join("partial").join("hello.txt")),
-        file(dir.join("partial_a").join("have_ext.exe")),
+        file(dir.join("partial-a").join("anotherfile")),
-        file(dir.join("partial_a").join("have_ext.txt")),
+        file(dir.join("partial-a").join("have_ext.exe")),
-        file(dir.join("partial_a").join("hello")),
+        file(dir.join("partial-a").join("have_ext.txt")),
-        file(dir.join("partial_a").join("hola")),
+        file(dir.join("partial-a").join("hello")),
-        file(dir.join("partial_b").join("hello_b")),
+        file(dir.join("partial-a").join("hola")),
-        file(dir.join("partial_b").join("hi_b")),
+        file(dir.join("partial-b").join("hello_b")),
-        file(dir.join("partial_c").join("hello_c")),
+        file(dir.join("partial-b").join("hi_b")),
        file(dir.join("partial-c").join("hello_c")),
    ];
    // Match the results
-    match_suggestions(expected_paths, suggestions);
+    match_suggestions(&expected_paths, &suggestions);
    // Test completion for a single file
    let dir_str = file(dir.join("fi").join("so"));
@ -333,7 +457,7 @@ fn partial_completions() {
    let expected_paths: Vec<String> = vec![file(dir.join("final_partial").join("somefile"))];
    // Match the results
-    match_suggestions(expected_paths, suggestions);
+    match_suggestions(&expected_paths, &suggestions);
    // Test completion where there is a sneaky `..` in the path
    let dir_str = file(dir.join("par").join("..").join("fi").join("so"));
@ -343,19 +467,25 @@ fn partial_completions() {
    // Create the expected values
    let expected_paths: Vec<String> = vec![
        file(
-            dir.join("partial_a")
+            dir.join("partial")
                .join("..")
                .join("final_partial")
                .join("somefile"),
        ),
        file(
-            dir.join("partial_b")
+            dir.join("partial-a")
                .join("..")
                .join("final_partial")
                .join("somefile"),
        ),
        file(
-            dir.join("partial_c")
+            dir.join("partial-b")
                .join("..")
                .join("final_partial")
                .join("somefile"),
        ),
        file(
            dir.join("partial-c")
                .join("..")
                .join("final_partial")
                .join("somefile"),
@ -363,35 +493,35 @@ fn partial_completions() {
    ];
    // Match the results
-    match_suggestions(expected_paths, suggestions);
+    match_suggestions(&expected_paths, &suggestions);
    // Test completion for all files under directories whose names begin with "pa"
-    let file_str = file(dir.join("partial_a").join("have"));
+    let file_str = file(dir.join("partial-a").join("have"));
    let target_file = format!("rm {file_str}");
    let suggestions = completer.complete(&target_file, target_file.len());
    // Create the expected values
    let expected_paths: Vec<String> = vec![
-        file(dir.join("partial_a").join("have_ext.exe")),
+        file(dir.join("partial-a").join("have_ext.exe")),
-        file(dir.join("partial_a").join("have_ext.txt")),
+        file(dir.join("partial-a").join("have_ext.txt")),
    ];
    // Match the results
-    match_suggestions(expected_paths, suggestions);
+    match_suggestions(&expected_paths, &suggestions);
    // Test completion for all files under directories whose names begin with "pa"
-    let file_str = file(dir.join("partial_a").join("have_ext."));
+    let file_str = file(dir.join("partial-a").join("have_ext."));
    let file_dir = format!("rm {file_str}");
    let suggestions = completer.complete(&file_dir, file_dir.len());
    // Create the expected values
    let expected_paths: Vec<String> = vec![
-        file(dir.join("partial_a").join("have_ext.exe")),
+        file(dir.join("partial-a").join("have_ext.exe")),
-        file(dir.join("partial_a").join("have_ext.txt")),
+        file(dir.join("partial-a").join("have_ext.txt")),
    ];
    // Match the results
-    match_suggestions(expected_paths, suggestions);
+    match_suggestions(&expected_paths, &suggestions);
 }
 #[test]
@ -426,15 +556,16 @@ fn command_ls_with_filecompletion() {
        ".hidden_folder/".to_string(),
    ];
-    match_suggestions(expected_paths, suggestions);
+    match_suggestions(&expected_paths, &suggestions);
    let target_dir = "ls custom_completion.";
    let suggestions = completer.complete(target_dir, target_dir.len());
    let expected_paths: Vec<String> = vec!["custom_completion.nu".to_string()];
-    match_suggestions(expected_paths, suggestions)
+    match_suggestions(&expected_paths, &suggestions);
 }
 #[test]
 fn command_open_with_filecompletion() {
    let (_, _, engine, stack) = new_engine();
@ -467,14 +598,14 @@ fn command_open_with_filecompletion() {
        ".hidden_folder/".to_string(),
    ];
-    match_suggestions(expected_paths, suggestions);
+    match_suggestions(&expected_paths, &suggestions);
    let target_dir = "open custom_completion.";
    let suggestions = completer.complete(target_dir, target_dir.len());
    let expected_paths: Vec<String> = vec!["custom_completion.nu".to_string()];
-    match_suggestions(expected_paths, suggestions)
+    match_suggestions(&expected_paths, &suggestions);
 }
 #[test]
@ -509,7 +640,7 @@ fn command_rm_with_globcompletion() {
        ".hidden_folder/".to_string(),
    ];
-    match_suggestions(expected_paths, suggestions)
+    match_suggestions(&expected_paths, &suggestions)
 }
 #[test]
@ -544,7 +675,7 @@ fn command_cp_with_globcompletion() {
        ".hidden_folder/".to_string(),
    ];
-    match_suggestions(expected_paths, suggestions)
+    match_suggestions(&expected_paths, &suggestions)
 }
 #[test]
@ -579,7 +710,7 @@ fn command_save_with_filecompletion() {
        ".hidden_folder/".to_string(),
    ];
-    match_suggestions(expected_paths, suggestions)
+    match_suggestions(&expected_paths, &suggestions)
 }
 #[test]
@ -614,7 +745,7 @@ fn command_touch_with_filecompletion() {
        ".hidden_folder/".to_string(),
    ];
-    match_suggestions(expected_paths, suggestions)
+    match_suggestions(&expected_paths, &suggestions)
 }
 #[test]
@ -649,7 +780,28 @@ fn command_watch_with_filecompletion() {
        ".hidden_folder/".to_string(),
    ];
-    match_suggestions(expected_paths, suggestions)
+    match_suggestions(&expected_paths, &suggestions)
 }
 #[rstest]
 fn subcommand_completions(mut subcommand_completer: NuCompleter) {
    let prefix = "foo br";
    let suggestions = subcommand_completer.complete(prefix, prefix.len());
    match_suggestions(
        &vec!["foo bar".to_string(), "foo aabcrr".to_string()],
        &suggestions,
    );
    let prefix = "foo b";
    let suggestions = subcommand_completer.complete(prefix, prefix.len());
    match_suggestions(
        &vec![
            "foo bar".to_string(),
            "foo aabcrr".to_string(),
            "foo abaz".to_string(),
        ],
        &suggestions,
    );
 }
 #[test]
@ -662,19 +814,19 @@ fn file_completion_quoted() {
    let suggestions = completer.complete(target_dir, target_dir.len());
    let expected_paths: Vec<String> = vec![
        "\'[a] bc.txt\'".to_string(),
        "`--help`".to_string(),
        "`-42`".to_string(),
        "`-inf`".to_string(),
        "`4.2`".to_string(),
        "\'[a] bc.txt\'".to_string(),
        "`te st.txt`".to_string(),
        "`te#st.txt`".to_string(),
        "`te'st.txt`".to_string(),
        "`te(st).txt`".to_string(),
-        format!("`{}`", folder("test dir".into())),
+        format!("`{}`", folder("test dir")),
    ];
-    match_suggestions(expected_paths, suggestions);
+    match_suggestions(&expected_paths, &suggestions);
    let dir: PathBuf = "test dir".into();
    let target_dir = format!("open '{}'", folder(dir.clone()));
@ -685,7 +837,7 @@ fn file_completion_quoted() {
        format!("`{}`", file(dir.join("single quote"))),
    ];
-    match_suggestions(expected_paths, suggestions)
+    match_suggestions(&expected_paths, &suggestions)
 }
 #[test]
@ -720,7 +872,7 @@ fn flag_completions() {
    ];
    // Match results
-    match_suggestions(expected, suggestions);
+    match_suggestions(&expected, &suggestions);
 }
 #[test]
@ -744,8 +896,21 @@ fn folder_with_directorycompletions() {
        folder(dir.join(".hidden_folder")),
    ];
    #[cfg(windows)]
    {
        let target_dir = format!("cd {dir_str}/");
        let slash_suggestions = completer.complete(&target_dir, target_dir.len());
        let expected_slash_paths: Vec<String> = expected_paths
            .iter()
            .map(|s| s.replace('\\', "/"))
            .collect();
        match_suggestions(&expected_slash_paths, &slash_suggestions);
    }
    // Match the results
-    match_suggestions(expected_paths, suggestions);
+    match_suggestions(&expected_paths, &suggestions);
 }
 #[test]
@ -783,11 +948,11 @@ fn variables_completions() {
        "plugin-path".into(),
        "startup-time".into(),
        "temp-path".into(),
-        "vendor-autoload-dir".into(),
+        "vendor-autoload-dirs".into(),
    ];
    // Match results
-    match_suggestions(expected, suggestions);
+    match_suggestions(&expected, &suggestions);
    // Test completions for $nu.h (filter)
    let suggestions = completer.complete("$nu.h", 5);
@ -801,7 +966,7 @@ fn variables_completions() {
    ];
    // Match results
-    match_suggestions(expected, suggestions);
+    match_suggestions(&expected, &suggestions);
    // Test completions for $nu.os-info
    let suggestions = completer.complete("$nu.os-info.", 12);
@ -813,7 +978,7 @@ fn variables_completions() {
        "name".into(),
    ];
    // Match results
-    match_suggestions(expected, suggestions);
+    match_suggestions(&expected, &suggestions);
    // Test completions for custom var
    let suggestions = completer.complete("$actor.", 7);
@ -823,7 +988,7 @@ fn variables_completions() {
    let expected: Vec<String> = vec!["age".into(), "name".into()];
    // Match results
-    match_suggestions(expected, suggestions);
+    match_suggestions(&expected, &suggestions);
    // Test completions for custom var (filtering)
    let suggestions = completer.complete("$actor.n", 8);
@ -833,7 +998,7 @@ fn variables_completions() {
    let expected: Vec<String> = vec!["name".into()];
    // Match results
-    match_suggestions(expected, suggestions);
+    match_suggestions(&expected, &suggestions);
    // Test completions for $env
    let suggestions = completer.complete("$env.", 5);
@ -846,7 +1011,7 @@ fn variables_completions() {
    let expected: Vec<String> = vec!["PATH".into(), "PWD".into(), "TEST".into()];
    // Match results
-    match_suggestions(expected, suggestions);
+    match_suggestions(&expected, &suggestions);
    // Test completions for $env
    let suggestions = completer.complete("$env.T", 6);
@ -856,7 +1021,12 @@ fn variables_completions() {
    let expected: Vec<String> = vec!["TEST".into()];
    // Match results
-    match_suggestions(expected, suggestions);
+    match_suggestions(&expected, &suggestions);
    let suggestions = completer.complete("$", 1);
    let expected: Vec<String> = vec!["$actor".into(), "$env".into(), "$in".into(), "$nu".into()];
    match_suggestions(&expected, &suggestions);
 }
 #[test]
@ -875,7 +1045,7 @@ fn alias_of_command_and_flags() {
    #[cfg(not(windows))]
    let expected_paths: Vec<String> = vec!["test_a/".to_string(), "test_b/".to_string()];
-    match_suggestions(expected_paths, suggestions)
+    match_suggestions(&expected_paths, &suggestions)
 }
 #[test]
@ -894,7 +1064,7 @@ fn alias_of_basic_command() {
    #[cfg(not(windows))]
    let expected_paths: Vec<String> = vec!["test_a/".to_string(), "test_b/".to_string()];
-    match_suggestions(expected_paths, suggestions)
+    match_suggestions(&expected_paths, &suggestions)
 }
 #[test]
@ -916,7 +1086,7 @@ fn alias_of_another_alias() {
    #[cfg(not(windows))]
    let expected_paths: Vec<String> = vec!["test_a/".to_string(), "test_b/".to_string()];
-    match_suggestions(expected_paths, suggestions)
+    match_suggestions(&expected_paths, &suggestions)
 }
 fn run_external_completion(completer: &str, input: &str) -> Vec<Suggestion> {
@ -979,35 +1149,35 @@ fn unknown_command_completion() {
        ".hidden_folder/".to_string(),
    ];
-    match_suggestions(expected_paths, suggestions)
+    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);
+    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);
+    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);
+    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);
+    match_suggestions(&expected, &suggestions);
 }
 #[test]
@ -1041,77 +1211,88 @@ fn filecompletions_triggers_after_cursor() {
        ".hidden_folder/".to_string(),
    ];
-    match_suggestions(expected_paths, suggestions);
+    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);
+    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);
+    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);
+    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);
+    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);
+    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);
+    match_suggestions(&expected, &suggestions);
 }
 #[rstest]
 fn custom_completer_triggers_cursor_before_word(mut custom_completer: NuCompleter) {
    let suggestions = custom_completer.complete("cmd foo  bar", 8);
    let expected: Vec<String> = vec!["cmd".into(), "foo".into(), "".into()];
-    match_suggestions(expected, suggestions);
+    match_suggestions(&expected, &suggestions);
 }
 #[rstest]
 fn custom_completer_triggers_cursor_on_word_left_boundary(mut custom_completer: NuCompleter) {
    let suggestions = custom_completer.complete("cmd foo bar", 8);
    let expected: Vec<String> = vec!["cmd".into(), "foo".into(), "".into()];
-    match_suggestions(expected, suggestions);
+    match_suggestions(&expected, &suggestions);
 }
 #[rstest]
 fn custom_completer_triggers_cursor_next_to_word(mut custom_completer: NuCompleter) {
    let suggestions = custom_completer.complete("cmd foo bar", 11);
    let expected: Vec<String> = vec!["cmd".into(), "foo".into(), "bar".into()];
-    match_suggestions(expected, suggestions);
+    match_suggestions(&expected, &suggestions);
 }
 #[rstest]
 fn custom_completer_triggers_cursor_after_word(mut custom_completer: NuCompleter) {
    let suggestions = custom_completer.complete("cmd foo bar ", 12);
    let expected: Vec<String> = vec!["cmd".into(), "foo".into(), "bar".into(), "".into()];
-    match_suggestions(expected, suggestions);
+    match_suggestions(&expected, &suggestions);
 }
 #[rstest]
 fn sort_fuzzy_completions_in_alphabetical_order(mut fuzzy_alpha_sort_completer: NuCompleter) {
    let suggestions = fuzzy_alpha_sort_completer.complete("ls nu", 5);
    // Even though "nushell" is a better match, it should come second because
    // the completions should be sorted in alphabetical order
    match_suggestions(
        &vec!["custom_completion.nu".into(), "nushell".into()],
        &suggestions,
    );
 }
 #[ignore = "was reverted, still needs fixing"]
--- a/crates/nu-cli/tests/completions/support/completions_helpers.rs
+++ b/crates/nu-cli/tests/completions/support/completions_helpers.rs
@ -1,5 +1,6 @@
 use nu_engine::eval_block;
 use nu_parser::parse;
 use nu_path::{AbsolutePathBuf, PathBuf};
 use nu_protocol::{
    debugger::WithoutDebug,
    engine::{EngineState, Stack, StateWorkingSet},
@ -7,14 +8,14 @@ use nu_protocol::{
 };
 use nu_test_support::fs;
 use reedline::Suggestion;
-use std::path::{PathBuf, MAIN_SEPARATOR};
+use std::path::MAIN_SEPARATOR;
 fn create_default_context() -> EngineState {
    nu_command::add_shell_command_context(nu_cmd_lang::create_default_context())
 }
 // creates a new engine with the current path into the completions fixtures folder
-pub fn new_engine() -> (PathBuf, String, EngineState, Stack) {
+pub fn new_engine() -> (AbsolutePathBuf, String, EngineState, Stack) {
    // Target folder inside assets
    let dir = fs::fixtures().join("completions");
    let dir_str = dir
@ -68,7 +69,53 @@ pub fn new_engine() -> (PathBuf, String, EngineState, Stack) {
    (dir, dir_str, engine_state, stack)
 }
-pub fn new_quote_engine() -> (PathBuf, String, EngineState, Stack) {
+// creates a new engine with the current path into the completions fixtures folder
 pub fn new_dotnu_engine() -> (AbsolutePathBuf, String, EngineState, Stack) {
    // Target folder inside assets
    let dir = fs::fixtures().join("dotnu_completions");
    let dir_str = dir
        .clone()
        .into_os_string()
        .into_string()
        .unwrap_or_default();
    let dir_span = nu_protocol::Span::new(0, dir_str.len());
    // Create a new engine with default context
    let mut engine_state = create_default_context();
    // Add $nu
    engine_state.generate_nu_constant();
    // New stack
    let mut stack = Stack::new();
    // Add pwd as env var
    stack.add_env_var("PWD".to_string(), Value::string(dir_str.clone(), dir_span));
    stack.add_env_var(
        "TEST".to_string(),
        Value::string("NUSHELL".to_string(), dir_span),
    );
    stack.add_env_var(
        "NU_LIB_DIRS".to_string(),
        Value::List {
            vals: vec![
                Value::string(file(dir.join("lib-dir1")), dir_span),
                Value::string(file(dir.join("lib-dir2")), dir_span),
                Value::string(file(dir.join("lib-dir3")), dir_span),
            ],
            internal_span: dir_span,
        },
    );
    // 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() -> (AbsolutePathBuf, String, EngineState, Stack) {
    // Target folder inside assets
    let dir = fs::fixtures().join("quoted_completions");
    let dir_str = dir
@ -103,7 +150,7 @@ pub fn new_quote_engine() -> (PathBuf, String, EngineState, Stack) {
    (dir, dir_str, engine_state, stack)
 }
-pub fn new_partial_engine() -> (PathBuf, String, EngineState, Stack) {
+pub fn new_partial_engine() -> (AbsolutePathBuf, String, EngineState, Stack) {
    // Target folder inside assets
    let dir = fs::fixtures().join("partial_completions");
    let dir_str = dir
@ -139,7 +186,7 @@ pub fn new_partial_engine() -> (PathBuf, String, EngineState, Stack) {
 }
 // match a list of suggestions with the expected values
-pub fn match_suggestions(expected: Vec<String>, suggestions: Vec<Suggestion>) {
+pub fn match_suggestions(expected: &Vec<String>, suggestions: &Vec<Suggestion>) {
    let expected_len = expected.len();
    let suggestions_len = suggestions.len();
    if expected_len != suggestions_len {
@ -149,22 +196,25 @@ pub fn match_suggestions(expected: Vec<String>, suggestions: Vec<Suggestion>) {
            Expected: {expected:#?}\n"
        )
    }
-    expected.iter().zip(suggestions).for_each(|it| {
+
-        assert_eq!(it.0, &it.1.value);
+    let suggestoins_str = suggestions
-    });
+        .iter()
        .map(|it| it.value.clone())
        .collect::<Vec<_>>();
    assert_eq!(expected, &suggestoins_str);
 }
 // append the separator to the converted path
-pub fn folder(path: PathBuf) -> String {
+pub fn folder(path: impl Into<PathBuf>) -> String {
    let mut converted_path = file(path);
    converted_path.push(MAIN_SEPARATOR);
    converted_path
 }
 // convert a given path to string
-pub fn file(path: PathBuf) -> String {
+pub fn file(path: impl Into<PathBuf>) -> String {
-    path.into_os_string().into_string().unwrap_or_default()
+    path.into().into_os_string().into_string().unwrap()
 }
 // merge_input executes the given input into the engine
@ -173,7 +223,7 @@ pub fn merge_input(
    input: &[u8],
    engine_state: &mut EngineState,
    stack: &mut Stack,
-    dir: PathBuf,
+    dir: AbsolutePathBuf,
 ) -> Result<(), ShellError> {
    let (block, delta) = {
        let mut working_set = StateWorkingSet::new(engine_state);
--- a/crates/nu-cmd-base/Cargo.toml
+++ b/crates/nu-cmd-base/Cargo.toml
@ -5,15 +5,15 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-base"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-base"
-version = "0.95.0"
+version = "0.97.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.95.0" }
+nu-engine = { path = "../nu-engine", version = "0.97.0" }
-nu-parser = { path = "../nu-parser", version = "0.95.0" }
+nu-parser = { path = "../nu-parser", version = "0.97.0" }
-nu-path = { path = "../nu-path", version = "0.95.0" }
+nu-path = { path = "../nu-path", version = "0.97.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
 indexmap = { workspace = true }
 miette = { workspace = true }
--- a/crates/nu-cmd-base/README.md
+++ b/crates/nu-cmd-base/README.md
@ -0,0 +1,5 @@
 Utilities used by the different `nu-command`/`nu-cmd-*` crates, should not contain any full `Command` implementations.
 ## Internal Nushell crate
 This crate implements components of Nushell and is not designed to support plugin authors or other users directly.
--- a/crates/nu-cmd-base/src/input_handler.rs
+++ b/crates/nu-cmd-base/src/input_handler.rs
@ -1,5 +1,5 @@
-use nu_protocol::{ast::CellPath, PipelineData, ShellError, Span, Value};
+use nu_protocol::{ast::CellPath, PipelineData, ShellError, Signals, Span, Value};
-use std::sync::{atomic::AtomicBool, Arc};
+use std::sync::Arc;
 pub trait CmdArgument {
    fn take_cell_paths(&mut self) -> Option<Vec<CellPath>>;
@ -40,7 +40,7 @@ pub fn operate<C, A>(
    mut arg: A,
    input: PipelineData,
    span: Span,
-    ctrlc: Option<Arc<AtomicBool>>,
+    signals: &Signals,
 ) -> Result<PipelineData, ShellError>
 where
    A: CmdArgument + Send + Sync + 'static,
@ -55,7 +55,7 @@ where
                    _ => cmd(&v, &arg, span),
                }
            },
-            ctrlc,
+            signals,
        ),
        Some(column_paths) => {
            let arg = Arc::new(arg);
@ -79,7 +79,7 @@ where
                    }
                    v
                },
-                ctrlc,
+                signals,
            )
        }
    }
--- a/crates/nu-cmd-base/src/lib.rs
+++ b/crates/nu-cmd-base/src/lib.rs
@ -1,3 +1,4 @@
 #![doc = include_str!("../README.md")]
 pub mod formats;
 pub mod hook;
 pub mod input_handler;
--- a/crates/nu-cmd-base/src/util.rs
+++ b/crates/nu-cmd-base/src/util.rs
@ -1,21 +1,28 @@
 use nu_path::AbsolutePathBuf;
 use nu_protocol::{
    engine::{EngineState, Stack},
    Range, ShellError, Span, Value,
 };
-use std::{ops::Bound, path::PathBuf};
+use std::ops::Bound;
-pub fn get_init_cwd() -> PathBuf {
+pub fn get_init_cwd() -> AbsolutePathBuf {
-    std::env::current_dir().unwrap_or_else(|_| {
+    std::env::current_dir()
-        std::env::var("PWD")
+        .ok()
-            .map(Into::into)
+        .and_then(|path| AbsolutePathBuf::try_from(path).ok())
-            .unwrap_or_else(|_| nu_path::home_dir().unwrap_or_default())
+        .or_else(|| {
-    })
+            std::env::var("PWD")
                .ok()
                .and_then(|path| AbsolutePathBuf::try_from(path).ok())
        })
        .or_else(nu_path::home_dir)
        .expect("Failed to get current working directory")
 }
-pub fn get_guaranteed_cwd(engine_state: &EngineState, stack: &Stack) -> PathBuf {
+pub fn get_guaranteed_cwd(engine_state: &EngineState, stack: &Stack) -> AbsolutePathBuf {
    engine_state
        .cwd(Some(stack))
-        .unwrap_or(crate::util::get_init_cwd())
+        .ok()
        .unwrap_or_else(get_init_cwd)
 }
 type MakeRangeError = fn(&str, Span) -> ShellError;
--- a/crates/nu-cmd-extra/Cargo.toml
+++ b/crates/nu-cmd-extra/Cargo.toml
@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT"
 name = "nu-cmd-extra"
 repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-extra"
-version = "0.95.0"
+version = "0.97.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@ -13,13 +13,13 @@ version = "0.95.0"
 bench = false
 [dependencies]
-nu-cmd-base = { path = "../nu-cmd-base", version = "0.95.0" }
+nu-cmd-base = { path = "../nu-cmd-base", version = "0.97.0" }
-nu-engine = { path = "../nu-engine", version = "0.95.0" }
+nu-engine = { path = "../nu-engine", version = "0.97.0" }
-nu-json = { version = "0.95.0", path = "../nu-json" }
+nu-json = { version = "0.97.0", path = "../nu-json" }
-nu-parser = { path = "../nu-parser", version = "0.95.0" }
+nu-parser = { path = "../nu-parser", version = "0.97.0" }
-nu-pretty-hex = { version = "0.95.0", path = "../nu-pretty-hex" }
+nu-pretty-hex = { version = "0.97.0", path = "../nu-pretty-hex" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
-nu-utils = { path = "../nu-utils", version = "0.95.0" }
+nu-utils = { path = "../nu-utils", version = "0.97.0" }
 # Potential dependencies for extras
 heck = { workspace = true }
@ -33,6 +33,6 @@ v_htmlescape = { workspace = true }
 itertools = { workspace = true }
 [dev-dependencies]
-nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.95.0" }
+nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.97.0" }
-nu-command = { path = "../nu-command", version = "0.95.0" }
+nu-command = { path = "../nu-command", version = "0.97.0" }
-nu-test-support = { path = "../nu-test-support", version = "0.95.0" }
+nu-test-support = { path = "../nu-test-support", version = "0.97.0" }
--- a/crates/nu-cmd-extra/src/extra/bits/and.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/and.rs
@ -79,7 +79,7 @@ impl Command for BitsAnd {
        input.map(
            move |value| binary_op(&value, &target, little_endian, |(l, r)| l & r, head),
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
        )
    }
--- a/crates/nu-cmd-extra/src/extra/bits/into.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/into.rs
@ -1,6 +1,9 @@
 use std::io::{self, Read, Write};
 use nu_cmd_base::input_handler::{operate, CmdArgument};
 use nu_engine::command_prelude::*;
 use nu_protocol::Signals;
 use num_traits::ToPrimitive;
 pub struct Arguments {
@ -118,12 +121,43 @@ fn into_bits(
    let cell_paths = call.rest(engine_state, stack, 0)?;
    let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
-    if let PipelineData::ByteStream(stream, ..) = input {
+    if let PipelineData::ByteStream(stream, metadata) = input {
-        // TODO: in the future, we may want this to stream out, converting each to bytes
+        Ok(PipelineData::ByteStream(
-        Ok(Value::binary(stream.into_bytes()?, head).into_pipeline_data())
+            byte_stream_to_bits(stream, head),
            metadata,
        ))
    } else {
        let args = Arguments { cell_paths };
-        operate(action, args, input, call.head, engine_state.ctrlc.clone())
+        operate(action, args, input, call.head, engine_state.signals())
    }
 }
 fn byte_stream_to_bits(stream: ByteStream, head: Span) -> ByteStream {
    if let Some(mut reader) = stream.reader() {
        let mut is_first = true;
        ByteStream::from_fn(
            head,
            Signals::empty(),
            ByteStreamType::String,
            move |buffer| {
                let mut byte = [0];
                if reader.read(&mut byte[..]).err_span(head)? > 0 {
                    // Format the byte as bits
                    if is_first {
                        is_first = false;
                    } else {
                        buffer.push(b' ');
                    }
                    write!(buffer, "{:08b}", byte[0]).expect("format failed");
                    Ok(true)
                } else {
                    // EOF
                    Ok(false)
                }
            },
        )
    } else {
        ByteStream::read(io::empty(), head, Signals::empty(), ByteStreamType::String)
    }
 }
--- a/crates/nu-cmd-extra/src/extra/bits/not.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/not.rs
@ -82,7 +82,7 @@ impl Command for BitsNot {
            number_size,
        };
-        operate(action, args, input, head, engine_state.ctrlc.clone())
+        operate(action, args, input, head, engine_state.signals())
    }
    fn examples(&self) -> Vec<Example> {
--- a/crates/nu-cmd-extra/src/extra/bits/or.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/or.rs
@ -80,7 +80,7 @@ impl Command for BitsOr {
        input.map(
            move |value| binary_op(&value, &target, little_endian, |(l, r)| l | r, head),
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
        )
    }
--- a/crates/nu-cmd-extra/src/extra/bits/rotate_left.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/rotate_left.rs
@ -86,7 +86,7 @@ impl Command for BitsRol {
            bits,
        };
-        operate(action, args, input, head, engine_state.ctrlc.clone())
+        operate(action, args, input, head, engine_state.signals())
    }
    fn examples(&self) -> Vec<Example> {
--- a/crates/nu-cmd-extra/src/extra/bits/rotate_right.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/rotate_right.rs
@ -86,7 +86,7 @@ impl Command for BitsRor {
            bits,
        };
-        operate(action, args, input, head, engine_state.ctrlc.clone())
+        operate(action, args, input, head, engine_state.signals())
    }
    fn examples(&self) -> Vec<Example> {
--- a/crates/nu-cmd-extra/src/extra/bits/shift_left.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/shift_left.rs
@ -88,7 +88,7 @@ impl Command for BitsShl {
            bits,
        };
-        operate(action, args, input, head, engine_state.ctrlc.clone())
+        operate(action, args, input, head, engine_state.signals())
    }
    fn examples(&self) -> Vec<Example> {
--- a/crates/nu-cmd-extra/src/extra/bits/shift_right.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/shift_right.rs
@ -88,7 +88,7 @@ impl Command for BitsShr {
            bits,
        };
-        operate(action, args, input, head, engine_state.ctrlc.clone())
+        operate(action, args, input, head, engine_state.signals())
    }
    fn examples(&self) -> Vec<Example> {
--- a/crates/nu-cmd-extra/src/extra/bits/xor.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/xor.rs
@ -80,7 +80,7 @@ impl Command for BitsXor {
        input.map(
            move |value| binary_op(&value, &target, little_endian, |(l, r)| l ^ r, head),
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
        )
    }
--- a/crates/nu-cmd-extra/src/extra/conversions/fmt.rs
+++ b/crates/nu-cmd-extra/src/extra/conversions/fmt.rs
@ -59,7 +59,7 @@ fn fmt(
 ) -> Result<PipelineData, ShellError> {
    let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
    let args = CellPathOnlyArgs::from(cell_paths);
-    operate(action, args, input, call.head, engine_state.ctrlc.clone())
+    operate(action, args, input, call.head, engine_state.signals())
 }
 fn action(input: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value {
--- a/crates/nu-cmd-extra/src/extra/filters/each_while.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/each_while.rs
@ -89,7 +89,7 @@ impl Command for EachWhile {
                        }
                    })
                    .fuse()
-                    .into_pipeline_data(head, engine_state.ctrlc.clone()))
+                    .into_pipeline_data(head, engine_state.signals().clone()))
            }
            PipelineData::ByteStream(stream, ..) => {
                let span = stream.span();
@ -107,7 +107,7 @@ impl Command for EachWhile {
                            }
                        })
                        .fuse()
-                        .into_pipeline_data(head, engine_state.ctrlc.clone()))
+                        .into_pipeline_data(head, engine_state.signals().clone()))
                } else {
                    Ok(PipelineData::Empty)
                }
--- a/crates/nu-cmd-extra/src/extra/filters/update_cells.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/update_cells.rs
@ -108,7 +108,7 @@ impl Command for UpdateCells {
            columns,
            span: head,
        }
-        .into_pipeline_data(head, engine_state.ctrlc.clone())
+        .into_pipeline_data(head, engine_state.signals().clone())
        .set_metadata(metadata))
    }
 }
--- a/crates/nu-cmd-extra/src/extra/formats/to/html.rs
+++ b/crates/nu-cmd-extra/src/extra/formats/to/html.rs
@ -239,7 +239,7 @@ fn to_html(
    let partial = call.has_flag(engine_state, stack, "partial")?;
    let list = call.has_flag(engine_state, stack, "list")?;
    let theme: Option<Spanned<String>> = call.get_flag(engine_state, stack, "theme")?;
-    let config = engine_state.get_config();
+    let config = &stack.get_config(engine_state);
    let vec_of_values = input.into_iter().collect::<Vec<Value>>();
    let headers = merge_descriptors(&vec_of_values);
@ -368,6 +368,7 @@ fn theme_demo(span: Span) -> PipelineData {
        .collect();
    Value::list(result, span).into_pipeline_data_with_metadata(PipelineMetadata {
        data_source: DataSource::HtmlThemes,
        content_type: None,
    })
 }
--- a/crates/nu-cmd-extra/src/extra/math/arccos.rs
+++ b/crates/nu-cmd-extra/src/extra/math/arccos.rs
@ -45,7 +45,7 @@ impl Command for SubCommand {
        }
        input.map(
            move |value| operate(value, head, use_degrees),
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
        )
    }
--- a/crates/nu-cmd-extra/src/extra/math/arccosh.rs
+++ b/crates/nu-cmd-extra/src/extra/math/arccosh.rs
@ -41,10 +41,7 @@ impl Command for SubCommand {
        if matches!(input, PipelineData::Empty) {
            return Err(ShellError::PipelineEmpty { dst_span: head });
        }
-        input.map(
+        input.map(move |value| operate(value, head), engine_state.signals())
            move |value| operate(value, head),
            engine_state.ctrlc.clone(),
        )
    }
    fn examples(&self) -> Vec<Example> {
--- a/crates/nu-cmd-extra/src/extra/math/arcsin.rs
+++ b/crates/nu-cmd-extra/src/extra/math/arcsin.rs
@ -45,7 +45,7 @@ impl Command for SubCommand {
        }
        input.map(
            move |value| operate(value, head, use_degrees),
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
        )
    }
--- a/crates/nu-cmd-extra/src/extra/math/arcsinh.rs
+++ b/crates/nu-cmd-extra/src/extra/math/arcsinh.rs
@ -41,10 +41,7 @@ impl Command for SubCommand {
        if matches!(input, PipelineData::Empty) {
            return Err(ShellError::PipelineEmpty { dst_span: head });
        }
-        input.map(
+        input.map(move |value| operate(value, head), engine_state.signals())
            move |value| operate(value, head),
            engine_state.ctrlc.clone(),
        )
    }
    fn examples(&self) -> Vec<Example> {
--- a/crates/nu-cmd-extra/src/extra/math/arctan.rs
+++ b/crates/nu-cmd-extra/src/extra/math/arctan.rs
@ -45,7 +45,7 @@ impl Command for SubCommand {
        }
        input.map(
            move |value| operate(value, head, use_degrees),
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
        )
    }
--- a/crates/nu-cmd-extra/src/extra/math/arctanh.rs
+++ b/crates/nu-cmd-extra/src/extra/math/arctanh.rs
@ -41,10 +41,7 @@ impl Command for SubCommand {
        if matches!(input, PipelineData::Empty) {
            return Err(ShellError::PipelineEmpty { dst_span: head });
        }
-        input.map(
+        input.map(move |value| operate(value, head), engine_state.signals())
            move |value| operate(value, head),
            engine_state.ctrlc.clone(),
        )
    }
    fn examples(&self) -> Vec<Example> {
--- a/crates/nu-cmd-extra/src/extra/math/cos.rs
+++ b/crates/nu-cmd-extra/src/extra/math/cos.rs
@ -44,7 +44,7 @@ impl Command for SubCommand {
        }
        input.map(
            move |value| operate(value, head, use_degrees),
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
        )
    }
--- a/crates/nu-cmd-extra/src/extra/math/cosh.rs
+++ b/crates/nu-cmd-extra/src/extra/math/cosh.rs
@ -41,10 +41,7 @@ impl Command for SubCommand {
        if matches!(input, PipelineData::Empty) {
            return Err(ShellError::PipelineEmpty { dst_span: head });
        }
-        input.map(
+        input.map(move |value| operate(value, head), engine_state.signals())
            move |value| operate(value, head),
            engine_state.ctrlc.clone(),
        )
    }
    fn examples(&self) -> Vec<Example> {
--- a/crates/nu-cmd-extra/src/extra/math/exp.rs
+++ b/crates/nu-cmd-extra/src/extra/math/exp.rs
@ -41,10 +41,7 @@ impl Command for SubCommand {
        if matches!(input, PipelineData::Empty) {
            return Err(ShellError::PipelineEmpty { dst_span: head });
        }
-        input.map(
+        input.map(move |value| operate(value, head), engine_state.signals())
            move |value| operate(value, head),
            engine_state.ctrlc.clone(),
        )
    }
    fn examples(&self) -> Vec<Example> {
--- a/crates/nu-cmd-extra/src/extra/math/ln.rs
+++ b/crates/nu-cmd-extra/src/extra/math/ln.rs
@ -41,10 +41,7 @@ impl Command for SubCommand {
        if matches!(input, PipelineData::Empty) {
            return Err(ShellError::PipelineEmpty { dst_span: head });
        }
-        input.map(
+        input.map(move |value| operate(value, head), engine_state.signals())
            move |value| operate(value, head),
            engine_state.ctrlc.clone(),
        )
    }
    fn examples(&self) -> Vec<Example> {
--- a/crates/nu-cmd-extra/src/extra/math/sin.rs
+++ b/crates/nu-cmd-extra/src/extra/math/sin.rs
@ -44,7 +44,7 @@ impl Command for SubCommand {
        }
        input.map(
            move |value| operate(value, head, use_degrees),
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
        )
    }
--- a/crates/nu-cmd-extra/src/extra/math/sinh.rs
+++ b/crates/nu-cmd-extra/src/extra/math/sinh.rs
@ -41,10 +41,7 @@ impl Command for SubCommand {
        if matches!(input, PipelineData::Empty) {
            return Err(ShellError::PipelineEmpty { dst_span: head });
        }
-        input.map(
+        input.map(move |value| operate(value, head), engine_state.signals())
            move |value| operate(value, head),
            engine_state.ctrlc.clone(),
        )
    }
    fn examples(&self) -> Vec<Example> {
--- a/crates/nu-cmd-extra/src/extra/math/tan.rs
+++ b/crates/nu-cmd-extra/src/extra/math/tan.rs
@ -44,7 +44,7 @@ impl Command for SubCommand {
        }
        input.map(
            move |value| operate(value, head, use_degrees),
-            engine_state.ctrlc.clone(),
+            engine_state.signals(),
        )
    }
--- a/crates/nu-cmd-extra/src/extra/math/tanh.rs
+++ b/crates/nu-cmd-extra/src/extra/math/tanh.rs
@ -41,10 +41,7 @@ impl Command for SubCommand {
        if matches!(input, PipelineData::Empty) {
            return Err(ShellError::PipelineEmpty { dst_span: head });
        }
-        input.map(
+        input.map(move |value| operate(value, head), engine_state.signals())
            move |value| operate(value, head),
            engine_state.ctrlc.clone(),
        )
    }
    fn examples(&self) -> Vec<Example> {
--- a/crates/nu-cmd-extra/src/extra/platform/ansi/gradient.rs
+++ b/crates/nu-cmd-extra/src/extra/platform/ansi/gradient.rs
@ -140,7 +140,7 @@ fn operate(
                ret
            }
        },
-        engine_state.ctrlc.clone(),
+        engine_state.signals(),
    )
 }
--- a/crates/nu-cmd-extra/src/extra/strings/encode_decode/hex.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/encode_decode/hex.rs
@ -88,7 +88,7 @@ pub fn operate(
        cell_paths,
    };
-    general_operate(action, args, input, call.head, engine_state.ctrlc.clone())
+    general_operate(action, args, input, call.head, engine_state.signals())
 }
 fn action(
--- a/crates/nu-cmd-extra/src/extra/strings/format/command.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/format/command.rs
@ -1,5 +1,5 @@
 use nu_engine::command_prelude::*;
-use nu_protocol::{ast::PathMember, engine::StateWorkingSet, ListStream};
+use nu_protocol::{ast::PathMember, engine::StateWorkingSet, Config, ListStream};
 #[derive(Clone)]
 pub struct FormatPattern;
@ -43,6 +43,8 @@ impl Command for FormatPattern {
        let it_id = working_set.add_variable(b"$it".to_vec(), call.head, Type::Any, false);
        stack.add_var(it_id, input_val.clone());
        let config = stack.get_config(engine_state);
        match specified_pattern {
            Err(e) => Err(e),
            Ok(pattern) => {
@ -56,7 +58,7 @@ impl Command for FormatPattern {
                    string_span.start + 1,
                )?;
-                format(input_val, &ops, engine_state, call.head)
+                format(input_val, &ops, engine_state, &config, call.head)
            }
        }
    }
@ -181,33 +183,30 @@ fn format(
    input_data: Value,
    format_operations: &[FormatOperation],
    engine_state: &EngineState,
    config: &Config,
    head_span: Span,
 ) -> Result<PipelineData, ShellError> {
    let data_as_value = input_data;
    //  We can only handle a Record or a List of Records
    match data_as_value {
-        Value::Record { .. } => {
+        Value::Record { .. } => match format_record(format_operations, &data_as_value, config) {
-            match format_record(format_operations, &data_as_value, engine_state) {
+            Ok(value) => Ok(PipelineData::Value(Value::string(value, head_span), None)),
-                Ok(value) => Ok(PipelineData::Value(Value::string(value, head_span), None)),
+            Err(value) => Err(value),
-                Err(value) => Err(value),
+        },
            }
        }
        Value::List { vals, .. } => {
            let mut list = vec![];
            for val in vals.iter() {
                match val {
-                    Value::Record { .. } => {
+                    Value::Record { .. } => match format_record(format_operations, val, config) {
-                        match format_record(format_operations, val, engine_state) {
+                        Ok(value) => {
-                            Ok(value) => {
+                            list.push(Value::string(value, head_span));
                                list.push(Value::string(value, head_span));
                            }
                            Err(value) => {
                                return Err(value);
                            }
                        }
-                    }
+                        Err(value) => {
                            return Err(value);
                        }
                    },
                    Value::Error { error, .. } => return Err(*error.clone()),
                    _ => {
                        return Err(ShellError::OnlySupportsThisInputType {
@ -220,7 +219,7 @@ fn format(
                }
            }
-            Ok(ListStream::new(list.into_iter(), head_span, engine_state.ctrlc.clone()).into())
+            Ok(ListStream::new(list.into_iter(), head_span, engine_state.signals().clone()).into())
        }
        // Unwrapping this ShellError is a bit unfortunate.
        // Ideally, its Span would be preserved.
@ -237,9 +236,8 @@ fn format(
 fn format_record(
    format_operations: &[FormatOperation],
    data_as_value: &Value,
-    engine_state: &EngineState,
+    config: &Config,
 ) -> Result<String, ShellError> {
    let config = engine_state.get_config();
    let mut output = String::new();
    for op in format_operations {
--- a/crates/nu-cmd-extra/src/extra/strings/str_/case/mod.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/str_/case/mod.rs
@ -44,7 +44,7 @@ where
        case_operation,
        cell_paths,
    };
-    general_operate(action, args, input, call.head, engine_state.ctrlc.clone())
+    general_operate(action, args, input, call.head, engine_state.signals())
 }
 fn action<F>(input: &Value, args: &Arguments<F>, head: Span) -> Value
--- a/crates/nu-cmd-extra/src/lib.rs
+++ b/crates/nu-cmd-extra/src/lib.rs
@ -1,3 +1,4 @@
 #![doc = include_str!("../README.md")]
 mod example_test;
 pub mod extra;
 pub use extra::*;
--- a/crates/nu-cmd-extra/tests/commands/bits/into.rs
+++ b/crates/nu-cmd-extra/tests/commands/bits/into.rs
@ -0,0 +1,13 @@
 use nu_test_support::nu;
 #[test]
 fn byte_stream_into_bits() {
    let result = nu!("[0x[01] 0x[02 03]] | bytes collect | into bits");
    assert_eq!("00000001 00000010 00000011", result.out);
 }
 #[test]
 fn byte_stream_into_bits_is_stream() {
    let result = nu!("[0x[01] 0x[02 03]] | bytes collect | into bits | describe");
    assert_eq!("string (stream)", result.out);
 }
--- a/crates/nu-cmd-extra/tests/commands/bits/mod.rs
+++ b/crates/nu-cmd-extra/tests/commands/bits/mod.rs
@ -0,0 +1 @@
 mod into;
--- a/crates/nu-cmd-extra/tests/commands/mod.rs
+++ b/crates/nu-cmd-extra/tests/commands/mod.rs
@ -1 +1,2 @@
 mod bits;
 mod bytes;
--- a/crates/nu-cmd-lang/Cargo.toml
+++ b/crates/nu-cmd-lang/Cargo.toml
@ -6,22 +6,22 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang"
 edition = "2021"
 license = "MIT"
 name = "nu-cmd-lang"
-version = "0.95.0"
+version = "0.97.0"
 [lib]
 bench = false
 [dependencies]
-nu-engine = { path = "../nu-engine", version = "0.95.0" }
+nu-engine = { path = "../nu-engine", version = "0.97.0" }
-nu-parser = { path = "../nu-parser", version = "0.95.0" }
+nu-parser = { path = "../nu-parser", version = "0.97.0" }
-nu-protocol = { path = "../nu-protocol", version = "0.95.0" }
+nu-protocol = { path = "../nu-protocol", version = "0.97.0" }
-nu-utils = { path = "../nu-utils", version = "0.95.0" }
+nu-utils = { path = "../nu-utils", version = "0.97.0" }
 itertools = { workspace = true }
-shadow-rs = { version = "0.28", default-features = false }
+shadow-rs = { version = "0.31", default-features = false }
 [build-dependencies]
-shadow-rs = { version = "0.28", default-features = false }
+shadow-rs = { version = "0.31", default-features = false }
 [features]
 mimalloc = []
--- a/crates/nu-cmd-lang/src/core_commands/break_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/break_.rs
@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
 use nu_protocol::engine::CommandType;
 #[derive(Clone)]
 pub struct Break;
@ -18,6 +19,17 @@ impl Command for Break {
            .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
  break can only be used in while, loop, and for loops. It can not be used with each or other filter commands"#
    }
    fn command_type(&self) -> CommandType {
        CommandType::Keyword
    }
    fn run(
        &self,
        _engine_state: &EngineState,
--- a/crates/nu-cmd-lang/src/core_commands/collect.rs
+++ b/crates/nu-cmd-lang/src/core_commands/collect.rs
@ -50,6 +50,7 @@ is particularly large, this can cause high memory usage."#
            // check where some input came from.
            Some(PipelineMetadata {
                data_source: DataSource::FilePath(_),
                content_type: None,
            }) => None,
            other => other,
        };
--- a/crates/nu-cmd-lang/src/core_commands/const_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/const_.rs
@ -46,6 +46,9 @@ impl Command for Const {
        call: &Call,
        _input: PipelineData,
    ) -> Result<PipelineData, ShellError> {
        // This is compiled specially by the IR compiler. The code here is never used when
        // running in IR mode.
        let call = call.assert_ast_call()?;
        let var_id = if let Some(id) = call.positional_nth(0).and_then(|pos| pos.as_var()) {
            id
        } else {
--- a/crates/nu-cmd-lang/src/core_commands/continue_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/continue_.rs
@ -1,4 +1,5 @@
 use nu_engine::command_prelude::*;
 use nu_protocol::engine::CommandType;
 #[derive(Clone)]
 pub struct Continue;
@ -18,6 +19,16 @@ impl Command for Continue {
            .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
  continue can only be used in while, loop, and for loops. It can not be used with each or other filter commands"#
    }
    fn command_type(&self) -> CommandType {
        CommandType::Keyword
    }
    fn run(
        &self,
        _engine_state: &EngineState,
--- a/crates/nu-cmd-lang/src/core_commands/def.rs
+++ b/crates/nu-cmd-lang/src/core_commands/def.rs
@ -70,6 +70,11 @@ impl Command for Def {
                example: r#"def --wrapped my-echo [...rest] { ^echo ...$rest }; my-echo -e 'spam\tspam'"#,
                result: Some(Value::test_string("spam\tspam")),
            },
            Example {
                description: "Define a custom command with a type signature. Passing a non-int value will result in an error",
                example: r#"def only_int []: int -> int { $in }; 42 | only_int"#,
                result: Some(Value::test_int(42)),
            },
        ]
    }
 }
--- a/crates/nu-cmd-lang/src/core_commands/do_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/do_.rs
@ -23,11 +23,7 @@ impl Command for Do {
    fn signature(&self) -> Signature {
        Signature::build("do")
-            .required(
+            .required("closure", SyntaxShape::Closure(None), "The closure to run.")
                "closure",
                SyntaxShape::OneOf(vec![SyntaxShape::Closure(None), SyntaxShape::Any]),
                "The closure to run.",
            )
            .input_output_types(vec![(Type::Any, Type::Any)])
            .switch(
                "ignore-errors",
@ -85,6 +81,10 @@ impl Command for Do {
        bind_args_to(&mut callee_stack, &block.signature, rest, head)?;
        let eval_block_with_early_return = get_eval_block_with_early_return(engine_state);
        // Applies to all block evaluation once set true
        callee_stack.use_ir = caller_stack.has_env_var(engine_state, "NU_USE_IR");
        let result = eval_block_with_early_return(engine_state, &mut callee_stack, block, input);
        if has_env {
--- a/crates/nu-cmd-lang/src/core_commands/error_make.rs
+++ b/crates/nu-cmd-lang/src/core_commands/error_make.rs
@ -56,16 +56,7 @@ impl Command for ErrorMake {
            Example {
                description: "Create a simple custom error",
                example: r#"error make {msg: "my custom error message"}"#,
-                result: Some(Value::error(
+                result: None,
                    ShellError::GenericError {
                        error: "my custom error message".into(),
                        msg: "".into(),
                        span: None,
                        help: None,
                        inner: vec![],
                    },
                    Span::unknown(),
                )),
            },
            Example {
                description: "Create a more complex custom error",
@ -82,16 +73,7 @@ impl Command for ErrorMake {
        }
        help: "A help string, suggesting a fix to the user"  # optional
    }"#,
-                result: Some(Value::error(
+                result: None,
                    ShellError::GenericError {
                        error: "my custom error message".into(),
                        msg: "my custom label text".into(),
                        span: Some(Span::new(123, 456)),
                        help: Some("A help string, suggesting a fix to the user".into()),
                        inner: vec![],
                    },
                    Span::unknown(),
                )),
            },
            Example {
                description:
--- a/crates/nu-cmd-lang/src/core_commands/for_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/for_.rs
@ -1,6 +1,5 @@
 use nu_engine::{command_prelude::*, get_eval_block, get_eval_expression};
-use nu_protocol::engine::CommandType;
+use nu_protocol::{engine::CommandType, Signals};
 use nu_protocol::ParseWarning;
 #[derive(Clone)]
 pub struct For;
@ -29,11 +28,6 @@ impl Command for For {
                "Range of the loop.",
            )
            .required("block", SyntaxShape::Block, "The block to run.")
            .switch(
                "numbered",
                "DEPRECATED: return a numbered item ($it.index and $it.item)",
                Some('n'),
            )
            .creates_scope()
            .category(Category::Core)
    }
@ -54,6 +48,9 @@ impl Command for For {
        call: &Call,
        _input: PipelineData,
    ) -> Result<PipelineData, ShellError> {
        // This is compiled specially by the IR compiler. The code here is never used when
        // running in IR mode.
        let call = call.assert_ast_call()?;
        let head = call.head;
        let var_id = call
            .positional_nth(0)
@ -78,23 +75,6 @@ impl Command for For {
        let value = eval_expression(engine_state, stack, keyword_expr)?;
        let numbered = call.has_flag(engine_state, stack, "numbered")?;
        if numbered {
            nu_protocol::report_error_new(
                engine_state,
                &ParseWarning::DeprecatedWarning {
                    old_command: "--numbered/-n".into(),
                    new_suggestion: "use `enumerate`".into(),
                    span: call
                        .get_named_arg("numbered")
                        .expect("`get_named_arg` found `--numbered` but still failed")
                        .span,
                    url: "See `help for` examples".into(),
                },
            );
        }
        let ctrlc = engine_state.ctrlc.clone();
        let engine_state = engine_state.clone();
        let block = engine_state.get_block(block_id);
@ -103,29 +83,14 @@ impl Command for For {
        let span = value.span();
        match value {
            Value::List { vals, .. } => {
-                for (idx, x) in vals.into_iter().enumerate() {
+                for x in vals.into_iter() {
-                    if nu_utils::ctrl_c::was_pressed(&ctrlc) {
+                    engine_state.signals().check(head)?;
                        break;
                    }
                    // 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(
+                    stack.add_var(var_id, x);
                        var_id,
                        if numbered {
                            Value::record(
                                record! {
                                    "index" => Value::int(idx as i64, head),
                                    "item" => x,
                                },
                                head,
                            )
                        } else {
                            x
                        },
                    );
                    match eval_block(&engine_state, stack, block, PipelineData::empty()) {
                        Err(ShellError::Break { .. }) => {
@ -151,21 +116,9 @@ impl Command for For {
                }
            }
            Value::Range { val, .. } => {
-                for (idx, x) in val.into_range_iter(span, ctrlc).enumerate() {
+                for x in val.into_range_iter(span, Signals::empty()) {
-                    stack.add_var(
+                    engine_state.signals().check(head)?;
-                        var_id,
+                    stack.add_var(var_id, x);
                        if numbered {
                            Value::record(
                                record! {
                                    "index" => Value::int(idx as i64, head),
                                    "item" => x,
                                },
                                head,
                            )
                        } else {
                            x
                        },
                    );
                    match eval_block(&engine_state, stack, block, PipelineData::empty()) {
                        Err(ShellError::Break { .. }) => {
--- a/crates/nu-cmd-lang/src/core_commands/if_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/if_.rs
@ -2,7 +2,7 @@ use nu_engine::{
    command_prelude::*, get_eval_block, get_eval_expression, get_eval_expression_with_input,
 };
 use nu_protocol::{
-    engine::StateWorkingSet,
+    engine::{CommandType, StateWorkingSet},
    eval_const::{eval_const_subexpression, eval_constant, eval_constant_with_input},
 };
@ -41,6 +41,15 @@ impl Command for If {
            .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 command_type(&self) -> CommandType {
        CommandType::Keyword
    }
    fn is_const(&self) -> bool {
        true
    }
@ -51,6 +60,9 @@ impl Command for If {
        call: &Call,
        input: PipelineData,
    ) -> Result<PipelineData, ShellError> {
        // This is compiled specially by the IR compiler. The code here is never used when
        // running in IR mode.
        let call = call.assert_ast_call()?;
        let cond = call.positional_nth(0).expect("checked through parser");
        let then_block = call
            .positional_nth(1)
@ -90,6 +102,9 @@ impl Command for If {
        call: &Call,
        input: PipelineData,
    ) -> Result<PipelineData, ShellError> {
        // This is compiled specially by the IR compiler. The code here is never used when
        // running in IR mode.
        let call = call.assert_ast_call()?;
        let cond = call.positional_nth(0).expect("checked through parser");
        let then_block = call
            .positional_nth(1)
--- a/crates/nu-cmd-lang/src/core_commands/let_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/let_.rs
@ -46,6 +46,9 @@ impl Command for Let {
        call: &Call,
        input: PipelineData,
    ) -> Result<PipelineData, ShellError> {
        // This is compiled specially by the IR compiler. The code here is never used when
        // running in IR mode.
        let call = call.assert_ast_call()?;
        let var_id = call
            .positional_nth(0)
            .expect("checked through parser")
--- a/crates/nu-cmd-lang/src/core_commands/loop_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/loop_.rs
@ -1,4 +1,5 @@
 use nu_engine::{command_prelude::*, get_eval_block};
 use nu_protocol::engine::CommandType;
 #[derive(Clone)]
 pub struct Loop;
@ -20,6 +21,15 @@ impl Command for Loop {
            .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 command_type(&self) -> CommandType {
        CommandType::Keyword
    }
    fn run(
        &self,
        engine_state: &EngineState,
@ -27,6 +37,10 @@ impl Command for Loop {
        call: &Call,
        _input: PipelineData,
    ) -> Result<PipelineData, ShellError> {
        // This is compiled specially by the IR compiler. The code here is never used when
        // running in IR mode.
        let call = call.assert_ast_call()?;
        let head = call.head;
        let block_id = call
            .positional_nth(0)
            .expect("checked through parser")
@ -39,9 +53,7 @@ impl Command for Loop {
        let stack = &mut stack.push_redirection(None, None);
        loop {
-            if nu_utils::ctrl_c::was_pressed(&engine_state.ctrlc) {
+            engine_state.signals().check(head)?;
                break;
            }
            match eval_block(engine_state, stack, block, PipelineData::empty()) {
                Err(ShellError::Break { .. }) => {
--- a/crates/nu-cmd-lang/src/core_commands/match_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/match_.rs
@ -1,7 +1,7 @@
 use nu_engine::{
    command_prelude::*, get_eval_block, get_eval_expression, get_eval_expression_with_input,
 };
-use nu_protocol::engine::Matcher;
+use nu_protocol::engine::{CommandType, Matcher};
 #[derive(Clone)]
 pub struct Match;
@ -27,6 +27,15 @@ impl Command for Match {
            .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 command_type(&self) -> CommandType {
        CommandType::Keyword
    }
    fn run(
        &self,
        engine_state: &EngineState,
@ -34,6 +43,9 @@ impl Command for Match {
        call: &Call,
        input: PipelineData,
    ) -> Result<PipelineData, ShellError> {
        // This is compiled specially by the IR compiler. The code here is never used when
        // running in IR mode.
        let call = call.assert_ast_call()?;
        let value: Value = call.req(engine_state, stack, 0)?;
        let matches = call
            .positional_nth(1)
--- a/crates/nu-cmd-lang/src/core_commands/mut_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/mut_.rs
@ -46,6 +46,9 @@ impl Command for Mut {
        call: &Call,
        input: PipelineData,
    ) -> Result<PipelineData, ShellError> {
        // This is compiled specially by the IR compiler. The code here is never used when
        // running in IR mode.
        let call = call.assert_ast_call()?;
        let var_id = call
            .positional_nth(0)
            .expect("checked through parser")
--- a/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/overlay/use_.rs
@ -65,9 +65,9 @@ impl Command for OverlayUse {
        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 Some(overlay_expr) = call.get_parser_info(caller_stack, "overlay_expr") {
                if let Expr::Overlay(module_id) = &overlay_expr.expr {
-                    module_id
+                    *module_id
                } else {
                    return Err(ShellError::NushellFailedSpanned {
                        msg: "Not an overlay".to_string(),
@ -110,7 +110,7 @@ impl Command for OverlayUse {
            // a) adding a new overlay
            // b) refreshing an active overlay (the origin module changed)
-            let module = engine_state.get_module(*module_id);
+            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 {
@ -118,7 +118,7 @@ impl Command for OverlayUse {
                    &name_arg.item,
                    engine_state,
                    caller_stack,
-                    get_dirs_var_from_call(call),
+                    get_dirs_var_from_call(caller_stack, call),
                )?;
                let block = engine_state.get_block(block_id);
--- a/crates/nu-cmd-lang/src/core_commands/scope/command.rs
+++ b/crates/nu-cmd-lang/src/core_commands/scope/command.rs
@ -1,5 +1,4 @@
 use nu_engine::{command_prelude::*, get_full_help};
 use nu_protocol::engine::CommandType;
 #[derive(Clone)]
 pub struct Scope;
@ -20,10 +19,6 @@ impl Command for Scope {
        "Commands for getting info about what is in scope."
    }
    fn command_type(&self) -> CommandType {
        CommandType::Keyword
    }
    fn run(
        &self,
        engine_state: &EngineState,
--- a/crates/nu-cmd-lang/src/core_commands/try_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/try_.rs
@ -1,5 +1,5 @@
 use nu_engine::{command_prelude::*, get_eval_block, EvalBlockFn};
-use nu_protocol::engine::Closure;
+use nu_protocol::engine::{Closure, CommandType};
 #[derive(Clone)]
 pub struct Try;
@ -31,6 +31,15 @@ impl Command for Try {
            .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 command_type(&self) -> CommandType {
        CommandType::Keyword
    }
    fn run(
        &self,
        engine_state: &EngineState,
@ -38,6 +47,9 @@ impl Command for Try {
        call: &Call,
        input: PipelineData,
    ) -> Result<PipelineData, ShellError> {
        // This is compiled specially by the IR compiler. The code here is never used when
        // running in IR mode.
        let call = call.assert_ast_call()?;
        let try_block = call
            .positional_nth(0)
            .expect("checked through parser")
--- a/Show More
+++ b/Show More
`@ -1 +1,2 @@`
		`mod keybindings_list;`
	`mod nu_highlight;`	`mod nu_highlight;`